From 1d36bfcbf9b517d8ae6a39044e51121e0597e546 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 18 Oct 2022 10:15:35 -0500 Subject: [PATCH 01/12] Bump PS to 0.15.6 --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 1cc6fef0..1f8d5b78 100644 --- a/stack.yaml +++ b/stack.yaml @@ -3,7 +3,7 @@ packages: - "." extra-deps: - - purescript-0.15.4 + - purescript-0.15.6 - language-javascript-0.7.0.0 - process-1.6.13.1 # The Cabal library is not in Stackage From 9c76160b45f532bbf035b3236e7e8126bd633f8e Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 18 Oct 2022 10:23:03 -0500 Subject: [PATCH 02/12] Update yaml lock --- stack.yaml.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stack.yaml.lock b/stack.yaml.lock index 34e8181a..d926c517 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,12 +5,12 @@ packages: - completed: - hackage: purescript-0.15.4@sha256:29fcb37f227a475a4357de52962f3564da6c881c146a679a514086d9883b1599,20642 + hackage: purescript-0.15.6@sha256:d06964345d46009b0a2d5f610f9e0394912da682f508458e7c059a4d6b0299c1,20800 pantry-tree: - size: 151335 - sha256: 6432cafb3d7b3334654d3e5c584eeada632e4c767403ede43953f2d3f33aa8ee + size: 153963 + sha256: 8a43be3726b172e8cfeebfb05462f17eeb3af932576c5e48cf366c0751f1fdf8 original: - hackage: purescript-0.15.4 + hackage: purescript-0.15.6 - completed: hackage: language-javascript-0.7.0.0@sha256:3eab0262b8ac5621936a4beab6a0f97d0e00a63455a8b0e3ac1547b4088dae7d,3898 pantry-tree: From c896233b387046d037b2c96a2334068b9fccf7cd Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 18 Oct 2022 10:23:14 -0500 Subject: [PATCH 03/12] Update package set to latest version --- staging/packages.dhall | 5 +++-- staging/spago.dhall | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/staging/packages.dhall b/staging/packages.dhall index a6bdea47..4eb15b19 100644 --- a/staging/packages.dhall +++ b/staging/packages.dhall @@ -1,5 +1,6 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220901/packages.dhall - sha256:f1531b29c21ac437ffe5666c1b6cc76f0a9c29d3c9d107ff047aa2567744994f + https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20221018/packages.dhall + sha256:b1db2e4a17260ace8d17858602f8c56f460982d6e404818d7f6cb9f053324bb1 in upstream + with metadata.version = "v0.15.6" diff --git a/staging/spago.dhall b/staging/spago.dhall index 58ac0ad8..8a5329ed 100644 --- a/staging/spago.dhall +++ b/staging/spago.dhall @@ -1,6 +1,7 @@ { name = "try-purescript-server" , dependencies = - [ "ace" + [ "abc-parser" + , "ace" , "aff" , "aff-bus" , "aff-coroutines" @@ -26,6 +27,7 @@ , "assert" , "avar" , "b64" + , "barbies" , "barlow-lens" , "bifunctors" , "bigints" @@ -38,9 +40,12 @@ , "catenable-lists" , "channel" , "checked-exceptions" + , "classnames" , "codec" , "codec-argonaut" , "colors" + , "concur-core" + , "concur-react" , "concurrent-queues" , "console" , "const" @@ -53,11 +58,13 @@ , "datetime-parsing" , "debug" , "decimals" + , "default-values" , "deku" , "deno" , "dissect" , "distributive" , "dodo-printer" + , "dom-filereader" , "dom-indexed" , "dotenv" , "droplet" @@ -68,13 +75,16 @@ , "elmish-enzyme" , "elmish-hooks" , "elmish-html" + , "elmish-testing-library" , "email-validate" , "encoding" , "enums" + , "error" , "exceptions" , "exists" , "exitcodes" , "expect-inferred" + , "fallback" , "fast-vect" , "fetch" , "fetch-argonaut" @@ -97,6 +107,7 @@ , "freer-free" , "freet" , "functions" + , "functor1" , "functors" , "fuzzy" , "gen" @@ -108,6 +119,7 @@ , "graphs" , "group" , "halogen" + , "halogen-bootstrap5" , "halogen-css" , "halogen-formless" , "halogen-hooks" @@ -134,8 +146,13 @@ , "integers" , "interpolate" , "invariant" + , "jarilo" + , "jelly" + , "jest" + , "js-bigints" , "js-date" , "js-fileio" + , "js-promise" , "js-timers" , "js-uri" , "justifill" @@ -154,6 +171,7 @@ , "matrices" , "matryoshka" , "maybe" + , "mdast-util-from-markdown" , "media-types" , "metadata" , "midi" @@ -167,11 +185,13 @@ , "monoid-extras" , "monoidal" , "morello" + , "mote" , "motsunabe" , "nano-id" , "naturals" , "nested-functor" , "newtype" + , "nextui" , "node-buffer" , "node-buffer-blob" , "node-child-process" @@ -182,6 +202,7 @@ , "node-path" , "node-process" , "node-readline" + , "node-sqlite3" , "node-streams" , "node-streams-aff" , "node-url" @@ -229,9 +250,9 @@ , "quickcheck-combinators" , "quickcheck-laws" , "quickcheck-utf8" - , "quotient" , "random" , "rationals" + , "rdf" , "react" , "react-basic" , "react-basic-classic" @@ -242,9 +263,9 @@ , "react-dom" , "react-halo" , "react-icons" + , "react-testing-library" , "read" , "record" - , "refined" , "refs" , "remotedata" , "resource" @@ -258,6 +279,7 @@ , "run" , "safe-coerce" , "safely" + , "school-of-music" , "selection-foldable" , "semirings" , "signal" @@ -273,6 +295,7 @@ , "spec" , "spec-discovery" , "spec-quickcheck" + , "splitmix" , "ssrs" , "st" , "strictlypositiveint" @@ -283,12 +306,16 @@ , "substitute" , "sunde" , "supply" + , "svg-parser" , "systemd-journald" , "tailrec" + , "tecton" + , "tecton-halogen" , "test-unit" , "thermite" , "thermite-dom" , "these" + , "toppokki" , "transformers" , "tree-rose" , "tuples" @@ -302,6 +329,7 @@ , "uint" , "ulid" , "uncurried-transformers" + , "undefined" , "undefined-is-not-a-problem" , "unfoldable" , "unicode" @@ -326,7 +354,6 @@ , "web-fetch" , "web-file" , "web-html" - , "web-page-visibility" , "web-pointerevents" , "web-promise" , "web-router" @@ -335,6 +362,7 @@ , "web-streams" , "web-touchevents" , "web-uievents" + , "web-url" , "web-workers" , "web-xhr" , "which" From e93f7a052ee7c60a91a60ee2a5e6a9bec0ae9f27 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 18 Oct 2022 10:23:24 -0500 Subject: [PATCH 04/12] Update changelog; prep for release --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f976dc31..493d059a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,14 @@ New features: Bugfixes: +Other improvements: + +## [v2022-10-18.1](https://github.com/purescript/trypurescript/releases/tag/v2022-10-18.1) + Other improvements: - Update main example to note that editor state is persisted in the URL (#300 by @thomashoneyman) +- Update PureScript to `0.15.6` (#302 by @JordanMartinez) +- Update to latest package set (#302 by @JordanMartinez) ## [v2022-09-10.1](https://github.com/purescript/trypurescript/releases/tag/v2022-09-10.1) From 46fc2914fb5036ea3f1c7ec307eb26dffbdcb6b0 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Tue, 18 Oct 2022 10:25:38 -0500 Subject: [PATCH 05/12] Update shared config --- 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 bbb30345..7189ef99 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.4" +pursVersion = "v0.15.6" pursReleaseUrl :: String pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion packageSetVersion :: String -packageSetVersion = "0.15.4-20220901" +packageSetVersion = "0.15.4-20221018" packageSetPackageJsonUrl :: String packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json" From c5df20ff119f7e67860293941db7034ef89115f8 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 12:59:39 -0600 Subject: [PATCH 06/12] Fix compiler error --- server/Main.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/Main.hs b/server/Main.hs index 9f317e6d..fdbbb748 100644 --- a/server/Main.hs +++ b/server/Main.hs @@ -66,7 +66,7 @@ toCompilerErrors :: NE.NonEmpty CST.ParserError -> Error toCompilerErrors = CompilerErrors . toJsonErrors . CST.toMultipleErrors "" toJsonErrors :: P.MultipleErrors -> [P.JSONError] -toJsonErrors = P.toJSONErrors False P.Error +toJsonErrors = P.toJSONErrors False P.Error [] -- As of PureScript 0.14 we only need the `codegen` part of `MakeActions` to run -- Try PureScript, because we already know all dependencies are compiled, we're From d64c20858661a7544acd5127032cdde5a7ea7932 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 12:59:51 -0600 Subject: [PATCH 07/12] Update PureScript to 0.15.7 --- stack.yaml | 6 ++---- stack.yaml.lock | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/stack.yaml b/stack.yaml index 1f8d5b78..ad37c43d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,9 @@ -resolver: nightly-2022-06-09 +resolver: nightly-2022-11-12 packages: - "." extra-deps: - - purescript-0.15.6 + - purescript-0.15.7 - language-javascript-0.7.0.0 - process-1.6.13.1 # The Cabal library is not in Stackage @@ -12,7 +12,5 @@ extra-deps: - protolude-0.3.1 flags: - aeson-pretty: - lib-only: true these: assoc: false diff --git a/stack.yaml.lock b/stack.yaml.lock index d926c517..8e71b630 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,43 +5,43 @@ packages: - completed: - hackage: purescript-0.15.6@sha256:d06964345d46009b0a2d5f610f9e0394912da682f508458e7c059a4d6b0299c1,20800 + hackage: purescript-0.15.7@sha256:fbf49910576377332e202d7fac73c7904dff7357508f702c7c68d7c59c83d41e,21420 pantry-tree: - size: 153963 - sha256: 8a43be3726b172e8cfeebfb05462f17eeb3af932576c5e48cf366c0751f1fdf8 + sha256: 3487b12981c52d188684f42c58585f27d77f7365758a99ade0b28af06522c130 + size: 154992 original: - hackage: purescript-0.15.6 + hackage: purescript-0.15.7 - completed: hackage: language-javascript-0.7.0.0@sha256:3eab0262b8ac5621936a4beab6a0f97d0e00a63455a8b0e3ac1547b4088dae7d,3898 pantry-tree: - size: 2244 sha256: b0f28d836cb3fbde203fd7318a896c3a20acd8653a905e1950ae2d9a64bccebf + size: 2244 original: hackage: language-javascript-0.7.0.0 - completed: hackage: process-1.6.13.1@sha256:c8bb8b7c993ff72d771381b3b56852dd154bce51880a24789c11f57b0688d353,2963 pantry-tree: - size: 1543 sha256: 58117b15fa330c79b3bca6b29c65f815e45840f79cc0915d3434f25e54ac8fa5 + size: 1543 original: hackage: process-1.6.13.1 - completed: hackage: Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459 pantry-tree: - size: 19757 sha256: b250a53bdb56844f047a2927833bb565b936a289abfa85dfc2a63148d776368a + size: 19757 original: hackage: Cabal-3.6.3.0 - completed: hackage: protolude-0.3.1@sha256:1cc9e5a5c26c33a43c52b554443dd9779fef13974eaa0beec7ca6d2551b400da,2647 pantry-tree: - size: 1645 sha256: 6452a6ca8d395f7d810139779bb0fd16fc1dbb00f1862630bc08ef5a100430f9 + size: 1645 original: hackage: protolude-0.3.1 snapshots: - completed: - size: 607265 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/6/9.yaml - sha256: 819ac07621dac5b2c320c45cb8c27f141f95114a1749b19b06d2c3606c79e839 - original: nightly-2022-06-09 + sha256: 5cacb39a2c21842535dc0a31e2005d3b1eb18e451a89d58c28381e1efdb9520f + size: 647983 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/11/12.yaml + original: nightly-2022-11-12 From 6d859f037b2a382f97b8e8616c67a890b3520c0d Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 13:01:00 -0600 Subject: [PATCH 08/12] Update package set --- staging/packages.dhall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/packages.dhall b/staging/packages.dhall index 4eb15b19..304d919b 100644 --- a/staging/packages.dhall +++ b/staging/packages.dhall @@ -1,6 +1,6 @@ let upstream = - https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20221018/packages.dhall - sha256:b1db2e4a17260ace8d17858602f8c56f460982d6e404818d7f6cb9f053324bb1 + https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20221212/packages.dhall + sha256:62ea94a2728dc4f0a47491c064776f402a8a1b3cf2d8a7ec83c96075d30bd590 in upstream - with metadata.version = "v0.15.6" + with metadata.version = "v0.15.7" From 5b9ef5b587a372ce5fffd9e81b056b59ea6fe686 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 13:03:29 -0600 Subject: [PATCH 09/12] Install entire package set --- staging/spago.dhall | 51 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/staging/spago.dhall b/staging/spago.dhall index 8a5329ed..c6e90a84 100644 --- a/staging/spago.dhall +++ b/staging/spago.dhall @@ -29,10 +29,24 @@ , "b64" , "barbies" , "barlow-lens" + , "basic-auth" , "bifunctors" , "bigints" , "bolson" , "bower-json" + , "bucketchain" + , "bucketchain-basic-auth" + , "bucketchain-conditional" + , "bucketchain-cors" + , "bucketchain-csrf" + , "bucketchain-header-utils" + , "bucketchain-health" + , "bucketchain-history-api-fallback" + , "bucketchain-logger" + , "bucketchain-secure" + , "bucketchain-simple-api" + , "bucketchain-sslify" + , "bucketchain-static" , "call-by-name" , "canvas" , "canvas-action" @@ -40,6 +54,10 @@ , "catenable-lists" , "channel" , "checked-exceptions" + , "classless" + , "classless-arbitrary" + , "classless-decode-json" + , "classless-encode-json" , "classnames" , "codec" , "codec-argonaut" @@ -53,6 +71,7 @@ , "control" , "convertable-options" , "coroutines" + , "crypto" , "css" , "datetime" , "datetime-parsing" @@ -69,6 +88,7 @@ , "dotenv" , "droplet" , "dynamic-buffer" + , "echarts-simple" , "effect" , "either" , "elmish" @@ -84,6 +104,7 @@ , "exists" , "exitcodes" , "expect-inferred" + , "fahrtwind" , "fallback" , "fast-vect" , "fetch" @@ -102,6 +123,7 @@ , "fork" , "form-urlencoded" , "formatters" + , "framer-motion" , "free" , "freeap" , "freer-free" @@ -115,6 +137,9 @@ , "generic-router" , "geometry-plane" , "github-actions-toolkit" + , "grain" + , "grain-router" + , "grain-virtualized" , "graphql-client" , "graphs" , "group" @@ -132,7 +157,6 @@ , "halogen-vdom-string-renderer" , "heckin" , "heterogeneous" - , "heterogeneous-extrablatt" , "homogeneous" , "http-methods" , "httpure" @@ -141,6 +165,7 @@ , "httpurple-yoga-json" , "hyrule" , "identity" + , "identy" , "indexed-monad" , "int64" , "integers" @@ -148,11 +173,15 @@ , "invariant" , "jarilo" , "jelly" + , "jelly-hooks" + , "jelly-router" + , "jelly-signal" , "jest" , "js-bigints" , "js-date" , "js-fileio" , "js-promise" + , "js-promise-aff" , "js-timers" , "js-uri" , "justifill" @@ -187,6 +216,7 @@ , "morello" , "mote" , "motsunabe" + , "mysql" , "nano-id" , "naturals" , "nested-functor" @@ -206,11 +236,13 @@ , "node-streams" , "node-streams-aff" , "node-url" + , "nodemailer" , "nonempty" , "now" , "npm-package-json" , "nullable" , "numbers" + , "object-maps" , "ocarina" , "open-folds" , "open-memoize" @@ -229,6 +261,7 @@ , "pha" , "phaser" , "pipes" + , "pirates-charm" , "point-free" , "pointed-list" , "polymorphic-vectors" @@ -254,18 +287,23 @@ , "rationals" , "rdf" , "react" + , "react-aria" , "react-basic" , "react-basic-classic" , "react-basic-dnd" , "react-basic-dom" , "react-basic-emotion" , "react-basic-hooks" + , "react-basic-storybook" , "react-dom" , "react-halo" , "react-icons" , "react-testing-library" + , "react-virtuoso" , "read" , "record" + , "record-extra" + , "record-studio" , "refs" , "remotedata" , "resource" @@ -284,7 +322,10 @@ , "semirings" , "signal" , "simple-emitter" + , "simple-i18n" , "simple-json" + , "simple-jwt" + , "simple-ulid" , "sized-matrices" , "sized-vectors" , "slug" @@ -308,6 +349,7 @@ , "supply" , "svg-parser" , "systemd-journald" + , "tagged" , "tailrec" , "tecton" , "tecton-halogen" @@ -337,13 +379,16 @@ , "unordered-collections" , "unsafe-coerce" , "unsafe-reference" + , "untagged-to-tagged" , "untagged-union" , "uri" , "uuid" + , "uuidv4" , "validation" , "variant" , "vectorfield" , "versions" + , "visx" , "web-clipboard" , "web-cssom" , "web-dom" @@ -355,7 +400,9 @@ , "web-file" , "web-html" , "web-pointerevents" + , "web-proletarian" , "web-promise" + , "web-resize-observer" , "web-router" , "web-socket" , "web-storage" @@ -368,7 +415,9 @@ , "which" , "yoga-fetch" , "yoga-json" + , "yoga-om" , "yoga-postgres" + , "yoga-tree" ] , packages = ./packages.dhall , sources = [ "src/**/*.purs" ] From 74da74120bbac8427f2dc8e99813eacf57a47572 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 13:05:00 -0600 Subject: [PATCH 10/12] Update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 493d059a..2490a387 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,11 +12,11 @@ Bugfixes: Other improvements: -## [v2022-10-18.1](https://github.com/purescript/trypurescript/releases/tag/v2022-10-18.1) +## [v2022-12-12.1](https://github.com/purescript/trypurescript/releases/tag/v2022-12-12.1) Other improvements: - Update main example to note that editor state is persisted in the URL (#300 by @thomashoneyman) -- Update PureScript to `0.15.6` (#302 by @JordanMartinez) +- Update PureScript to `0.15.7` (#302 by @JordanMartinez) - Update to latest package set (#302 by @JordanMartinez) ## [v2022-09-10.1](https://github.com/purescript/trypurescript/releases/tag/v2022-09-10.1) From bc6f79c9c6bcc98f32c3089f9c30cf77ebfd6254 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 13:05:58 -0600 Subject: [PATCH 11/12] Update config --- 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 7189ef99..d544b4ef 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.6" +pursVersion = "v0.15.7" pursReleaseUrl :: String pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion packageSetVersion :: String -packageSetVersion = "0.15.4-20221018" +packageSetVersion = "0.15.4-20221212" packageSetPackageJsonUrl :: String packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json" From 50c2e93f7db35b65f9075c79a9b98e5ba931860d Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 12 Dec 2022 17:50:19 -0600 Subject: [PATCH 12/12] Drop visx due to it including a module named `Main` --- staging/spago.dhall | 1 - 1 file changed, 1 deletion(-) diff --git a/staging/spago.dhall b/staging/spago.dhall index c6e90a84..d03f3379 100644 --- a/staging/spago.dhall +++ b/staging/spago.dhall @@ -388,7 +388,6 @@ , "variant" , "vectorfield" , "versions" - , "visx" , "web-clipboard" , "web-cssom" , "web-dom"