Move builder into a packages/cloudflare directory to match its new pa…

…ckage name
opennextjs · Sep 20, 2024 · 0da9b6b · 0da9b6b
1 parent 47270d3
commit 0da9b6b
Show file tree

Hide file tree

Showing 41 changed files with 51 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [POC] Build Next.js app for cf workers
 
-This monorepo includes a POC to see if it is possible to get a Next.js application built via `next build` (in standalone mode) to run in the Cloudflare workerd runtime.
+This monorepo includes a package for adapting a Next.js application built via `next build` (in standalone mode) to run in the Cloudflare workerd runtime.
 
 > [!NOTE]
 > The code here is built based on the amazing work done by @mhart in <https://github.com/mhart/nextjs-commerce>
@@ -9,8 +9,8 @@ This monorepo includes a POC to see if it is possible to get a Next.js applicati
 
 The repository contains two directories:
 
-- `builder` containing a package that can be used to build Cloudflare workers compatible output from Next.js applications
-- `examples` containing Next.js applications that use the above mentioned builder.
+- `packages` containing a cloudflare package that can be used to build Cloudflare workers compatible output from Next.js applications
+- `examples` containing Next.js applications that use the above mentioned cloudflare.
 
 ## How to try out/develop in the repository
 
@@ -23,13 +23,13 @@ pnpm i
 build the worker with:
 
 ```sh
-pnpm --filter builder build
+pnpm --filter cloudflare build
 ```
 
 or in watch mode with:
 
 ```sh
-pnpm --filter builder build:watch
+pnpm --filter cloudflare build:watch
 ```
 
 build and preview the worker for the `api` application:

diff --git a/TODO.md b/TODO.md
@@ -37,24 +37,24 @@ DONE:
   experimental_assets = { directory = ".worker-next/assets", binding = "ASSETS" }
   ```
 
-- Build the builder
+- Build the cloudflare builder
 
   ```sh
-  pnpm --filter builder build:watch
+  pnpm --filter cloudflare build:watch
   ```
 
 - To build for workers:
 
   - Build the next app once:
 
     ```sh
-    node /path/to/poc-next/builder/dist/index.mjs && npx wrangler dev
+    node /path/to/poc-next/packages/cloudflare/dist/index.mjs && npx wrangler dev
     ```
 
   - Then you can skip building the next app
 
     ```sh
-    SKIP_NEXT_APP_BUILD=1 node /path/to/poc-next/builder/dist/index.mjs && npx wrangler dev
+    SKIP_NEXT_APP_BUILD=1 node /path/to/poc-next/packages/cloudflare/dist/index.mjs && npx wrangler dev
     ```
 
 ## Open next [example app](https://github.com/sst/open-next/tree/main/example)

diff --git a/examples/create-next-app/package.json b/examples/create-next-app/package.json
@@ -7,7 +7,7 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "build:worker": "pnpm cloudflare",
+    "build:worker": "cloudflare",
     "dev:worker": "wrangler dev --port 8771",
     "preview:worker": "pnpm build:worker && pnpm dev:worker",
     "e2e": "playwright test -c e2e/playwright.config.ts"

diff --git a/builder/.gitignore → packages/cloudflare/.gitignore b/builder/.gitignore → packages/cloudflare/.gitignore
diff --git a/builder/README.md → packages/cloudflare/README.md b/builder/README.md → packages/cloudflare/README.md
@@ -1,8 +1,10 @@
 # Next.js builder for Cloudflare
 
+How to update a Next.js application to run on Cloudflare.
+
 ## Configure your app
 
-- add the following `devDependency` to the `package.json`:
+- add the following `devDependencies` to the `package.json`:
 
   ```bash
   pnpm add -D wrangler@latest @opennextjs/cloudflare

diff --git a/builder/package.json → packages/cloudflare/package.json b/builder/package.json → packages/cloudflare/package.json
@@ -16,7 +16,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/flarelabs-net/poc-next.git",
-    "directory": "builder"
+    "directory": "packages/cloudflare"
   },
   "keywords": [
     "cloudflare",

diff --git a/builder/src/args.ts → packages/cloudflare/src/args.ts b/builder/src/args.ts → packages/cloudflare/src/args.ts
diff --git a/builder/src/build/build-next-app.ts → ...es/cloudflare/src/build/build-next-app.ts b/builder/src/build/build-next-app.ts → ...es/cloudflare/src/build/build-next-app.ts
diff --git a/builder/src/build/build-worker.ts → ...ages/cloudflare/src/build/build-worker.ts b/builder/src/build/build-worker.ts → ...ages/cloudflare/src/build/build-worker.ts
diff --git a/builder/src/build/build.ts → packages/cloudflare/src/build/build.ts b/builder/src/build/build.ts → packages/cloudflare/src/build/build.ts
diff --git a/...ld/patches/investigated/copy-templates.ts → ...ld/patches/investigated/copy-templates.ts b/...ld/patches/investigated/copy-templates.ts → ...ld/patches/investigated/copy-templates.ts
diff --git a/...ild/patches/investigated/patch-require.ts → ...ild/patches/investigated/patch-require.ts b/...ild/patches/investigated/patch-require.ts → ...ild/patches/investigated/patch-require.ts
diff --git a/...et-chunk-installation-identifiers.test.ts → ...et-chunk-installation-identifiers.test.ts b/...et-chunk-installation-identifiers.test.ts → ...et-chunk-installation-identifiers.test.ts
diff --git a/...ile/get-chunk-installation-identifiers.ts → ...ile/get-chunk-installation-identifiers.ts b/...ile/get-chunk-installation-identifiers.ts → ...ile/get-chunk-installation-identifiers.ts
diff --git a/...th-updated-webpack-f-require-code.test.ts → ...th-updated-webpack-f-require-code.test.ts b/...th-updated-webpack-f-require-code.test.ts → ...th-updated-webpack-f-require-code.test.ts
diff --git a/...nt-with-updated-webpack-f-require-code.ts → ...nt-with-updated-webpack-f-require-code.ts b/...nt-with-updated-webpack-f-require-code.ts → ...nt-with-updated-webpack-f-require-code.ts
diff --git a/...dated-webpack-chunks-file-content.test.ts → ...dated-webpack-chunks-file-content.test.ts b/...dated-webpack-chunks-file-content.test.ts → ...dated-webpack-chunks-file-content.test.ts
diff --git a/...et-updated-webpack-chunks-file-content.ts → ...et-updated-webpack-chunks-file-content.ts b/...et-updated-webpack-chunks-file-content.ts → ...et-updated-webpack-chunks-file-content.ts
diff --git a/...gated/update-webpack-chunks-file/index.ts → ...gated/update-webpack-chunks-file/index.ts b/...gated/update-webpack-chunks-file/index.ts → ...gated/update-webpack-chunks-file/index.ts
diff --git a/...e/test-fixtures/minified-webpacks-file.js → ...e/test-fixtures/minified-webpacks-file.js b/...e/test-fixtures/minified-webpacks-file.js → ...e/test-fixtures/minified-webpacks-file.js
diff --git a/...test-fixtures/unminified-webpacks-file.js → ...test-fixtures/unminified-webpacks-file.js b/...test-fixtures/unminified-webpacks-file.js → ...test-fixtures/unminified-webpacks-file.js
diff --git a/.../test-snapshots/minified-webpacks-file.js → .../test-snapshots/minified-webpacks-file.js b/.../test-snapshots/minified-webpacks-file.js → .../test-snapshots/minified-webpacks-file.js
diff --git a/...est-snapshots/unminified-webpacks-file.js → ...est-snapshots/unminified-webpacks-file.js b/...est-snapshots/unminified-webpacks-file.js → ...est-snapshots/unminified-webpacks-file.js
diff --git a/...es/to-investigate/inline-eval-manifest.ts → ...es/to-investigate/inline-eval-manifest.ts b/...es/to-investigate/inline-eval-manifest.ts → ...es/to-investigate/inline-eval-manifest.ts
diff --git a/...hes/to-investigate/inline-next-require.ts → ...hes/to-investigate/inline-next-require.ts b/...hes/to-investigate/inline-next-require.ts → ...hes/to-investigate/inline-next-require.ts
diff --git a/.../patches/to-investigate/patch-find-dir.ts → .../patches/to-investigate/patch-find-dir.ts b/.../patches/to-investigate/patch-find-dir.ts → .../patches/to-investigate/patch-find-dir.ts
diff --git a/...patches/to-investigate/patch-read-file.ts → ...patches/to-investigate/patch-read-file.ts b/...patches/to-investigate/patch-read-file.ts → ...patches/to-investigate/patch-read-file.ts
diff --git a/...d/patches/to-investigate/wrangler-deps.ts → ...d/patches/to-investigate/wrangler-deps.ts b/...d/patches/to-investigate/wrangler-deps.ts → ...d/patches/to-investigate/wrangler-deps.ts
diff --git a/builder/src/build/utils/index.ts → packages/cloudflare/src/build/utils/index.ts b/builder/src/build/utils/index.ts → packages/cloudflare/src/build/utils/index.ts
diff --git a/builder/src/build/utils/ts-parse-file.ts → ...oudflare/src/build/utils/ts-parse-file.ts b/builder/src/build/utils/ts-parse-file.ts → ...oudflare/src/build/utils/ts-parse-file.ts
diff --git a/builder/src/index.ts → packages/cloudflare/src/index.ts b/builder/src/index.ts → packages/cloudflare/src/index.ts
diff --git a/builder/src/nextjs-paths.ts → packages/cloudflare/src/nextjs-paths.ts b/builder/src/nextjs-paths.ts → packages/cloudflare/src/nextjs-paths.ts
diff --git a/builder/src/templates/shims/empty.ts → ...s/cloudflare/src/templates/shims/empty.ts b/builder/src/templates/shims/empty.ts → ...s/cloudflare/src/templates/shims/empty.ts
diff --git a/builder/src/templates/shims/env.ts → ...ges/cloudflare/src/templates/shims/env.ts b/builder/src/templates/shims/env.ts → ...ges/cloudflare/src/templates/shims/env.ts
diff --git a/builder/src/templates/shims/node-fs.ts → ...cloudflare/src/templates/shims/node-fs.ts b/builder/src/templates/shims/node-fs.ts → ...cloudflare/src/templates/shims/node-fs.ts
diff --git a/builder/src/templates/shims/throw.ts → ...s/cloudflare/src/templates/shims/throw.ts b/builder/src/templates/shims/throw.ts → ...s/cloudflare/src/templates/shims/throw.ts
diff --git a/builder/src/templates/worker.ts → packages/cloudflare/src/templates/worker.ts b/builder/src/templates/worker.ts → packages/cloudflare/src/templates/worker.ts
diff --git a/builder/tsconfig.json → packages/cloudflare/tsconfig.json b/builder/tsconfig.json → packages/cloudflare/tsconfig.json
diff --git a/builder/tsup.config.ts → packages/cloudflare/tsup.config.ts b/builder/tsup.config.ts → packages/cloudflare/tsup.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,5 +1,5 @@
 packages:
-  - "builder"
+  - "packages/*"
   - "examples/*"
 
 catalog: