wrangler 0.0.0-e95bea2 → 0.0.0-e95e5a0

package/src/module-collection.ts

@@ -2,6 +2,7 @@ import crypto from "node:crypto";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import globToRegExp from "glob-to-regexp";
+import { logger } from "./logger";
 import type { Config, ConfigModuleRuleType } from "./config";
 import type { CfModule, CfModuleType, CfScriptFormat } from "./worker";
 import type esbuild from "esbuild";
@@ -58,7 +59,7 @@ export default function createModuleCollector(props: {
     if (rule.type in completedRuleLocations) {
       if (rules[completedRuleLocations[rule.type]].fallthrough !== false) {
         if (index < (props.rules || []).length) {
-          console.warn(
+          logger.warn(
             `The module rule at position ${index} (${JSON.stringify(
               rule
             )}) has the same type as a previous rule (at position ${
@@ -68,7 +69,7 @@ export default function createModuleCollector(props: {
             )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow this one to also be used, or \`fallthrough = false\` to silence this warning.`
           );
         } else {
-          console.warn(
+          logger.warn(
             `The default module rule ${JSON.stringify(
               rule
             )} has the same type as a previous rule (at position ${
@@ -102,7 +103,7 @@ export default function createModuleCollector(props: {
           modules.splice(0);
         });
 
-        // ~ start  legacy module specifier support ~
+        // ~ start legacy module specifier support ~
 
         // This section detects usage of "legacy" 1.x style module specifiers
         // and modifies them so they "work" in wrangler v2, but with a warning
@@ -117,62 +118,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
+              logger.warn(
+                `Deprecation: 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) => {
@@ -216,10 +222,9 @@ export default function createModuleCollector(props: {
                   return {
                     // We replace the the module with an identifier
                     // that we'll separately add to the form upload
-                    // as part of [wasm_modules]/[text_blobs]. This identifier has to be a valid
+                    // as part of [wasm_modules]/[text_blobs]/[data_blobs]. This identifier has to be a valid
                     // JS identifier, so we replace all non alphanumeric characters
                     // with an underscore.
-                    // TODO: what of "Data"?
                     contents: `export default ${args.path.replace(
                       /[^a-zA-Z0-9_$]/g,
                       "_"

package/src/open-in-browser.ts

@@ -1,13 +1,14 @@
 import open from "open";
+import { logger } from "./logger";
 
 /**
  * An extremely simple wrapper around the open command.
  * Specifically, it adds an 'error' event handler so that when this function
- * is called in environments where we can't open the browser (e.g. github codespaces,
- * stackblitz, remote servers), it doesn't just crash the process.
+ * is called in environments where we can't open the browser (e.g. GitHub Codespaces,
+ * StackBlitz, remote servers), it doesn't just crash the process.
  *
  * @param url the URL to point the browser at
- * @param options open a chromium-based browser instead of the default
+ * @param options open a Chromium-based browser instead of the default
  */
 export default async function openInBrowser(
   url: string,
@@ -20,6 +21,6 @@ export default async function openInBrowser(
     : undefined;
   const childProcess = await open(url, options);
   childProcess.on("error", () => {
-    console.warn(`Failed to open ${url} in a browser`);
+    logger.warn(`Failed to open ${url} in a browser.`);
   });
 }

package/src/package-manager.ts

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { execa, execaCommandSync } from "execa";
+import { logger } from "./logger";
 
 export interface PackageManager {
   cwd: string;
@@ -16,26 +17,26 @@ export async function getPackageManager(cwd: string): Promise<PackageManager> {
 
   if (hasNpmLock) {
     if (hasNpm) {
-      console.log(
+      logger.log(
         "Using npm as package manager, as there is already a package-lock.json file."
       );
       return { ...NpmPackageManager, cwd };
     } else if (hasYarn) {
-      console.log("Using yarn as package manager.");
-      console.warn(
+      logger.log("Using yarn as package manager.");
+      logger.warn(
         "There is already a package-lock.json file but could not find npm on the PATH."
       );
       return { ...YarnPackageManager, cwd };
     }
   } else if (hasYarnLock) {
     if (hasYarn) {
-      console.log(
+      logger.log(
         "Using yarn as package manager, as there is already a yarn.lock file."
       );
       return { ...YarnPackageManager, cwd };
     } else if (hasNpm) {
-      console.log("Using npm as package manager.");
-      console.warn(
+      logger.log("Using npm as package manager.");
+      logger.warn(
         "There is already a yarn.lock file but could not find yarn on the PATH."
       );
       return { ...NpmPackageManager, cwd };
@@ -43,10 +44,10 @@ export async function getPackageManager(cwd: string): Promise<PackageManager> {
   }
 
   if (hasNpm) {
-    console.log("Using npm as package manager.");
+    logger.log("Using npm as package manager.");
     return { ...NpmPackageManager, cwd };
   } else if (hasYarn) {
-    console.log("Using yarn as package manager.");
+    logger.log("Using yarn as package manager.");
     return { ...YarnPackageManager, cwd };
   } else {
     throw new Error(