From c084873218be68303c6dbc338aaf9d4a9f258c1c Mon Sep 17 00:00:00 2001
From: Glen Whitney <glen@studioinfinity.org>
Date: Tue, 21 Jul 2020 22:57:19 -0700
Subject: [PATCH] Update Makefile for current tools

  It appears that since the Makefile was last actively used, the file
  structure for some dependencies and the command-line arguments for
  uglifyjs have changed. This commit updates the Makefile for the current
  state of affairs, and ensures (via package.json) that we have a suitably
  recent uglify-js to match the Makefile.
---
 Makefile     | 14 ++++++--------
 package.json |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a9218d16..97d6f7cd 100644
--- a/Makefile
+++ b/Makefile
@@ -37,26 +37,23 @@ $(JS_FILES): %.js: src/%.ls
 manifest ::
 	perl -pi -e 's/# [A-Z].*\n/# @{[`date`]}/m' manifest.appcache
 
-./node_modules/streamline/bin/_node \
 ./node_modules/uglify-js/bin/uglifyjs :
-	npm i --dev
+	npm install uglify-js
 
 static/multi.js :: multi/main.ls multi/styles.styl
 	webpack --optimize-minimize
 
 depends: app.js static/ethercalc.js static/start.css static/multi.js
 
-node_modules/socialcalc/dist/SocialCalc.js: ./node_modules/streamline/bin/_node
-	@-mkdir -p node_modules/socialcalc/dist
-	cp node_modules/socialcalc/SocialCalc.js node_modules/socialcalc/dist/SocialCalc.js || true
-
 static/ethercalc.js: $(ETHERCALC_FILES) \
      ./node_modules/socialcalc/dist/SocialCalc.js \
      ./node_modules/uglify-js/bin/uglifyjs
 	@-mkdir -p .git
 	@echo '// Auto-generated from "make depends"; ALL CHANGES HERE WILL BE LOST!' > $@
-	node node_modules/uglify-js/bin/uglifyjs node_modules/socialcalc/dist/SocialCalc.js $(ETHERCALC_FILES) $(UGLIFYJS_ARGS) --source-map ethercalc.js.map --source-map-include-sources >> $@
-	mv ethercalc.js.map static
+	node node_modules/uglify-js/bin/uglifyjs node_modules/socialcalc/dist/SocialCalc.js $(ETHERCALC_FILES) $(UGLIFYJS_ARGS) --source-map includeSources -o tmpec.js
+	cat tmpec.js >> $@
+	rm tmpec.js
+	mv tmpec.js.map static/ethercalc.js.map
 
 COFFEE := $(shell command -v coffee 2> /dev/null)
 .coffee.js:
@@ -74,6 +71,7 @@ endif
 
 clean ::
 	@-rm $(JS_FILES)
+	@-rm static/ethercalc.js static/ethercalc.js.map
 
 .SUFFIXES: .js .css .sass .ls
 .PHONY: run vm expire all clean depends
diff --git a/package.json b/package.json
index 4b1d87ec..771abba1 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "style-loader": "^0.8.2",
     "stylus-loader": "^3.0.2",
     "superagent": "^0.21.0",
+    "uglify-js": "^3.1.0",
     "webpack": "^1.4.13",
     "webpack-dev-server": "^1.6.6"
   },