[spago] turn off pedanticPackages & bundle.min.js by default

There is a bug in spago:
https://github.com/purescript/spago/issues/1243
This is to overcome slow builds.

Also, bundle the minified version by default.
parent 739f2d62
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
<div id="portal"></div> <div id="portal"></div>
<script src="js/jquery@3.5.1/jquery.slim.min.js"></script> <script src="js/jquery@3.5.1/jquery.slim.min.js"></script>
<script src="js/bootstrap@4.6.2/bootstrap.bundle.min.js"></script> <script src="js/bootstrap@4.6.2/bootstrap.bundle.min.js"></script>
<script src="bundle.js"></script> <script src="bundle.min.js"></script>
</body> </body>
</html> </html>
...@@ -58,11 +58,11 @@ ...@@ -58,11 +58,11 @@
"slimlock": "slimlock" "slimlock": "slimlock"
}, },
"locked": { "locked": {
"lastModified": 1713366964, "lastModified": 1719849006,
"narHash": "sha256-s1WUptOTTAQ3aW6JlIpDgWofoQF5vp7q8ItbTeSxLL4=", "narHash": "sha256-0HpRwEdvAlbSka5tFLwokz2bEV+QgoGqRZ0BR/ghB6w=",
"owner": "thomashoneyman", "owner": "thomashoneyman",
"repo": "purescript-overlay", "repo": "purescript-overlay",
"rev": "235afffdb751d83c7775b334e5be944848fc24ad", "rev": "6a00f4a8fbb42e0494a57c5da99b1375721a6c4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
......
...@@ -16,11 +16,13 @@ ...@@ -16,11 +16,13 @@
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ purescript-overlay.overlays.default ]; overlays = builtins.attrValues { purescript = purescript-overlay.overlays.default; };
}; };
dependencies = with pkgs; [ dependencies = with pkgs; [
purescript purs-bin.purs-0_15_16-1 # from the purescript-overlay
spago-bin.spago-0_93_35
#purescript
#spago-unstable #spago-unstable
nodejs nodejs
nodePackages.npm nodePackages.npm
...@@ -29,7 +31,6 @@ ...@@ -29,7 +31,6 @@
serve = pkgs.writeShellScriptBin "serve" '' serve = pkgs.writeShellScriptBin "serve" ''
set -e set -e
#yarn server
npm run server npm run server
''; '';
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
echo "Installing JS Dependencies" echo "Installing JS Dependencies"
#npm install #npm install
# https://docs.npmjs.com/cli/v9/commands/npm-ci # https://docs.npmjs.com/cli/v9/commands/npm-ci
npm ci #npm ci
#npm/bin/npm install --dev #npm/bin/npm install --dev
echo "Compiling" echo "Compiling"
...@@ -113,7 +114,6 @@ ...@@ -113,7 +114,6 @@
text = '' text = ''
set -e set -e
#yarn css
npm run css npm run css
''; '';
}; };
...@@ -125,11 +125,11 @@ ...@@ -125,11 +125,11 @@
buildInputs = with pkgs; (dependencies ++ [ buildInputs = with pkgs; (dependencies ++ [
# scripts # scripts
self.packages.${system}.build self.packages.${system}.build
self.packages.${system}.build-css
self.packages.${system}.compile self.packages.${system}.compile
self.packages.${system}.test-ps self.packages.${system}.test-ps
self.packages.${system}.repl self.packages.${system}.repl
self.packages.${system}.build-css
build-watch build-watch
build-zephyr build-zephyr
minify-bundle minify-bundle
......
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
<body> <body>
<div id="app"></div> <div id="app"></div>
<div id="portal"></div> <div id="portal"></div>
<script src="bundle.js"></script> <script src="bundle.min.js"></script>
</body> </body>
</html> </html>
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": "0.0.7.1.6.3", "version": "0.0.7.1.6.3",
"scripts": { "scripts": {
"build": "spago build", "build": "spago build",
"bundle": "spago bundle --module Main --outfile dist/bundle.js", "bundle": "spago bundle --module Main --outfile dist/bundle.min.js --minify --source-maps",
"css": "$npm_execpath css-themes", "css": "$npm_execpath css-themes",
"css-themes": "$npm_execpath css-default-theme && $npm_execpath css-dark-theme && $npm_execpath css-darkster-theme && $npm_execpath css-greyson-theme && $npm_execpath css-herbie-theme && $npm_execpath css-monotony-theme", "css-themes": "$npm_execpath css-default-theme && $npm_execpath css-dark-theme && $npm_execpath css-darkster-theme && $npm_execpath css-greyson-theme && $npm_execpath css-herbie-theme && $npm_execpath css-monotony-theme",
"css-default-theme": "sass src/sass/themes/default.scss:dist/styles/bootstrap-default.css", "css-default-theme": "sass src/sass/themes/default.scss:dist/styles/bootstrap-default.css",
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
"css-herbie-theme": "sass src/sass/themes/herbie.scss:dist/styles/bootstrap-herbie.css", "css-herbie-theme": "sass src/sass/themes/herbie.scss:dist/styles/bootstrap-herbie.css",
"css-monotony-theme": "sass src/sass/themes/monotony.scss:dist/styles/bootstrap-monotony.css", "css-monotony-theme": "sass src/sass/themes/monotony.scss:dist/styles/bootstrap-monotony.css",
"docs": "spago docs", "docs": "spago docs",
"minify": "spago bundle --module Main --outfile dist/bundle.min.js --minify",
"repl": "spago repl", "repl": "spago repl",
"server": "serve -l 8008 dist", "server": "serve -l 8008 dist",
"server-ssl": "ssl-serve --ssl dist", "server-ssl": "ssl-serve --ssl dist",
...@@ -51,6 +50,7 @@ ...@@ -51,6 +50,7 @@
"immer": "~9.0.5", "immer": "~9.0.5",
"isomorphic-unfetch": "~3.1.0", "isomorphic-unfetch": "~3.1.0",
"markdown-it": "~13.0.1", "markdown-it": "~13.0.1",
"minify": "^11.3.0",
"prop-types": "~15.6.2", "prop-types": "~15.6.2",
"react": "~18.2.0", "react": "~18.2.0",
"react-awesome-popover": "~6.1.1", "react-awesome-popover": "~6.1.1",
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
"react-testing-library": "~8.0.1", "react-testing-library": "~8.0.1",
"sass": "~1.77.0", "sass": "~1.77.0",
"serve": "~14.2.3", "serve": "~14.2.3",
"spago": "~0.93.29", "spago": "~0.93.35",
"ssl-serve": "~6.5.8", "ssl-serve": "~6.5.8",
"taiko": "latest", "taiko": "latest",
"vscode-languageserver": "~7.0.0", "vscode-languageserver": "~7.0.0",
......
...@@ -84,7 +84,6 @@ workspace: ...@@ -84,7 +84,6 @@ workspace:
- uri: ">=9.0.0 <10.0.0" - uri: ">=9.0.0 <10.0.0"
- uuid: ">=9.0.0 <10.0.0" - uuid: ">=9.0.0 <10.0.0"
- validation: ">=6.0.0 <7.0.0" - validation: ">=6.0.0 <7.0.0"
- var
- web-file: ">=4.0.0 <5.0.0" - web-file: ">=4.0.0 <5.0.0"
- web-html: ">=4.1.0 <5.0.0" - web-html: ">=4.1.0 <5.0.0"
- web-socket - web-socket
...@@ -243,7 +242,7 @@ workspace: ...@@ -243,7 +242,7 @@ workspace:
- websocket-simple - websocket-simple
package_set: package_set:
address: address:
registry: 50.13.1 registry: 53.2.0
compiler: ">=0.15.15 <0.16.0" compiler: ">=0.15.15 <0.16.0"
content: content:
abc-parser: 2.0.1 abc-parser: 2.0.1
...@@ -268,7 +267,7 @@ workspace: ...@@ -268,7 +267,7 @@ workspace:
argonaut-traversals: 10.0.0 argonaut-traversals: 10.0.0
argparse-basic: 2.0.0 argparse-basic: 2.0.0
array-builder: 0.1.2 array-builder: 0.1.2
array-search: 0.5.6 array-search: 0.6.0
arraybuffer: 13.2.0 arraybuffer: 13.2.0
arraybuffer-builder: 3.1.0 arraybuffer-builder: 3.1.0
arraybuffer-types: 3.0.2 arraybuffer-types: 3.0.2
...@@ -277,7 +276,7 @@ workspace: ...@@ -277,7 +276,7 @@ workspace:
arrays-zipper: 2.0.1 arrays-zipper: 2.0.1
ask: 1.0.0 ask: 1.0.0
assert: 6.0.0 assert: 6.0.0
assert-multiple: 0.3.4 assert-multiple: 0.4.0
avar: 5.0.0 avar: 5.0.0
b64: 0.0.8 b64: 0.0.8
barbies: 1.0.1 barbies: 1.0.1
...@@ -292,6 +291,7 @@ workspace: ...@@ -292,6 +291,7 @@ workspace:
canvas-action: 9.0.0 canvas-action: 9.0.0
cartesian: 1.0.6 cartesian: 1.0.6
catenable-lists: 7.0.0 catenable-lists: 7.0.0
cbor-stream: 1.3.0
chameleon: 1.0.0 chameleon: 1.0.0
chameleon-halogen: 1.0.3 chameleon-halogen: 1.0.3
chameleon-react-basic: 1.1.0 chameleon-react-basic: 1.1.0
...@@ -307,7 +307,7 @@ workspace: ...@@ -307,7 +307,7 @@ workspace:
classnames: 2.0.0 classnames: 2.0.0
codec: 6.1.0 codec: 6.1.0
codec-argonaut: 10.0.0 codec-argonaut: 10.0.0
codec-json: 1.1.0 codec-json: 1.2.0
colors: 7.0.1 colors: 7.0.1
concur-core: 0.5.0 concur-core: 0.5.0
concur-react: 0.5.0 concur-react: 0.5.0
...@@ -320,10 +320,11 @@ workspace: ...@@ -320,10 +320,11 @@ workspace:
coroutines: 7.0.0 coroutines: 7.0.0
css: 6.0.0 css: 6.0.0
css-frameworks: 1.0.1 css-frameworks: 1.0.1
csv-stream: 1.1.7 csv-stream: 2.3.0
data-mvc: 0.0.2 data-mvc: 0.0.2
datetime: 6.1.0 datetime: 6.1.0
datetime-parsing: 0.2.0 datetime-parsing: 0.2.0
debounce: 0.1.0
debug: 6.0.2 debug: 6.0.2
decimals: 7.1.0 decimals: 7.1.0
default-values: 1.0.1 default-values: 1.0.1
...@@ -345,18 +346,19 @@ workspace: ...@@ -345,18 +346,19 @@ workspace:
elmish: 0.11.3 elmish: 0.11.3
elmish-enzyme: 0.1.1 elmish-enzyme: 0.1.1
elmish-hooks: 0.10.0 elmish-hooks: 0.10.0
elmish-html: 0.8.2 elmish-html: 0.8.3
elmish-testing-library: 0.3.2 elmish-testing-library: 0.3.2
email-validate: 7.0.0 email-validate: 7.0.0
encoding: 0.0.9 encoding: 0.0.9
enums: 6.0.1 enums: 6.0.1
env-names: 0.3.4 env-names: 0.4.0
error: 2.0.0 error: 2.0.0
eta-conversion: 0.3.2 eta-conversion: 0.3.2
exceptions: 6.0.0 exceptions: 6.1.0
exists: 6.0.0 exists: 6.0.0
exitcodes: 4.0.0 exitcodes: 4.0.0
expect-inferred: 3.0.0 expect-inferred: 3.0.0
ezfetch: 1.0.0
fahrtwind: 2.0.0 fahrtwind: 2.0.0
fallback: 0.1.0 fallback: 0.1.0
fast-vect: 1.2.0 fast-vect: 1.2.0
...@@ -425,6 +427,7 @@ workspace: ...@@ -425,6 +427,7 @@ workspace:
homogeneous: 0.4.0 homogeneous: 0.4.0
http-methods: 6.0.0 http-methods: 6.0.0
httpurple: 4.0.0 httpurple: 4.0.0
huffman: 0.4.0
humdrum: 0.0.1 humdrum: 0.0.1
hyrule: 2.3.8 hyrule: 2.3.8
identity: 6.0.0 identity: 6.0.0
...@@ -453,7 +456,7 @@ workspace: ...@@ -453,7 +456,7 @@ workspace:
js-promise-aff: 1.0.0 js-promise-aff: 1.0.0
js-timers: 6.1.0 js-timers: 6.1.0
js-uri: 3.1.0 js-uri: 3.1.0
json: 1.0.0 json: 1.1.0
json-codecs: 5.0.0 json-codecs: 5.0.0
justifill: 0.5.0 justifill: 0.5.0
jwt: 0.0.9 jwt: 0.0.9
...@@ -472,7 +475,7 @@ workspace: ...@@ -472,7 +475,7 @@ workspace:
logging-journald: 0.4.0 logging-journald: 0.4.0
lumi-components: 18.0.0 lumi-components: 18.0.0
machines: 7.0.0 machines: 7.0.0
maps-eager: 0.4.1 maps-eager: 0.5.0
marionette: 1.0.0 marionette: 1.0.0
marionette-react-basic-hooks: 0.1.1 marionette-react-basic-hooks: 0.1.1
marked: 0.1.0 marked: 0.1.0
...@@ -508,7 +511,7 @@ workspace: ...@@ -508,7 +511,7 @@ workspace:
node-child-process: 11.1.0 node-child-process: 11.1.0
node-event-emitter: 3.0.0 node-event-emitter: 3.0.0
node-execa: 5.0.0 node-execa: 5.0.0
node-fs: 9.1.0 node-fs: 9.2.0
node-glob-basic: 1.3.0 node-glob-basic: 1.3.0
node-http: 9.1.0 node-http: 9.1.0
node-http2: 1.1.1 node-http2: 1.1.1
...@@ -517,8 +520,9 @@ workspace: ...@@ -517,8 +520,9 @@ workspace:
node-os: 5.1.0 node-os: 5.1.0
node-path: 5.0.0 node-path: 5.0.0
node-process: 11.2.0 node-process: 11.2.0
node-readline: 8.1.0 node-readline: 8.1.1
node-sqlite3: 8.0.0 node-sqlite3: 8.0.0
node-stream-pipes: 2.1.4
node-streams: 9.0.0 node-streams: 9.0.0
node-tls: 0.3.1 node-tls: 0.3.1
node-url: 7.0.1 node-url: 7.0.1
...@@ -558,7 +562,7 @@ workspace: ...@@ -558,7 +562,7 @@ workspace:
pointed-list: 0.5.1 pointed-list: 0.5.1
polymorphic-vectors: 4.0.0 polymorphic-vectors: 4.0.0
posix-types: 6.0.0 posix-types: 6.0.0
postgresql: 1.5.1 postgresql: 2.0.17
precise: 6.0.0 precise: 6.0.0
precise-datetime: 7.0.0 precise-datetime: 7.0.0
prelude: 6.0.1 prelude: 6.0.1
...@@ -593,7 +597,7 @@ workspace: ...@@ -593,7 +597,7 @@ workspace:
react-markdown: 0.1.0 react-markdown: 0.1.0
react-testing-library: 4.0.1 react-testing-library: 4.0.1
react-virtuoso: 1.0.0 react-virtuoso: 1.0.0
reactix: 0.6.0 reactix: 0.6.1
read: 1.0.1 read: 1.0.1
recharts: 1.1.0 recharts: 1.1.0
record: 4.0.0 record: 4.0.0
...@@ -602,6 +606,7 @@ workspace: ...@@ -602,6 +606,7 @@ workspace:
record-studio: 1.0.4 record-studio: 1.0.4
refs: 6.0.0 refs: 6.0.0
remotedata: 5.0.1 remotedata: 5.0.1
repr: 0.5.0
resize-observer: 1.0.0 resize-observer: 1.0.0
resource: 2.0.1 resource: 2.0.1
resourcet: 1.0.0 resourcet: 1.0.0
...@@ -609,6 +614,7 @@ workspace: ...@@ -609,6 +614,7 @@ workspace:
return: 0.2.0 return: 0.2.0
ring-modules: 5.0.1 ring-modules: 5.0.1
rito: 0.3.4 rito: 0.3.4
roman: 0.4.0
rough-notation: 1.0.2 rough-notation: 1.0.2
routing: 11.0.0 routing: 11.0.0
routing-duplex: 0.7.0 routing-duplex: 0.7.0
...@@ -658,7 +664,7 @@ workspace: ...@@ -658,7 +664,7 @@ workspace:
these: 6.0.0 these: 6.0.0
toestand: 0.9.0 toestand: 0.9.0
transformation-matrix: 1.0.1 transformation-matrix: 1.0.1
transformers: 6.0.0 transformers: 6.1.0
tree-rose: 4.0.2 tree-rose: 4.0.2
ts-bridge: 4.0.0 ts-bridge: 4.0.0
tuples: 7.0.0 tuples: 7.0.0
...@@ -687,6 +693,7 @@ workspace: ...@@ -687,6 +693,7 @@ workspace:
untagged-to-tagged: 0.1.4 untagged-to-tagged: 0.1.4
untagged-union: 1.0.0 untagged-union: 1.0.0
uri: 9.0.0 uri: 9.0.0
url-immutable: 1.0.0
uuid: 9.0.0 uuid: 9.0.0
uuidv4: 1.0.0 uuidv4: 1.0.0
validation: 6.0.0 validation: 6.0.0
...@@ -752,8 +759,8 @@ workspace: ...@@ -752,8 +759,8 @@ workspace:
ref: v3.0.2-spago-next ref: v3.0.2-spago-next
simple-json-generics: 0.2.1 simple-json-generics: 0.2.1
spec-discovery: spec-discovery:
git: https://github.com/garganscript/purescript-spec-discovery.git git: https://github.com/purescript-spec/purescript-spec-discovery.git
ref: v8.2.0-spago-next ref: b0ed1c443b4d194122d437d31666fedf95fa00f7
string-search: string-search:
git: https://gitlab.iscpif.fr/gargantext/purescript-string-search.git git: https://gitlab.iscpif.fr/gargantext/purescript-string-search.git
ref: spago-next ref: spago-next
...@@ -1144,8 +1151,8 @@ packages: ...@@ -1144,8 +1151,8 @@ packages:
- unfoldable - unfoldable
exceptions: exceptions:
type: registry type: registry
version: 6.0.0 version: 6.1.0
integrity: sha256-y/xTAEIZIARCE+50/u1di0ncebJ+CIwNOLswyOWzMTw= integrity: sha256-K0T89IHtF3vBY7eSAO7eDOqSb2J9kZGAcDN5+IKsF8E=
dependencies: dependencies:
- effect - effect
- either - either
...@@ -1577,8 +1584,8 @@ packages: ...@@ -1577,8 +1584,8 @@ packages:
- unsafe-coerce - unsafe-coerce
node-fs: node-fs:
type: registry type: registry
version: 9.1.0 version: 9.2.0
integrity: sha256-TzhvGdrwcM0bazDvrWSqh+M/H8GKYf1Na6aGm2Qg4+c= integrity: sha256-Sg0vkXycEzkEerX6hLccz21Ygd9w1+QSk1thotRZPGI=
dependencies: dependencies:
- datetime - datetime
- effect - effect
...@@ -2009,8 +2016,8 @@ packages: ...@@ -2009,8 +2016,8 @@ packages:
- tuples - tuples
spec-discovery: spec-discovery:
type: git type: git
url: https://github.com/garganscript/purescript-spec-discovery.git url: https://github.com/purescript-spec/purescript-spec-discovery.git
rev: 8e1e85dea4b52c5b52f80003311226c327fbba64 rev: b0ed1c443b4d194122d437d31666fedf95fa00f7
dependencies: dependencies:
- aff - aff
- aff-promise - aff-promise
...@@ -2142,8 +2149,8 @@ packages: ...@@ -2142,8 +2149,8 @@ packages:
- typisch - typisch
transformers: transformers:
type: registry type: registry
version: 6.0.0 version: 6.1.0
integrity: sha256-Pzw40HjthX77tdPAYzjx43LK3X5Bb7ZspYAp27wksFA= integrity: sha256-3Bm+Z6tsC/paG888XkywDngJ2JMos+JfOhRlkVfb7gI=
dependencies: dependencies:
- control - control
- distributive - distributive
...@@ -2156,6 +2163,7 @@ packages: ...@@ -2156,6 +2163,7 @@ packages:
- maybe - maybe
- newtype - newtype
- prelude - prelude
- st
- tailrec - tailrec
- tuples - tuples
- unfoldable - unfoldable
......
workspace: workspace:
packageSet: packageSet:
registry: 50.13.1 registry: 53.2.0
extraPackages: extraPackages:
# garganscript packages # garganscript packages
d3: d3:
...@@ -39,8 +39,8 @@ workspace: ...@@ -39,8 +39,8 @@ workspace:
# for tests # for tests
spec-discovery: spec-discovery:
git: https://github.com/garganscript/purescript-spec-discovery.git git: https://github.com/purescript-spec/purescript-spec-discovery.git
ref: v8.2.0-spago-next ref: b0ed1c443b4d194122d437d31666fedf95fa00f7
package: package:
name: gargantext name: gargantext
...@@ -134,12 +134,11 @@ package: ...@@ -134,12 +134,11 @@ package:
- web-url: ">=2.0.0 <3.0.0" - web-url: ">=2.0.0 <3.0.0"
- web-xhr: ">=5.0.1 <6.0.0" - web-xhr: ">=5.0.1 <6.0.0"
- websocket-simple - websocket-simple
- var
build: build:
# Be strict about missing packages # Be strict about missing packages
# https://github.com/purescript/spago/issues/1211#issuecomment-2066083651 # https://github.com/purescript/spago/issues/1211#issuecomment-2066083651
pedanticPackages: true #pedanticPackages: true
# convert compiler warnings to errors: # convert compiler warnings to errors:
# strict: # strict:
# true # true
......
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