@opennextjs/cloudflare 0.1.0 → 0.2.0

package/dist/cli/index.mjs

@@ -238,8 +238,8 @@ var require_brace_expansion = __commonJS({
 import path, { relative } from "node:path";
 import { readdirSync, statSync } from "node:fs";
 var PACKAGE_NAME = "@opennextjs/cloudflare";
-function getConfig(appDir, outputDir2) {
-  const dotNext = path.join(outputDir2, ".next");
+function getConfig(projectOpts) {
+  const dotNext = path.join(projectOpts.outputDir, ".next");
   const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
   const standaloneRoot = path.join(dotNext, "standalone");
   const standaloneApp = path.join(standaloneRoot, appPath);
@@ -250,10 +250,14 @@ function getConfig(appDir, outputDir2) {
   const internalTemplates = path.join(internalPackage, "cli", "templates");
   process.env.__OPENNEXT_KV_BINDING_NAME ??= "NEXT_CACHE_WORKERS_KV";
   return {
-    buildTimestamp: Date.now(),
+    build: {
+      timestamp: Date.now(),
+      skipNextBuild: projectOpts.skipNextBuild,
+      shouldMinify: projectOpts.minify
+    },
     paths: {
-      nextApp: appDir,
-      builderOutput: outputDir2,
+      sourceDir: projectOpts.sourceDir,
+      outputDir: projectOpts.outputDir,
       dotNext,
       standaloneRoot,
       standaloneApp,
@@ -403,7 +407,7 @@ function runNextBuildCommand(packager, nextAppDir2) {
     cwd: nextAppDir2,
     env: {
       ...process.env,
-      // equivalent to: https://github.com/sst/open-next/blob/f61b0e9/packages/open-next/src/build.ts#L168-L173
+      // equivalent to: https://github.com/opennextjs/opennextjs-aws/blob/f61b0e9/packages/open-next/src/build.ts#L168-L173
       // Equivalent to setting `output: "standalone"` in next.config.js
       NEXT_PRIVATE_STANDALONE: "true"
     }
@@ -461,7 +465,7 @@ function copyPrerenderedRoutes(config) {
   console.log("# copyPrerenderedRoutes");
   const serverAppDirPath = join2(config.paths.standaloneAppServer, "app");
   const prerenderManifestPath = join2(config.paths.standaloneAppDotNext, "prerender-manifest.json");
-  const outputPath = join2(config.paths.builderOutput, "assets", SEED_DATA_DIR);
+  const outputPath = join2(config.paths.outputDir, "assets", SEED_DATA_DIR);
   const prerenderManifest = existsSync(prerenderManifestPath) ? JSON.parse(readFileSync(prerenderManifestPath, "utf8")) : {};
   const prerenderedRoutes = Object.keys(prerenderManifest.routes);
   const prerenderedAssets = readPathsRecursively(serverAppDirPath).map((fullPath) => ({ fullPath, relativePath: fullPath.replace(serverAppDirPath, "") })).filter(
@@ -472,7 +476,7 @@ function copyPrerenderedRoutes(config) {
     mkdirSync(dirname(destPath), { recursive: true });
     if (fullPath.endsWith(NEXT_META_SUFFIX)) {
       const data = JSON.parse(readFileSync(fullPath, "utf8"));
-      writeFileSync(destPath, JSON.stringify({ ...data, lastModified: config.buildTimestamp }));
+      writeFileSync(destPath, JSON.stringify({ ...data, lastModified: config.build.timestamp }));
     } else {
       copyFileSync(fullPath, destPath);
     }
@@ -4334,12 +4338,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path14) {
-    if (!path14) {
+  resolve(path13) {
+    if (!path13) {
       return this;
     }
-    const rootPath = this.getRootString(path14);
-    const dir = path14.substring(rootPath.length);
+    const rootPath = this.getRootString(path13);
+    const dir = path13.substring(rootPath.length);
     const dirParts = dir.split(this.splitSep);
     const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
     return result;
@@ -5091,8 +5095,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path14) {
-    return win32.parse(path14).root;
+  getRootString(path13) {
+    return win32.parse(path13).root;
   }
   /**
    * @internal
@@ -5138,8 +5142,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path14) {
-    return path14.startsWith("/") ? "/" : "";
+  getRootString(path13) {
+    return path13.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5228,11 +5232,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path14 = this.cwd) {
-    if (typeof path14 === "string") {
-      path14 = this.cwd.resolve(path14);
+  depth(path13 = this.cwd) {
+    if (typeof path13 === "string") {
+      path13 = this.cwd.resolve(path13);
     }
-    return path14.depth();
+    return path13.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5719,9 +5723,9 @@ var PathScurryBase = class {
     process3();
     return results;
   }
-  chdir(path14 = this.cwd) {
+  chdir(path13 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path14 === "string" ? this.cwd.resolve(path14) : path14;
+    this.cwd = typeof path13 === "string" ? this.cwd.resolve(path13) : path13;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -6077,8 +6081,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path14, n]) => [
-      path14,
+    return [...this.store.entries()].map(([path13, n]) => [
+      path13,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6283,9 +6287,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path14, opts) {
+  constructor(patterns, path13, opts) {
     this.patterns = patterns;
-    this.path = path14;
+    this.path = path13;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6304,11 +6308,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path14) {
-    return this.seen.has(path14) || !!this.#ignore?.ignored?.(path14);
+  #ignored(path13) {
+    return this.seen.has(path13) || !!this.#ignore?.ignored?.(path13);
   }
-  #childrenIgnored(path14) {
-    return !!this.#ignore?.childrenIgnored?.(path14);
+  #childrenIgnored(path13) {
+    return !!this.#ignore?.childrenIgnored?.(path13);
   }
   // backpressure mechanism
   pause() {
@@ -6523,8 +6527,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path14, opts) {
-    super(patterns, path14, opts);
+  constructor(patterns, path13, opts) {
+    super(patterns, path13, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6561,8 +6565,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path14, opts) {
-    super(patterns, path14, opts);
+  constructor(patterns, path13, opts) {
+    super(patterns, path13, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6946,14 +6950,14 @@ async function patchCache(code, config) {
   console.log("# patchCache");
   const cacheHandlerFileName = "cache-handler.mjs";
   const cacheHandlerEntrypoint = join3(config.paths.internalTemplates, "cache-handler", "index.ts");
-  const cacheHandlerOutputFile = join3(config.paths.builderOutput, cacheHandlerFileName);
+  const cacheHandlerOutputFile = join3(config.paths.outputDir, cacheHandlerFileName);
   await build({
     entryPoints: [cacheHandlerEntrypoint],
     bundle: true,
     outfile: cacheHandlerOutputFile,
     format: "esm",
     target: "esnext",
-    minify: true,
+    minify: config.build.shouldMinify,
     define: {
       "process.env.__OPENNEXT_KV_BINDING_NAME": `"${config.cache.kvBindingName}"`
     }
@@ -7198,21 +7202,21 @@ async function buildWorker(config) {
 \x1B[0m`);
   await cp(
     path12.join(config.paths.dotNext, "static"),
-    path12.join(config.paths.builderOutput, "assets", "_next", "static"),
+    path12.join(config.paths.outputDir, "assets", "_next", "static"),
     {
       recursive: true
     }
   );
-  const publicDir = path12.join(config.paths.nextApp, "public");
+  const publicDir = path12.join(config.paths.sourceDir, "public");
   if (existsSync5(publicDir)) {
-    await cp(publicDir, path12.join(config.paths.builderOutput, "assets"), {
+    await cp(publicDir, path12.join(config.paths.outputDir, "assets"), {
       recursive: true
     });
   }
   copyPrerenderedRoutes(config);
   copyPackageCliFiles(packageDistDir, config);
   const workerEntrypoint = path12.join(config.paths.internalTemplates, "worker.ts");
-  const workerOutputFile = path12.join(config.paths.builderOutput, "index.mjs");
+  const workerOutputFile = path12.join(config.paths.outputDir, "index.mjs");
   const nextConfigStr = readFileSync7(path12.join(config.paths.standaloneApp, "/server.js"), "utf8")?.match(
     /const nextConfig = ({.+?})\n/
   )?.[1] ?? {};
@@ -7329,23 +7333,22 @@ function createFixRequiresESBuildPlugin(config) {
 
 // src/cli/build/index.ts
 import { cpSync as cpSync2 } from "node:fs";
-import path13 from "node:path";
+import { join as join4 } from "node:path";
 import { rm } from "node:fs/promises";
-async function build3(appDir, opts) {
-  if (!opts.skipBuild) {
-    await buildNextjsApp(appDir);
+async function build3(projectOpts) {
+  if (!projectOpts.skipNextBuild) {
+    await buildNextjsApp(projectOpts.sourceDir);
   }
-  if (!containsDotNextDir(appDir)) {
-    throw new Error(`.next folder not found in ${appDir}`);
+  if (!containsDotNextDir(projectOpts.sourceDir)) {
+    throw new Error(`.next folder not found in ${projectOpts.sourceDir}`);
   }
-  const outputDir2 = path13.resolve(opts.outputDir ?? appDir, ".worker-next");
-  await cleanDirectory(outputDir2);
-  cpSync2(path13.join(appDir, ".next"), path13.join(outputDir2, ".next"), { recursive: true });
-  const config = getConfig(appDir, outputDir2);
+  await cleanDirectory(projectOpts.outputDir);
+  cpSync2(join4(projectOpts.sourceDir, ".next"), join4(projectOpts.outputDir, ".next"), { recursive: true });
+  const config = getConfig(projectOpts);
   await buildWorker(config);
 }
-async function cleanDirectory(path14) {
-  return await rm(path14, { recursive: true, force: true });
+async function cleanDirectory(path13) {
+  return await rm(path13, { recursive: true, force: true });
 }
 
 // src/cli/index.ts
@@ -7357,7 +7360,7 @@ import { parseArgs } from "node:util";
 import { resolve } from "node:path";
 function getArgs() {
   const {
-    values: { skipBuild: skipBuild2, output }
+    values: { skipBuild, output, noMinify }
   } = parseArgs({
     options: {
       skipBuild: {
@@ -7368,6 +7371,10 @@ function getArgs() {
       output: {
         type: "string",
         short: "o"
+      },
+      noMinify: {
+        type: "boolean",
+        default: false
       }
     },
     allowPositionals: false
@@ -7378,18 +7385,19 @@ function getArgs() {
   }
   return {
     outputDir: outputDir2,
-    skipBuild: skipBuild2 || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD))
+    skipNextBuild: skipBuild || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD)),
+    minify: !noMinify
   };
 }
-function assertDirArg(path14, argName, make) {
+function assertDirArg(path13, argName, make) {
   let dirStats;
   try {
-    dirStats = statSync3(path14);
+    dirStats = statSync3(path13);
   } catch {
     if (!make) {
       throw new Error(`Error: the provided${argName ? ` "${argName}"` : ""} input is not a valid path`);
     }
-    mkdirSync2(path14);
+    mkdirSync2(path13);
     return;
   }
   if (!dirStats.isDirectory()) {
@@ -7402,10 +7410,15 @@ import { resolve as resolve2 } from "node:path";
 var nextAppDir = resolve2(".");
 console.log(`Building the Next.js app in the current folder (${nextAppDir})`);
 if (!["js", "cjs", "mjs", "ts"].some((ext2) => existsSync6(`./next.config.${ext2}`))) {
-  throw new Error("Error: Not in a Next.js app project");
+  console.error(
+    "Error: next.config file not found. Please make sure you run the command inside a Next.js app"
+  );
+  process.exit(1);
 }
-var { skipBuild, outputDir } = getArgs();
-await build3(nextAppDir, {
-  outputDir,
-  skipBuild: !!skipBuild
+var { skipNextBuild, outputDir, minify } = getArgs();
+await build3({
+  sourceDir: nextAppDir,
+  outputDir: resolve2(outputDir ?? nextAppDir, ".worker-next"),
+  skipNextBuild,
+  minify
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "bin": "dist/cli/index.mjs",
   "main": "./dist/api/index.mjs",
   "types": "./dist/api/index.d.mts",