weapp-vite 5.2.3 → 5.4.0

package/dist/cli.cjs

@@ -1,9 +1,15 @@
 "use strict"; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
+var _chunkLX2OMRQ4cjs = require('./chunk-LX2OMRQ4.cjs');
 
 
 
-var _chunkGMCAZZQYcjs = require('./chunk-GMCAZZQY.cjs');
+
+
+
+
+
+var _chunkXEHEGODScjs = require('./chunk-XEHEGODS.cjs');
 
 
 var _chunkOS76JPG2cjs = require('./chunk-OS76JPG2.cjs');
@@ -12,6 +18,7 @@ var _chunkOS76JPG2cjs = require('./chunk-OS76JPG2.cjs');
 _chunkOS76JPG2cjs.init_cjs_shims.call(void 0, );
 var _process = require('process'); var _process2 = _interopRequireDefault(_process);
 var _init = require('@weapp-core/init');
+var _shared = require('@weapp-core/shared');
 
 // ../../node_modules/.pnpm/cac@6.7.14/node_modules/cac/dist/index.mjs
 _chunkOS76JPG2cjs.init_cjs_shims.call(void 0, );
@@ -599,7 +606,7 @@ var CAC = class extends _events.EventEmitter {
 };
 var cac = (name = "") => new CAC(name);
 
-// ../../node_modules/.pnpm/package-manager-detector@1.4.0/node_modules/package-manager-detector/dist/commands.mjs
+// ../../node_modules/.pnpm/package-manager-detector@1.4.1/node_modules/package-manager-detector/dist/commands.mjs
 _chunkOS76JPG2cjs.init_cjs_shims.call(void 0, );
 function dashDashArg(agent, agentCommand) {
   return (args) => {
@@ -676,7 +683,7 @@ var bun = {
   "global": ["bun", "add", "-g", 0],
   "add": ["bun", "add", 0],
   "upgrade": ["bun", "update", 0],
-  "upgrade-interactive": ["bun", "update", 0],
+  "upgrade-interactive": ["bun", "update", "-i", 0],
   "execute": ["bun", "x", 0],
   "execute-local": ["bun", "x", 0],
   "uninstall": ["bun", "remove", 0],
@@ -736,7 +743,7 @@ var _weappidecli = require('weapp-ide-cli');
 _chunkOS76JPG2cjs.init_cjs_shims.call(void 0, );
 
 var _schematics = require('@weapp-core/schematics');
-var _shared = require('@weapp-core/shared');
+
 var _fsextra = require('fs-extra'); var _fsextra2 = _interopRequireDefault(_fsextra);
 
 function composePath(outDir, filename) {
@@ -804,7 +811,7 @@ async function generate(options) {
   for (const { code, fileName: fileName2 } of files) {
     if (code !== void 0) {
       await _fsextra2.default.outputFile(_pathe2.default.resolve(basepath, fileName2), code, "utf8");
-      _chunkGMCAZZQYcjs.logger_default.success(`${composePath(outDir, fileName2)} \u521B\u5EFA\u6210\u529F\uFF01`);
+      _chunkXEHEGODScjs.logger_default.success(`${composePath(outDir, fileName2)} \u521B\u5EFA\u6210\u529F\uFF01`);
     }
   }
 }
@@ -842,36 +849,110 @@ async function readTemplateFile(templatePath, context) {
 // src/cli.ts
 var cli = cac("weapp-vite");
 try {
-  _chunkGMCAZZQYcjs.checkRuntime.call(void 0, {
+  _chunkXEHEGODScjs.checkRuntime.call(void 0, {
     bun: "0.0.0",
     deno: "0.0.0",
     node: "20.19.0"
   });
 } catch (e) {
 }
-function loadConfig(configFile) {
-  return _vite.loadConfigFromFile.call(void 0, {
+async function loadConfig(configFile) {
+  const cwd = _process2.default.cwd();
+  let resolvedConfigFile = configFile;
+  if (resolvedConfigFile && !_pathe2.default.isAbsolute(resolvedConfigFile)) {
+    resolvedConfigFile = _pathe2.default.resolve(cwd, resolvedConfigFile);
+  }
+  const configEnv = {
     command: "serve",
     mode: "development"
-  }, configFile, _process2.default.cwd());
+  };
+  const loaded = await _vite.loadConfigFromFile.call(void 0, configEnv, resolvedConfigFile, cwd);
+  const weappConfigFilePath = await _chunkXEHEGODScjs.resolveWeappConfigFile.call(void 0, {
+    root: cwd,
+    specified: resolvedConfigFile
+  });
+  let weappLoaded;
+  if (weappConfigFilePath) {
+    const normalizedWeappPath = _pathe2.default.resolve(weappConfigFilePath);
+    const normalizedLoadedPath = _optionalChain([loaded, 'optionalAccess', _6 => _6.path]) ? _pathe2.default.resolve(loaded.path) : void 0;
+    if (normalizedLoadedPath && normalizedLoadedPath === normalizedWeappPath) {
+      weappLoaded = loaded;
+    } else {
+      weappLoaded = await _vite.loadConfigFromFile.call(void 0, configEnv, weappConfigFilePath, cwd);
+    }
+  }
+  if (!loaded && !weappLoaded) {
+    return void 0;
+  }
+  const config = _nullishCoalesce(_optionalChain([loaded, 'optionalAccess', _7 => _7.config]), () => ( (_nullishCoalesce(_optionalChain([weappLoaded, 'optionalAccess', _8 => _8.config]), () => ( {})))));
+  if (_optionalChain([weappLoaded, 'optionalAccess', _9 => _9.config, 'optionalAccess', _10 => _10.weapp])) {
+    config.weapp = _shared.defu.call(void 0, 
+      weappLoaded.config.weapp,
+      _nullishCoalesce(config.weapp, () => ( {}))
+    );
+  }
+  const dependencySet = /* @__PURE__ */ new Set();
+  for (const dependency of _nullishCoalesce(_optionalChain([loaded, 'optionalAccess', _11 => _11.dependencies]), () => ( []))) {
+    dependencySet.add(dependency);
+  }
+  for (const dependency of _nullishCoalesce(_optionalChain([weappLoaded, 'optionalAccess', _12 => _12.dependencies]), () => ( []))) {
+    dependencySet.add(dependency);
+  }
+  return {
+    config,
+    path: _nullishCoalesce(_nullishCoalesce(_optionalChain([weappLoaded, 'optionalAccess', _13 => _13.path]), () => ( _optionalChain([loaded, 'optionalAccess', _14 => _14.path]))), () => ( resolvedConfigFile)),
+    dependencies: Array.from(dependencySet)
+  };
 }
 var logBuildAppFinishOnlyShowOnce = false;
-function logBuildAppFinish(configService) {
-  if (!logBuildAppFinishOnlyShowOnce) {
-    const { command, args } = _nullishCoalesce(resolveCommand(
-      configService.packageManager.agent,
-      "run",
-      ["open"]
-    ), () => ( {
-      command: "npm",
-      args: ["run", "open"]
-    }));
-    const devCommand = `${command} ${args.join(" ")}`;
-    _chunkGMCAZZQYcjs.logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01\u9884\u89C8\u65B9\u5F0F ( `2` \u79CD\u9009\u5176\u4E00\u5373\u53EF)\uFF1A");
-    _chunkGMCAZZQYcjs.logger_default.info(`\u6267\u884C \`${devCommand}\` \u53EF\u4EE5\u76F4\u63A5\u5728 \`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\` \u91CC\u6253\u5F00\u5F53\u524D\u5E94\u7528`);
-    _chunkGMCAZZQYcjs.logger_default.info("\u6216\u624B\u52A8\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55(`project.config.json` \u6587\u4EF6\u6240\u5728\u7684\u76EE\u5F55)\uFF0C\u5373\u53EF\u9884\u89C8\u6548\u679C");
+function logBuildAppFinish(configService, webServer, options = {}) {
+  if (logBuildAppFinishOnlyShowOnce) {
+    return;
+  }
+  const { skipMini = false, skipWeb = false } = options;
+  if (skipMini) {
+    if (webServer) {
+      const urls = webServer.resolvedUrls;
+      const candidates = urls ? [..._nullishCoalesce(urls.local, () => ( [])), ..._nullishCoalesce(urls.network, () => ( []))] : [];
+      if (candidates.length > 0) {
+        _chunkXEHEGODScjs.logger_default.success("Web \u8FD0\u884C\u65F6\u5DF2\u542F\u52A8\uFF0C\u6D4F\u89C8\u5668\u8BBF\u95EE\uFF1A");
+        for (const url of candidates) {
+          _chunkXEHEGODScjs.logger_default.info(`  \u279C  ${url}`);
+        }
+      } else {
+        _chunkXEHEGODScjs.logger_default.success("Web \u8FD0\u884C\u65F6\u5DF2\u542F\u52A8");
+      }
+    } else {
+      _chunkXEHEGODScjs.logger_default.success("Web \u8FD0\u884C\u65F6\u5DF2\u542F\u52A8");
+    }
     logBuildAppFinishOnlyShowOnce = true;
+    return;
   }
+  const { command, args } = _nullishCoalesce(resolveCommand(
+    configService.packageManager.agent,
+    "run",
+    ["open"]
+  ), () => ( {
+    command: "npm",
+    args: ["run", "open"]
+  }));
+  const devCommand = `${command} ${args.join(" ")}`;
+  _chunkXEHEGODScjs.logger_default.success("\u5E94\u7528\u6784\u5EFA\u5B8C\u6210\uFF01\u9884\u89C8\u65B9\u5F0F ( `2` \u79CD\u9009\u5176\u4E00\u5373\u53EF)\uFF1A");
+  _chunkXEHEGODScjs.logger_default.info(`\u6267\u884C \`${devCommand}\` \u53EF\u4EE5\u76F4\u63A5\u5728 \`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\` \u91CC\u6253\u5F00\u5F53\u524D\u5E94\u7528`);
+  _chunkXEHEGODScjs.logger_default.info("\u6216\u624B\u52A8\u6253\u5F00\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u5BFC\u5165\u6839\u76EE\u5F55(`project.config.json` \u6587\u4EF6\u6240\u5728\u7684\u76EE\u5F55)\uFF0C\u5373\u53EF\u9884\u89C8\u6548\u679C");
+  if (!skipWeb && webServer) {
+    const urls = webServer.resolvedUrls;
+    const candidates = urls ? [..._nullishCoalesce(urls.local, () => ( [])), ..._nullishCoalesce(urls.network, () => ( []))] : [];
+    if (candidates.length > 0) {
+      _chunkXEHEGODScjs.logger_default.success("Web \u8FD0\u884C\u65F6\u5DF2\u542F\u52A8\uFF0C\u6D4F\u89C8\u5668\u8BBF\u95EE\uFF1A");
+      for (const url of candidates) {
+        _chunkXEHEGODScjs.logger_default.info(`  \u279C  ${url}`);
+      }
+    } else {
+      _chunkXEHEGODScjs.logger_default.success("Web \u8FD0\u884C\u65F6\u5DF2\u542F\u52A8");
+    }
+  }
+  logBuildAppFinishOnlyShowOnce = true;
 }
 function filterDuplicateOptions(options) {
   for (const [key, value] of Object.entries(options)) {
@@ -898,28 +979,104 @@ async function openIde() {
   try {
     await _weappidecli.parse.call(void 0, ["open", "-p"]);
   } catch (error) {
-    _chunkGMCAZZQYcjs.logger_default.error(error);
+    _chunkXEHEGODScjs.logger_default.error(error);
+  }
+}
+function logRuntimeTarget(targets) {
+  _chunkXEHEGODScjs.logger_default.info(`\u76EE\u6807\u5E73\u53F0\uFF1A${targets.label}`);
+}
+function resolveRuntimeTargets(options) {
+  const rawPlatform = typeof options.platform === "string" ? options.platform : typeof options.p === "string" ? options.p : void 0;
+  if (!rawPlatform) {
+    return {
+      runMini: true,
+      runWeb: false,
+      mpPlatform: _chunkXEHEGODScjs.DEFAULT_MP_PLATFORM,
+      label: _chunkXEHEGODScjs.DEFAULT_MP_PLATFORM
+    };
+  }
+  const normalized = _chunkXEHEGODScjs.normalizeMiniPlatform.call(void 0, rawPlatform);
+  if (!normalized) {
+    return {
+      runMini: true,
+      runWeb: false,
+      mpPlatform: _chunkXEHEGODScjs.DEFAULT_MP_PLATFORM,
+      label: _chunkXEHEGODScjs.DEFAULT_MP_PLATFORM
+    };
+  }
+  if (normalized === "h5" || normalized === "web") {
+    return {
+      runMini: false,
+      runWeb: true,
+      mpPlatform: void 0,
+      label: normalized === "h5" ? "h5" : "web"
+    };
+  }
+  const mpPlatform = _chunkXEHEGODScjs.resolveMiniPlatform.call(void 0, normalized);
+  if (mpPlatform) {
+    return {
+      runMini: true,
+      runWeb: false,
+      mpPlatform,
+      label: mpPlatform
+    };
   }
+  _chunkXEHEGODScjs.logger_default.warn(`\u672A\u8BC6\u522B\u7684\u5E73\u53F0 "${rawPlatform}"\uFF0C\u5DF2\u56DE\u9000\u5230 ${_chunkXEHEGODScjs.DEFAULT_MP_PLATFORM}`);
+  return {
+    runMini: true,
+    runWeb: false,
+    mpPlatform: _chunkXEHEGODScjs.DEFAULT_MP_PLATFORM,
+    label: _chunkXEHEGODScjs.DEFAULT_MP_PLATFORM
+  };
+}
+function createInlineConfig(mpPlatform) {
+  if (!mpPlatform) {
+    return void 0;
+  }
+  return {
+    weapp: {
+      platform: mpPlatform
+    }
+  };
 }
 cli.option("-c, --config <file>", `[string] use specified config file`).option("--base <path>", `[string] public base path (default: /)`, {
   type: [convertBase]
 }).option("-l, --logLevel <level>", `[string] info | warn | error | silent`).option("--clearScreen", `[boolean] allow/disable clear screen when logging`).option("-d, --debug [feat]", `[string | boolean] show debug logs`).option("-f, --filter <filter>", `[string] filter debug logs`).option("-m, --mode <mode>", `[string] set env mode`);
-cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).action(async (root, options) => {
+cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).option("-p, --platform <platform>", `[string] target platform (weapp | h5)`).action(async (root, options) => {
   filterDuplicateOptions(options);
   const configFile = resolveConfigFile(options);
-  const { buildService, configService } = await _chunkGMCAZZQYcjs.createCompilerContext.call(void 0, {
+  const targets = resolveRuntimeTargets(options);
+  logRuntimeTarget(targets);
+  const inlineConfig = createInlineConfig(targets.mpPlatform);
+  const { buildService, configService, webService } = await _chunkLX2OMRQ4cjs.createCompilerContext.call(void 0, {
     cwd: root,
     mode: _nullishCoalesce(options.mode, () => ( "development")),
     isDev: true,
-    configFile
+    configFile,
+    inlineConfig
   });
-  await buildService.build(options);
-  logBuildAppFinish(configService);
-  if (options.open) {
+  if (targets.runMini) {
+    await buildService.build(options);
+  }
+  let webServer;
+  if (targets.runWeb) {
+    try {
+      webServer = await _optionalChain([webService, 'optionalAccess', _15 => _15.startDevServer, 'call', _16 => _16()]);
+    } catch (error) {
+      _chunkXEHEGODScjs.logger_default.error(error);
+      throw error;
+    }
+  }
+  if (targets.runMini) {
+    logBuildAppFinish(configService, webServer, { skipWeb: !targets.runWeb });
+  } else if (targets.runWeb) {
+    logBuildAppFinish(configService, webServer, { skipMini: true });
+  }
+  if (options.open && targets.runMini) {
     await openIde();
   }
 });
-cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option(
+cli.command("build [root]", "build for production").option("--target <target>", `[string] transpile target (default: 'modules')`).option("--outDir <dir>", `[string] output directory (default: dist)`).option("-p, --platform <platform>", `[string] target platform (weapp | h5)`).option(
   "--sourcemap [output]",
   `[boolean | "inline" | "hidden"] output source maps for build (default: false)`
 ).option(
@@ -931,14 +1088,32 @@ cli.command("build [root]", "build for production").option("--target <target>",
 ).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--skipNpm", `[boolean] if skip npm build`).option("-o, --open", `[boolean] open ide`).action(async (root, options) => {
   filterDuplicateOptions(options);
   const configFile = resolveConfigFile(options);
-  const { buildService, configService } = await _chunkGMCAZZQYcjs.createCompilerContext.call(void 0, {
+  const targets = resolveRuntimeTargets(options);
+  logRuntimeTarget(targets);
+  const inlineConfig = createInlineConfig(targets.mpPlatform);
+  const { buildService, configService, webService } = await _chunkLX2OMRQ4cjs.createCompilerContext.call(void 0, {
     cwd: root,
     mode: _nullishCoalesce(options.mode, () => ( "production")),
-    configFile
+    configFile,
+    inlineConfig
   });
-  await buildService.build(options);
-  logBuildAppFinish(configService);
-  if (options.open) {
+  if (targets.runMini) {
+    await buildService.build(options);
+  }
+  const webConfig = configService.weappWebConfig;
+  if (targets.runWeb && _optionalChain([webConfig, 'optionalAccess', _17 => _17.enabled])) {
+    try {
+      await _optionalChain([webService, 'optionalAccess', _18 => _18.build, 'call', _19 => _19()]);
+      _chunkXEHEGODScjs.logger_default.success(`Web \u6784\u5EFA\u5B8C\u6210\uFF0C\u8F93\u51FA\u76EE\u5F55\uFF1A${configService.relativeCwd(webConfig.outDir)}`);
+    } catch (error) {
+      _chunkXEHEGODScjs.logger_default.error(error);
+      throw error;
+    }
+  }
+  if (targets.runMini) {
+    logBuildAppFinish(configService, void 0, { skipWeb: !targets.runWeb });
+  }
+  if (options.open && targets.runMini) {
     await openIde();
   }
 });
@@ -948,7 +1123,7 @@ cli.command("init").action(async () => {
       command: "weapp-vite"
     });
   } catch (error) {
-    _chunkGMCAZZQYcjs.logger_default.error(error);
+    _chunkXEHEGODScjs.logger_default.error(error);
   }
 });
 cli.command("open").action(async () => {
@@ -958,7 +1133,7 @@ cli.command("npm").alias("build:npm").alias("build-npm").action(async () => {
   try {
     await _weappidecli.parse.call(void 0, ["build-npm", "-p"]);
   } catch (error) {
-    _chunkGMCAZZQYcjs.logger_default.error(error);
+    _chunkXEHEGODScjs.logger_default.error(error);
   }
 });
 cli.command("g [filepath]", "generate component").alias("generate").option("-a, --app", "type app").option("-p, --page", "type app").option("-n, --name <name>", "filename").action(async (filepath, options) => {
@@ -973,25 +1148,25 @@ cli.command("g [filepath]", "generate component").alias("generate").option("-a,
     fileName = "app";
   }
   if (filepath === void 0) {
-    _chunkGMCAZZQYcjs.logger_default.error("weapp-vite generate <outDir> \u547D\u4EE4\u5FC5\u987B\u4F20\u5165\u8DEF\u5F84\u53C2\u6570 outDir");
+    _chunkXEHEGODScjs.logger_default.error("weapp-vite generate <outDir> \u547D\u4EE4\u5FC5\u987B\u4F20\u5165\u8DEF\u5F84\u53C2\u6570 outDir");
     return;
   }
   if (options.page) {
     type = "page";
   }
-  const generateOptions = _optionalChain([config, 'optionalAccess', _6 => _6.config, 'access', _7 => _7.weapp, 'optionalAccess', _8 => _8.generate]);
-  fileName = _nullishCoalesce(_optionalChain([generateOptions, 'optionalAccess', _9 => _9.filenames, 'optionalAccess', _10 => _10[type]]), () => ( fileName));
+  const generateOptions = _optionalChain([config, 'optionalAccess', _20 => _20.config, 'access', _21 => _21.weapp, 'optionalAccess', _22 => _22.generate]);
+  fileName = _nullishCoalesce(_optionalChain([generateOptions, 'optionalAccess', _23 => _23.filenames, 'optionalAccess', _24 => _24[type]]), () => ( fileName));
   await generate({
-    outDir: _pathe2.default.join(_nullishCoalesce(_optionalChain([generateOptions, 'optionalAccess', _11 => _11.dirs, 'optionalAccess', _12 => _12[type]]), () => ( "")), filepath),
+    outDir: _pathe2.default.join(_nullishCoalesce(_optionalChain([generateOptions, 'optionalAccess', _25 => _25.dirs, 'optionalAccess', _26 => _26[type]]), () => ( "")), filepath),
     type,
     fileName,
-    extensions: _optionalChain([generateOptions, 'optionalAccess', _13 => _13.extensions]),
-    templates: _optionalChain([generateOptions, 'optionalAccess', _14 => _14.templates])
+    extensions: _optionalChain([generateOptions, 'optionalAccess', _27 => _27.extensions]),
+    templates: _optionalChain([generateOptions, 'optionalAccess', _28 => _28.templates])
   });
 });
 cli.command("create [outDir]", "create project").option("-t, --template <type>", "template type").action(async (outDir, options) => {
   await _init.createProject.call(void 0, outDir, options.template);
 });
 cli.help();
-cli.version(_chunkGMCAZZQYcjs.VERSION);
+cli.version(_chunkXEHEGODScjs.VERSION);
 cli.parse();