wrangler 0.0.21 → 0.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {

package/src/__tests__/publish.test.ts

@@ -2362,6 +2362,30 @@ export default{
       `"Deprecation warning: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"index.wasm\\" with \\"./index.wasm\\";"`
     );
   });
+
+  it("should not match regular module specifiers when there aren't any possible legacy module matches", async () => {
+    // see https://github.com/cloudflare/wrangler2/issues/655 for bug details
+
+    fs.writeFileSync(
+      "./index.js",
+      `import inner from './inner/index.js'; export default {};`
+    );
+    fs.mkdirSync("./inner", { recursive: true });
+    fs.writeFileSync("./inner/index.js", `export default 123`);
+    mockSubDomainRequest();
+    mockUploadWorkerRequest();
+
+    await runWrangler(
+      "publish index.js --compatibility-date 2022-03-17 --name test-name"
+    );
+    expect(std.out).toMatchInlineSnapshot(`
+      "Uploaded test-name (TIMINGS)
+      Published test-name (TIMINGS)
+        test-name.test-sub-domain.workers.dev"
+    `);
+    expect(std.err).toMatchInlineSnapshot(`""`);
+    expect(std.warn).toMatchInlineSnapshot(`""`);
+  });
 });
 
 /** Write a mock Worker script to disk. */

package/src/module-collection.ts

@@ -117,62 +117,67 @@ export default function createModuleCollector(props: {
           });
         });
 
-        build.onResolve(
-          {
-            filter: new RegExp(
-              [...props.wrangler1xlegacyModuleReferences.fileNames]
-                .map((fileName) => `^${fileName}$`)
-                .join("|")
-            ),
-          },
-          async (args: esbuild.OnResolveArgs) => {
-            if (
-              args.kind !== "import-statement" &&
-              args.kind !== "require-call"
-            ) {
-              return;
-            }
-            // In the future, this will simply throw an error
-            console.warn(
-              `Deprecation warning: detected a legacy module import in "./${path.relative(
-                process.cwd(),
-                args.importer
-              )}". This will stop working in the future. Replace references to "${
+        if (props.wrangler1xlegacyModuleReferences.fileNames.size > 0) {
+          build.onResolve(
+            {
+              filter: new RegExp(
+                "^(" +
+                  [...props.wrangler1xlegacyModuleReferences.fileNames].join(
+                    "|"
+                  ) +
+                  ")$"
+              ),
+            },
+            async (args: esbuild.OnResolveArgs) => {
+              if (
+                args.kind !== "import-statement" &&
+                args.kind !== "require-call"
+              ) {
+                return;
+              }
+              // In the future, this will simply throw an error
+              console.warn(
+                `Deprecation warning: detected a legacy module import in "./${path.relative(
+                  process.cwd(),
+                  args.importer
+                )}". This will stop working in the future. Replace references to "${
+                  args.path
+                }" with "./${args.path}";`
+              );
+
+              // take the file and massage it to a
+              // transportable/manageable format
+              const filePath = path.join(
+                props.wrangler1xlegacyModuleReferences.rootDirectory,
                 args.path
-              }" with "./${args.path}";`
-            );
+              );
+              const fileContent = await readFile(filePath);
+              const fileHash = crypto
+                .createHash("sha1")
+                .update(fileContent)
+                .digest("hex");
+              const fileName = `./${fileHash}-${path.basename(args.path)}`;
 
-            // take the file and massage it to a
-            // transportable/manageable format
-            const filePath = path.join(
-              props.wrangler1xlegacyModuleReferences.rootDirectory,
-              args.path
-            );
-            const fileContent = await readFile(filePath);
-            const fileHash = crypto
-              .createHash("sha1")
-              .update(fileContent)
-              .digest("hex");
-            const fileName = `./${fileHash}-${path.basename(args.path)}`;
-
-            const { rule } =
-              rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
-            if (rule) {
-              // add the module to the array
-              modules.push({
-                name: fileName,
-                content: fileContent,
-                type: RuleTypeToModuleType[rule.type],
-              });
-              return {
-                path: fileName, // change the reference to the changed module
-                external: props.format === "modules", // mark it as external in the bundle
-                namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
-                watchFiles: [filePath], // we also add the file to esbuild's watch list
-              };
+              const { rule } =
+                rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
+              if (rule) {
+                // add the module to the array
+                modules.push({
+                  name: fileName,
+                  content: fileContent,
+                  type: RuleTypeToModuleType[rule.type],
+                });
+                return {
+                  path: fileName, // change the reference to the changed module
+                  external: props.format === "modules", // mark it as external in the bundle
+                  namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
+                  watchFiles: [filePath], // we also add the file to esbuild's watch list
+                };
+              }
             }
-          }
-        );
+          );
+        }
+
         // ~ end legacy module specifier support ~
 
         rules?.forEach((rule) => {

package/wrangler-dist/cli.js

@@ -131708,7 +131708,7 @@ var import_prompts = __toESM(require_prompts3());
 
 // package.json
 var name = "wrangler";
-var version = "0.0.21";
+var version = "0.0.22";
 
 // src/reporting.ts
 function initReporting() {
@@ -138094,32 +138094,34 @@ function createModuleCollector(props) {
             };
           });
         });
-        build5.onResolve({
-          filter: new RegExp([...props.wrangler1xlegacyModuleReferences.fileNames].map((fileName) => `^${fileName}$`).join("|"))
-        }, async (args2) => {
-          if (args2.kind !== "import-statement" && args2.kind !== "require-call") {
-            return;
-          }
-          console.warn(`Deprecation warning: detected a legacy module import in "./${import_node_path12.default.relative(process.cwd(), args2.importer)}". This will stop working in the future. Replace references to "${args2.path}" with "./${args2.path}";`);
-          const filePath = import_node_path12.default.join(props.wrangler1xlegacyModuleReferences.rootDirectory, args2.path);
-          const fileContent = await (0, import_promises2.readFile)(filePath);
-          const fileHash = import_node_crypto2.default.createHash("sha1").update(fileContent).digest("hex");
-          const fileName = `./${fileHash}-${import_node_path12.default.basename(args2.path)}`;
-          const { rule } = rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
-          if (rule) {
-            modules.push({
-              name: fileName,
-              content: fileContent,
-              type: RuleTypeToModuleType[rule.type]
-            });
-            return {
-              path: fileName,
-              external: props.format === "modules",
-              namespace: `wrangler-module-${rule.type}`,
-              watchFiles: [filePath]
-            };
-          }
-        });
+        if (props.wrangler1xlegacyModuleReferences.fileNames.size > 0) {
+          build5.onResolve({
+            filter: new RegExp("^(" + [...props.wrangler1xlegacyModuleReferences.fileNames].join("|") + ")$")
+          }, async (args2) => {
+            if (args2.kind !== "import-statement" && args2.kind !== "require-call") {
+              return;
+            }
+            console.warn(`Deprecation warning: detected a legacy module import in "./${import_node_path12.default.relative(process.cwd(), args2.importer)}". This will stop working in the future. Replace references to "${args2.path}" with "./${args2.path}";`);
+            const filePath = import_node_path12.default.join(props.wrangler1xlegacyModuleReferences.rootDirectory, args2.path);
+            const fileContent = await (0, import_promises2.readFile)(filePath);
+            const fileHash = import_node_crypto2.default.createHash("sha1").update(fileContent).digest("hex");
+            const fileName = `./${fileHash}-${import_node_path12.default.basename(args2.path)}`;
+            const { rule } = rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
+            if (rule) {
+              modules.push({
+                name: fileName,
+                content: fileContent,
+                type: RuleTypeToModuleType[rule.type]
+              });
+              return {
+                path: fileName,
+                external: props.format === "modules",
+                namespace: `wrangler-module-${rule.type}`,
+                watchFiles: [filePath]
+              };
+            }
+          });
+        }
         rules?.forEach((rule) => {
           if (rule.type === "ESModule" || rule.type === "CommonJS")
             return;