From 49e9fda1c4d6f4ee4870b50fa1c7470ff1968a24 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 05:50:39 -0600 Subject: [PATCH 1/9] Update stack.yaml --- stack.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.yaml b/stack.yaml index ad37c43..3329d75 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,9 +1,9 @@ -resolver: nightly-2022-11-12 +resolver: 20.9 packages: - "." extra-deps: - - purescript-0.15.7 + - purescript-0.15.8 - language-javascript-0.7.0.0 - process-1.6.13.1 # The Cabal library is not in Stackage From ab173bc636d18bea643803ffb0e7f1e7cd45db0d Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 05:51:13 -0600 Subject: [PATCH 2/9] Update package set to latest --- staging/packages.dhall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/packages.dhall b/staging/packages.dhall index 304d919..1622cf7 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-20221212/packages.dhall - sha256:62ea94a2728dc4f0a47491c064776f402a8a1b3cf2d8a7ec83c96075d30bd590 + https://github.com/purescript/package-sets/releases/download/psc-0.15.7-20230306/packages.dhall + sha256:0757626c7422b8b5b5b1d0df3d3628e5deac755d7f89c433a9bf89009787dcbd in upstream - with metadata.version = "v0.15.7" + with metadata.version = "v0.15.8" From 8ff5b0d0df3f5aa072bdcd9922edf0da165d879f Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 05:55:18 -0600 Subject: [PATCH 3/9] Flesh-out temp spago.dhall file --- RELEASE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE.md b/RELEASE.md index 284d275..df5b708 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -34,7 +34,8 @@ Update the package set by doing the following: ```dhall { name = "try-purescript-server" , dependencies = [] : List Text - , ... + , packages = ./packages.dhall + , sources = [ "src/**/*.purs" ] } ``` From bca2c91a0cdda40b94e75d09055b409ab2365965 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 05:56:43 -0600 Subject: [PATCH 4/9] Install entire package set --- staging/spago.dhall | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/staging/spago.dhall b/staging/spago.dhall index d03f337..18bf87d 100644 --- a/staging/spago.dhall +++ b/staging/spago.dhall @@ -12,12 +12,14 @@ , "affjax-web" , "ansi" , "argonaut" + , "argonaut-aeson-generic" , "argonaut-codecs" , "argonaut-core" , "argonaut-generic" , "argonaut-traversals" , "argparse-basic" , "array-builder" + , "array-search" , "arraybuffer" , "arraybuffer-builder" , "arraybuffer-types" @@ -25,6 +27,7 @@ , "arrays-zipper" , "ask" , "assert" + , "assert-multiple" , "avar" , "b64" , "barbies" @@ -99,6 +102,7 @@ , "email-validate" , "encoding" , "enums" + , "env-names" , "error" , "exceptions" , "exists" @@ -146,7 +150,9 @@ , "halogen" , "halogen-bootstrap5" , "halogen-css" + , "halogen-echarts-simple" , "halogen-formless" + , "halogen-helix" , "halogen-hooks" , "halogen-hooks-extra" , "halogen-store" @@ -163,9 +169,11 @@ , "httpurple" , "httpurple-argonaut" , "httpurple-yoga-json" + , "humdrum" , "hyrule" , "identity" , "identy" + , "indexed-db" , "indexed-monad" , "int64" , "integers" @@ -173,10 +181,10 @@ , "invariant" , "jarilo" , "jelly" - , "jelly-hooks" , "jelly-router" , "jelly-signal" , "jest" + , "js-abort-controller" , "js-bigints" , "js-date" , "js-fileio" @@ -184,6 +192,7 @@ , "js-promise-aff" , "js-timers" , "js-uri" + , "json-codecs" , "justifill" , "jwt" , "language-cst-parser" @@ -197,6 +206,10 @@ , "logging" , "logging-journald" , "machines" + , "maps-eager" + , "marionette" + , "marionette-commander" + , "marionette-react-basic-hooks" , "matrices" , "matryoshka" , "maybe" @@ -217,17 +230,22 @@ , "mote" , "motsunabe" , "mysql" + , "n3" , "nano-id" , "naturals" , "nested-functor" , "newtype" + , "nextjs" , "nextui" , "node-buffer" , "node-buffer-blob" , "node-child-process" + , "node-event-emitter" + , "node-execa" , "node-fs" , "node-fs-aff" , "node-http" + , "node-human-signals" , "node-net" , "node-path" , "node-process" @@ -298,9 +316,11 @@ , "react-dom" , "react-halo" , "react-icons" + , "react-markdown" , "react-testing-library" , "react-virtuoso" , "read" + , "recharts" , "record" , "record-extra" , "record-studio" @@ -339,6 +359,7 @@ , "splitmix" , "ssrs" , "st" + , "statistics" , "strictlypositiveint" , "string-parsers" , "strings" @@ -358,11 +379,13 @@ , "thermite-dom" , "these" , "toppokki" + , "transformation-matrix" , "transformers" , "tree-rose" , "tuples" , "two-or-more" , "type-equality" + , "typedenv" , "typelevel" , "typelevel-lists" , "typelevel-peano" @@ -375,6 +398,7 @@ , "undefined-is-not-a-problem" , "unfoldable" , "unicode" + , "unique" , "unlift" , "unordered-collections" , "unsafe-coerce" @@ -387,9 +411,12 @@ , "validation" , "variant" , "vectorfield" + , "vectors" , "versions" + , "visx" , "web-clipboard" , "web-cssom" + , "web-cssom-view" , "web-dom" , "web-dom-parser" , "web-dom-xpath" @@ -397,6 +424,7 @@ , "web-events" , "web-fetch" , "web-file" + , "web-geometry" , "web-html" , "web-pointerevents" , "web-proletarian" @@ -411,6 +439,7 @@ , "web-url" , "web-workers" , "web-xhr" + , "webextension-polyfill" , "which" , "yoga-fetch" , "yoga-json" From ba82635fe256dd8ed4234d72a642ee6a808cb1d3 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 05:57:40 -0600 Subject: [PATCH 5/9] 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 d544b4e..5fd129a 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.7" +pursVersion = "v0.15.8" pursReleaseUrl :: String pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion packageSetVersion :: String -packageSetVersion = "0.15.4-20221212" +packageSetVersion = "0.15.7-20230306" packageSetPackageJsonUrl :: String packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json" From 234e6e44e6482dbd494ff2349546b6546bdac249 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 06:02:28 -0600 Subject: [PATCH 6/9] Update summary for package set updates --- RELEASE.md | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index df5b708..1129ab7 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -21,7 +21,30 @@ The try.purescript.org server only has a limited amount of memory. If the packag Before deploying an updated package set, someone (your reviewer) should check that the memory required to hold the package set's externs files does not exceed that of the try.purescript.org server. -Update the package set by doing the following: +Update the package set by doing the following. Each step is explained below: + +### Summary + +```sh +pushd staging +spago upgrade-set +cat > spago.dhall << EOF +{ name = "try-purescript-server" +, dependencies = [] : List Text +, packages = ./packages.dhall +, sources = [ "src/**/*.purs" ] +} +EOF +spago ls packages | cut -f 1 -d ' ' | xargs spago install +popd +pushd client +npm run updateConfigVersions +popd +# add any new shims +# update ES Module Shims (if needed) +``` + +### Step-by-Step Explanation 1. Update the `upstream` package set in `staging/packages.dhall`: @@ -39,13 +62,13 @@ Update the package set by doing the following: } ``` -3. Install all packages in the package set by running this command: +3. For `staging/spago.dhall`, install all packages in the package set by running this command: ``` $ spago ls packages | cut -f 1 -d ' ' | xargs spago install ``` -4. Update the `client/src/Try/SharedConfig.purs` file by running this command: +4. Update the `client/src/Try/SharedConfig.purs` file by running this command in `client`: ```console $ npm run updateConfigVersions From 0c3bd4247cde8717dbc6a1ccda65201208be953f Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 06:08:59 -0600 Subject: [PATCH 7/9] Fix resolver --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 3329d75..e54cf96 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: 20.9 +resolver: lts-20.9 packages: - "." From 7d416127f0d393a690fd5d0b18ab56f0abb23209 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 06:19:27 -0600 Subject: [PATCH 8/9] Update stack.yaml.lock file --- stack.yaml.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/stack.yaml.lock b/stack.yaml.lock index 8e71b63..a7b0a77 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,12 +5,12 @@ packages: - completed: - hackage: purescript-0.15.7@sha256:fbf49910576377332e202d7fac73c7904dff7357508f702c7c68d7c59c83d41e,21420 + hackage: purescript-0.15.8@sha256:5d7c19e5a49f83acbe8ecc43bf93feb0e075bb11992df9b83af4467aea0bf41d,21427 pantry-tree: - sha256: 3487b12981c52d188684f42c58585f27d77f7365758a99ade0b28af06522c130 - size: 154992 + sha256: 79dde609e3b525e30234fd76b0901f72d48dea47a879d547864d959f85b81760 + size: 156457 original: - hackage: purescript-0.15.7 + hackage: purescript-0.15.8 - completed: hackage: language-javascript-0.7.0.0@sha256:3eab0262b8ac5621936a4beab6a0f97d0e00a63455a8b0e3ac1547b4088dae7d,3898 pantry-tree: @@ -41,7 +41,7 @@ packages: hackage: protolude-0.3.1 snapshots: - completed: - sha256: 5cacb39a2c21842535dc0a31e2005d3b1eb18e451a89d58c28381e1efdb9520f - size: 647983 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/11/12.yaml - original: nightly-2022-11-12 + sha256: c11fcbeb1aa12761044755b1109d16952ede2cb6147ebde777dd5cb38f784501 + size: 649333 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/9.yaml + original: lts-20.9 From b9b9168ca31c24ddda553d8e95d95e56eebf7c63 Mon Sep 17 00:00:00 2001 From: Jordan Martinez Date: Mon, 6 Mar 2023 06:19:33 -0600 Subject: [PATCH 9/9] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2490a38..54b6811 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ Bugfixes: Other improvements: +## [v2023-03-06.1](https://github.com/purescript/trypurescript/releases/tag/v2023-03-06.1) + +Other improvements: +- Bump PureScript to `0.15.8` (#305 by @JordanMartinez) +- Update to latest package set (#305 by @JordanMartinez) + ## [v2022-12-12.1](https://github.com/purescript/trypurescript/releases/tag/v2022-12-12.1) Other improvements: