Add native support for Windows 🎉

As of cloudflare/workerd#452, `workerd` supports Windows' natively.
This change upgrades `workerd`, then removes the WSL and Docker
runtime shells. It also `Cherry`picks #509, to allow Miniflare
development on Windows too.

Author: mrbbot

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest] # `windows-latest` not yet supported
+        os: [ubuntu-latest, windows-latest]
         node: [16.13.0, latest]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 

package-lock.json

@@ -23,13 +23,13 @@
     "dev": "node scripts/build.mjs watch",
     "helpers:scaffold": "node scripts/scaffold.mjs",
     "helpers:version": "node scripts/version.mjs",
-    "lint": "eslint 'packages/*/{src,test}/**/*.ts' 'scripts/**/*.{js,mjs}' 'types/**/*.ts'",
+    "lint": "eslint \"packages/*/{src,test}/**/*.ts\" \"scripts/**/*.{js,mjs}\" \"types/**/*.ts\"",
     "lint:fix": "npm run lint -- --fix",
     "prepublishOnly": "npm run lint && npm run clean && npm run build && npm run types:bundle && npm run test",
     "test": "npm run build && ava && rimraf ./.tmp",
     "types:build": "tsc",
     "___$comment:types:bundle": "api-extractor doesn't know to load index.ts instead of index.d.ts when resolving imported types",
-    "types:bundle": "cp node_modules/@cloudflare/workers-types/experimental/index.ts node_modules/@cloudflare/workers-types/experimental/index.d.ts && npm run types:build && node scripts/types.mjs"
+    "types:bundle": "node scripts/copy.mjs node_modules/@cloudflare/workers-types/experimental/index.ts node_modules/@cloudflare/workers-types/experimental/index.d.ts && npm run types:build && node scripts/types.mjs"
   },
   "devDependencies": {
     "@ava/get-port": "^2.0.0",

package.json

@@ -23,8 +23,7 @@
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "files": [
-    "dist/src",
-    "lib"
+    "dist/src"
   ],
   "dependencies": {
     "acorn": "^8.8.0",
@@ -39,7 +38,7 @@
     "source-map-support": "0.5.21",
     "stoppable": "^1.1.0",
     "undici": "^5.13.0",
-    "workerd": "^1.20230221.0",
+    "workerd": "^1.20230404.0",
     "ws": "^8.11.0",
     "youch": "^3.2.2",
     "zod": "^3.20.6"

packages/tre/lib/docker-restart.sh

@@ -54,13 +54,11 @@ import {
 import {
   Config,
   Runtime,
-  RuntimeConstructor,
   RuntimeOptions,
   Service,
   Socket,
   Worker_Binding,
   Worker_Module,
-  getSupportedRuntime,
   serializeConfig,
 } from "./runtime";
 import {
@@ -232,7 +230,6 @@ export class Miniflare {
   #log: Log;
   readonly #clock: Clock;
 
-  readonly #runtimeConstructor: RuntimeConstructor;
   #runtime?: Runtime;
   #removeRuntimeExitHook?: () => void;
   #runtimeEntryURL?: URL;
@@ -286,12 +283,6 @@ export class Miniflare {
     this.#clock = this.#sharedOpts.core.clock ?? defaultClock;
     this.#initPlugins();
 
-    // Get supported shell for executing runtime binary
-    // TODO: allow this to be configured if necessary
-    this.#runtimeConstructor = getSupportedRuntime();
-    const desc = this.#runtimeConstructor.description;
-    this.#log.debug(`Running workerd ${desc}...`);
-
     this.#liveReloadServer = new WebSocketServer({ noServer: true });
     this.#webSocketServer = new WebSocketServer({
       noServer: true,
@@ -386,12 +377,11 @@ export class Miniflare {
       inspectorPort: this.#sharedOpts.core.inspectorPort,
       verbose: this.#sharedOpts.core.verbose,
     };
-    this.#runtime = new this.#runtimeConstructor(opts);
+    this.#runtime = new Runtime(opts);
     this.#removeRuntimeExitHook = exitHook(() => void this.#runtime?.dispose());
 
     const accessibleHost =
-      this.#runtime.accessibleHostOverride ??
-      (host === "*" || host === "0.0.0.0" ? "127.0.0.1" : host);
+      host === "*" || host === "0.0.0.0" ? "127.0.0.1" : host;
     this.#runtimeEntryURL = new URL(`http://${accessibleHost}:${entryPort}`);
 
     const config = await this.#assembleConfig();

packages/tre/lib/wsl-restart.sh

@@ -50,8 +50,9 @@ export const DEFAULT_PERSIST_ROOT = ".mf";
 export const PARAM_FILE_UNSANITISE = "unsanitise";
 
 export function maybeParseURL(url: Persistence): URL | undefined {
+  if (typeof url !== "string" || path.isAbsolute(url)) return;
   try {
-    if (typeof url === "string") return new URL(url);
+    return new URL(url);
   } catch {}
 }