@edgeone/nuxt-pages 1.0.0-beta.1 → 1.0.0-beta.2

package/dist/esm-chunks/chunk-ZR3DYEBK.js

@@ -0,0 +1,180 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+import {
+  require_lib
+} from "./chunk-VCJ5U4PV.js";
+import {
+  __toESM
+} from "./chunk-6BT4RYQJ.js";
+
+// src/build/content/module-inject.ts
+var parser = __toESM(require_lib(), 1);
+import { existsSync } from "node:fs";
+import { readFile, writeFile, rm } from "node:fs/promises";
+import { join } from "node:path";
+import { createRequire } from "node:module";
+var require2 = createRequire(import.meta.url);
+var traverse = require2("@babel/traverse").default;
+var generate = require2("@babel/generator").default;
+var TEMP_MODULE_FILENAME = ".edgeone-nitro-config.mjs";
+function generateModuleContent() {
+  return `// Auto-generated by @edgeone/nuxt-pages \u2014 DO NOT EDIT
+// This file will be removed after build completes.
+import { defineNuxtModule } from '@nuxt/kit'
+
+export default defineNuxtModule({
+  meta: { name: 'edgeone-nitro-config' },
+  setup(_options, nuxt) {
+    nuxt.hook('nitro:config', (nitroConfig) => {
+      // Store original values for reference
+      const originalOutput = nitroConfig.output ? { ...nitroConfig.output } : null
+      const originalPreset = nitroConfig.preset
+
+      // Override output directories for EdgeOne deployment
+      nitroConfig.output = nitroConfig.output || {}
+      nitroConfig.output.dir = '.edgeone'
+      nitroConfig.output.publicDir = '.edgeone/assets'
+      nitroConfig.output.serverDir = '.edgeone/cloud-functions/ssr-node'
+
+      // Remove preset to use default node-server
+      if (nitroConfig.preset && nitroConfig.preset !== 'node-server') {
+        delete nitroConfig.preset
+      }
+    })
+  }
+})
+`;
+}
+async function writeTempModule(projectRoot) {
+  const modulePath = join(projectRoot, TEMP_MODULE_FILENAME);
+  await writeFile(modulePath, generateModuleContent(), "utf-8");
+  console.log(`Created temporary EdgeOne module: ${modulePath}`);
+  return modulePath;
+}
+async function removeTempModule(projectRoot) {
+  const modulePath = join(projectRoot, TEMP_MODULE_FILENAME);
+  if (existsSync(modulePath)) {
+    await rm(modulePath, { force: true });
+    console.log(`Removed temporary EdgeOne module: ${modulePath}`);
+  }
+}
+function addModuleToConfig(code, moduleRef) {
+  try {
+    const ast = parser.parse(code, {
+      sourceType: "module",
+      plugins: ["typescript"]
+    });
+    let configObjectNode = null;
+    let modulesArrayNode = null;
+    traverse(ast, {
+      CallExpression(path) {
+        const { node } = path;
+        if (node.callee.type === "Identifier" && node.callee.name === "defineNuxtConfig" && node.arguments.length > 0) {
+          let arg = node.arguments[0];
+          while (arg.type === "TSAsExpression" || arg.type === "TSSatisfiesExpression" || arg.type === "TSTypeAssertion") {
+            arg = arg.expression;
+          }
+          if (arg.type !== "ObjectExpression") return;
+          configObjectNode = arg;
+          for (const prop of configObjectNode.properties) {
+            if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && prop.key.name === "modules" && prop.value.type === "ArrayExpression") {
+              modulesArrayNode = prop.value;
+              break;
+            }
+          }
+          path.stop();
+        }
+      }
+    });
+    if (!configObjectNode) {
+      return null;
+    }
+    const originalCode = code;
+    if (modulesArrayNode) {
+      const stringLiteral = {
+        type: "StringLiteral",
+        value: moduleRef
+      };
+      modulesArrayNode.elements.unshift(stringLiteral);
+    } else {
+      const modulesProp = {
+        type: "ObjectProperty",
+        key: { type: "Identifier", name: "modules" },
+        value: {
+          type: "ArrayExpression",
+          elements: [{ type: "StringLiteral", value: moduleRef }]
+        },
+        computed: false,
+        shorthand: false
+      };
+      configObjectNode.properties.unshift(modulesProp);
+    }
+    const output = generate(ast, { retainLines: true }, code);
+    return { newCode: output.code, originalCode };
+  } catch (e) {
+    console.error("Failed to inject module into nuxt config:", e);
+    return null;
+  }
+}
+async function injectEdgeoneModule(configPath, projectRoot) {
+  const result = {
+    success: false,
+    originalConfigContent: null,
+    configPath,
+    projectRoot
+  };
+  try {
+    await writeTempModule(projectRoot);
+    if (!configPath || !existsSync(configPath)) {
+      const defaultConfig = `export default defineNuxtConfig({
+  modules: ['./${TEMP_MODULE_FILENAME}'],
+})`;
+      const newConfigPath = join(projectRoot, "nuxt.config.ts");
+      await writeFile(newConfigPath, defaultConfig, "utf-8");
+      console.log(`Created nuxt.config.ts with EdgeOne module at: ${newConfigPath}`);
+      result.configPath = newConfigPath;
+      result.originalConfigContent = null;
+      result.success = true;
+      return result;
+    }
+    const configContent = await readFile(configPath, "utf-8");
+    const moduleRef = `./${TEMP_MODULE_FILENAME}`;
+    const astResult = addModuleToConfig(configContent, moduleRef);
+    if (astResult) {
+      await writeFile(configPath, astResult.newCode, "utf-8");
+      console.log(`Injected EdgeOne module into: ${configPath}`);
+      result.originalConfigContent = astResult.originalCode;
+      result.success = true;
+    } else {
+      console.error("Failed to inject module via AST, cleaning up temp module file");
+      await removeTempModule(projectRoot);
+    }
+  } catch (error) {
+    console.error("injectEdgeoneModule failed:", error);
+    await removeTempModule(projectRoot).catch(() => {
+    });
+  }
+  return result;
+}
+async function cleanupEdgeoneModule(injectionResult) {
+  try {
+    const { originalConfigContent, configPath, projectRoot } = injectionResult;
+    if (originalConfigContent !== null && existsSync(configPath)) {
+      await writeFile(configPath, originalConfigContent, "utf-8");
+      console.log(`Restored nuxt config: ${configPath}`);
+    }
+    await removeTempModule(projectRoot);
+  } catch (error) {
+    console.error("cleanupEdgeoneModule failed:", error);
+  }
+}
+
+export {
+  removeTempModule,
+  injectEdgeoneModule,
+  cleanupEdgeoneModule
+};

package/dist/index.js

@@ -6,24 +6,25 @@
     
 import {
   PluginContext
-} from "./esm-chunks/chunk-Y3YAV6NZ.js";
+} from "./esm-chunks/chunk-VDBASNGL.js";
 import {
   createNuxtRoutesMeta
-} from "./esm-chunks/chunk-UFRAZNP3.js";
-import {
-  createServerHandler,
-  patchNitroHandler
-} from "./esm-chunks/chunk-L23O2KDO.js";
-import "./esm-chunks/chunk-TP3RAVPL.js";
-import {
-  addNitroBuildOutputConfig,
-  resetNitroConfig
-} from "./esm-chunks/chunk-7RNB5RB6.js";
+} from "./esm-chunks/chunk-3HA3DZ3G.js";
 import {
   resetEdgeOneConfig,
   useStaticBuild
-} from "./esm-chunks/chunk-5JK44IEA.js";
-import "./esm-chunks/chunk-V2LFVP3C.js";
+} from "./esm-chunks/chunk-AZLY3JO2.js";
+import {
+  cleanupEdgeoneModule,
+  injectEdgeoneModule,
+  removeTempModule
+} from "./esm-chunks/chunk-ZR3DYEBK.js";
+import "./esm-chunks/chunk-VCJ5U4PV.js";
+import {
+  createServerHandler,
+  patchNitroHandler
+} from "./esm-chunks/chunk-PJWA566S.js";
+import "./esm-chunks/chunk-K5VT7O2H.js";
 import "./esm-chunks/chunk-6BT4RYQJ.js";
 
 // src/index.ts
@@ -43,18 +44,19 @@ var removeIndexMJS = async (ctx) => {
     await rm(join(ctx.serverHandlerDir, "index.mjs"), { force: true });
   }
 };
-var recordOldNitroConfig = null;
+var moduleInjectionResult = null;
 var recordOldEdgeOneConfig = -1;
 var onPreBuild = async (options) => {
-  console.log("\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C} ======= new nuxt pages 1.1.0+ ============");
+  console.log("xixi\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C}\u{1F62C} ======= new nuxt pages 1.1.0+ ============");
   try {
     const ctx = new PluginContext(options);
-    recordOldNitroConfig = await addNitroBuildOutputConfig(ctx);
     const packagePath = ctx.resolveFromPackagePath("");
-    const cwd = packagePath || process.cwd();
+    const projectRoot = packagePath || process.cwd();
+    const configPath = ctx.nuxtConfigPath || "";
+    moduleInjectionResult = await injectEdgeoneModule(configPath, projectRoot);
     if (await checkModules(ctx, "@nuxt/content")) {
       console.warn("\u26A0\uFE0F @nuxt/content detected, switching to static deployment.");
-      recordOldEdgeOneConfig = useStaticBuild(cwd);
+      recordOldEdgeOneConfig = useStaticBuild(projectRoot);
     }
   } catch (error) {
     console.error("onPreBuild failed:", error);
@@ -73,13 +75,16 @@ var onBuild = async (options) => {
 var onPostBuild = async (options) => {
   const ctx = new PluginContext(options);
   const packagePath = ctx.resolveFromPackagePath("");
-  const cwd = packagePath || process.cwd();
-  if (recordOldNitroConfig) {
-    await resetNitroConfig(recordOldNitroConfig.oldOutput, recordOldNitroConfig.oldPreset);
+  const projectRoot = packagePath || process.cwd();
+  if (moduleInjectionResult) {
+    await cleanupEdgeoneModule(moduleInjectionResult);
     await removeIndexMJS(ctx);
+  } else {
+    await removeTempModule(projectRoot).catch(() => {
+    });
   }
   if (recordOldEdgeOneConfig !== -1) {
-    resetEdgeOneConfig(cwd, recordOldEdgeOneConfig);
+    resetEdgeOneConfig(projectRoot, recordOldEdgeOneConfig);
   }
 };
 export {

package/dist/utils.js

@@ -5,25 +5,22 @@
       })();
     
 import {
-  addCodeToGenerateEdgeoneWithAST,
   getHandlersArrayWithAST,
   getModulesWithAST,
   getPrerenderRoutesWithAST,
   getRouteRulesWithAST,
   getRoutesArrayWithAST,
   resetEdgeOneConfig,
-  resetNitroConfigWithAST,
   useStaticBuild
-} from "./esm-chunks/chunk-5JK44IEA.js";
+} from "./esm-chunks/chunk-AZLY3JO2.js";
+import "./esm-chunks/chunk-VCJ5U4PV.js";
 import "./esm-chunks/chunk-6BT4RYQJ.js";
 export {
-  addCodeToGenerateEdgeoneWithAST,
   getHandlersArrayWithAST,
   getModulesWithAST,
   getPrerenderRoutesWithAST,
   getRouteRulesWithAST,
   getRoutesArrayWithAST,
   resetEdgeOneConfig,
-  resetNitroConfigWithAST,
   useStaticBuild
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgeone/nuxt-pages",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "main": "./dist/index.js",
   "scripts": {
     "test": "vitest run --passWithNoTests",
@@ -36,6 +36,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "@babel/generator": "^7.28.4",
     "@babel/parser": "^7.28.4",
     "@babel/traverse": "^7.28.4",
     "@babel/types": "^7.28.4",

package/dist/esm-chunks/chunk-7RNB5RB6.js

@@ -1,131 +0,0 @@
-
-      var require = await (async () => {
-        var { createRequire } = await import("node:module");
-        return createRequire(import.meta.url);
-      })();
-    
-import {
-  addCodeToGenerateEdgeoneWithAST,
-  resetNitroConfigWithAST
-} from "./chunk-5JK44IEA.js";
-import {
-  trace,
-  wrapTracer
-} from "./chunk-V2LFVP3C.js";
-
-// src/build/content/static.ts
-import { existsSync } from "node:fs";
-import { readFile, writeFile } from "node:fs/promises";
-var tracer = wrapTracer(trace.getTracer("Nuxt runtime"));
-var addNitroBuildOutputConfig = async (ctx) => {
-  return tracer.withActiveSpan(
-    "addNitroBuildOutputConfig",
-    async (span) => {
-      const result = {
-        success: false,
-        message: ""
-      };
-      try {
-        const nitroConfigDir = ctx.nuxtConfigPath;
-        if (!nitroConfigDir || !existsSync(nitroConfigDir)) {
-          console.log("Nuxt config file not found, creating nuxt.config.ts...");
-          const defaultNuxtConfig = `export default defineNuxtConfig({
-            srcDir: 'app',
-            nitro: {
-              output: {
-                dir: '.edgeone',
-                publicDir: '.edgeone/assets',
-                serverDir: '.edgeone/cloud-functions/ssr-node',
-              },
-            },
-            devtools: { enabled: true },
-          })`;
-          const configPath = ctx.resolveFromPackagePath("nuxt.config.ts");
-          await writeFile(configPath, defaultNuxtConfig, "utf-8");
-          console.log(`Created nuxt.config.ts at: ${configPath}`);
-          Object.assign(result, {
-            success: true,
-            message: `Created nuxt.config.ts at: ${configPath}`,
-            configPath,
-            newCode: defaultNuxtConfig
-          });
-        } else {
-          console.log("Nuxt config file found, adding nitro.output config...");
-          const configContent = await readFile(nitroConfigDir, "utf-8");
-          const astResult = addCodeToGenerateEdgeoneWithAST(configContent, `
-            nitro: {
-              output: {
-                dir: '.edgeone',
-                publicDir: '.edgeone/assets',
-                serverDir: '.edgeone/cloud-functions/ssr-node',
-              },
-            },
-          `);
-          if (astResult?.newCode) {
-            await writeFile(nitroConfigDir, astResult.newCode, "utf-8");
-            console.log(`Successfully updated nuxt config file: ${nitroConfigDir}`);
-            Object.assign(result, {
-              success: true,
-              message: `Successfully updated nuxt config file: ${nitroConfigDir}`,
-              configPath: nitroConfigDir,
-              oldOutput: astResult.oldOutput,
-              oldPreset: astResult.oldPreset,
-              newCode: astResult.newCode
-            });
-          } else {
-            console.log("Failed to generate new config code");
-            Object.assign(result, {
-              success: false,
-              message: "Failed to generate new config code",
-              configPath: nitroConfigDir
-            });
-          }
-        }
-      } catch (error) {
-        span.end();
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        ctx.failBuild("Failed copying static assets", error);
-        Object.assign(result, {
-          success: false,
-          message: `Error: ${errorMessage}`
-        });
-      }
-      return result;
-    }
-  );
-};
-var resetNitroConfig = async (oldOutput, oldPreset) => {
-  try {
-    const possiblePaths = [
-      process.cwd() + "/nuxt.config.ts",
-      process.cwd() + "/nuxt.config.js",
-      process.cwd() + "/nuxt.config.mjs"
-    ];
-    let configPath = null;
-    for (const path of possiblePaths) {
-      if (existsSync(path)) {
-        configPath = path;
-        break;
-      }
-    }
-    if (!configPath) {
-      console.warn("nuxt.config.ts not found, cannot reset config");
-      return;
-    }
-    const configContent = await readFile(configPath, "utf-8");
-    const restoredCode = resetNitroConfigWithAST(configContent, oldOutput, oldPreset);
-    if (restoredCode) {
-      await writeFile(configPath, restoredCode, "utf-8");
-      console.log(`Successfully restored nuxt config file: ${configPath}`);
-    } else {
-      console.warn("Failed to restore nuxt.config.ts using AST");
-    }
-  } catch (error) {
-    console.error("Error restoring nuxt.config.ts:", error);
-  }
-};
-
-export {
-  addNitroBuildOutputConfig,
-  resetNitroConfig
-};