Move update-check and cf.json default locations to node_modules

Author: mrbbot

packages/http-server/src/plugin.ts

@@ -34,7 +34,7 @@ export interface HTTPPluginDefaults {
 }
 
 const defaultCertRoot = path.resolve(".mf", "cert");
-const defaultCfPath = path.resolve(".mf", "cf.json");
+const defaultCfPath = path.resolve("node_modules", ".mf", "cf.json");
 const defaultCfFetch = process.env.NODE_ENV !== "test";
 const defaultCfFetchEndpoint = "https://workers.cloudflare.com/cf.json";
 const defaultCf: IncomingRequestCfProperties = {

packages/http-server/test/plugin.spec.ts

@@ -138,7 +138,9 @@ test("HTTPPlugin: logs options", (t) => {
     "Live Reload: true",
   ]);
   logs = logPluginOptions(HTTPPlugin, { cfFetch: true });
-  t.deepEqual(logs, [`Request cf Object Fetch: .mf${path.sep}cf.json`]);
+  t.deepEqual(logs, [
+    `Request cf Object Fetch: node_modules${path.sep}.mf${path.sep}cf.json`,
+  ]);
   logs = logPluginOptions(HTTPPlugin, { cfFetch: false });
   t.deepEqual(logs, []);
 });

packages/jest-environment-miniflare/src/storage.ts

@@ -14,7 +14,7 @@ export class StackedMemoryStorage extends MemoryStorage {
     // If the storage wasn't created immediately (e.g. caches.open(), Durable
     // Object instances), the stack may be popped more times than it's pushed.
     // If this happens, default to an empty map, since the storage didn't exist
-    // at the  new stack level.
+    // at the new stack level.
     this.map = this.stack.pop() ?? new Map();
   }
 }

packages/miniflare/src/cli.ts

@@ -99,9 +99,9 @@ async function main() {
     // Get currently installed package metadata
     const pkgFile = path.join(__dirname, "..", "..", "package.json");
     const pkg = JSON.parse(await fs.readFile(pkgFile, "utf8"));
-    const mfDir = path.resolve(".mf");
-    await fs.mkdir(mfDir, { recursive: true });
-    const lastCheckFile = path.join(mfDir, "update-check");
+    const cacheDir = path.resolve("node_modules", ".mf");
+    await fs.mkdir(cacheDir, { recursive: true });
+    const lastCheckFile = path.join(cacheDir, "update-check");
     await updateCheck({ pkg, lastCheckFile, log: mf.log });
   } catch (e: any) {
     mf.log.debug("Unable to check for updates: " + e.stack);