From 1312184bb5dca6a7436aee1fb60ac009014c4e86 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 24 Jun 2022 09:16:12 -0500 Subject: [PATCH 1/6] Update PureScript to 0.15.3 --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 4be775d7..7d3f3b69 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,7 +3,7 @@ packages: - "." extra-deps: - - purescript-0.15.2 + - purescript-0.15.3 - language-javascript-0.7.0.0 - monoidal-containers-0.6.2.0 - process-1.6.13.1 From 2f73dfd0e1cdcec97519035ef5b6d376e81d4d18 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 24 Jun 2022 09:16:24 -0500 Subject: [PATCH 2/6] Update to latest package set and install all packages --- staging/packages.dhall | 4 ++-- staging/spago.dhall | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/staging/packages.dhall b/staging/packages.dhall index f9039b01..620501fe 100644 --- a/staging/packages.dhall +++ b/staging/packages.dhall @@ -1,5 +1,5 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220531/packages.dhall - sha256:278d3608439187e51136251ebf12fabda62d41ceb4bec9769312a08b56f853e3 + https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220621/packages.dhall + sha256:78caab14e4d8ff3886a057f0380c2d4a2500e2ee7ab5c1d32a0f9ce5c71eedd8 in upstream diff --git a/staging/spago.dhall b/staging/spago.dhall index 168c1740..34bd8022 100644 --- a/staging/spago.dhall +++ b/staging/spago.dhall @@ -16,6 +16,7 @@ , "argonaut-generic" , "argonaut-traversals" , "argparse-basic" + , "array-builder" , "arraybuffer" , "arraybuffer-builder" , "arraybuffer-types" @@ -28,6 +29,7 @@ , "barlow-lens" , "bifunctors" , "bigints" + , "bolson" , "bower-json" , "call-by-name" , "canvas" @@ -51,6 +53,7 @@ , "datetime-parsing" , "debug" , "decimals" + , "deku" , "dissect" , "distributive" , "dodo-printer" @@ -59,6 +62,10 @@ , "dynamic-buffer" , "effect" , "either" + , "elmish" + , "elmish-enzyme" + , "elmish-hooks" + , "elmish-html" , "email-validate" , "encoding" , "enums" @@ -99,14 +106,19 @@ , "halogen-store" , "halogen-storybook" , "halogen-subscriptions" + , "halogen-svg-elems" , "halogen-vdom" , "halogen-vdom-string-renderer" , "heckin" , "heterogeneous" , "heterogeneous-extrablatt" + , "homogeneous" , "http-methods" , "httpure" , "httpurple" + , "httpurple-argonaut" + , "httpurple-yoga-json" + , "hyrule" , "identity" , "indexed-monad" , "int64" @@ -121,11 +133,14 @@ , "jwt" , "language-cst-parser" , "lazy" + , "lazy-joe" , "lcg" , "leibniz" , "linalg" , "lists" + , "literals" , "logging" + , "logging-journald" , "machines" , "matrices" , "matryoshka" @@ -139,13 +154,16 @@ , "monad-logger" , "monad-loops" , "monad-unlift" + , "monoid-extras" , "monoidal" , "morello" , "motsunabe" + , "nano-id" , "naturals" , "nested-functor" , "newtype" , "node-buffer" + , "node-buffer-blob" , "node-child-process" , "node-fs" , "node-fs-aff" @@ -162,10 +180,12 @@ , "npm-package-json" , "nullable" , "numbers" + , "ocarina" , "open-folds" , "open-memoize" , "open-pairing" , "options" + , "optparse" , "ordered-collections" , "ordered-set" , "orders" @@ -176,8 +196,10 @@ , "partial" , "pathy" , "pha" + , "phaser" , "pipes" , "point-free" + , "pointed-list" , "polymorphic-vectors" , "posix-types" , "precise" @@ -203,6 +225,7 @@ , "react" , "react-basic" , "react-basic-dom" + , "react-basic-hooks" , "react-dom" , "read" , "record" @@ -214,6 +237,7 @@ , "result" , "return" , "ring-modules" + , "rito" , "routing" , "routing-duplex" , "run" @@ -223,6 +247,7 @@ , "semirings" , "signal" , "simple-emitter" + , "simple-json" , "sized-matrices" , "sized-vectors" , "slug" @@ -241,6 +266,7 @@ , "stringutils" , "substitute" , "supply" + , "systemd-journald" , "tailrec" , "test-unit" , "thermite" @@ -258,9 +284,11 @@ , "typelevel-rows" , "uint" , "uncurried-transformers" + , "undefined-is-not-a-problem" , "unfoldable" , "unicode" , "unlift" + , "unordered-collections" , "unsafe-coerce" , "unsafe-reference" , "uri" From 77ae999e151b32ade262b8655b89616f5d688608 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 24 Jun 2022 09:16:30 -0500 Subject: [PATCH 3/6] Update versions --- client/src/Try/SharedConfig.purs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/Try/SharedConfig.purs b/client/src/Try/SharedConfig.purs index 99ed04a9..74ef436b 100644 --- a/client/src/Try/SharedConfig.purs +++ b/client/src/Try/SharedConfig.purs @@ -6,13 +6,13 @@ module Try.SharedConfig where import Prelude pursVersion :: String -pursVersion = "v0.15.2" +pursVersion = "v0.15.3" pursReleaseUrl :: String pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion packageSetVersion :: String -packageSetVersion = "0.15.2-20220531" +packageSetVersion = "0.15.2-20220621" packageSetPackageJsonUrl :: String packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json" From d3fc6ddc8e7727f93aafaccc0d9744fe404e716b Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 24 Jun 2022 09:27:44 -0500 Subject: [PATCH 4/6] Update stack yaml file to match purescript's one --- stack.yaml | 8 +++++--- stack.yaml.lock | 38 +++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/stack.yaml b/stack.yaml index 7d3f3b69..5ac88318 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,13 +1,15 @@ -resolver: lts-18.15 +resolver: nightly-2022-06-09 packages: - "." extra-deps: - purescript-0.15.3 - language-javascript-0.7.0.0 - - monoidal-containers-0.6.2.0 - process-1.6.13.1 - - Cabal-3.2.1.0 + # The Cabal library is not in Stackage + - Cabal-3.6.3.0 + # Protolude is not yet in resolver snapshot + - protolude-0.3.1 flags: aeson-pretty: diff --git a/stack.yaml.lock b/stack.yaml.lock index 05765018..497814bf 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,12 +5,12 @@ packages: - completed: - hackage: purescript-0.15.2@sha256:c269f5e8ca70a49e45345d9d1e60c47c32b5bd1e87073224cefd22f5273ce164,20150 + hackage: purescript-0.15.3@sha256:c996f177092867d4f88327a641611535b58fd042f2d3fed16d994440587515dc,20642 pantry-tree: - size: 148972 - sha256: 4526fbe5158eedb966b56626873bdc5a46fd0ab9cd8835c35d48365f5e9caa87 + size: 151267 + sha256: 20847b2aa168b38d34b562576f40df2821f55f512f2585d42cfe8e6c4cbe8695 original: - hackage: purescript-0.15.2 + hackage: purescript-0.15.3 - completed: hackage: language-javascript-0.7.0.0@sha256:3eab0262b8ac5621936a4beab6a0f97d0e00a63455a8b0e3ac1547b4088dae7d,3898 pantry-tree: @@ -18,13 +18,6 @@ packages: sha256: b0f28d836cb3fbde203fd7318a896c3a20acd8653a905e1950ae2d9a64bccebf original: hackage: language-javascript-0.7.0.0 -- completed: - hackage: monoidal-containers-0.6.2.0@sha256:124941d70df5e2928b4c6db605a1d0464e68c2c6b02e426db24a40194d43821d,2219 - pantry-tree: - size: 569 - sha256: 07ceac751866bad09af45df7d0ae97420d659221e8a0d85407705dcda1f6e89b - original: - hackage: monoidal-containers-0.6.2.0 - completed: hackage: process-1.6.13.1@sha256:c8bb8b7c993ff72d771381b3b56852dd154bce51880a24789c11f57b0688d353,2963 pantry-tree: @@ -33,15 +26,22 @@ packages: original: hackage: process-1.6.13.1 - completed: - hackage: Cabal-3.2.1.0@sha256:8743076ec022296f9771d962000c9ca3a0fe02e68c37b992c63e382a675f791d,27482 + hackage: Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459 + pantry-tree: + size: 19757 + sha256: b250a53bdb56844f047a2927833bb565b936a289abfa85dfc2a63148d776368a + original: + hackage: Cabal-3.6.3.0 +- completed: + hackage: protolude-0.3.1@sha256:1cc9e5a5c26c33a43c52b554443dd9779fef13974eaa0beec7ca6d2551b400da,2647 pantry-tree: - size: 41224 - sha256: 92682a2aab8d967de341acff88525376eb9a31f53f094e0878c51c2886564f3a + size: 1645 + sha256: 6452a6ca8d395f7d810139779bb0fd16fc1dbb00f1862630bc08ef5a100430f9 original: - hackage: Cabal-3.2.1.0 + hackage: protolude-0.3.1 snapshots: - completed: - size: 586286 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/15.yaml - sha256: 2c9cb11d7aa0656bf28672dcb2414ab21e3ba9ea83ca170c216b2c2fc7e55856 - original: lts-18.15 + size: 607265 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/6/9.yaml + sha256: 819ac07621dac5b2c320c45cb8c27f141f95114a1749b19b06d2c3606c79e839 + original: nightly-2022-06-09 From 01433a2ca4f152191a75db1b2ccb4e6b381185ae Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 24 Jun 2022 09:28:33 -0500 Subject: [PATCH 5/6] Account for qualify local bindings by source pos PR --- server/Main.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/Main.hs b/server/Main.hs index 8434aa32..981b0b7f 100644 --- a/server/Main.hs +++ b/server/Main.hs @@ -41,6 +41,7 @@ import qualified Language.PureScript.Errors.JSON as P import qualified Language.PureScript.Interactive as I import qualified Language.PureScript.Make as Make import qualified Language.PureScript.Make.Cache as Cache +import qualified Language.PureScript.Names as N import qualified Language.PureScript.TypeChecker.TypeSearch as TS import qualified Network.Wai.Handler.Warp as Warp import System.Environment (getArgs) @@ -192,13 +193,13 @@ getOpts port = def lookupAllConstructors :: P.Environment -> P.SourceType -> [P.SourceType] lookupAllConstructors env = P.everywhereOnTypesM $ \case - P.TypeConstructor ann (P.Qualified Nothing tyCon) -> P.TypeConstructor ann <$> lookupConstructor env tyCon + P.TypeConstructor ann (P.Qualified (N.BySourcePos _) tyCon) -> P.TypeConstructor ann <$> lookupConstructor env tyCon other -> pure other where lookupConstructor :: P.Environment -> P.ProperName 'P.TypeName -> [P.Qualified (P.ProperName 'P.TypeName)] lookupConstructor env nm = [ q - | (q@(P.Qualified (Just _) thisNm), _) <- M.toList (P.types env) + | (q@(P.Qualified (N.ByModuleName _) thisNm), _) <- M.toList (P.types env) , thisNm == nm ] From 37c08f6dda7b9d85e34b5f5917eca22925623ad2 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Fri, 24 Jun 2022 09:30:50 -0500 Subject: [PATCH 6/6] Add changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f12f0711..149bc1d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ New features: Bugfixes: Other improvements: +- Update to PureScript 0.15.3 (#281 by @JordanMartinez) +- Update codebase to GHC 9.2.3 (#281 by @JordanMartinez) ## [v2022-06-18.1](https://github.com/purescript/trypurescript/releases/tag/v2022-06-18.1)