[wasm] use updated node to run jsvu (#18386)

* [wasm] use updated node to run jsvu

* [wasm] make the browser tests use the node we've installed

* [wasm] Fix browser tests to reference dotnet.js

9 files changed, 25 insertions, 19 deletions

diff --git a/sdks/wasm/Makefile b/sdks/wasm/Makefile
index 211e8394c18..7db0279a828 100644
--- a/sdks/wasm/Makefile
+++ b/sdks/wasm/Makefile
@@ -98,12 +98,15 @@ ifeq ($(UNAME),Darwin)
 endif
 .PHONY: jsup
 
-jsup:
-	node node_modules/jsvu/cli.js --os=$(JSVU_OS) --engines=all
+NPM=$(CURDIR)/node_modules/node/bin/node $(CURDIR)/node_modules/npm/bin/npm-cli.js
 
-.stamp-jsvu:
-	npm install
-	node node_modules/jsvu/cli.js --os=$(JSVU_OS) --engines=all
+jsup: .stamp-jsvu
+	node_modules/node/bin/node node_modules/jsvu/cli.js --os=$(JSVU_OS) --engines=chakra,javascriptcore,spidermonkey,v8,xs
+
+.stamp-jsvu: 
+	npm install npm@^6.13.4
+	node_modules/npm/bin/npm-cli.js install
+	node_modules/node/bin/node node_modules/jsvu/cli.js --os=$(JSVU_OS) --engines=chakra,javascriptcore,spidermonkey,v8,xs
 	touch $@
 
 .PHONY: toolchain
@@ -413,18 +416,18 @@ $(eval $(call XunitTestTemplate,corlib-xunit,corlib-xunit,wasm_corlib_xunit-test
 
 $(BROWSER_TEST)/.stamp-browser-test-suite: packager.exe $(WASM_FRAMEWORK)/.stamp-framework $(BROWSER_TEST_SOURCES) clean-browser-tests build-sdk 
 	$(DOTNET_BUILD) tests/browser/src -v normal
-	(cd $(BROWSER_TEST) && npm install)
+	(cd $(BROWSER_TEST) && $(NPM) install)
 	touch $@
 
 $(BROWSER_TEST_THREADS)/.stamp-browser-test-threads-suite: packager.exe $(WASM_FRAMEWORK)/.stamp-framework $(BROWSER_TEST_SOURCES) clean-browser-tests build-sdk
 	$(DOTNET_BUILD) tests/browser/src -v normal -c DebugThreads
-	(cd $(BROWSER_TEST) && npm install)
+	(cd $(BROWSER_TEST) && $(NPM) install)
 	touch $@
 
 $(BROWSER_TEST_DYNAMIC)/.stamp-browser-test-dynamic-suite: packager.exe $(WASM_FRAMEWORK)/.stamp-framework $(BROWSER_TEST_SOURCES) clean-browser-tests build-sdk
 	echo BROWSER_TEST_SOURCES: $(BROWSER_TEST_SOURCES)
 	$(DOTNET_BUILD) tests/browser/src -v normal -p:EnableMonoWasmDynamic=true
-	(cd $(BROWSER_TEST) && npm install)
+	(cd $(BROWSER_TEST) && $(NPM) install)
 	touch $@
 
 .stamp-build-debugger-test-app: packager.exe binding_tests.dll debugger-test.dll debugger-driver.html
@@ -639,18 +642,18 @@ run-debugger-tests: build-debugger-test-app build-dbg-testsuite
 	dotnet test DebuggerTestSuite
 
 run-browser-tests: build-browser-test-suite
-	(cd $(BROWSER_TEST) && npm test)
+	(cd $(BROWSER_TEST) && $(NPM) test)
 
 build-browser-test-suite: $(BROWSER_TEST)/.stamp-browser-test-suite
 
 run-browser-threads-tests: $(BROWSER_TEST_THREADS)/.stamp-browser-test-threads-suite
-	(cd $(BROWSER_TEST_THREADS) && npm test)
+	(cd $(BROWSER_TEST_THREADS) && $(NPM) test)
 
 run-browser-dynamic-tests: $(BROWSER_TEST_DYNAMIC)/.stamp-browser-test-dynamic-suite
-	(cd $(BROWSER_TEST_DYNAMIC) && npm test)
+	(cd $(BROWSER_TEST_DYNAMIC) && $(NPM) test)
 
 run-browser-safari-tests: $(BROWSER_TEST)/.stamp-browser-test-suite
-	(cd $(BROWSER_TEST) && npm run testsafari)
+	(cd $(BROWSER_TEST) && $(NPM) run testsafari)
 
 clean: clean-browser-tests
 	$(RM) -r *.o
diff --git a/sdks/wasm/package.json b/sdks/wasm/package.json
index 76ae0148eb4..3ca4745bb6a 100644
--- a/sdks/wasm/package.json
+++ b/sdks/wasm/package.json
@@ -9,8 +9,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "jsvu": "git+https://github.com/kjpou1/jsvu.git#mono-wasm",
+    "jsvu": "git+https://github.com/GoogleChromeLabs/jsvu.git",
     "lite-server": "^2.5.3",
+    "node": ">11.0.0",
+    "npm": "^6.13.4",
     "puppeteer": "^1.17.0"
   }
 }
diff --git a/sdks/wasm/tests/browser/.npmrc b/sdks/wasm/tests/browser/.npmrc
new file mode 100644
index 00000000000..a21347f1bde
--- /dev/null
+++ b/sdks/wasm/tests/browser/.npmrc
@@ -0,0 +1 @@
+scripts-prepend-node-path=true
\ No newline at end of file
diff --git a/sdks/wasm/tests/browser/src/BrowserTestSuite/core-bindings-spec.html b/sdks/wasm/tests/browser/src/BrowserTestSuite/core-bindings-spec.html
index f39c386ef77..64b254542fe 100644
--- a/sdks/wasm/tests/browser/src/BrowserTestSuite/core-bindings-spec.html
+++ b/sdks/wasm/tests/browser/src/BrowserTestSuite/core-bindings-spec.html
@@ -19,7 +19,7 @@
       };
     </script>
 
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec-with-prom-lib.html b/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec-with-prom-lib.html
index ed6fadb14ae..663e97d68da 100644
--- a/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec-with-prom-lib.html
+++ b/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec-with-prom-lib.html
@@ -19,7 +19,7 @@
       };
     </script>
 
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec.html b/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec.html
index 9646da9a939..0c3a014bdd5 100644
--- a/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec.html
+++ b/sdks/wasm/tests/browser/src/BrowserTestSuite/http-spec.html
@@ -19,7 +19,7 @@
       };
     </script>
 
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/sdks/wasm/tests/browser/src/BrowserTestSuite/issues-spec.html b/sdks/wasm/tests/browser/src/BrowserTestSuite/issues-spec.html
index 235232c3b2e..77561784d07 100644
--- a/sdks/wasm/tests/browser/src/BrowserTestSuite/issues-spec.html
+++ b/sdks/wasm/tests/browser/src/BrowserTestSuite/issues-spec.html
@@ -19,7 +19,7 @@
       };
     </script>
 
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/sdks/wasm/tests/browser/src/BrowserTestSuite/zip-spec.html b/sdks/wasm/tests/browser/src/BrowserTestSuite/zip-spec.html
index 9646da9a939..0c3a014bdd5 100644
--- a/sdks/wasm/tests/browser/src/BrowserTestSuite/zip-spec.html
+++ b/sdks/wasm/tests/browser/src/BrowserTestSuite/zip-spec.html
@@ -19,7 +19,7 @@
       };
     </script>
 
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
   </body>
 </html>
\ No newline at end of file
diff --git a/sdks/wasm/tests/runtime/index.html b/sdks/wasm/tests/runtime/index.html
index b027d3c0762..0b932b53a36 100644
--- a/sdks/wasm/tests/runtime/index.html
+++ b/sdks/wasm/tests/runtime/index.html
@@ -11,7 +11,7 @@
     <script type="text/javascript" src="mono-config.js"></script>
     <script type="text/javascript" src="runtime.js"></script>
 
-    <script defer src="mono.js"></script>
+    <script defer src="dotnet.js"></script>
 
   </body>
 </html>
\ No newline at end of file