[MERGE]

README.md

@@ -215,7 +215,7 @@ runtime or `devDependencies` if it is not.
 
 #### Add a purescript dependency?
 
-Add it to `psc-package.json` without the `purescript-` prefix.
+Add it to `spago.dhall` (or run `spago install ...`).
 
 If is not in the package set, you will need to read the next section.
 
@@ -225,18 +225,6 @@ You need to add an entry to the relevant map in
 `packages.dhall`. There are comments in the file explaining how it
 works. It's written in dhall, so you can use comments and such.
 
-You will then need to rebuild the package set:
-
-```shell
-yarn rebuild-set # or darn rebuild-set
-```
-
-#### Upgrade the base package set local is based on to latest?
-
-```shell
-yarn rebase-set && yarn rebuild-set # or darn rebase-set && darn rebuild-set
-```
-
 ## Theory Introduction
 
 Making sense of out text isn't actually that hard, but it does require

package.json

@@ -4,11 +4,6 @@
     "scripts": {
         "generate-purs-packages-nix": "./nix/generate-purs-packages.nix",
         "generate-psc-packages-nix": "./nix/generate-packages-json.bash",
-        "rebase-set": "spago upgrade-set && yarn generate-psc-packages-nix",
-        "rebuild-set": "yarn generate-psc-packages-nix",
-        "install-ps": "psc-package install",
-        "compile": "pulp build",
-        "build": "pulp browserify -t dist/bundle.js",
         "css": "sass src/sass/sass.sass:dist/styles/sass.css && yarn css-themes",
         "css-themes": "yarn css-default-theme && yarn css-dark-theme && yarn css-darkster-theme && yarn css-greyson-theme && yarn css-herbie-theme && yarn css-monotony-theme",
         "css-default-theme": "sass src/sass/bootstrap/default.sass:dist/styles/bootstrap-default.css",
@@ -34,13 +29,13 @@
         "@popperjs/core": "^2.9.2",
         "aes-js": "^3.1.1",
         "base-x": "^3.0.2",
-        "bootstrap": "^5.0.1",
+        "bootstrap": "^5.0.2",
         "bootstrap-dark": "^1.0.3",
         "create-react-class": "^15.6.3",
         "echarts": "^5.1.2",
         "echarts-for-react": "^3.0.1",
         "highlightjs": "^9.16.2",
-        "immer": "^9.0.3",
+        "immer": "^9.0.5",
         "prop-types": "^15.6.2",
         "pullstate": "^1.20.6",
         "react": "^17.0.2",
@@ -55,17 +50,13 @@
         "@babel/core": "^7.12.9",
         "@babel/preset-react": "^7.12.7",
         "parcel": "^2.0.0-beta.2",
-        "psc-package": "^4.0.1",
-        "pulp": "^15.0.0",
         "react-testing-library": "^8.0.1",
-        "sass": "^1.23.7",
+        "sass": "^1.35.2",
         "serve": "^12.0.0",
-        "spago": "^0.20.3",
         "vscode-languageserver": "^7.0.0",
         "xhr2": "^0.2.1"
     },
     "optionalDependencies": {
-        "purescript": "^0.14.3",
         "purescript-language-server": "^0.15.2"
     }
 }

shell.nix

@@ -18,8 +18,8 @@ let
     echo "Compiling"
     #build-purs
     echo "Bundling"
-    #yarn pulp browserify --skip-compile -t dist/bundle.js --src-path output
-    yarn spago build
+    #pulp browserify --skip-compile -t dist/bundle.js --src-path output
+    spago build
     browserify
   '';
 
@@ -28,20 +28,20 @@ let
     set -e
 
     echo "Build watch"
-    yarn spago build -w --then browserify
+    spago build -w --then browserify
   '';
 
   browserify = pkgs.writeShellScriptBin "browserify" ''
     #!/usr/bin/env bash
     set -e
 
-    yarn pulp browserify --skip-compile -t dist/bundle.js --src-path output
+    pulp browserify --skip-compile -t dist/bundle.js --src-path output
   '';
 
   repl = pkgs.writeShellScriptBin "repl" ''
     #!/usr/bin/env bash
 
-    yarn pulp repl
+    pulp repl
   '';
 
   test-ps = pkgs.writeShellScriptBin "test-ps" ''
@@ -51,8 +51,8 @@ let
     echo "Compiling"
     build-purs
     echo "Testing"
-    # yarn pulp browserify --skip-compile -t dist/bundle.js --src-path output
-    # yarn pulp test --src-path output --test-path output
+    # pulp browserify --skip-compile -t dist/bundle.js --src-path output
+    # pulp test --src-path output --test-path output
     NODE_PATH=output node -e "require('Test.Main').main();"
   '';
 in
@@ -66,6 +66,7 @@ pkgs.mkShell {
     build-watch
     build
     repl
+    pkgs.pulp
     pkgs.spago
     pkgs.yarn
     test-ps