Use native runtime on macOS (#386)

* Use `NativeRuntime` on macOS * Add `compatibilityDate` to miniflare injected workers (KV, R2, and Core Entry)
cloudflare · Sep 23, 2022 · 4aa7199 · 4aa7199
1 parent b929f02
commit 4aa7199
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/tre/README.md b/packages/tre/README.md
@@ -7,6 +7,6 @@ runtime... 👀
 
 # Additional Development Setup
 
-1. Copy the open-source runtime binary to `./lib/cfwrkr`
+1. Copy the open-source runtime binary to `./lib/workerd`
 2. Copy the config files `sserve-conf.{capnp,capnp.d.ts,capnp.js,ts}` to
    `./src/runtime/config/`
diff --git a/packages/tre/src/index.ts b/packages/tre/src/index.ts
@@ -101,7 +101,7 @@ type PluginRouters = {
 };
 
 // `__dirname` relative to bundled output `dist/src/index.js`
-const RUNTIME_PATH = path.resolve(__dirname, "..", "..", "lib", "cfwrkr");
+const RUNTIME_PATH = path.resolve(__dirname, "..", "..", "lib", "workerd");
 
 type StoppableServer = http.Server & stoppable.WithStop;
 

diff --git a/packages/tre/src/plugins/core/index.ts b/packages/tre/src/plugins/core/index.ts
@@ -157,6 +157,7 @@ export const CORE_PLUGIN: Plugin<
         worker: {
           serviceWorkerScript: SCRIPT_ENTRY,
           bindings: serviceEntryBindings,
+          compatibilityDate: "2022-09-01",
         },
       },
     ];

diff --git a/packages/tre/src/plugins/kv/index.ts b/packages/tre/src/plugins/kv/index.ts
@@ -106,6 +106,7 @@ export const KV_PLUGIN: Plugin<
             { name: BINDING_TEXT_NAMESPACE, text: id },
             loopbackBinding,
           ],
+          compatibilityDate: "2022-09-01",
         },
       })
     );

diff --git a/packages/tre/src/plugins/r2/index.ts b/packages/tre/src/plugins/r2/index.ts
@@ -57,6 +57,7 @@ export const R2_PLUGIN: Plugin<
             { name: BINDING_TEXT_NAMESPACE, text: id },
             loopbackBinding,
           ],
+          compatibilityDate: "2022-09-01",
         },
       })
     );

diff --git a/packages/tre/src/runtime/index.ts b/packages/tre/src/runtime/index.ts
@@ -42,7 +42,7 @@ function waitForExit(process: childProcess.ChildProcess): Promise<void> {
 
 class NativeRuntime extends Runtime {
   static isSupported() {
-    return process.platform === "linux"; // TODO: and "darwin"?
+    return process.platform === "linux" || process.platform === "darwin";
   }
   static supportSuggestion = "Run using a Linux or macOS based system";
   static description = "natively ⚡️";
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,7 @@ export const KV_PLUGIN: Plugin< @@
                 { name: BINDING_TEXT_NAMESPACE, text: id },
                 loopbackBinding,
               ],
+              compatibilityDate: "2022-09-01",
             },
           })
         );
@@ Expand Down @@