Minify CodeMirror and Acorn dependencies to speed up page loading

marijnh · marijnh · commit 266517612ca6 · 2014-10-06T15:21:24.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /book.pdf
 /html/[012]*.html
 /html/js/chapter_info.js
+/html/js/acorn_codemirror.js
 /code/chapter/*
 /code/file_server.js
 /code/skillsharing.zip
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ CHAPTERS := 00_intro 01_values 02_program_structure 03_functions 04_data 05_high
 
 SVGS := $(wildcard img/*.svg)
 
-html: $(foreach CHAP,$(CHAPTERS),html/$(CHAP).html) html/js/chapter_info.js \
+html: $(foreach CHAP,$(CHAPTERS),html/$(CHAP).html) html/js/chapter_info.js html/js/acorn_codemirror.js \
       code/skillsharing.zip code/solutions/20_4_a_public_space_on_the_web.zip \
       $(patsubst img/%.svg,img/generated/%.png,$(SVGS))
 
@@ -15,6 +15,16 @@ html/%.html: %.txt asciidoc_html.conf
 html/js/chapter_info.js: $(foreach CHAP,$(CHAPTERS),$(CHAP).txt) code/solutions/* bin/chapter_info.js
 	node bin/chapter_info.js > html/js/chapter_info.js
 
+html/js/acorn_codemirror.js: node_modules/codemirror/lib/codemirror.js \
+	                     node_modules/codemirror/mode/javascript/javascript.js \
+	                     node_modules/codemirror/mode/css/css.js \
+	                     node_modules/codemirror/mode/xml/xml.js \
+	                     node_modules/codemirror/mode/htmlmixed/htmlmixed.js \
+	                     node_modules/codemirror/addon/edit/matchbrackets.js \
+	                     node_modules/acorn/acorn.js \
+	                     node_modules/acorn/util/walk.js
+	node_modules/.bin/uglifyjs $? -m -o $@
+
 img/generated/%.png: img/%.svg
 	inkscape --export-png=$@ $<
 
diff --git a/asciidoc_html.conf b/asciidoc_html.conf
@@ -72,14 +72,7 @@ template::[source-filter-style]
   <meta charset="utf-8">
   <title>{doctitle} :: Eloquent JavaScript</title>
   <link rel=stylesheet href="js/node_modules/codemirror/lib/codemirror.css">
-  <script src="js/node_modules/codemirror/lib/codemirror.js"></script>
-  <script src="js/node_modules/codemirror/mode/javascript/javascript.js"></script>
-  <script src="js/node_modules/codemirror/mode/css/css.js"></script>
-  <script src="js/node_modules/codemirror/mode/xml/xml.js"></script>
-  <script src="js/node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
-  <script src="js/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
-  <script src="js/node_modules/acorn/acorn.js"></script>
-  <script src="js/node_modules/acorn/util/walk.js"></script>
+  <script src="js/acorn_codemirror.js"></script>
   <link rel=stylesheet href="css/ejs.css">
   <script src="js/sandbox.js"></script>
   <script src="js/ejs.js"></script>
diff --git a/code/index.html b/code/index.html
@@ -5,23 +5,8 @@
   <title>Eloquent JavaScript :: Code Sandbox</title>
 
   <link rel=stylesheet href="js/node_modules/codemirror/lib/codemirror.css">
-  <script src="js/node_modules/codemirror/lib/codemirror.js"></script>
-  <script src="js/node_modules/codemirror/mode/javascript/javascript.js"></script>
-  <script src="js/node_modules/codemirror/mode/css/css.js"></script>
-  <script src="js/node_modules/codemirror/mode/xml/xml.js"></script>
-  <script src="js/node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
-  <script src="js/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
-  <script src="js/node_modules/acorn/acorn.js"></script>
-  <script src="js/node_modules/acorn/util/walk.js"></script>
+  <script src="js/acorn_codemirror.js"></script>
   <link rel=stylesheet href="js/node_modules/codemirror/lib/codemirror.css">
-  <script src="js/node_modules/codemirror/lib/codemirror.js"></script>
-  <script src="js/node_modules/codemirror/mode/javascript/javascript.js"></script>
-  <script src="js/node_modules/codemirror/mode/css/css.js"></script>
-  <script src="js/node_modules/codemirror/mode/xml/xml.js"></script>
-  <script src="js/node_modules/codemirror/mode/htmlmixed/htmlmixed.js"></script>
-  <script src="js/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
-  <script src="js/node_modules/acorn/acorn.js"></script>
-  <script src="js/node_modules/acorn/util/walk.js"></script>
   <link rel=stylesheet href="css/ejs.css">
   <script src="js/sandbox.js"></script>
   <script src="js/chapter_info.js"></script>
diff --git a/package.json b/package.json
@@ -10,7 +10,8 @@
   },
   "dependencies": {
     "acorn": "0.3",
-    "codemirror": "4"
+    "codemirror": "4",
+    "uglify-js": "2"
   },
   "devDependencies": {
     "contextify": "kkoopa/contextify",
