Merge pull request #1831 from bitwiseman/task/move-to-serve

Switch from node-static to serve

Makefile

@@ -11,7 +11,7 @@ all: depends generate-tests js beautify py package jstest pytest perf
 help:
 	@echo "make <action>"
 	@echo "    all       - build both implementations"
-	@echo "    static    - serve static version of site locally"
+	@echo "    serve    - serve site locally from localhost:8080"
 	@echo "    js        - build javascript"
 	@echo "    py        - build python"
 	@echo "    alltest   - test both implementations, js and python"
@@ -20,8 +20,8 @@ help:
 
 ci: all git-status-clear
 
-static: js/lib/*.js
-	@./node_modules/.bin/static -H '{"Cache-Control": "no-cache, must-revalidate"}'
+serve: js/lib/*.js
+	@./node_modules/.bin/serve
 
 js: generate-tests js/lib/*.js
 	@echo Testing node beautify functionality...
@@ -155,5 +155,5 @@ clean:
 	git clean -xfd
 #######################################################
 
-.PHONY: all beautify clean depends generate-tests git-status-clear help static update
+.PHONY: all beautify clean depends generate-tests git-status-clear help serve update
 

azure-pipelines.yml

@@ -39,15 +39,15 @@ jobs:
     vmImage: 'ubuntu-latest'
   strategy:
     matrix:
-      Python27_Node8:
+      Python27_Node10:
         python.version: '2.7'
-        node_version: 8.x
-      Python36_Node10:
-        python.version: '3.6'
         node_version: 10.x
-      Python37_Node12:
-        python.version: '3.7'
+      Python36_Node12:
+        python.version: '3.6'
         node_version: 12.x
+      Python37_Node13:
+        python.version: '3.7'
+        node_version: 13.x
       Python38_Node13:
         python.version: '3.8'
         node_version: 13.x
@@ -72,12 +72,15 @@ jobs:
     vmImage: 'macOS-latest'
   strategy:
     matrix:
-      Python27_Node8:
+      Python27_Node10:
         python.version: '2.7'
-        node_version: 8.x
+        node_version: 10.x
       Python37_Node12:
         python.version: '3.7'
         node_version: 12.x
+      Python38_Node13:
+        python.version: '3.8'
+        node_version: 13.x
     maxParallel: 6
 
   steps: