@fchc8/vite-plugin-multi-page 1.6.0 → 1.7.0

package/dist/cli.js

@@ -38,179 +38,27 @@ var init_cjs_shims = __esm({
   }
 });
 
-// src/config-loader.ts
-var config_loader_exports = {};
-__export(config_loader_exports, {
-  hasCustomConfig: () => hasCustomConfig,
-  loadUserConfig: () => loadUserConfig
-});
-function hasCustomConfig() {
-  for (const filename of CONFIG_FILES) {
-    const configPath = path.resolve(process.cwd(), filename);
-    if (fs.existsSync(configPath)) {
-      return true;
-    }
-  }
-  return false;
-}
-async function loadUserConfig(context) {
-  const customConfig = await loadCustomConfig();
-  if (customConfig) {
-    const result = customConfig(context);
-    if (!result) {
-      return {};
-    }
-    return result;
-  }
-  return null;
-}
-async function loadConfigFile(filePath) {
-  if (filePath.endsWith(".ts")) {
-    try {
-      const code = await fs.promises.readFile(filePath, "utf-8");
-      const esbuild = await import("esbuild");
-      const result = await esbuild.transform(code, {
-        loader: "ts",
-        format: "cjs",
-        // 使用 CommonJS 格式便于使用 Module._compile
-        target: "node16",
-        sourcemap: false
-      });
-      const tempModule = new import_node_module.Module(filePath);
-      tempModule.filename = filePath;
-      tempModule.paths = import_node_module.Module._nodeModulePaths(path.dirname(filePath));
-      tempModule._compile(result.code, filePath);
-      return tempModule.exports;
-    } catch (esbuildError) {
-      console.warn("esbuild \u8F6C\u8BD1\u5931\u8D25\uFF0C\u5C1D\u8BD5\u7B80\u5355\u8F6C\u6362:", esbuildError);
-      const code = await fs.promises.readFile(filePath, "utf-8");
-      const jsCode = code.replace(/export\s+default\s+/, "module.exports = ").replace(/import\s+.*?from\s+['"][^'"]*['"];?\s*/g, "").replace(/:\s*[^=,})\]]+/g, "");
-      const tempModule = new import_node_module.Module(filePath);
-      tempModule.filename = filePath;
-      tempModule.paths = import_node_module.Module._nodeModulePaths(path.dirname(filePath));
-      tempModule._compile(jsCode, filePath);
-      return tempModule.exports;
-    }
-  }
-  if (filePath.endsWith(".js") || filePath.endsWith(".mjs")) {
-    const fileUrl = (0, import_node_url.pathToFileURL)(filePath).href;
-    return import(`${fileUrl}?t=${Date.now()}`);
-  }
-  throw new Error(`\u4E0D\u652F\u6301\u7684\u914D\u7F6E\u6587\u4EF6\u7C7B\u578B: ${filePath}`);
-}
-async function loadCustomConfig() {
-  const cwd = process.cwd();
-  for (const configFile of CONFIG_FILES) {
-    const configPath = path.resolve(cwd, configFile);
-    if (fs.existsSync(configPath)) {
-      try {
-        const configModule = await loadConfigFile(configPath);
-        const configFunction = configModule.default || configModule;
-        if (typeof configFunction === "function") {
-          return configFunction;
-        } else {
-          console.warn(`\u914D\u7F6E\u6587\u4EF6 ${configFile} \u5FC5\u987B\u9ED8\u8BA4\u5BFC\u51FA\u4E00\u4E2A\u51FD\u6570`);
-        }
-      } catch (error) {
-        if (configFile.endsWith(".ts")) {
-          console.error(`\u52A0\u8F7DTypeScript\u914D\u7F6E\u6587\u4EF6 ${configFile} \u5931\u8D25:`, error);
-          console.log("\u63D0\u793A\uFF1A\u786E\u4FDD\u4F60\u7684\u9879\u76EE\u652F\u6301TypeScript\uFF0C\u6216\u8005\u4F7F\u7528 .js/.mjs \u914D\u7F6E\u6587\u4EF6");
-        } else {
-          console.error(`\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6 ${configFile} \u5931\u8D25:`, error);
-        }
-      }
-    }
-  }
-  return null;
-}
-var fs, path, import_node_url, import_node_module, CONFIG_FILES;
-var init_config_loader = __esm({
-  "src/config-loader.ts"() {
-    "use strict";
-    init_cjs_shims();
-    fs = __toESM(require("fs"));
-    path = __toESM(require("path"));
-    import_node_url = require("url");
-    import_node_module = require("module");
-    CONFIG_FILES = [
-      "multipage.config.js",
-      "multipage.config.mjs",
-      "multipage.config.ts"
-    ];
-  }
-});
-
-// src/defaults.ts
-var defaults_exports = {};
-__export(defaults_exports, {
-  DEFAULT_CONFIG: () => DEFAULT_CONFIG,
-  isEmptyConfig: () => isEmptyConfig,
-  mergeWithDefaults: () => mergeWithDefaults
-});
-function mergeWithDefaults(userConfig) {
-  if (!userConfig) {
-    return { ...DEFAULT_CONFIG };
-  }
-  return {
-    entry: userConfig.entry ?? DEFAULT_CONFIG.entry,
-    exclude: userConfig.exclude ?? DEFAULT_CONFIG.exclude,
-    template: userConfig.template ?? DEFAULT_CONFIG.template,
-    placeholder: userConfig.placeholder ?? DEFAULT_CONFIG.placeholder,
-    debug: userConfig.debug ?? DEFAULT_CONFIG.debug,
-    strategies: userConfig.strategies ?? DEFAULT_CONFIG.strategies,
-    pageConfigs: userConfig.pageConfigs ?? DEFAULT_CONFIG.pageConfigs,
-    __forceBuildStrategy: userConfig.__forceBuildStrategy
-  };
-}
-function isEmptyConfig(config) {
-  if (Object.keys(config).length === 0) {
-    return true;
-  }
-  const hasValidEntry = config.entry && config.entry !== DEFAULT_CONFIG.entry;
-  const hasValidStrategies = config.strategies && Object.keys(config.strategies).length > 0;
-  const hasValidPageConfigs = config.pageConfigs && (typeof config.pageConfigs === "function" || Object.keys(config.pageConfigs).length > 0);
-  return !hasValidEntry && !hasValidStrategies && !hasValidPageConfigs;
-}
-var DEFAULT_CONFIG;
-var init_defaults = __esm({
-  "src/defaults.ts"() {
-    "use strict";
-    init_cjs_shims();
-    DEFAULT_CONFIG = {
-      entry: "src/pages/**/*.{ts,js}",
-      exclude: [],
-      template: "index.html",
-      placeholder: "{{ENTRY_FILE}}",
-      debug: false,
-      strategies: {
-        default: {}
-      },
-      pageConfigs: {}
-    };
-  }
-});
-
 // src/file-filter.ts
 function filterEntryFiles(files, entry, exclude, _log) {
   const result = [];
   const nameToFile = /* @__PURE__ */ new Map();
   let basePattern = entry.replace(/\/\*.*$/, "");
   if (!basePattern || basePattern === entry) {
-    basePattern = path2.dirname(entry.split("*")[0]);
+    basePattern = path.dirname(entry.split("*")[0]);
   }
   const candidateFiles = [];
   for (const file of files) {
     if (exclude.includes(file)) {
       continue;
     }
-    const relativePath = path2.relative(basePattern, file);
-    const pathParts = relativePath.split(path2.sep);
+    const relativePath = path.relative(basePattern, file);
+    const pathParts = relativePath.split(path.sep);
     if (pathParts.length === 1) {
       const fileName = pathParts[0];
-      const name = path2.basename(fileName, path2.extname(fileName));
+      const name = path.basename(fileName, path.extname(fileName));
       candidateFiles.push({ name, file, priority: 1 });
     } else if (pathParts.length >= 2) {
-      const fileName = path2.basename(file, path2.extname(file));
+      const fileName = path.basename(file, path.extname(file));
       const dirName = pathParts[0];
       if (fileName === "main") {
         candidateFiles.push({ name: dirName, file, priority: 2 });
@@ -232,12 +80,12 @@ function filterEntryFiles(files, entry, exclude, _log) {
   }
   return result;
 }
-var path2;
+var path;
 var init_file_filter = __esm({
   "src/file-filter.ts"() {
     "use strict";
     init_cjs_shims();
-    path2 = __toESM(require("path"));
+    path = __toESM(require("path"));
   }
 });
 
@@ -334,7 +182,7 @@ function generateBuildConfig(options) {
       const pageContext = {
         pageName: entryFile.name,
         filePath: entryFile.file,
-        relativePath: path3.relative(process.cwd(), entryFile.file)
+        relativePath: path2.relative(process.cwd(), entryFile.file)
       };
       const pageConfig = getPageConfig(pageConfigs, pageContext, log);
       const strategyName = (pageConfig == null ? void 0 : pageConfig.strategy) || "default";
@@ -415,7 +263,7 @@ function generateStrategyConfig(strategyName, pages, entryFiles, strategyConfig,
     const pageContext = {
       pageName,
       filePath: entryFile.file,
-      relativePath: path3.relative(process.cwd(), entryFile.file),
+      relativePath: path2.relative(process.cwd(), entryFile.file),
       strategy: strategyName
     };
     const pageConfig = getPageConfig(pageConfigs, pageContext, log);
@@ -424,17 +272,17 @@ function generateStrategyConfig(strategyName, pages, entryFiles, strategyConfig,
     }
     let templatePath = defaultTemplate;
     const pageSpecificTemplate = `${pageName}.html`;
-    if (fs2.existsSync(path3.resolve(process.cwd(), pageSpecificTemplate))) {
+    if (fs.existsSync(path2.resolve(process.cwd(), pageSpecificTemplate))) {
       templatePath = pageSpecificTemplate;
     } else if (pageConfig == null ? void 0 : pageConfig.template) {
       templatePath = pageConfig.template;
     }
-    const templateFullPath = path3.resolve(process.cwd(), templatePath);
-    if (!fs2.existsSync(templateFullPath)) {
+    const templateFullPath = path2.resolve(process.cwd(), templatePath);
+    if (!fs.existsSync(templateFullPath)) {
       log(`\u8B66\u544A: \u6A21\u677F\u6587\u4EF6\u4E0D\u5B58\u5728: ${templatePath}`);
       continue;
     }
-    let templateContent = fs2.readFileSync(templateFullPath, "utf-8");
+    let templateContent = fs.readFileSync(templateFullPath, "utf-8");
     if (templateContent.includes(placeholder)) {
       const entryPath = `./${entryFile.file}`;
       templateContent = templateContent.replace(
@@ -442,8 +290,8 @@ function generateStrategyConfig(strategyName, pages, entryFiles, strategyConfig,
         entryPath
       );
     }
-    const tempHtmlPath = path3.resolve(process.cwd(), `.temp.mp.${pageName}.html`);
-    fs2.writeFileSync(tempHtmlPath, templateContent);
+    const tempHtmlPath = path2.resolve(process.cwd(), `.temp.mp.${pageName}.html`);
+    fs.writeFileSync(tempHtmlPath, templateContent);
     tempFiles.push(tempHtmlPath);
     htmlInputs[pageName] = tempHtmlPath;
   }
@@ -486,22 +334,22 @@ function getViteOutputDirectory(viteBuildArgs = []) {
   const outDirIndex = viteBuildArgs.findIndex((arg) => arg === "--outDir");
   if (outDirIndex !== -1 && outDirIndex + 1 < viteBuildArgs.length) {
     const outDir = viteBuildArgs[outDirIndex + 1];
-    return path3.resolve(process.cwd(), outDir);
+    return path2.resolve(process.cwd(), outDir);
   }
   const outDirArg = viteBuildArgs.find((arg) => arg.startsWith("--outDir="));
   if (outDirArg) {
     const outDir = outDirArg.split("=")[1];
-    return path3.resolve(process.cwd(), outDir);
+    return path2.resolve(process.cwd(), outDir);
   }
-  return path3.resolve(process.cwd(), "dist");
+  return path2.resolve(process.cwd(), "dist");
 }
 function cleanViteOutputDirectory(viteBuildArgs = []) {
   const outputDir = getViteOutputDirectory(viteBuildArgs);
   const log = createLogger(true);
   try {
-    if (fs2.existsSync(outputDir)) {
-      fs2.rmSync(outputDir, { recursive: true, force: true });
-      log(`\u{1F9F9} \u6E05\u7406\u8F93\u51FA\u76EE\u5F55: ${path3.relative(process.cwd(), outputDir)}`);
+    if (fs.existsSync(outputDir)) {
+      fs.rmSync(outputDir, { recursive: true, force: true });
+      log(`\u{1F9F9} \u6E05\u7406\u8F93\u51FA\u76EE\u5F55: ${path2.relative(process.cwd(), outputDir)}`);
     }
   } catch (error) {
     log(`\u26A0\uFE0F \u6E05\u7406\u8F93\u51FA\u76EE\u5F55\u5931\u8D25: ${outputDir}`, error);
@@ -521,7 +369,7 @@ function getAvailableStrategies(options) {
       const pageContext = {
         pageName: entryFile.name,
         filePath: entryFile.file,
-        relativePath: path3.relative(process.cwd(), entryFile.file)
+        relativePath: path2.relative(process.cwd(), entryFile.file)
       };
       const pageConfig = getPageConfig(pageConfigs, pageContext, log);
       const strategyName = (pageConfig == null ? void 0 : pageConfig.strategy) || "default";
@@ -533,21 +381,173 @@ function getAvailableStrategies(options) {
     return ["default"];
   }
 }
-var import_vite, import_glob, path3, fs2;
+var import_vite, import_glob, path2, fs;
 var init_build_config = __esm({
   "src/build-config.ts"() {
     "use strict";
     init_cjs_shims();
     import_vite = require("vite");
     import_glob = require("glob");
-    path3 = __toESM(require("path"));
-    fs2 = __toESM(require("fs"));
+    path2 = __toESM(require("path"));
+    fs = __toESM(require("fs"));
     init_file_filter();
     init_page_config();
     init_utils();
   }
 });
 
+// src/config-loader.ts
+var config_loader_exports = {};
+__export(config_loader_exports, {
+  hasCustomConfig: () => hasCustomConfig,
+  loadUserConfig: () => loadUserConfig
+});
+function hasCustomConfig() {
+  for (const filename of CONFIG_FILES) {
+    const configPath = path3.resolve(process.cwd(), filename);
+    if (fs2.existsSync(configPath)) {
+      return true;
+    }
+  }
+  return false;
+}
+async function loadUserConfig(context) {
+  const customConfig = await loadCustomConfig();
+  if (customConfig) {
+    const result = customConfig(context);
+    if (!result) {
+      return {};
+    }
+    return result;
+  }
+  return null;
+}
+async function loadConfigFile(filePath) {
+  if (filePath.endsWith(".ts")) {
+    try {
+      const code = await fs2.promises.readFile(filePath, "utf-8");
+      const esbuild = await import("esbuild");
+      const result = await esbuild.transform(code, {
+        loader: "ts",
+        format: "cjs",
+        // 使用 CommonJS 格式便于使用 Module._compile
+        target: "node16",
+        sourcemap: false
+      });
+      const tempModule = new import_node_module.Module(filePath);
+      tempModule.filename = filePath;
+      tempModule.paths = import_node_module.Module._nodeModulePaths(path3.dirname(filePath));
+      tempModule._compile(result.code, filePath);
+      return tempModule.exports;
+    } catch (esbuildError) {
+      console.warn("esbuild \u8F6C\u8BD1\u5931\u8D25\uFF0C\u5C1D\u8BD5\u7B80\u5355\u8F6C\u6362:", esbuildError);
+      const code = await fs2.promises.readFile(filePath, "utf-8");
+      const jsCode = code.replace(/export\s+default\s+/, "module.exports = ").replace(/import\s+.*?from\s+['"][^'"]*['"];?\s*/g, "").replace(/:\s*[^=,})\]]+/g, "");
+      const tempModule = new import_node_module.Module(filePath);
+      tempModule.filename = filePath;
+      tempModule.paths = import_node_module.Module._nodeModulePaths(path3.dirname(filePath));
+      tempModule._compile(jsCode, filePath);
+      return tempModule.exports;
+    }
+  }
+  if (filePath.endsWith(".js") || filePath.endsWith(".mjs")) {
+    const fileUrl = (0, import_node_url.pathToFileURL)(filePath).href;
+    return import(`${fileUrl}?t=${Date.now()}`);
+  }
+  throw new Error(`\u4E0D\u652F\u6301\u7684\u914D\u7F6E\u6587\u4EF6\u7C7B\u578B: ${filePath}`);
+}
+async function loadCustomConfig() {
+  const cwd = process.cwd();
+  for (const configFile of CONFIG_FILES) {
+    const configPath = path3.resolve(cwd, configFile);
+    if (fs2.existsSync(configPath)) {
+      try {
+        const configModule = await loadConfigFile(configPath);
+        const configFunction = configModule.default || configModule;
+        if (typeof configFunction === "function") {
+          return configFunction;
+        } else {
+          console.warn(`\u914D\u7F6E\u6587\u4EF6 ${configFile} \u5FC5\u987B\u9ED8\u8BA4\u5BFC\u51FA\u4E00\u4E2A\u51FD\u6570`);
+        }
+      } catch (error) {
+        if (configFile.endsWith(".ts")) {
+          console.error(`\u52A0\u8F7DTypeScript\u914D\u7F6E\u6587\u4EF6 ${configFile} \u5931\u8D25:`, error);
+          console.log("\u63D0\u793A\uFF1A\u786E\u4FDD\u4F60\u7684\u9879\u76EE\u652F\u6301TypeScript\uFF0C\u6216\u8005\u4F7F\u7528 .js/.mjs \u914D\u7F6E\u6587\u4EF6");
+        } else {
+          console.error(`\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6 ${configFile} \u5931\u8D25:`, error);
+        }
+      }
+    }
+  }
+  return null;
+}
+var fs2, path3, import_node_url, import_node_module, CONFIG_FILES;
+var init_config_loader = __esm({
+  "src/config-loader.ts"() {
+    "use strict";
+    init_cjs_shims();
+    fs2 = __toESM(require("fs"));
+    path3 = __toESM(require("path"));
+    import_node_url = require("url");
+    import_node_module = require("module");
+    CONFIG_FILES = [
+      "multipage.config.js",
+      "multipage.config.mjs",
+      "multipage.config.ts"
+    ];
+  }
+});
+
+// src/defaults.ts
+var defaults_exports = {};
+__export(defaults_exports, {
+  DEFAULT_CONFIG: () => DEFAULT_CONFIG,
+  isEmptyConfig: () => isEmptyConfig,
+  mergeWithDefaults: () => mergeWithDefaults
+});
+function mergeWithDefaults(userConfig) {
+  if (!userConfig) {
+    return { ...DEFAULT_CONFIG };
+  }
+  return {
+    entry: userConfig.entry ?? DEFAULT_CONFIG.entry,
+    exclude: userConfig.exclude ?? DEFAULT_CONFIG.exclude,
+    template: userConfig.template ?? DEFAULT_CONFIG.template,
+    placeholder: userConfig.placeholder ?? DEFAULT_CONFIG.placeholder,
+    debug: userConfig.debug ?? DEFAULT_CONFIG.debug,
+    strategies: userConfig.strategies ?? DEFAULT_CONFIG.strategies,
+    pageConfigs: userConfig.pageConfigs ?? DEFAULT_CONFIG.pageConfigs,
+    __forceBuildStrategy: userConfig.__forceBuildStrategy
+  };
+}
+function isEmptyConfig(config) {
+  if (Object.keys(config).length === 0) {
+    return true;
+  }
+  const hasValidEntry = config.entry && config.entry !== DEFAULT_CONFIG.entry;
+  const hasValidStrategies = config.strategies && Object.keys(config.strategies).length > 0;
+  const hasValidPageConfigs = config.pageConfigs && (typeof config.pageConfigs === "function" || Object.keys(config.pageConfigs).length > 0);
+  return !hasValidEntry && !hasValidStrategies && !hasValidPageConfigs;
+}
+var DEFAULT_CONFIG;
+var init_defaults = __esm({
+  "src/defaults.ts"() {
+    "use strict";
+    init_cjs_shims();
+    DEFAULT_CONFIG = {
+      entry: "src/pages/**/*.{ts,js}",
+      exclude: [],
+      template: "index.html",
+      placeholder: "{{ENTRY_FILE}}",
+      debug: false,
+      strategies: {
+        default: {}
+      },
+      pageConfigs: {}
+    };
+  }
+});
+
 // src/cli.ts
 var cli_exports = {};
 __export(cli_exports, {
@@ -559,6 +559,7 @@ var import_node_child_process = require("child_process");
 var fs3 = __toESM(require("fs"));
 var path4 = __toESM(require("path"));
 var glob2 = __toESM(require("glob"));
+init_build_config();
 function parseArgs() {
   const args = process.argv.slice(2);
   const viteBuildArgs = [];
@@ -635,19 +636,18 @@ function buildStrategy(strategy, viteBuildArgs, debug) {
     }
     child.on("close", (code) => {
       const success = code === 0;
-      const outputDir = `dist/${strategy}`;
+      const actualOutputDir = getViteOutputDirectory(viteBuildArgs);
       if (success) {
         log(`\u2705 \u7B56\u7565 ${strategy} \u6784\u5EFA\u6210\u529F`);
         try {
-          const outputPath = path4.resolve(process.cwd(), outputDir);
-          if (fs3.existsSync(outputPath)) {
-            const files = fs3.readdirSync(outputPath);
+          if (fs3.existsSync(actualOutputDir)) {
+            const files = fs3.readdirSync(actualOutputDir);
             for (const file of files) {
               if (file.startsWith(".temp.mp.") && file.endsWith(".html")) {
-                const oldPath = path4.resolve(outputPath, file);
+                const oldPath = path4.resolve(actualOutputDir, file);
                 const name = file.replace(/^\.temp\.mp\./, "").replace(/\.html$/, "");
                 const newName = `${name}.html`;
-                const newPath = path4.resolve(outputPath, newName);
+                const newPath = path4.resolve(actualOutputDir, newName);
                 fs3.renameSync(oldPath, newPath);
                 log(`\u91CD\u547D\u540DHTML: ${file} -> ${newName}`);
               }
@@ -666,16 +666,17 @@ function buildStrategy(strategy, viteBuildArgs, debug) {
         strategy,
         success,
         error: success ? void 0 : errorOutput || `\u6784\u5EFA\u5931\u8D25\uFF0C\u9000\u51FA\u7801: ${code}`,
-        outputDir
+        outputDir: actualOutputDir
       });
     });
     child.on("error", (error) => {
       log(`\u274C \u7B56\u7565 ${strategy} \u6784\u5EFA\u51FA\u9519:`, error.message);
+      const actualOutputDir = getViteOutputDirectory(viteBuildArgs);
       resolve4({
         strategy,
         success: false,
         error: error.message,
-        outputDir: `dist/${strategy}`
+        outputDir: actualOutputDir
       });
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fchc8/vite-plugin-multi-page",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "A powerful Vite plugin for building multi-page applications with smart file routing and multi-strategy builds",
   "main": "dist/index.js",
   "module": "dist/index.mjs",