wrangler 4.14.0 → 4.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "4.14.0",
+  "version": "4.14.1",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -57,7 +57,7 @@
     "unenv": "2.0.0-rc.15",
     "workerd": "1.20250428.0",
     "@cloudflare/kv-asset-handler": "0.4.0",
-    "miniflare": "4.20250428.0"
+    "miniflare": "4.20250428.1"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.721.0",
@@ -136,10 +136,10 @@
     "xxhash-wasm": "^1.0.1",
     "yargs": "^17.7.2",
     "@cloudflare/cli": "1.1.1",
-    "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.13.34",
+    "@cloudflare/pages-shared": "^0.13.35",
     "@cloudflare/workers-shared": "0.17.5",
-    "@cloudflare/workers-tsconfig": "0.0.0"
+    "@cloudflare/workers-tsconfig": "0.0.0",
+    "@cloudflare/eslint-config-worker": "1.1.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.20250428.0"

package/wrangler-dist/cli.d.ts

@@ -1589,6 +1589,8 @@ declare type Entry = {
     file: string;
     /** A worker's directory. Usually where the Wrangler configuration file is located */
     projectRoot: string;
+    /** The path to the config file, if it exists. */
+    configPath: string | undefined;
     /** Is this a module worker or a service worker? */
     format: CfScriptFormat;
     /** The directory that contains all of a `--no-bundle` worker's modules. Usually `${directory}/src`. Defaults to path.dirname(file) */

package/wrangler-dist/cli.js

@@ -81399,7 +81399,7 @@ var import_miniflare8 = require("miniflare");
 init_import_meta_url();
 var import_node_assert5 = __toESM(require("node:assert"));
 var import_node_crypto4 = require("node:crypto");
-var import_node_path15 = __toESM(require("node:path"));
+var import_node_path16 = __toESM(require("node:path"));
 var import_miniflare6 = require("miniflare");
 
 // src/ai/fetcher.ts
@@ -81413,7 +81413,7 @@ var import_undici3 = __toESM(require_undici());
 
 // package.json
 var name = "wrangler";
-var version = "4.14.0";
+var version = "4.14.1";
 
 // src/environment-variables/misc-variables.ts
 init_import_meta_url();
@@ -90548,7 +90548,10 @@ function validateScopeKeys(scopes) {
   return scopes.every((scope) => scope in DefaultScopes);
 }
 __name(validateScopeKeys, "validateScopeKeys");
-var CALLBACK_URL = "http://localhost:8976/oauth/callback";
+function getCallbackUrl(host = "localhost", port = 8976) {
+  return `http://${host}:${port}/oauth/callback`;
+}
+__name(getCallbackUrl, "getCallbackUrl");
 var LocalState = {
   ...getAuthTokens()
 };
@@ -90790,7 +90793,7 @@ function isReturningFromAuthServer(query) {
   return true;
 }
 __name(isReturningFromAuthServer, "isReturningFromAuthServer");
-async function getAuthURL(scopes, clientId) {
+async function getAuthURL(scopes, clientId, callbackHost, callbackPort) {
   const { codeChallenge, codeVerifier } = await generatePKCECodes();
   const stateQueryParam = generateRandomState(RECOMMENDED_STATE_LENGTH);
   Object.assign(LocalState, {
@@ -90801,7 +90804,7 @@ async function getAuthURL(scopes, clientId) {
   return generateAuthUrl({
     authUrl: getAuthUrlFromEnv(),
     clientId,
-    callbackUrl: CALLBACK_URL,
+    callbackUrl: getCallbackUrl(callbackHost, callbackPort),
     scopes,
     stateQueryParam,
     codeChallenge
@@ -90880,7 +90883,7 @@ async function exchangeAuthCodeForAccessToken() {
   const params = new URLSearchParams({
     grant_type: `authorization_code`,
     code: authorizationCode ?? "",
-    redirect_uri: CALLBACK_URL,
+    redirect_uri: getCallbackUrl(),
     client_id: getClientIdFromEnv(),
     code_verifier: codeVerifier
   });
@@ -90988,7 +90991,12 @@ async function loginOrRefreshIfRequired(props) {
 }
 __name(loginOrRefreshIfRequired, "loginOrRefreshIfRequired");
 async function getOauthToken(options) {
-  const urlToOpen = await getAuthURL(options.scopes, options.clientId);
+  const urlToOpen = await getAuthURL(
+    options.scopes,
+    options.clientId,
+    options.callbackHost,
+    options.callbackPort
+  );
   let server;
   let loginTimeoutHandle;
   const timerPromise = new Promise((_4, reject) => {
@@ -91524,18 +91532,78 @@ __name(AIFetcher, "AIFetcher");
 // src/deployment-bundle/module-collection.ts
 init_import_meta_url();
 var import_node_crypto3 = __toESM(require("node:crypto"));
-var import_node_fs7 = require("node:fs");
+var import_node_fs8 = require("node:fs");
 var import_promises4 = require("node:fs/promises");
-var import_node_path14 = __toESM(require("node:path"));
+var import_node_path15 = __toESM(require("node:path"));
 var import_glob_to_regexp2 = __toESM(require_glob_to_regexp());
 var import_resolve = __toESM(require_resolve());
 
 // src/deployment-bundle/find-additional-modules.ts
 init_import_meta_url();
 var import_promises3 = require("node:fs/promises");
-var import_node_path13 = __toESM(require("node:path"));
+var import_node_path14 = __toESM(require("node:path"));
 var import_glob_to_regexp = __toESM(require_glob_to_regexp());
 
+// src/paths.ts
+init_import_meta_url();
+var import_node_console = require("node:console");
+var import_node_fs6 = __toESM(require("node:fs"));
+var import_node_path12 = __toESM(require("node:path"));
+var import_signal_exit3 = __toESM(require_signal_exit());
+function toUrlPath(filePath) {
+  (0, import_node_console.assert)(
+    !/^[a-z]:/i.test(filePath),
+    "Tried to convert a Windows file path with a drive to a URL path."
+  );
+  return filePath.replace(/\\/g, "/");
+}
+__name(toUrlPath, "toUrlPath");
+function readableRelative(to) {
+  const relativePath = import_node_path12.default.relative(process.cwd(), to);
+  if (
+    // No directory nesting, return as-is
+    import_node_path12.default.basename(relativePath) === relativePath || // Outside current directory
+    relativePath.startsWith(".")
+  ) {
+    return relativePath;
+  } else {
+    return "./" + relativePath;
+  }
+}
+__name(readableRelative, "readableRelative");
+function getBasePath() {
+  return import_node_path12.default.resolve(__dirname, "..");
+}
+__name(getBasePath, "getBasePath");
+function getWranglerHiddenDirPath(projectRoot) {
+  projectRoot ??= process.cwd();
+  return import_node_path12.default.join(projectRoot, ".wrangler");
+}
+__name(getWranglerHiddenDirPath, "getWranglerHiddenDirPath");
+function getWranglerTmpDir(projectRoot, prefix, cleanup = true) {
+  const tmpRoot = import_node_path12.default.join(getWranglerHiddenDirPath(projectRoot), "tmp");
+  import_node_fs6.default.mkdirSync(tmpRoot, { recursive: true });
+  const tmpPrefix = import_node_path12.default.join(tmpRoot, `${prefix}-`);
+  const tmpDir = import_node_fs6.default.realpathSync(import_node_fs6.default.mkdtempSync(tmpPrefix));
+  const removeDir = /* @__PURE__ */ __name(() => {
+    if (cleanup) {
+      try {
+        return import_node_fs6.default.rmSync(tmpDir, { recursive: true, force: true });
+      } catch (e7) {
+      }
+    }
+  }, "removeDir");
+  const removeExitListener = (0, import_signal_exit3.default)(removeDir);
+  return {
+    path: tmpDir,
+    remove() {
+      removeExitListener();
+      removeDir();
+    }
+  };
+}
+__name(getWranglerTmpDir, "getWranglerTmpDir");
+
 // src/deployment-bundle/bundle-type.ts
 init_import_meta_url();
 function getBundleType(format9, file) {
@@ -91608,8 +91676,8 @@ __name(parseRules, "parseRules");
 
 // src/deployment-bundle/source-maps.ts
 init_import_meta_url();
-var import_node_fs6 = __toESM(require("node:fs"));
-var import_node_path12 = __toESM(require("node:path"));
+var import_node_fs7 = __toESM(require("node:fs"));
+var import_node_path13 = __toESM(require("node:path"));
 function loadSourceMaps(main2, modules, bundle) {
   const { sourceMapPath, sourceMapMetadata } = bundle;
   if (sourceMapPath && sourceMapMetadata) {
@@ -91624,18 +91692,18 @@ function loadSourceMap({ name: name2, filePath }, sourceMapPath, { entryDirector
     return [];
   }
   const map2 = JSON.parse(
-    import_node_fs6.default.readFileSync(import_node_path12.default.join(entryDirectory, sourceMapPath), "utf8")
+    import_node_fs7.default.readFileSync(import_node_path13.default.join(entryDirectory, sourceMapPath), "utf8")
   );
   map2.file = name2;
   if (map2.sourceRoot) {
-    const sourceRootPath = import_node_path12.default.dirname(
-      import_node_path12.default.join(entryDirectory, sourceMapPath)
+    const sourceRootPath = import_node_path13.default.dirname(
+      import_node_path13.default.join(entryDirectory, sourceMapPath)
     );
-    map2.sourceRoot = import_node_path12.default.relative(sourceRootPath, map2.sourceRoot);
+    map2.sourceRoot = import_node_path13.default.relative(sourceRootPath, map2.sourceRoot);
   }
   map2.sources = map2.sources.map((source) => {
-    const originalPath = import_node_path12.default.join(import_node_path12.default.dirname(filePath), source);
-    return import_node_path12.default.relative(entryDirectory, originalPath);
+    const originalPath = import_node_path13.default.join(import_node_path13.default.dirname(filePath), source);
+    return import_node_path13.default.relative(entryDirectory, originalPath);
   });
   return [
     {
@@ -91695,14 +91763,14 @@ function sourceMapForModule(module3) {
   if (sourceMapUrl === void 0) {
     return;
   }
-  const sourcemapPath = import_node_path12.default.join(import_node_path12.default.dirname(module3.filePath), sourceMapUrl);
-  if (!import_node_fs6.default.existsSync(sourcemapPath)) {
+  const sourcemapPath = import_node_path13.default.join(import_node_path13.default.dirname(module3.filePath), sourceMapUrl);
+  if (!import_node_fs7.default.existsSync(sourcemapPath)) {
     throw new Error(
       `Invalid source map path in ${module3.filePath}: ${sourcemapPath} does not exist.`
     );
   }
   const map2 = JSON.parse(
-    import_node_fs6.default.readFileSync(sourcemapPath, "utf8")
+    import_node_fs7.default.readFileSync(sourcemapPath, "utf8")
   );
   map2.file = module3.name;
   if (map2.sourceRoot) {
@@ -91732,12 +91800,18 @@ function stripPrefix(prefix, input) {
 __name(stripPrefix, "stripPrefix");
 
 // src/deployment-bundle/find-additional-modules.ts
-async function* getFiles(root, relativeTo) {
-  for (const file of await (0, import_promises3.readdir)(root, { withFileTypes: true })) {
+async function* getFiles(configPath, moduleRoot, relativeTo, projectRoot) {
+  const wranglerHiddenDirPath = getWranglerHiddenDirPath(projectRoot);
+  for (const file of await (0, import_promises3.readdir)(moduleRoot, { withFileTypes: true })) {
+    const absPath = import_node_path14.default.join(moduleRoot, file.name);
     if (file.isDirectory()) {
-      yield* getFiles(import_node_path13.default.join(root, file.name), relativeTo);
+      if (absPath !== wranglerHiddenDirPath) {
+        yield* getFiles(configPath, absPath, relativeTo, projectRoot);
+      }
     } else {
-      yield import_node_path13.default.relative(relativeTo, import_node_path13.default.join(root, file.name)).replaceAll("\\", "/");
+      if (absPath !== configPath) {
+        yield import_node_path14.default.relative(relativeTo, absPath).replaceAll("\\", "/");
+      }
     }
   }
 }
@@ -91748,8 +91822,13 @@ function isValidPythonPackageName(name2) {
 }
 __name(isValidPythonPackageName, "isValidPythonPackageName");
 async function findAdditionalModules(entry, rules, attachSourcemaps = false) {
-  const files = getFiles(entry.moduleRoot, entry.moduleRoot);
-  const relativeEntryPoint = import_node_path13.default.relative(entry.moduleRoot, entry.file).replaceAll("\\", "/");
+  const files = getFiles(
+    entry.configPath,
+    entry.moduleRoot,
+    entry.moduleRoot,
+    entry.projectRoot
+  );
+  const relativeEntryPoint = import_node_path14.default.relative(entry.moduleRoot, entry.file).replaceAll("\\", "/");
   if (Array.isArray(rules)) {
     rules = parseRules(rules);
   }
@@ -91762,7 +91841,7 @@ async function findAdditionalModules(entry, rules, attachSourcemaps = false) {
     let pythonRequirements = "";
     try {
       pythonRequirements = await (0, import_promises3.readFile)(
-        import_node_path13.default.resolve(entry.projectRoot, "requirements.txt"),
+        import_node_path14.default.resolve(entry.projectRoot, "requirements.txt"),
         "utf-8"
       );
     } catch (e7) {
@@ -91826,7 +91905,7 @@ async function matchFiles(files, relativeTo, { rules, removedRules }) {
         if (!regexp.test(filePath)) {
           continue;
         }
-        const absoluteFilePath = import_node_path13.default.join(relativeTo, filePath);
+        const absoluteFilePath = import_node_path14.default.join(relativeTo, filePath);
         const fileContent = await (0, import_promises3.readFile)(
           absoluteFilePath
         );
@@ -91871,19 +91950,19 @@ async function* findAdditionalModuleWatchDirs(root) {
       if (entry.name === "node_modules" || entry.name === ".git") {
         continue;
       }
-      yield* findAdditionalModuleWatchDirs(import_node_path13.default.join(root, entry.name));
+      yield* findAdditionalModuleWatchDirs(import_node_path14.default.join(root, entry.name));
     }
   }
 }
 __name(findAdditionalModuleWatchDirs, "findAdditionalModuleWatchDirs");
 async function writeAdditionalModules(modules, destination) {
   for (const module3 of modules) {
-    const modulePath = import_node_path13.default.resolve(destination, module3.name);
+    const modulePath = import_node_path14.default.resolve(destination, module3.name);
     logger.debug("Writing additional module to output", modulePath);
-    await (0, import_promises3.mkdir)(import_node_path13.default.dirname(modulePath), { recursive: true });
+    await (0, import_promises3.mkdir)(import_node_path14.default.dirname(modulePath), { recursive: true });
     await (0, import_promises3.writeFile)(modulePath, module3.content);
     if (module3.sourceMap) {
-      const sourcemapPath = import_node_path13.default.resolve(destination, module3.sourceMap.name);
+      const sourcemapPath = import_node_path14.default.resolve(destination, module3.sourceMap.name);
       await (0, import_promises3.writeFile)(sourcemapPath, module3.sourceMap.content);
     }
   }
@@ -91942,7 +92021,7 @@ function createModuleCollector(props) {
             }
             const found = await findAdditionalModules(props.entry, parsedRules);
             foundModulePaths = found.map(
-              ({ name: name2 }) => import_node_path14.default.resolve(props.entry.moduleRoot, name2)
+              ({ name: name2 }) => import_node_path15.default.resolve(props.entry.moduleRoot, name2)
             );
             modules.push(...found);
           }
@@ -91957,7 +92036,7 @@ function createModuleCollector(props) {
             const watchDirs = [];
             if (props.findAdditionalModules) {
               watchFiles = foundModulePaths;
-              const root = import_node_path14.default.resolve(props.entry.moduleRoot);
+              const root = import_node_path15.default.resolve(props.entry.moduleRoot);
               for await (const dir of findAdditionalModuleWatchDirs(root)) {
                 watchDirs.push(dir);
               }
@@ -91986,12 +92065,12 @@ function createModuleCollector(props) {
                 return;
               }
               logger.warn(
-                `Deprecation: detected a legacy module import in "./${import_node_path14.default.relative(
+                `Deprecation: detected a legacy module import in "./${import_node_path15.default.relative(
                   process.cwd(),
                   args.importer
                 )}". This will stop working in the future. Replace references to "${args.path}" with "./${args.path}";`
               );
-              const filePath = import_node_path14.default.join(
+              const filePath = import_node_path15.default.join(
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 props.wrangler1xLegacyModuleReferences.rootDirectory,
                 args.path
@@ -92000,7 +92079,7 @@ function createModuleCollector(props) {
                 filePath
               );
               const fileHash = import_node_crypto3.default.createHash("sha1").update(fileContent).digest("hex");
-              const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${import_node_path14.default.basename(args.path)}`;
+              const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${import_node_path15.default.basename(args.path)}`;
               const { rule } = rulesMatchers.find(({ regex: regex2 }) => regex2.test(fileName)) || {};
               if (rule) {
                 modules.push({
@@ -92034,7 +92113,7 @@ function createModuleCollector(props) {
                 if (args.pluginData?.skip) {
                   return;
                 }
-                let filePath = import_node_path14.default.join(args.resolveDir, args.path);
+                let filePath = import_node_path15.default.join(args.resolveDir, args.path);
                 if (foundModulePaths.includes(filePath)) {
                   return { path: args.path, external: true };
                 }
@@ -92065,7 +92144,7 @@ function createModuleCollector(props) {
                   filePath
                 );
                 const fileHash = import_node_crypto3.default.createHash("sha1").update(fileContent).digest("hex");
-                const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${import_node_path14.default.basename(args.path)}`;
+                const fileName = props.preserveFileNames ? args.path : `./${fileHash}-${import_node_path15.default.basename(args.path)}`;
                 modules.push({
                   name: fileName,
                   filePath,
@@ -92127,8 +92206,8 @@ function getWrangler1xLegacyModuleReferences(rootDirectory, entryPath) {
   return {
     rootDirectory,
     fileNames: new Set(
-      (0, import_node_fs7.readdirSync)(rootDirectory, { withFileTypes: true }).filter(
-        (dirEntry) => dirEntry.isFile() && dirEntry.name !== import_node_path14.default.basename(entryPath)
+      (0, import_node_fs8.readdirSync)(rootDirectory, { withFileTypes: true }).filter(
+        (dirEntry) => dirEntry.isFile() && dirEntry.name !== import_node_path15.default.basename(entryPath)
       ).map((dirEnt) => dirEnt.name)
     )
   };
@@ -92895,7 +92974,7 @@ async function buildSourceOptions(config) {
       config.bundle.modules
     );
     const entrypointNames = isPython ? [] : config.bundle.entry.exports;
-    const modulesRoot = import_node_path15.default.dirname(scriptPath3);
+    const modulesRoot = import_node_path16.default.dirname(scriptPath3);
     const sourceOptions = {
       modulesRoot,
       modules: [
@@ -92908,7 +92987,7 @@ async function buildSourceOptions(config) {
         // Misc (WebAssembly, etc, ...)
         ...modules.map((module3) => ({
           type: ModuleTypeToRuleType[module3.type ?? "esm"],
-          path: import_node_path15.default.resolve(modulesRoot, module3.name),
+          path: import_node_path16.default.resolve(modulesRoot, module3.name),
           contents: module3.content
         }))
       ]
@@ -92989,14 +93068,14 @@ function buildMiniflareBindingOptions(config) {
   const wasmBindings = { ...bindings.wasm_modules };
   if (config.format === "service-worker" && config.bundle) {
     const scriptPath3 = config.bundle.path;
-    const modulesRoot = import_node_path15.default.dirname(scriptPath3);
+    const modulesRoot = import_node_path16.default.dirname(scriptPath3);
     for (const { type, name: name2 } of config.bundle.modules) {
       if (type === "text") {
-        textBlobBindings[getIdentifier(name2)] = import_node_path15.default.resolve(modulesRoot, name2);
+        textBlobBindings[getIdentifier(name2)] = import_node_path16.default.resolve(modulesRoot, name2);
       } else if (type === "buffer") {
-        dataBlobBindings[getIdentifier(name2)] = import_node_path15.default.resolve(modulesRoot, name2);
+        dataBlobBindings[getIdentifier(name2)] = import_node_path16.default.resolve(modulesRoot, name2);
       } else if (type === "compiled-wasm") {
-        wasmBindings[getIdentifier(name2)] = import_node_path15.default.resolve(modulesRoot, name2);
+        wasmBindings[getIdentifier(name2)] = import_node_path16.default.resolve(modulesRoot, name2);
       }
     }
   }
@@ -93310,16 +93389,16 @@ function buildMiniflareBindingOptions(config) {
 __name(buildMiniflareBindingOptions, "buildMiniflareBindingOptions");
 function buildPersistOptions(localPersistencePath) {
   if (localPersistencePath !== null) {
-    const v3Path = import_node_path15.default.join(localPersistencePath, "v3");
+    const v3Path = import_node_path16.default.join(localPersistencePath, "v3");
     return {
-      cachePersist: import_node_path15.default.join(v3Path, "cache"),
-      durableObjectsPersist: import_node_path15.default.join(v3Path, "do"),
-      kvPersist: import_node_path15.default.join(v3Path, "kv"),
-      r2Persist: import_node_path15.default.join(v3Path, "r2"),
-      d1Persist: import_node_path15.default.join(v3Path, "d1"),
-      workflowsPersist: import_node_path15.default.join(v3Path, "workflows"),
-      secretsStorePersist: import_node_path15.default.join(v3Path, "secrets-store"),
-      analyticsEngineDatasetsPersist: import_node_path15.default.join(v3Path, "analytics-engine")
+      cachePersist: import_node_path16.default.join(v3Path, "cache"),
+      durableObjectsPersist: import_node_path16.default.join(v3Path, "do"),
+      kvPersist: import_node_path16.default.join(v3Path, "kv"),
+      r2Persist: import_node_path16.default.join(v3Path, "r2"),
+      d1Persist: import_node_path16.default.join(v3Path, "d1"),
+      workflowsPersist: import_node_path16.default.join(v3Path, "workflows"),
+      secretsStorePersist: import_node_path16.default.join(v3Path, "secrets-store"),
+      analyticsEngineDatasetsPersist: import_node_path16.default.join(v3Path, "analytics-engine")
     };
   }
 }
@@ -93343,7 +93422,7 @@ function buildSitesOptions({
   if (legacyAssetPaths !== void 0) {
     const { baseDirectory, assetDirectory, includePatterns, excludePatterns } = legacyAssetPaths;
     return {
-      sitePath: import_node_path15.default.join(baseDirectory, assetDirectory),
+      sitePath: import_node_path16.default.join(baseDirectory, assetDirectory),
       siteInclude: includePatterns.length > 0 ? includePatterns : void 0,
       siteExclude: excludePatterns.length > 0 ? excludePatterns : void 0
     };
@@ -94318,19 +94397,19 @@ init_import_meta_url();
 var import_node_assert9 = __toESM(require("node:assert"));
 var import_node_crypto7 = require("node:crypto");
 var import_node_events2 = __toESM(require("node:events"));
-var import_node_path19 = __toESM(require("node:path"));
+var import_node_path20 = __toESM(require("node:path"));
 var import_miniflare10 = require("miniflare");
 
 // embed-worker:/home/runner/work/workers-sdk/workers-sdk/packages/wrangler/templates/startDevWorker/InspectorProxyWorker.ts
 init_import_meta_url();
-var import_node_path16 = __toESM(require("node:path"));
-var scriptPath = import_node_path16.default.resolve(__dirname, "..", "wrangler-dist/InspectorProxyWorker.js");
+var import_node_path17 = __toESM(require("node:path"));
+var scriptPath = import_node_path17.default.resolve(__dirname, "..", "wrangler-dist/InspectorProxyWorker.js");
 var InspectorProxyWorker_default = scriptPath;
 
 // embed-worker:/home/runner/work/workers-sdk/workers-sdk/packages/wrangler/templates/startDevWorker/ProxyWorker.ts
 init_import_meta_url();
-var import_node_path17 = __toESM(require("node:path"));
-var scriptPath2 = import_node_path17.default.resolve(__dirname, "..", "wrangler-dist/ProxyWorker.js");
+var import_node_path18 = __toESM(require("node:path"));
+var scriptPath2 = import_node_path18.default.resolve(__dirname, "..", "wrangler-dist/ProxyWorker.js");
 var ProxyWorker_default = scriptPath2;
 
 // ../../node_modules/.pnpm/ws@8.18.0/node_modules/ws/wrapper.mjs
@@ -94353,8 +94432,8 @@ var import_open2 = __toESM(require_open());
 // src/api/startDevWorker/bundle-allowed-paths.ts
 init_import_meta_url();
 var import_node_assert8 = __toESM(require("node:assert"));
-var import_node_fs8 = __toESM(require("node:fs"));
-var import_node_path18 = __toESM(require("node:path"));
+var import_node_fs9 = __toESM(require("node:fs"));
+var import_node_path19 = __toESM(require("node:path"));
 var import_node_url6 = require("node:url");
 function isAllowedSourcePath(bundle, filePath) {
   const allowed = getBundleReferencedPaths(bundle);
@@ -94381,12 +94460,12 @@ function getBundleReferencedPaths(bundle) {
     }
     const sourceMappingPath = (0, import_node_url6.fileURLToPath)(sourceMappingURL);
     allowed.sourceMapPaths.add(sourceMappingPath);
-    const sourceMapData = import_node_fs8.default.readFileSync(sourceMappingPath, "utf8");
+    const sourceMapData = import_node_fs9.default.readFileSync(sourceMappingPath, "utf8");
     const sourceMap = JSON.parse(sourceMapData);
     const sourceRoot = sourceMap.sourceRoot ?? "";
     for (const source of sourceMap.sources) {
       const sourceURL = new URL(
-        import_node_path18.default.posix.join(sourceRoot, source),
+        import_node_path19.default.posix.join(sourceRoot, source),
         sourceMappingURL
       );
       allowed.sourcePaths.add((0, import_node_url6.fileURLToPath)(sourceURL));
@@ -94409,7 +94488,7 @@ function* getBundleSourcePaths(bundle) {
 }
 __name(getBundleSourcePaths, "getBundleSourcePaths");
 function maybeGetSourceMappingURL(sourcePath) {
-  const source = import_node_fs8.default.readFileSync(sourcePath, "utf8");
+  const source = import_node_fs9.default.readFileSync(sourcePath, "utf8");
   const sourceMappingURLIndex = source.lastIndexOf("//# sourceMappingURL=");
   if (sourceMappingURLIndex === -1) {
     return;
@@ -94628,8 +94707,8 @@ var openInspector = /* @__PURE__ */ __name(async (inspectorPort, worker) => {
 
 // src/https-options.ts
 init_import_meta_url();
-var fs7 = __toESM(require("node:fs"));
-var path20 = __toESM(require("node:path"));
+var fs8 = __toESM(require("node:fs"));
+var path21 = __toESM(require("node:path"));
 var import_miniflare9 = require("miniflare");
 var CERT_EXPIRY_DAYS = 30;
 var ONE_DAY_IN_MS = 864e5;
@@ -94646,37 +94725,37 @@ function getHttpsOptions(customHttpsKeyPath = getHttpsKeyPathFromEnv(), customHt
         "Must specify both certificate path and key path to use a Custom Certificate."
       );
     }
-    if (!fs7.existsSync(customHttpsKeyPath)) {
+    if (!fs8.existsSync(customHttpsKeyPath)) {
       throw new UserError(
         "Missing Custom Certificate Key at " + customHttpsKeyPath
       );
     }
-    if (!fs7.existsSync(customHttpsCertPath)) {
+    if (!fs8.existsSync(customHttpsCertPath)) {
       throw new UserError(
         "Missing Custom Certificate File at " + customHttpsCertPath
       );
     }
     logger.log("Using custom certificate at ", customHttpsKeyPath);
     return {
-      key: fs7.readFileSync(customHttpsKeyPath, "utf8"),
-      cert: fs7.readFileSync(customHttpsCertPath, "utf8")
+      key: fs8.readFileSync(customHttpsKeyPath, "utf8"),
+      cert: fs8.readFileSync(customHttpsCertPath, "utf8")
     };
   }
-  const certDirectory = path20.join(getGlobalWranglerConfigPath(), "local-cert");
-  const keyPath = path20.join(certDirectory, "key.pem");
-  const certPath = path20.join(certDirectory, "cert.pem");
-  const regenerate = !fs7.existsSync(keyPath) || !fs7.existsSync(certPath) || hasCertificateExpired(keyPath, certPath);
+  const certDirectory = path21.join(getGlobalWranglerConfigPath(), "local-cert");
+  const keyPath = path21.join(certDirectory, "key.pem");
+  const certPath = path21.join(certDirectory, "cert.pem");
+  const regenerate = !fs8.existsSync(keyPath) || !fs8.existsSync(certPath) || hasCertificateExpired(keyPath, certPath);
   if (regenerate) {
     logger.log("Generating new self-signed certificate...");
     const { key, cert } = generateCertificate();
     try {
-      fs7.mkdirSync(certDirectory, { recursive: true });
-      fs7.writeFileSync(keyPath, key, "utf8");
-      fs7.writeFileSync(certPath, cert, "utf8");
+      fs8.mkdirSync(certDirectory, { recursive: true });
+      fs8.writeFileSync(keyPath, key, "utf8");
+      fs8.writeFileSync(certPath, cert, "utf8");
     } catch (e7) {
       const message = e7 instanceof Error ? e7.message : `${e7}`;
       logger.warn(
-        `Unable to cache generated self-signed certificate in ${path20.relative(
+        `Unable to cache generated self-signed certificate in ${path21.relative(
           process.cwd(),
           certDirectory
         )}.
@@ -94686,15 +94765,15 @@ ${message}`
     return { key, cert };
   } else {
     return {
-      key: fs7.readFileSync(keyPath, "utf8"),
-      cert: fs7.readFileSync(certPath, "utf8")
+      key: fs8.readFileSync(keyPath, "utf8"),
+      cert: fs8.readFileSync(certPath, "utf8")
     };
   }
 }
 __name(getHttpsOptions, "getHttpsOptions");
 function hasCertificateExpired(keyPath, certPath) {
-  const keyStat = fs7.statSync(keyPath);
-  const certStat = fs7.statSync(certPath);
+  const keyStat = fs8.statSync(keyPath);
+  const certStat = fs8.statSync(certPath);
   const created = Math.max(keyStat.mtimeMs, certStat.mtimeMs);
   return Date.now() - created > (CERT_EXPIRY_DAYS - 2) * ONE_DAY_IN_MS;
 }
@@ -94772,7 +94851,7 @@ var ProxyController = class extends Controller {
           name: "ProxyWorker",
           compatibilityDate: "2023-12-18",
           compatibilityFlags: ["nodejs_compat"],
-          modulesRoot: import_node_path19.default.dirname(ProxyWorker_default),
+          modulesRoot: import_node_path20.default.dirname(ProxyWorker_default),
           modules: [{ type: "ESModule", path: ProxyWorker_default }],
           durableObjects: {
             DURABLE_OBJECT: {
@@ -94801,7 +94880,7 @@ var ProxyController = class extends Controller {
             "nodejs_compat",
             "increase_websocket_message_size"
           ],
-          modulesRoot: import_node_path19.default.dirname(InspectorProxyWorker_default),
+          modulesRoot: import_node_path20.default.dirname(InspectorProxyWorker_default),
           modules: [{ type: "ESModule", path: InspectorProxyWorker_default }],
           durableObjects: {
             DURABLE_OBJECT: {
@@ -99894,16 +99973,16 @@ var import_undici4 = __toESM(require_undici());
 
 // src/dev/get-local-persistence-path.ts
 init_import_meta_url();
-var import_node_path20 = __toESM(require("node:path"));
+var import_node_path21 = __toESM(require("node:path"));
 function getLocalPersistencePath(persistTo, { userConfigPath }) {
   return persistTo ? (
     // If path specified, always treat it as relative to cwd()
-    import_node_path20.default.resolve(process.cwd(), persistTo)
+    import_node_path21.default.resolve(process.cwd(), persistTo)
   ) : (
     // Otherwise, treat it as relative to the Wrangler configuration file,
     // if one can be found, otherwise cwd()
-    import_node_path20.default.resolve(
-      userConfigPath ? import_node_path20.default.dirname(userConfigPath) : process.cwd(),
+    import_node_path21.default.resolve(
+      userConfigPath ? import_node_path21.default.dirname(userConfigPath) : process.cwd(),
       ".wrangler/state"
     )
   );
@@ -100201,7 +100280,7 @@ var import_node_process9 = require("node:process");
 // ../../node_modules/.pnpm/execa@6.1.0/node_modules/execa/index.js
 init_import_meta_url();
 var import_node_buffer2 = require("node:buffer");
-var import_node_path22 = __toESM(require("node:path"), 1);
+var import_node_path23 = __toESM(require("node:path"), 1);
 var import_node_child_process = __toESM(require("node:child_process"), 1);
 var import_node_process8 = __toESM(require("node:process"), 1);
 var import_cross_spawn = __toESM(require_cross_spawn(), 1);
@@ -100224,7 +100303,7 @@ __name(stripFinalNewline, "stripFinalNewline");
 // ../../node_modules/.pnpm/npm-run-path@5.1.0/node_modules/npm-run-path/index.js
 init_import_meta_url();
 var import_node_process7 = __toESM(require("node:process"), 1);
-var import_node_path21 = __toESM(require("node:path"), 1);
+var import_node_path22 = __toESM(require("node:path"), 1);
 var import_node_url9 = __toESM(require("node:url"), 1);
 
 // ../../node_modules/.pnpm/path-key@4.0.0/node_modules/path-key/index.js
@@ -100250,15 +100329,15 @@ function npmRunPath(options = {}) {
   } = options;
   let previous;
   const cwdString = cwd2 instanceof URL ? import_node_url9.default.fileURLToPath(cwd2) : cwd2;
-  let cwdPath = import_node_path21.default.resolve(cwdString);
+  let cwdPath = import_node_path22.default.resolve(cwdString);
   const result = [];
   while (previous !== cwdPath) {
-    result.push(import_node_path21.default.join(cwdPath, "node_modules/.bin"));
+    result.push(import_node_path22.default.join(cwdPath, "node_modules/.bin"));
     previous = cwdPath;
-    cwdPath = import_node_path21.default.resolve(cwdPath, "..");
+    cwdPath = import_node_path22.default.resolve(cwdPath, "..");
   }
-  result.push(import_node_path21.default.resolve(cwdString, execPath, ".."));
-  return [...result, path_].join(import_node_path21.default.delimiter);
+  result.push(import_node_path22.default.resolve(cwdString, execPath, ".."));
+  return [...result, path_].join(import_node_path22.default.delimiter);
 }
 __name(npmRunPath, "npmRunPath");
 function npmRunPathEnv({ env: env6 = import_node_process7.default.env, ...options } = {}) {
@@ -100819,7 +100898,7 @@ var normalizeStdio = /* @__PURE__ */ __name((options) => {
 // ../../node_modules/.pnpm/execa@6.1.0/node_modules/execa/lib/kill.js
 init_import_meta_url();
 var import_node_os4 = __toESM(require("node:os"), 1);
-var import_signal_exit3 = __toESM(require_signal_exit(), 1);
+var import_signal_exit4 = __toESM(require_signal_exit(), 1);
 var DEFAULT_FORCE_KILL_TIMEOUT = 1e3 * 5;
 var spawnedKill = /* @__PURE__ */ __name((kill, signal = "SIGTERM", options = {}) => {
   const killResult = kill(signal);
@@ -100883,7 +100962,7 @@ var setExitHandler = /* @__PURE__ */ __name(async (spawned, { cleanup, detached
   if (!cleanup || detached) {
     return timedPromise;
   }
-  const removeExitHandler = (0, import_signal_exit3.default)(() => {
+  const removeExitHandler = (0, import_signal_exit4.default)(() => {
     spawned.kill();
   });
   return timedPromise.finally(() => {
@@ -101060,7 +101139,7 @@ var handleArguments = /* @__PURE__ */ __name((file, args, options = {}) => {
   };
   options.env = getEnv(options);
   options.stdio = normalizeStdio(options);
-  if (import_node_process8.default.platform === "win32" && import_node_path22.default.basename(file, ".exe") === "cmd") {
+  if (import_node_process8.default.platform === "win32" && import_node_path23.default.basename(file, ".exe") === "cmd") {
     args.unshift("/q");
   }
   return { file, args, options, parsed };
@@ -101334,8 +101413,8 @@ __name(getNodeVersion, "getNodeVersion");
 // src/metrics/metrics-config.ts
 init_import_meta_url();
 var import_node_crypto8 = require("node:crypto");
-var import_node_fs9 = require("node:fs");
-var import_node_path23 = __toESM(require("node:path"));
+var import_node_fs10 = require("node:fs");
+var import_node_path24 = __toESM(require("node:path"));
 var CURRENT_METRICS_DATE = new Date(2022, 6, 4);
 function getMetricsConfig({
   sendMetrics
@@ -101374,8 +101453,8 @@ function getMetricsConfig({
 }
 __name(getMetricsConfig, "getMetricsConfig");
 function writeMetricsConfig(config) {
-  (0, import_node_fs9.mkdirSync)(import_node_path23.default.dirname(getMetricsConfigPath()), { recursive: true });
-  (0, import_node_fs9.writeFileSync)(
+  (0, import_node_fs10.mkdirSync)(import_node_path24.default.dirname(getMetricsConfigPath()), { recursive: true });
+  (0, import_node_fs10.writeFileSync)(
     getMetricsConfigPath(),
     JSON.stringify(
       config,
@@ -101387,7 +101466,7 @@ function writeMetricsConfig(config) {
 __name(writeMetricsConfig, "writeMetricsConfig");
 function readMetricsConfig() {
   try {
-    const config = (0, import_node_fs9.readFileSync)(getMetricsConfigPath(), "utf8");
+    const config = (0, import_node_fs10.readFileSync)(getMetricsConfigPath(), "utf8");
     return JSON.parse(
       config,
       (key, value) => key === "date" ? new Date(value) : value
@@ -101407,7 +101486,7 @@ function updateMetricsPermission(enabled) {
 }
 __name(updateMetricsPermission, "updateMetricsPermission");
 function getMetricsConfigPath() {
-  return import_node_path23.default.resolve(getGlobalWranglerConfigPath(), "metrics.json");
+  return import_node_path24.default.resolve(getGlobalWranglerConfigPath(), "metrics.json");
 }
 __name(getMetricsConfigPath, "getMetricsConfigPath");
 function getDeviceId(config) {
@@ -101675,7 +101754,7 @@ __name(getMetricsUsageHeaders, "getMetricsUsageHeaders");
 
 // src/r2/helpers.ts
 init_import_meta_url();
-var fs8 = __toESM(require("node:fs"));
+var fs9 = __toESM(require("node:fs"));
 var import_web = require("node:stream/web");
 var import_miniflare14 = require("miniflare");
 
@@ -102720,7 +102799,7 @@ function isValidR2BucketName(name2) {
 __name(isValidR2BucketName, "isValidR2BucketName");
 var CHUNK_SIZE = 1024;
 async function createFileReadableStream(filePath) {
-  const handle = await fs8.promises.open(filePath, "r");
+  const handle = await fs9.promises.open(filePath, "r");
   let position = 0;
   return new import_web.ReadableStream({
     async pull(controller) {
@@ -103159,62 +103238,6 @@ var fs11 = __toESM(require("node:fs"));
 var path28 = __toESM(require("node:path"));
 var esbuild = __toESM(require("esbuild"));
 
-// src/paths.ts
-init_import_meta_url();
-var import_node_console = require("node:console");
-var import_node_fs10 = __toESM(require("node:fs"));
-var import_node_path24 = __toESM(require("node:path"));
-var import_signal_exit4 = __toESM(require_signal_exit());
-function toUrlPath(filePath) {
-  (0, import_node_console.assert)(
-    !/^[a-z]:/i.test(filePath),
-    "Tried to convert a Windows file path with a drive to a URL path."
-  );
-  return filePath.replace(/\\/g, "/");
-}
-__name(toUrlPath, "toUrlPath");
-function readableRelative(to) {
-  const relativePath = import_node_path24.default.relative(process.cwd(), to);
-  if (
-    // No directory nesting, return as-is
-    import_node_path24.default.basename(relativePath) === relativePath || // Outside current directory
-    relativePath.startsWith(".")
-  ) {
-    return relativePath;
-  } else {
-    return "./" + relativePath;
-  }
-}
-__name(readableRelative, "readableRelative");
-function getBasePath() {
-  return import_node_path24.default.resolve(__dirname, "..");
-}
-__name(getBasePath, "getBasePath");
-function getWranglerTmpDir(projectRoot, prefix, cleanup = true) {
-  projectRoot ??= process.cwd();
-  const tmpRoot = import_node_path24.default.join(projectRoot, ".wrangler", "tmp");
-  import_node_fs10.default.mkdirSync(tmpRoot, { recursive: true });
-  const tmpPrefix = import_node_path24.default.join(tmpRoot, `${prefix}-`);
-  const tmpDir = import_node_fs10.default.realpathSync(import_node_fs10.default.mkdtempSync(tmpPrefix));
-  const removeDir = /* @__PURE__ */ __name(() => {
-    if (cleanup) {
-      try {
-        return import_node_fs10.default.rmSync(tmpDir, { recursive: true, force: true });
-      } catch (e7) {
-      }
-    }
-  }, "removeDir");
-  const removeExitListener = (0, import_signal_exit4.default)(removeDir);
-  return {
-    path: tmpDir,
-    remove() {
-      removeExitListener();
-      removeDir();
-    }
-  };
-}
-__name(getWranglerTmpDir, "getWranglerTmpDir");
-
 // src/deployment-bundle/apply-middleware.ts
 init_import_meta_url();
 var fs10 = __toESM(require("node:fs"));
@@ -115139,7 +115162,8 @@ function createHandler(def) {
       }
       const experimentalFlags = def.behaviour?.overrideExperimentalFlags ? def.behaviour?.overrideExperimentalFlags(args) : {
         MULTIWORKER: false,
-        RESOURCES_PROVISION: args.experimentalProvision ?? false
+        RESOURCES_PROVISION: args.experimentalProvision ?? false,
+        MIXED_MODE: args.experimentalMixedMode ?? false
       };
       await run(
         experimentalFlags,
@@ -117496,6 +117520,7 @@ ${migrateUrl}`
   return {
     file: paths.absolutePath,
     projectRoot,
+    configPath: config.configPath,
     format: format9,
     moduleRoot: args.moduleRoot ?? config.base_dir ?? import_node_path32.default.dirname(paths.absolutePath),
     name: config.name ?? "worker",
@@ -117848,7 +117873,8 @@ var deployCommand = createCommand({
     useConfigRedirectIfAvailable: true,
     overrideExperimentalFlags: /* @__PURE__ */ __name((args) => ({
       MULTIWORKER: false,
-      RESOURCES_PROVISION: args.experimentalProvision ?? false
+      RESOURCES_PROVISION: args.experimentalProvision ?? false,
+      MIXED_MODE: false
     }), "overrideExperimentalFlags")
   },
   validateArgs(args) {
@@ -120539,6 +120565,7 @@ function buildWorkerFromFunctions({
   const entry = {
     file: (0, import_node_path38.resolve)(getBasePath(), "templates/pages-template-worker.ts"),
     projectRoot: functionsDirectory,
+    configPath: void 0,
     format: "modules",
     moduleRoot: functionsDirectory,
     exports: []
@@ -120605,6 +120632,7 @@ function buildRawWorker({
   const entry = {
     file: workerScriptPath,
     projectRoot: (0, import_node_path38.resolve)(directory),
+    configPath: void 0,
     format: "modules",
     moduleRoot: (0, import_node_path38.resolve)(directory),
     exports: []
@@ -120675,6 +120703,7 @@ async function produceWorkerBundleForWorkerJSDirectory({
     {
       file: entrypoint,
       projectRoot: (0, import_node_path38.resolve)(workerJSDirectory),
+      configPath: void 0,
       format: "modules",
       moduleRoot: (0, import_node_path38.resolve)(workerJSDirectory),
       exports: []
@@ -120871,6 +120900,7 @@ function buildPluginFromFunctions({
   const entry = {
     file: (0, import_node_path39.resolve)(getBasePath(), "templates/pages-template-plugin.ts"),
     projectRoot: functionsDirectory,
+    configPath: void 0,
     format: "modules",
     moduleRoot: functionsDirectory,
     exports: []
@@ -124588,7 +124618,8 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
     const devServer = await run(
       {
         MULTIWORKER: Array.isArray(args.config),
-        RESOURCES_PROVISION: false
+        RESOURCES_PROVISION: false,
+        MIXED_MODE: false
       },
       () => startDev({
         script: scriptEntrypoint,
@@ -124651,6 +124682,7 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
         persistTo: args.persistTo,
         logLevel: args.logLevel ?? "log",
         experimentalProvision: void 0,
+        experimentalMixedMode: false,
         experimentalVectorizeBindToProd: false,
         experimentalImagesLocalMode: false,
         enableIpc: true,
@@ -148432,7 +148464,8 @@ var versionsUploadCommand = createCommand({
     useConfigRedirectIfAvailable: true,
     overrideExperimentalFlags: /* @__PURE__ */ __name((args) => ({
       MULTIWORKER: false,
-      RESOURCES_PROVISION: args.experimentalProvision ?? false
+      RESOURCES_PROVISION: args.experimentalProvision ?? false,
+      MIXED_MODE: false
     }), "overrideExperimentalFlags")
   },
   handler: /* @__PURE__ */ __name(async function versionsUploadHandler(args, { config }) {
@@ -150667,6 +150700,11 @@ function createCLIParser(argv) {
     type: "boolean",
     hidden: true,
     alias: ["x-provision"]
+  }).option("experimental-mixed-mode", {
+    describe: `Experimental: Enable Mixed Mode`,
+    type: "boolean",
+    hidden: true,
+    alias: ["x-mixed-mode"]
   }).epilogue(
     `Please report any issues to ${source_default.hex("#3B818D")(
       "https://github.com/cloudflare/workers-sdk/issues/new/choose"
@@ -153588,7 +153626,8 @@ var dev = createCommand({
     provideConfig: false,
     overrideExperimentalFlags: /* @__PURE__ */ __name((args) => ({
       MULTIWORKER: Array.isArray(args.config),
-      RESOURCES_PROVISION: args.experimentalProvision ?? false
+      RESOURCES_PROVISION: args.experimentalProvision ?? false,
+      MIXED_MODE: args.experimentalMixedMode ?? false
     }), "overrideExperimentalFlags")
   },
   metadata: {
@@ -154459,6 +154498,7 @@ unstable_dev()'s behaviour will likely change in future releases`
     logLevel: options?.logLevel ?? defaultLogLevel,
     port: options?.port ?? 0,
     experimentalProvision: void 0,
+    experimentalMixedMode: false,
     experimentalVectorizeBindToProd: vectorizeBindToProd ?? false,
     experimentalImagesLocalMode: imagesLocalMode ?? false,
     enableIpc: options?.experimental?.enableIpc,
@@ -154468,7 +154508,8 @@ unstable_dev()'s behaviour will likely change in future releases`
     {
       // TODO: can we make this work?
       MULTIWORKER: false,
-      RESOURCES_PROVISION: false
+      RESOURCES_PROVISION: false,
+      MIXED_MODE: false
     },
     () => startDev(devOptions)
   );
@@ -154714,6 +154755,7 @@ var BundlerController = class extends Controller {
       const entry = {
         file: config.entrypoint,
         projectRoot: config.projectRoot,
+        configPath: config.config,
         format: config.build.format,
         moduleRoot: config.build.moduleRoot,
         exports: config.build.exports
@@ -154837,6 +154879,7 @@ var BundlerController = class extends Controller {
     const entry = {
       file: config.entrypoint,
       projectRoot: config.projectRoot,
+      configPath: config.config,
       format: config.build.format,
       moduleRoot: config.build.moduleRoot,
       exports: config.build.exports,
@@ -156425,7 +156468,9 @@ async function getPlatformProxy(options = {}) {
   const miniflareOptions = await run(
     {
       MULTIWORKER: false,
-      RESOURCES_PROVISION: false
+      RESOURCES_PROVISION: false,
+      // TODO: when possible mixed mode should be made available for getPlatformProxy
+      MIXED_MODE: false
     },
     () => getMiniflareOptionsFromConfig(rawConfig, env6, options)
   );