From 54bcebba0fd24a2e2056c20243a6ba7ab7c85504 Mon Sep 17 00:00:00 2001 From: Fabrizio Ferrai Date: Wed, 17 Apr 2019 17:22:39 +0300 Subject: [PATCH 1/2] Install "psci-support" on init This is to avoid things like `spago repl` failing on new projects --- templates/spago.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/spago.dhall b/templates/spago.dhall index b940e9c27..361544cb1 100644 --- a/templates/spago.dhall +++ b/templates/spago.dhall @@ -5,7 +5,7 @@ You can edit this file as you like. { name = "my-project" , dependencies = - [ "effect", "console" ] + [ "effect", "console", "psci-support" ] , packages = ./packages.dhall } From 7c72fd9f57f198645ab53f75f5665e6a468af38e Mon Sep 17 00:00:00 2001 From: Fabrizio Ferrai Date: Wed, 17 Apr 2019 22:00:10 +0300 Subject: [PATCH 2/2] Update tests and package set --- .travis.yml | 2 +- templates/packages.dhall | 4 ++-- test/fixtures/bundle.js | 29 +++++++++++------------ test/fixtures/module.js | 29 +++++++++++------------ test/fixtures/run-output.txt | 2 +- test/fixtures/spago-install-failure.dhall | 2 +- test/fixtures/spago-install-success.dhall | 2 +- test/fixtures/spago-psc-failure.dhall | 2 +- test/fixtures/spago-psc-success.dhall | 2 +- 9 files changed, 36 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 394e2e7f0..573f062bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,7 +85,7 @@ script: fi - export PATH="${PATH}:$(pwd)/artifacts" - ./scripts/check-package-sets-version - - npm install -g purescript@0.12.3 + - npm install -g purescript@0.12.5 - cd test/spago-test/ && python3 ../spago-test.py && cd ../../ - npm install -g psc-package@3.0.1 - cd test/psc-package-local-test/ && python3 ../psc-package-test.py && cd ../../ diff --git a/templates/packages.dhall b/templates/packages.dhall index 75aa849cd..da6cb122f 100644 --- a/templates/packages.dhall +++ b/templates/packages.dhall @@ -109,10 +109,10 @@ let additions = -} let mkPackage = - https://raw.githubusercontent.com/purescript/package-sets/psc-0.12.3-20190403/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57 + https://raw.githubusercontent.com/purescript/package-sets/psc-0.12.4-20190413/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57 let upstream = - https://raw.githubusercontent.com/purescript/package-sets/psc-0.12.3-20190403/src/packages.dhall sha256:53f95298ca7734c037a0ebfd2ce982c004d8377ebc01cc3387f5a61508c6b8ac + https://raw.githubusercontent.com/purescript/package-sets/psc-0.12.4-20190413/src/packages.dhall sha256:a63cc6dbd2190cc4d4f898e4db59281e4bbd09a022de6036e379bc991e23e705 let overrides = {=} diff --git a/test/fixtures/bundle.js b/test/fixtures/bundle.js index 029559a65..1a1e418d3 100644 --- a/test/fixtures/bundle.js +++ b/test/fixtures/bundle.js @@ -1,7 +1,7 @@ -// Generated by purs bundle 0.12.3 +// Generated by purs bundle 0.12.5 var PS = {}; (function(exports) { - "use strict"; + "use strict"; exports.log = function (s) { return function () { @@ -10,22 +10,21 @@ var PS = {}; }; }; })(PS["Effect.Console"] = PS["Effect.Console"] || {}); -(function(exports) { - // Generated by purs version 0.12.3 +(function($PS) { + // Generated by purs version 0.12.5 "use strict"; - var $foreign = PS["Effect.Console"]; - var Data_Show = PS["Data.Show"]; - var Data_Unit = PS["Data.Unit"]; - var Effect = PS["Effect"]; + $PS["Effect.Console"] = $PS["Effect.Console"] || {}; + var exports = $PS["Effect.Console"]; + var $foreign = $PS["Effect.Console"]; exports["log"] = $foreign.log; -})(PS["Effect.Console"] = PS["Effect.Console"] || {}); -(function(exports) { - // Generated by purs version 0.12.3 +})(PS); +(function($PS) { + // Generated by purs version 0.12.5 "use strict"; - var Effect = PS["Effect"]; - var Effect_Console = PS["Effect.Console"]; - var Prelude = PS["Prelude"]; + $PS["Main"] = $PS["Main"] || {}; + var exports = $PS["Main"]; + var Effect_Console = $PS["Effect.Console"]; var main = Effect_Console.log("\ud83c\udf5d"); exports["main"] = main; -})(PS["Main"] = PS["Main"] || {}); +})(PS); PS["Main"].main(); \ No newline at end of file diff --git a/test/fixtures/module.js b/test/fixtures/module.js index a727e240a..0711c7b06 100644 --- a/test/fixtures/module.js +++ b/test/fixtures/module.js @@ -1,7 +1,7 @@ -// Generated by purs bundle 0.12.3 +// Generated by purs bundle 0.12.5 var PS = {}; (function(exports) { - "use strict"; + "use strict"; exports.log = function (s) { return function () { @@ -10,22 +10,21 @@ var PS = {}; }; }; })(PS["Effect.Console"] = PS["Effect.Console"] || {}); -(function(exports) { - // Generated by purs version 0.12.3 +(function($PS) { + // Generated by purs version 0.12.5 "use strict"; - var $foreign = PS["Effect.Console"]; - var Data_Show = PS["Data.Show"]; - var Data_Unit = PS["Data.Unit"]; - var Effect = PS["Effect"]; + $PS["Effect.Console"] = $PS["Effect.Console"] || {}; + var exports = $PS["Effect.Console"]; + var $foreign = $PS["Effect.Console"]; exports["log"] = $foreign.log; -})(PS["Effect.Console"] = PS["Effect.Console"] || {}); -(function(exports) { - // Generated by purs version 0.12.3 +})(PS); +(function($PS) { + // Generated by purs version 0.12.5 "use strict"; - var Effect = PS["Effect"]; - var Effect_Console = PS["Effect.Console"]; - var Prelude = PS["Prelude"]; + $PS["Main"] = $PS["Main"] || {}; + var exports = $PS["Main"]; + var Effect_Console = $PS["Effect.Console"]; var main = Effect_Console.log("\ud83c\udf5d"); exports["main"] = main; -})(PS["Main"] = PS["Main"] || {}); +})(PS); module.exports = PS["Main"]; diff --git a/test/fixtures/run-output.txt b/test/fixtures/run-output.txt index 4d3a086ce..905404fb3 100644 --- a/test/fixtures/run-output.txt +++ b/test/fixtures/run-output.txt @@ -1,4 +1,4 @@ 🍝 Installation complete. -Running command: `purs compile ".spago/console/v4.2.0/src/**/*.purs" ".spago/effect/v2.0.1/src/**/*.purs" ".spago/prelude/v4.1.0/src/**/*.purs" "src/**/*.purs" "test/**/*.purs"` +Running command: `purs compile ".spago/console/v4.2.0/src/**/*.purs" ".spago/effect/v2.0.1/src/**/*.purs" ".spago/prelude/v4.1.0/src/**/*.purs" ".spago/psci-support/v4.0.0/src/**/*.purs" "src/**/*.purs" "test/**/*.purs"` Build succeeded. diff --git a/test/fixtures/spago-install-failure.dhall b/test/fixtures/spago-install-failure.dhall index 1ee39bea6..771409017 100644 --- a/test/fixtures/spago-install-failure.dhall +++ b/test/fixtures/spago-install-failure.dhall @@ -5,7 +5,7 @@ You can edit this file as you like. { name = "aaa" , dependencies = - [ "effect", "console" ] + [ "effect", "console", "psci-support" ] , packages = ./packages.dhall } diff --git a/test/fixtures/spago-install-success.dhall b/test/fixtures/spago-install-success.dhall index df5ce84a3..e073278cd 100644 --- a/test/fixtures/spago-install-success.dhall +++ b/test/fixtures/spago-install-success.dhall @@ -5,7 +5,7 @@ You can edit this file as you like. { name = "aaa" , dependencies = - [ "console", "effect", "foreign", "simple-json" ] + [ "console", "effect", "foreign", "psci-support", "simple-json" ] , packages = ./packages.dhall } diff --git a/test/fixtures/spago-psc-failure.dhall b/test/fixtures/spago-psc-failure.dhall index 1ee39bea6..771409017 100644 --- a/test/fixtures/spago-psc-failure.dhall +++ b/test/fixtures/spago-psc-failure.dhall @@ -5,7 +5,7 @@ You can edit this file as you like. { name = "aaa" , dependencies = - [ "effect", "console" ] + [ "effect", "console", "psci-support" ] , packages = ./packages.dhall } diff --git a/test/fixtures/spago-psc-success.dhall b/test/fixtures/spago-psc-success.dhall index cb4782c41..1c820e6b9 100644 --- a/test/fixtures/spago-psc-success.dhall +++ b/test/fixtures/spago-psc-success.dhall @@ -5,7 +5,7 @@ You can edit this file as you like. { name = "aaa" , dependencies = - [ "console", "effect", "prelude" ] + [ "console", "effect", "prelude", "psci-support" ] , packages = ./packages.dhall }