diff --git a/CHANGELOG.md b/CHANGELOG.md index f976dc31..2490a387 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,14 @@ New features: Bugfixes: +Other improvements: + +## [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.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) diff --git a/client/src/Try/SharedConfig.purs b/client/src/Try/SharedConfig.purs index bbb30345..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.4" +pursVersion = "v0.15.7" pursReleaseUrl :: String pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion packageSetVersion :: String -packageSetVersion = "0.15.4-20220901" +packageSetVersion = "0.15.4-20221212" packageSetPackageJsonUrl :: String packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json" 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 diff --git a/stack.yaml b/stack.yaml index 1cc6fef0..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.4 + - 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 34e8181a..8e71b630 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -5,43 +5,43 @@ packages: - completed: - hackage: purescript-0.15.4@sha256:29fcb37f227a475a4357de52962f3564da6c881c146a679a514086d9883b1599,20642 + hackage: purescript-0.15.7@sha256:fbf49910576377332e202d7fac73c7904dff7357508f702c7c68d7c59c83d41e,21420 pantry-tree: - size: 151335 - sha256: 6432cafb3d7b3334654d3e5c584eeada632e4c767403ede43953f2d3f33aa8ee + sha256: 3487b12981c52d188684f42c58585f27d77f7365758a99ade0b28af06522c130 + size: 154992 original: - hackage: purescript-0.15.4 + 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 diff --git a/staging/packages.dhall b/staging/packages.dhall index a6bdea47..304d919b 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-20221212/packages.dhall + sha256:62ea94a2728dc4f0a47491c064776f402a8a1b3cf2d8a7ec83c96075d30bd590 in upstream + with metadata.version = "v0.15.7" diff --git a/staging/spago.dhall b/staging/spago.dhall index 58ac0ad8..d03f3379 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,11 +27,26 @@ , "assert" , "avar" , "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" @@ -38,9 +54,16 @@ , "catenable-lists" , "channel" , "checked-exceptions" + , "classless" + , "classless-arbitrary" + , "classless-decode-json" + , "classless-encode-json" + , "classnames" , "codec" , "codec-argonaut" , "colors" + , "concur-core" + , "concur-react" , "concurrent-queues" , "console" , "const" @@ -48,33 +71,41 @@ , "control" , "convertable-options" , "coroutines" + , "crypto" , "css" , "datetime" , "datetime-parsing" , "debug" , "decimals" + , "default-values" , "deku" , "deno" , "dissect" , "distributive" , "dodo-printer" + , "dom-filereader" , "dom-indexed" , "dotenv" , "droplet" , "dynamic-buffer" + , "echarts-simple" , "effect" , "either" , "elmish" , "elmish-enzyme" , "elmish-hooks" , "elmish-html" + , "elmish-testing-library" , "email-validate" , "encoding" , "enums" + , "error" , "exceptions" , "exists" , "exitcodes" , "expect-inferred" + , "fahrtwind" + , "fallback" , "fast-vect" , "fetch" , "fetch-argonaut" @@ -92,11 +123,13 @@ , "fork" , "form-urlencoded" , "formatters" + , "framer-motion" , "free" , "freeap" , "freer-free" , "freet" , "functions" + , "functor1" , "functors" , "fuzzy" , "gen" @@ -104,10 +137,14 @@ , "generic-router" , "geometry-plane" , "github-actions-toolkit" + , "grain" + , "grain-router" + , "grain-virtualized" , "graphql-client" , "graphs" , "group" , "halogen" + , "halogen-bootstrap5" , "halogen-css" , "halogen-formless" , "halogen-hooks" @@ -120,7 +157,6 @@ , "halogen-vdom-string-renderer" , "heckin" , "heterogeneous" - , "heterogeneous-extrablatt" , "homogeneous" , "http-methods" , "httpure" @@ -129,13 +165,23 @@ , "httpurple-yoga-json" , "hyrule" , "identity" + , "identy" , "indexed-monad" , "int64" , "integers" , "interpolate" , "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" @@ -154,6 +200,7 @@ , "matrices" , "matryoshka" , "maybe" + , "mdast-util-from-markdown" , "media-types" , "metadata" , "midi" @@ -167,11 +214,14 @@ , "monoid-extras" , "monoidal" , "morello" + , "mote" , "motsunabe" + , "mysql" , "nano-id" , "naturals" , "nested-functor" , "newtype" + , "nextui" , "node-buffer" , "node-buffer-blob" , "node-child-process" @@ -182,14 +232,17 @@ , "node-path" , "node-process" , "node-readline" + , "node-sqlite3" , "node-streams" , "node-streams-aff" , "node-url" + , "nodemailer" , "nonempty" , "now" , "npm-package-json" , "nullable" , "numbers" + , "object-maps" , "ocarina" , "open-folds" , "open-memoize" @@ -208,6 +261,7 @@ , "pha" , "phaser" , "pipes" + , "pirates-charm" , "point-free" , "pointed-list" , "polymorphic-vectors" @@ -229,22 +283,27 @@ , "quickcheck-combinators" , "quickcheck-laws" , "quickcheck-utf8" - , "quotient" , "random" , "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" - , "refined" + , "record-extra" + , "record-studio" , "refs" , "remotedata" , "resource" @@ -258,11 +317,15 @@ , "run" , "safe-coerce" , "safely" + , "school-of-music" , "selection-foldable" , "semirings" , "signal" , "simple-emitter" + , "simple-i18n" , "simple-json" + , "simple-jwt" + , "simple-ulid" , "sized-matrices" , "sized-vectors" , "slug" @@ -273,6 +336,7 @@ , "spec" , "spec-discovery" , "spec-quickcheck" + , "splitmix" , "ssrs" , "st" , "strictlypositiveint" @@ -283,12 +347,17 @@ , "substitute" , "sunde" , "supply" + , "svg-parser" , "systemd-journald" + , "tagged" , "tailrec" + , "tecton" + , "tecton-halogen" , "test-unit" , "thermite" , "thermite-dom" , "these" + , "toppokki" , "transformers" , "tree-rose" , "tuples" @@ -302,6 +371,7 @@ , "uint" , "ulid" , "uncurried-transformers" + , "undefined" , "undefined-is-not-a-problem" , "unfoldable" , "unicode" @@ -309,9 +379,11 @@ , "unordered-collections" , "unsafe-coerce" , "unsafe-reference" + , "untagged-to-tagged" , "untagged-union" , "uri" , "uuid" + , "uuidv4" , "validation" , "variant" , "vectorfield" @@ -326,21 +398,25 @@ , "web-fetch" , "web-file" , "web-html" - , "web-page-visibility" , "web-pointerevents" + , "web-proletarian" , "web-promise" + , "web-resize-observer" , "web-router" , "web-socket" , "web-storage" , "web-streams" , "web-touchevents" , "web-uievents" + , "web-url" , "web-workers" , "web-xhr" , "which" , "yoga-fetch" , "yoga-json" + , "yoga-om" , "yoga-postgres" + , "yoga-tree" ] , packages = ./packages.dhall , sources = [ "src/**/*.purs" ]