minor fixes

Author: vicb

.github/workflows/playwright.yml

@@ -22,6 +22,6 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: api-nodejs-hello-world-playwright-report
-          path: next-apps/api-nodejs-hello-world/playwright-report/
+          name: api-playwright-report
+          path: next-apps/api/playwright-report/
           retention-days: 30

README.md

@@ -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:
 
-- `nextjs-worker-builder` containing a package that can be used to build Cloudflare workers compatible output from Next.js applications
-- `next-apps` containing Next.js application that use the above mentioned builder (currently it only contains `api-nodejs-hello-world`)
+- `builder` containing a package that can be used to build Cloudflare workers compatible output from Next.js applications
+- `next` containing Next.js application that use the above mentioned builder (currently it only contains `api`)
 
 ## How to try out/develop in the repository
 
@@ -23,23 +23,23 @@ pnpm i
 build the worker with:
 
 ```sh
-pnpm --filter nextjs-worker-builder build
+pnpm --filter builder build
 ```
 
 or in watch mode with:
 
 ```sh
-pnpm --filter nextjs-worker-builder build:watch
+pnpm --filter builder build:watch
 ```
 
-build and preview the worker for the `api-nodejs-hello-world` application:
+build and preview the worker for the `api` application:
 
 ```sh
-pnpm --filter api-nodejs-hello-world preview:worker
+pnpm --filter api preview:worker
 ```
 
 You can skip building the next app when it has not been modified:
 
 ```sh
-SKIP_NEXT_APP_BUILD=true pnpm --filter api-nodejs-hello-world preview:worker
+SKIP_NEXT_APP_BUILD=true pnpm --filter api preview:worker
 ```

nextjs-worker-builder/.gitignore renamed to builder/.gitignore

@@ -1,5 +1,5 @@
 {
-	"name": "nextjs-worker-builder",
+	"name": "builder",
 	"scripts": {
 		"build": "tsup",
 		"build:watch": "tsup --watch src"
@@ -16,4 +16,4 @@
 		"tsup": "^8.2.4",
 		"typescript": "^5.5.4"
 	}
-}
+}

nextjs-worker-builder/package.json renamed to builder/package.json

@@ -26,7 +26,7 @@ function runNextBuildCommand(
 		env: {
 			...process.env,
 			// equivalent to: https://github.com/sst/open-next/blob/f61b0e9/packages/open-next/src/build.ts#L168-L173
-			// Equivalent to setting `target: "standalone"` in next.config.js
+			// Equivalent to setting `output: "standalone"` in next.config.js
 			NEXT_PRIVATE_STANDALONE: "true",
 		},
 	});

nextjs-worker-builder/src/args.ts renamed to builder/src/args.ts

@@ -13,6 +13,10 @@ import { patchFindDir } from "./patches/to-investigate/patchFindDir";
 import { inlineNextRequire } from "./patches/to-investigate/inlineNextRequire";
 import { inlineEvalManifest } from "./patches/to-investigate/inlineEvalManifest";
 
+import * as url from "url";
+
+const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+
 /**
  * Using the Next.js build output in the `.next` directory builds a workerd compatible output
  *
@@ -24,7 +28,6 @@ export async function buildWorker(
 	nextjsAppPaths: NextjsAppPaths
 ): Promise<void> {
 	const repoRoot = resolve(`${__dirname}/../..`);
-	console.log({ repoRoot });
 
 	const workerEntrypoint = `${__dirname}/templates/worker.ts`;
 	const workerOutputFile = `${outputDir}/index.mjs`;
@@ -121,7 +124,6 @@ async function updateWorkerBundledCode(
 	workerOutputFile: string,
 	nextjsAppPaths: NextjsAppPaths
 ): Promise<void> {
-	console.log({ workerOutputFile });
 	const originalCode = await readFile(workerOutputFile, "utf8");
 
 	let patchedCode = originalCode;

nextjs-worker-builder/src/build/build-next-app.ts renamed to builder/src/build/build-next-app.ts

@@ -1,5 +1,5 @@
 import { globSync } from "glob";
-import { NextjsAppPaths } from "../../../../nextjsPaths";
+import { NextjsAppPaths } from "builder/src/nextjsPaths";
 
 /**
  * `evalManifest` relies on readFileSync so we need to patch the function so that it instead returns the content of the manifest files