From 1e596ca4e1e61b83dea411fb7130a0565bbde4ad Mon Sep 17 00:00:00 2001
From: Jon Schoning <jonschoning@gmail.com>
Date: Mon, 5 Oct 2020 18:31:06 -0500
Subject: [PATCH] make purs build with purs and spago from node_modules

---
 purs/Makefile          |  8 ++++----
 purs/package-lock.json | 18 +++++++++---------
 purs/package.json      |  8 +++++---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/purs/Makefile b/purs/Makefile
index c5f9dba..0fd5375 100644
--- a/purs/Makefile
+++ b/purs/Makefile
@@ -3,13 +3,13 @@
 all: bundle
 
 install: 
-	@spago install
+	@npm run spago install
 
 build: 
-	@spago build
+	@npm run spago build
 
 bundle: build
-	@spago bundle-app --to dist/bundle.js
+	@npm run spago -- bundle-app --to dist/bundle.js
 	@npm run parcel-build
 	@rm -f dist/*.gz
 	@gzip -k dist/app.min.js.map
@@ -22,7 +22,7 @@ bundle: build
 
 docs:
 	@rm -Rf generated-docs
-	@purs docs ".spago/*/*/src/**/*.purs" --format html
+	@npm run purs -- docs ".spago/*/*/src/**/*.purs" --format html
 
 docset: docs
 	@(cd docset; python3 ./gen-docset.py)
diff --git a/purs/package-lock.json b/purs/package-lock.json
index b7d5f99..11eba39 100644
--- a/purs/package-lock.json
+++ b/purs/package-lock.json
@@ -4463,9 +4463,9 @@
       }
     },
     "marked": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz",
-      "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz",
+      "integrity": "sha512-tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA==",
       "dev": true
     },
     "md5.js": {
@@ -4675,9 +4675,9 @@
       }
     },
     "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==",
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz",
+      "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==",
       "dev": true
     },
     "move-concurrently": {
@@ -6588,9 +6588,9 @@
       "dev": true
     },
     "spago": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/spago/-/spago-0.15.3.tgz",
-      "integrity": "sha512-CNpbJiI+6MPpttbCtGIGFUroegXze4I7joXCTfiiTRzOUKcMV925fm7dxyAa3AVUUUvGi3D55k65aniGR1cVMA==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/spago/-/spago-0.16.0.tgz",
+      "integrity": "sha512-I7CpLNM+3EPqLeqrhQHPa8U7J1C90XzMIzrzDtlZQ0TeloseulopTd5l2hzhjaj5DrcVtYhYkh3DVY1QDh8+ZA==",
       "dev": true,
       "requires": {
         "request": "^2.88.0",
diff --git a/purs/package.json b/purs/package.json
index ab1794f..9b52239 100644
--- a/purs/package.json
+++ b/purs/package.json
@@ -2,16 +2,18 @@
   "name": "espial",
   "private": true,
   "scripts": {
+    "spago": "spago",
+    "purs": "purs",
     "make-install": "make install",
     "make-watch": "inotifywait -m -r -q -e close_write --format '%T %w%f' --timefmt '%T' src | while read FILE; do echo $FILE; make; done",
     "parcel-build": "parcel build dist/bundle.js --out-file dist/app.min.js --public-url /static/js/"
   },
   "devDependencies": {
-    "marked": "^1.1.0",
-    "moment": "^2.26.0",
+    "marked": "^1.2.0",
+    "moment": "^2.29.0",
     "parcel-bundler": "^1.12.4",
     "purescript": "^0.13.8",
-    "spago": "^0.15.2",
+    "spago": "^0.16.0",
     "terser": "^4.7.0"
   },
   "dependencies": {}