wrangler 0.0.0-e3cab74 → 0.0.0-e3e3243

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e3cab74",
+  "version": "0.0.0-e3e3243",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -39,6 +39,7 @@
     "esbuild": "0.14.23",
     "miniflare": "2.3.0",
     "path-to-regexp": "^6.2.0",
+    "selfsigned": "^2.0.0",
     "semiver": "^1.1.0",
     "xxhash-wasm": "^1.0.1"
   },
@@ -46,19 +47,18 @@
     "fsevents": "~2.3.2"
   },
   "devDependencies": {
-    "@babel/types": "^7.16.0",
     "@iarna/toml": "^2.2.5",
     "@sentry/cli": "^1.71.0",
     "@sentry/integrations": "^6.17.6",
     "@sentry/node": "^6.17.6",
     "@types/command-exists": "^1.2.0",
-    "@types/estree": "^0.0.50",
     "@types/glob-to-regexp": "0.4.1",
     "@types/mime": "^2.0.3",
     "@types/prompts": "^2.0.14",
     "@types/react": "^17.0.37",
     "@types/serve-static": "^1.13.10",
     "@types/signal-exit": "^3.0.1",
+    "@types/supports-color": "^8.1.1",
     "@types/ws": "^8.2.1",
     "@types/yargs": "^17.0.7",
     "chokidar": "^3.5.2",
@@ -87,8 +87,9 @@
     "react-error-boundary": "^3.1.4",
     "serve-static": "^1.14.1",
     "signal-exit": "^3.0.6",
+    "supports-color": "^9.2.1",
     "tmp-promise": "^3.0.3",
-    "undici": "4.13.0",
+    "undici": "^4.15.1",
     "ws": "^8.3.0",
     "yargs": "^17.3.0"
   },
@@ -97,13 +98,14 @@
     "bin",
     "pages",
     "miniflare-config-stubs",
+    "miniflare-dist",
     "wrangler-dist",
     "templates",
     "vendor",
     "import_meta_url.js"
   ],
   "scripts": {
-    "clean": "rm -rf wrangler-dist",
+    "clean": "rm -rf wrangler-dist miniflare-dist",
     "check:type": "tsc",
     "bundle": "node -r esbuild-register scripts/bundle.ts",
     "build": "npm run clean && npm run bundle",
@@ -120,10 +122,11 @@
     "testTimeout": 30000,
     "testRegex": ".*.(test|spec)\\.[jt]sx?$",
     "transformIgnorePatterns": [
-      "node_modules/(?!find-up|locate-path|p-locate|p-limit|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port)"
+      "node_modules/(?!find-up|locate-path|p-locate|p-limit|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color)"
     ],
     "moduleNameMapper": {
-      "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js"
+      "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
+      "miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
     },
     "transform": {
       "^.+\\.c?(t|j)sx?$": [

package/pages/functions/filepath-routing.test.ts

@@ -1,4 +1,4 @@
-import { writeFileSync } from "fs";
+import { writeFileSync, mkdirSync } from "fs";
 import { runInTempDir } from "../../src/__tests__/helpers/run-in-tmp";
 import { toUrlPath } from "../../src/paths";
 import { compareRoutes, generateConfigFromFileTree } from "./filepath-routing";
@@ -83,34 +83,134 @@ describe("filepath-routing", () => {
       `
       );
 
+      mkdirSync("todos");
+
+      writeFileSync(
+        "todos/[id].ts",
+        `
+      export function onRequestPost() {}
+      export function onRequestDelete() {}
+      `
+      );
+
+      mkdirSync("authors");
+      mkdirSync("authors/[authorId]");
+      mkdirSync("authors/[authorId]/todos");
+
+      writeFileSync(
+        "authors/[authorId]/todos/[todoId].ts",
+        `
+      export function onRequestPost() {}
+      `
+      );
+
+      mkdirSync("books");
+
+      writeFileSync(
+        "books/[[title]].ts",
+        `
+      export function onRequestPost() {}
+      `
+      );
+
+      mkdirSync("cats");
+      mkdirSync("cats/[[breed]]");
+
+      writeFileSync(
+        "cats/[[breed]]/blah.ts",
+        `
+      export function onRequestPost() {}
+      `
+      );
+
+      // This won't actually work at runtime.
+      writeFileSync(
+        "cats/[[breed]]/[[name]].ts",
+        `
+      export function onRequestPost() {}
+      `
+      );
+
       const entries = await generateConfigFromFileTree({
         baseDir: ".",
         baseURL: "/base" as UrlPath,
       });
-      expect(entries).toEqual({
-        routes: [
-          {
-            method: "DELETE",
-            module: ["bar.ts:onRequestDelete"],
-            routePath: "/base/bar",
-          },
-          {
-            method: "PUT",
-            module: ["bar.ts:onRequestPut"],
-            routePath: "/base/bar",
-          },
-          {
-            method: "GET",
-            module: ["foo.ts:onRequestGet"],
-            routePath: "/base/foo",
-          },
-          {
-            method: "POST",
-            module: ["foo.ts:onRequestPost"],
-            routePath: "/base/foo",
-          },
-        ],
-      });
+      expect(entries).toMatchInlineSnapshot(`
+        Object {
+          "routes": Array [
+            Object {
+              "method": "POST",
+              "module": Array [
+                "authors/[authorId]/todos/[todoId].ts:onRequestPost",
+              ],
+              "routePath": "/base/authors/:authorId/todos/:todoId",
+            },
+            Object {
+              "method": "POST",
+              "module": Array [
+                "cats/[[breed]]/blah.ts:onRequestPost",
+              ],
+              "routePath": "/base/cats/:breed*/blah",
+            },
+            Object {
+              "method": "POST",
+              "module": Array [
+                "cats/[[breed]]/[[name]].ts:onRequestPost",
+              ],
+              "routePath": "/base/cats/:breed*/:name*",
+            },
+            Object {
+              "method": "DELETE",
+              "module": Array [
+                "todos/[id].ts:onRequestDelete",
+              ],
+              "routePath": "/base/todos/:id",
+            },
+            Object {
+              "method": "POST",
+              "module": Array [
+                "todos/[id].ts:onRequestPost",
+              ],
+              "routePath": "/base/todos/:id",
+            },
+            Object {
+              "method": "POST",
+              "module": Array [
+                "books/[[title]].ts:onRequestPost",
+              ],
+              "routePath": "/base/books/:title*",
+            },
+            Object {
+              "method": "DELETE",
+              "module": Array [
+                "bar.ts:onRequestDelete",
+              ],
+              "routePath": "/base/bar",
+            },
+            Object {
+              "method": "PUT",
+              "module": Array [
+                "bar.ts:onRequestPut",
+              ],
+              "routePath": "/base/bar",
+            },
+            Object {
+              "method": "GET",
+              "module": Array [
+                "foo.ts:onRequestGet",
+              ],
+              "routePath": "/base/foo",
+            },
+            Object {
+              "method": "POST",
+              "module": Array [
+                "foo.ts:onRequestPost",
+              ],
+              "routePath": "/base/foo",
+            },
+          ],
+        }
+      `);
     });
   });
 });

package/pages/functions/filepath-routing.ts

@@ -64,14 +64,17 @@ export async function generateConfigFromFileTree({
 
           routePath = `${baseURL}/${routePath}`;
 
-          routePath = routePath.replace(/\[\[(.+)]]/g, ":$1*"); // transform [[id]] => :id*
-          routePath = routePath.replace(/\[(.+)]/g, ":$1"); // transform [id] => :id
+          routePath = routePath.replace(/\[\[([^\]]+)\]\]/g, ":$1*"); // transform [[id]] => :id*
+          routePath = routePath.replaceAll(/\[([^\]]+)\]/g, ":$1"); // transform [id] => :id
+
+          // These are used as module specifiers so UrlPaths are okay to use even on Windows
+          const modulePath = toUrlPath(path.relative(baseDir, filepath));
 
           const routeEntry: RouteConfig = {
             routePath: toUrlPath(routePath),
             method: method.toUpperCase() as HTTPMethod,
             [isMiddlewareFile ? "middleware" : "module"]: [
-              `${path.relative(baseDir, filepath)}:${exportName}`,
+              `${modulePath}:${exportName}`,
             ],
           };