Merge pull request #11 from flarelabs-net/url

Drop the URL patch
opennextjs · Sep 20, 2024 · 5454280 · 5454280
2 parents 3eea24c + ef608c3
commit 5454280
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 141 deletions.
diff --git a/TODO.md b/TODO.md
@@ -32,8 +32,7 @@ DONE:
 - add the following devDependency to the package.json:
 
   ```json
-  "node-url": "npm:url@^0.11.4",
-  "wrangler": "^3.77.0"
+  "wrangler": "^3.78.6"
   ```
 
 - add a wrangler.toml int the generated app
@@ -90,23 +89,11 @@ Changes:
     ...
   },
   "devDependencies": {
-    "node-url": "npm:url@^0.11.4",
-    "wrangler": "^3.77.0"
+    "wrangler": "^3.78.6"
     ...
   }
 ```
 
-- wrangler, update bundle.ts (based on 3.76.0)
-
-```js
-  //l 354
-  conditions: [],
-  platform: "node",
-```
-
-The conditions (`export const BUILD_CONDITIONS = ["workerd", "worker", "browser"];`)
-would pull browser files that are not traced by nft.
-
 - Build the app
 
-- Use the updated wrangler `pnpm --filter wrangler start dev -c /path/to/open-next/example/wrangler.toml`
+- Serve with `WRANGLER_BUILD_CONDITIONS="" WRANGLER_BUILD_PLATFORM="node" wrangler dev`
diff --git a/builder/src/build/build-worker.ts b/builder/src/build/build-worker.ts
@@ -4,7 +4,6 @@ import { readdirSync, readFileSync, writeFileSync } from "node:fs";
 import { cp, readFile, writeFile } from "node:fs/promises";
 
 import { patchRequire } from "./patches/investigated/patch-require";
-import { patchUrl } from "./patches/investigated/patch-url";
 import { copyTemplates } from "./patches/investigated/copy-templates";
 
 import { patchReadFile } from "./patches/to-investigate/patch-read-file";
@@ -149,7 +148,6 @@ async function updateWorkerBundledCode(
 
   patchedCode = patchRequire(patchedCode);
   patchedCode = patchReadFile(patchedCode, nextjsAppPaths);
-  patchedCode = patchUrl(patchedCode);
   patchedCode = inlineNextRequire(patchedCode, nextjsAppPaths);
   patchedCode = patchFindDir(patchedCode, nextjsAppPaths);
   patchedCode = inlineEvalManifest(patchedCode, nextjsAppPaths);

diff --git a/builder/src/build/patches/investigated/patch-url.ts b/builder/src/build/patches/investigated/patch-url.ts
diff --git a/examples/api/package.json b/examples/api/package.json
@@ -13,15 +13,14 @@
     "e2e": "playwright test"
   },
   "dependencies": {
-    "next": "14.2.5",
-    "react": "^18",
-    "react-dom": "^18"
+    "next": "catalog:",
+    "react": "catalog:",
+    "react-dom": "catalog:"
   },
   "devDependencies": {
     "@flarelabs-net/builder": "workspace:*",
-    "@playwright/test": "1.47.0",
-    "@types/node": "^22.2.0",
-    "node-url": "npm:url@^0.11.4",
-    "wrangler": "3.77.0"
+    "@playwright/test": "catalog:",
+    "@types/node": "catalog:",
+    "wrangler": "catalog:"
   }
 }
diff --git a/examples/create-next-app/package.json b/examples/create-next-app/package.json
@@ -13,22 +13,21 @@
     "e2e": "playwright test -c e2e/playwright.config.ts"
   },
   "dependencies": {
-    "react": "^18",
-    "react-dom": "^18",
-    "next": "14.2.11"
+    "react": "catalog:",
+    "react-dom": "catalog:",
+    "next": "catalog:"
   },
   "devDependencies": {
     "@flarelabs-net/builder": "workspace:*",
-    "@playwright/test": "1.47.0",
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.11",
+    "@playwright/test": "catalog:",
+    "@types/node": "catalog:",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
+    "eslint": "catalog:",
+    "eslint-config-next": "catalog:",
     "postcss": "^8",
-    "node-url": "npm:url@^0.11.4",
     "tailwindcss": "^3.4.1",
-    "typescript": "^5",
-    "wrangler": "^3.77.0"
+    "typescript": "catalog:",
+    "wrangler": "catalog:"
   }
 }