Add --experimental-local support to unstable_dev (#1940)

* Add `--experimental-local` support to `unstable_dev` * Enable `--experimental-vm-modules` in `local-mode-tests` `--experimental-local` uses `npx-import` to import `@miniflare/tre`, because we want to install `workerd` lazily. `npx-import` makes use of dynamic `import()`. Jest only supports this if `--experimental-vm-modules` is set. If it isn't, the tests just hang. * Report correct `port` from `Miniflare` in `onReady` ...and use correct `next` dist tag for `npx-import` * Temporarily remove `unstable_dev` `experimentalLocal` test
cloudflare · Sep 28, 2022 · b88ccf4 · b88ccf4
1 parent 58a430f
commit b88ccf4
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 109 deletions.
diff --git a/fixtures/local-mode-tests/package.json b/fixtures/local-mode-tests/package.json
@@ -9,8 +9,8 @@
 	"main": "index.js",
 	"scripts": {
 		"check:type": "tsc",
-		"test": "cross-env NODE_ENV=local-testing npx jest --forceExit",
-		"test:ci": "cross-env NODE_ENV=local-testing npx jest --forceExit"
+		"test": "cross-env NODE_ENV=local-testing NODE_OPTIONS=--experimental-vm-modules npx jest --forceExit",
+		"test:ci": "cross-env NODE_ENV=local-testing NODE_OPTIONS=--experimental-vm-modules npx jest --forceExit"
 	},
 	"jest": {
 		"restoreMocks": true,

diff --git a/fixtures/local-mode-tests/tests/unstableDev.test.ts b/fixtures/local-mode-tests/tests/unstableDev.test.ts
@@ -1,5 +1,8 @@
 import { unstable_dev } from "wrangler";
 
+// TODO: add test for `experimentalLocal: true` once issue with dynamic
+//  `import()` and `npx-import` resolved:
+//  https://github.com/cloudflare/wrangler2/pull/1940#issuecomment-1261166695
 describe("worker", () => {
 	let worker: {
 		fetch: (
@@ -22,7 +25,7 @@ describe("worker", () => {
 	});
 
 	afterAll(async () => {
-		await worker.stop();
+		await worker?.stop();
 	});
 
 	it("should invoke the worker and exit", async () => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json
@@ -112,7 +112,7 @@
 		"@databases/sql": "^3.2.0",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "3.0.0-next.1",
+		"@miniflare/tre": "3.0.0-next.2",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",

diff --git a/packages/wrangler/src/api/dev.ts b/packages/wrangler/src/api/dev.ts
@@ -54,6 +54,7 @@ interface DevOptions {
 	_?: (string | number)[]; //yargs wants this
 	$0?: string; //yargs wants this
 	testScheduled?: boolean;
+	experimentalLocal?: boolean;
 }
 
 interface DevApiOptions {

diff --git a/packages/wrangler/src/dev.tsx b/packages/wrangler/src/dev.tsx
@@ -561,10 +561,13 @@ export async function startApiDev(args: StartDevOptions) {
 			isWorkersSite: Boolean(args.site || configParam.site),
 			compatibilityDate: getDevCompatibilityDate(
 				config,
-				args["compatibility-date"]
+				// Only `compatibilityDate` will be set when using `unstable_dev`
+				args["compatibility-date"] ?? args.compatibilityDate
 			),
 			compatibilityFlags:
-				args["compatibility-flags"] || configParam.compatibility_flags,
+				args["compatibility-flags"] ??
+				args.compatibilityFlags ??
+				configParam.compatibility_flags,
 			usageModel: configParam.usage_model,
 			bindings: bindings,
 			crons: configParam.triggers.crons,
@@ -578,7 +581,7 @@ export async function startApiDev(args: StartDevOptions) {
 			firstPartyWorker: configParam.first_party_worker,
 			sendMetrics: configParam.send_metrics,
 			testScheduled: args.testScheduled,
-			experimentalLocal: undefined,
+			experimentalLocal: args.experimentalLocal,
 		});
 	}