Commit b53927a9 authored by Justin Woo's avatar Justin Woo Committed by Alexandre Delanoë

use yarn to install JS dependencies in build script

* update yarn lock file
* update dhall hashes
parent 3e4ade6d
Pipeline #1620 canceled with stage
let upstream = let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210716/packages.dhall sha256:64d7b5a1921e8458589add8a1499a1c82168e726a87fc4f958b3f8760cca2efe https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210716/packages.dhall sha256:1f9af624ddfd5352455b7ac6df714f950d499e7e3c6504f62ff467eebd11042c
let overrides = let overrides =
{ globals = { globals =
...@@ -8,8 +8,8 @@ let overrides = ...@@ -8,8 +8,8 @@ let overrides =
, version = "v4.1.0" , version = "v4.1.0"
} }
, smolder = , smolder =
{ dependencies = [ { dependencies =
"bifunctors" [ "bifunctors"
, "catenable-lists" , "catenable-lists"
, "free" , "free"
, "ordered-collections" , "ordered-collections"
...@@ -17,7 +17,8 @@ let overrides = ...@@ -17,7 +17,8 @@ let overrides =
, "strings" , "strings"
, "test-unit" , "test-unit"
, "transformers" , "transformers"
, "tuples"] , "tuples"
]
, repo = "https://github.com/bodil/purescript-smolder" , repo = "https://github.com/bodil/purescript-smolder"
, version = "v12.3.0" , version = "v12.3.0"
} }
...@@ -81,8 +82,17 @@ let additions = ...@@ -81,8 +82,17 @@ let additions =
, repo = "https://github.com/nwolverson/purescript-dom-filereader" , repo = "https://github.com/nwolverson/purescript-dom-filereader"
, version = "v5.0.0" , version = "v5.0.0"
} }
, formula = , formula =
{ dependencies = [ "effect", "prelude", "reactix", "record", "toestand", "tuples", "typelevel-prelude", "typisch" ] { dependencies =
[ "effect"
, "prelude"
, "reactix"
, "record"
, "toestand"
, "tuples"
, "typelevel-prelude"
, "typisch"
]
, repo = "https://github.com/poorscript/purescript-formula" , repo = "https://github.com/poorscript/purescript-formula"
, version = "v0.2.1" , version = "v0.2.1"
} }
...@@ -103,47 +113,53 @@ let additions = ...@@ -103,47 +113,53 @@ let additions =
} }
, reactix = , reactix =
{ dependencies = { dependencies =
[ "aff" [ "aff"
, "arrays" , "arrays"
, "dom-simple" , "dom-simple"
, "effect" , "effect"
, "ffi-simple" , "ffi-simple"
, "foldable-traversable" , "foldable-traversable"
, "functions" , "functions"
, "maybe" , "maybe"
, "nullable" , "nullable"
, "prelude" , "prelude"
, "psci-support" , "psci-support"
, "refs" , "refs"
, "spec" , "spec"
, "spec-mocha" , "spec-mocha"
, "strings" , "strings"
, "tuples" , "tuples"
, "unfoldable" , "unfoldable"
, "unsafe-coerce" , "unsafe-coerce"
] ]
, repo = "https://github.com/poorscript/purescript-reactix" , repo = "https://github.com/poorscript/purescript-reactix"
, version = "v0.4.13" , version = "v0.4.13"
} }
, simple-json-generics = , simple-json-generics =
{ dependencies = { dependencies = [ "simple-json" ]
[ "simple-json" ]
, repo = "https://github.com/justinwoo/purescript-simple-json-generics" , repo = "https://github.com/justinwoo/purescript-simple-json-generics"
, version = "v0.1.0" , version = "v0.1.0"
} }
, toestand = , toestand =
{ dependencies = [ "effect", "reactix", "prelude", "record", "tuples", "typelevel-prelude", "typisch" ] { dependencies =
[ "effect"
, "reactix"
, "prelude"
, "record"
, "tuples"
, "typelevel-prelude"
, "typisch"
]
, repo = "https://github.com/poorscript/purescript-toestand" , repo = "https://github.com/poorscript/purescript-toestand"
, version = "v0.6.2" , version = "v0.6.2"
} }
, typisch = , typisch =
{ dependencies = [ "prelude" ] { dependencies = [ "prelude" ]
, repo = "https://github.com/poorscript/purescript-typisch" , repo = "https://github.com/poorscript/purescript-typisch"
, version = "v0.2.1" , version = "v0.2.1"
} }
, tuples-native = , tuples-native =
{ dependencies = { dependencies = [ "prelude", "typelevel", "unsafe-coerce" ]
[ "prelude", "typelevel", "unsafe-coerce" ]
, repo = "https://github.com/poorscript/purescript-tuples-native" , repo = "https://github.com/poorscript/purescript-tuples-native"
, version = "v2.2.0" , version = "v2.2.0"
} }
...@@ -182,13 +198,9 @@ let additions = ...@@ -182,13 +198,9 @@ let additions =
} }
, web-url = , web-url =
{ dependencies = [ "prelude" ] { dependencies = [ "prelude" ]
, repo = "https://github.com/mjepronk/purescript-web-url" , repo = "https://github.com/mjepronk/purescript-web-url"
, version = "v1.0.2" , version = "v1.0.2"
} }
} }
--let localPackages = { in upstream // overrides // additions
-- reactix = ../../purescript-reactix/spago.dhall as Location
-- }
in upstream // overrides // additions -- // localPackages
...@@ -15,6 +15,9 @@ let ...@@ -15,6 +15,9 @@ let
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
echo "Installing JS Dependencies"
yarn
echo "Compiling" echo "Compiling"
#build-purs #build-purs
echo "Bundling" echo "Bundling"
......
...@@ -1975,11 +1975,7 @@ bootstrap-dark@^1.0.3: ...@@ -1975,11 +1975,7 @@ bootstrap-dark@^1.0.3:
dependencies: dependencies:
bootstrap ">=4.3" bootstrap ">=4.3"
<<<<<<< HEAD
bootstrap@>=4.3, bootstrap@^5.0.2: bootstrap@>=4.3, bootstrap@^5.0.2:
=======
bootstrap@>=4.3, bootstrap@^5.0.1:
>>>>>>> b689fd11ba983d8a687df733a5dde6e37e42fa93
version "5.0.2" version "5.0.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.2.tgz#aff23d5e0e03c31255ad437530ee6556e78e728e" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.2.tgz#aff23d5e0e03c31255ad437530ee6556e78e728e"
integrity sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q== integrity sha512-1Ge963tyEQWJJ+8qtXFU6wgmAVj9gweEjibUdbmcCEYsn38tVwRk8107rk2vzt6cfQcRr3SlZ8aQBqaD8aqf+Q==
...@@ -2990,15 +2986,9 @@ ejs@^2.6.1: ...@@ -2990,15 +2986,9 @@ ejs@^2.6.1:
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.723: electron-to-chromium@^1.3.723:
<<<<<<< HEAD
version "1.3.778"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.778.tgz#bf01048736c95b78f2988e88005e0ebb385942a4"
integrity sha512-Lw04qJaPtWdq0d7qKHJTgkam+FhFi3hm/scf1EyqJWdjO3ZIGUJhNmZJRXWb7yb/bRYXQyVGSpa9RqVpjjWMQw==
=======
version "1.3.775" version "1.3.775"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.775.tgz#046517d1f2cea753e06fff549995b9dc45e20082" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.775.tgz#046517d1f2cea753e06fff549995b9dc45e20082"
integrity sha512-EGuiJW4yBPOTj2NtWGZcX93ZE8IGj33HJAx4d3ouE2zOfW2trbWU+t1e0yzLr1qQIw81++txbM3BH52QwSRE6Q== integrity sha512-EGuiJW4yBPOTj2NtWGZcX93ZE8IGj33HJAx4d3ouE2zOfW2trbWU+t1e0yzLr1qQIw81++txbM3BH52QwSRE6Q==
>>>>>>> b689fd11ba983d8a687df733a5dde6e37e42fa93
elliptic@^6.5.2, elliptic@^6.5.3: elliptic@^6.5.2, elliptic@^6.5.3:
version "6.5.4" version "6.5.4"
...@@ -3261,14 +3251,6 @@ fast-levenshtein@~2.0.6: ...@@ -3261,14 +3251,6 @@ fast-levenshtein@~2.0.6:
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
<<<<<<< HEAD
=======
fast-safe-stringify@^2.0.7:
version "2.0.8"
resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f"
integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==
>>>>>>> b689fd11ba983d8a687df733a5dde6e37e42fa93
fast-url-parser@1.1.3: fast-url-parser@1.1.3:
version "1.1.3" version "1.1.3"
resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"
...@@ -3726,11 +3708,7 @@ immer@^8.0.1: ...@@ -3726,11 +3708,7 @@ immer@^8.0.1:
resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.4.tgz#3a21605a4e2dded852fb2afd208ad50969737b7a" resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.4.tgz#3a21605a4e2dded852fb2afd208ad50969737b7a"
integrity sha512-jMfL18P+/6P6epANRvRk6q8t+3gGhqsJ9EuJ25AXE+9bNTYtssvzeYbEd0mXRYWCmmXSIbnlpz6vd6iJlmGGGQ== integrity sha512-jMfL18P+/6P6epANRvRk6q8t+3gGhqsJ9EuJ25AXE+9bNTYtssvzeYbEd0mXRYWCmmXSIbnlpz6vd6iJlmGGGQ==
<<<<<<< HEAD
immer@^9.0.5: immer@^9.0.5:
=======
immer@^9.0.3:
>>>>>>> b689fd11ba983d8a687df733a5dde6e37e42fa93
version "9.0.5" version "9.0.5"
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec" resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.5.tgz#a7154f34fe7064f15f00554cc94c66cc0bf453ec"
integrity sha512-2WuIehr2y4lmYz9gaQzetPR2ECniCifk4ORaQbU3g5EalLt+0IVTosEPJ5BoYl/75ky2mivzdRzV8wWgQGOSYQ== integrity sha512-2WuIehr2y4lmYz9gaQzetPR2ECniCifk4ORaQbU3g5EalLt+0IVTosEPJ5BoYl/75ky2mivzdRzV8wWgQGOSYQ==
...@@ -5373,16 +5351,6 @@ purescript-language-server@^0.15.2: ...@@ -5373,16 +5351,6 @@ purescript-language-server@^0.15.2:
vscode-uri "^2.1.1" vscode-uri "^2.1.1"
which "^2.0.2" which "^2.0.2"
<<<<<<< HEAD
=======
purescript@^0.14.2:
version "0.14.3"
resolved "https://registry.yarnpkg.com/purescript/-/purescript-0.14.3.tgz#8a725c5dc640afeebb1fe9e2512477827ca05ee8"
integrity sha512-lAzHU/tcmxF4n3YUwUTwG/sIwHzjUq1zsIOBNmaVpbm7hxM+RhOTKMJdwdbTeCjxlilyVPWOLUQ6Exll4DYuMA==
dependencies:
purescript-installer "^0.2.0"
>>>>>>> b689fd11ba983d8a687df733a5dde6e37e42fa93
purgecss@^2.3.0: purgecss@^2.3.0:
version "2.3.0" version "2.3.0"
resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.3.0.tgz#5327587abf5795e6541517af8b190a6fb5488bb3" resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-2.3.0.tgz#5327587abf5795e6541517af8b190a6fb5488bb3"
...@@ -5813,21 +5781,7 @@ safe-regex@^1.1.0: ...@@ -5813,21 +5781,7 @@ safe-regex@^1.1.0:
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
<<<<<<< HEAD
sass@^1.35.2: sass@^1.35.2:
=======
sander@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/sander/-/sander-0.5.1.tgz#741e245e231f07cafb6fdf0f133adfa216a502ad"
integrity sha1-dB4kXiMfB8r7b98PEzrfohalAq0=
dependencies:
es6-promise "^3.1.2"
graceful-fs "^4.1.3"
mkdirp "^0.5.1"
rimraf "^2.5.2"
sass@^1.23.7:
>>>>>>> b689fd11ba983d8a687df733a5dde6e37e42fa93
version "1.35.2" version "1.35.2"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821" resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821"
integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw== integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment