@modern-js/app-tools 2.65.3 → 2.65.5

package/dist/cjs/commands/build.js

@@ -90,7 +90,9 @@ const build = async (api, options) => {
   if (!appContext.builder) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
-  await appContext.builder.build();
+  await appContext.builder.build({
+    watch: options === null || options === void 0 ? void 0 : options.watch
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/commands/index.js

@@ -65,7 +65,7 @@ const devCommand = async (program, api) => {
 const buildCommand = async (program, api) => {
   const hooks = api.getHooks();
   const platformBuilders = await hooks.registerBuildPlatform.call();
-  const buildProgram = program.command("build").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.build.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).action(async (options) => {
+  const buildProgram = program.command("build").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.build.describe)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).option("--analyze", import_locale.i18n.t(import_locale.localeKeys.command.shared.analyze)).option("-w --watch", import_locale.i18n.t(import_locale.localeKeys.command.build.watch)).action(async (options) => {
     const { build } = await import("./build.js");
     await build(api, options);
   });

package/dist/cjs/locale/en.js

@@ -38,7 +38,8 @@ const EN_LOCALE = {
       requireEntry: "You must choose at least one entry"
     },
     build: {
-      describe: "build the app for production"
+      describe: "build the app for production",
+      watch: "turn on watch mode, watch for changes and rebuild"
     },
     serve: {
       describe: "preview the production build locally"

package/dist/cjs/locale/zh.js

@@ -38,7 +38,8 @@ const ZH_LOCALE = {
       requireEntry: "请至少选择一个入口"
     },
     build: {
-      describe: "构建生产环境产物"
+      describe: "构建生产环境产物",
+      watch: "开启 watch 模式, 监听文件变更并重新构建"
     },
     serve: {
       describe: "启动生产环境服务"

package/dist/cjs/plugins/analyze/getServerRoutes.js

@@ -103,7 +103,7 @@ const applyRouteOptions = (original, routeOptions) => {
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   var _deploy_worker;
-  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
+  const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
@@ -117,7 +117,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,
       entryName,
-      entryPath: (0, import_utils.removeLeadingSlash)(import_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
+      entryPath: (0, import_utils.removeLeadingSlash)(import_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder || outputStructure === "flat" ? ".html" : "/index.html"}`)),
       isSPA: true,
       isStream: isStream || isRSC,
       isSSR,

package/dist/esm/commands/build.js

@@ -120,7 +120,9 @@ var build = function() {
           }
           return [
             4,
-            appContext.builder.build()
+            appContext.builder.build({
+              watch: options === null || options === void 0 ? void 0 : options.watch
+            })
           ];
         case 12:
           _state.sent();

package/dist/esm/commands/index.js

@@ -140,7 +140,7 @@ var buildCommand = function() {
           ];
         case 1:
           platformBuilders = _state.sent();
-          buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(function() {
+          buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("-w --watch", i18n.t(localeKeys.command.build.watch)).action(function() {
             var _ref2 = _async_to_generator(function(options) {
               var build;
               return _ts_generator(this, function(_state2) {

package/dist/esm/locale/en.js

@@ -15,7 +15,8 @@ var EN_LOCALE = {
       requireEntry: "You must choose at least one entry"
     },
     build: {
-      describe: "build the app for production"
+      describe: "build the app for production",
+      watch: "turn on watch mode, watch for changes and rebuild"
     },
     serve: {
       describe: "preview the production build locally"

package/dist/esm/locale/zh.js

@@ -15,7 +15,8 @@ var ZH_LOCALE = {
       requireEntry: "请至少选择一个入口"
     },
     build: {
-      describe: "构建生产环境产物"
+      describe: "构建生产环境产物",
+      watch: "开启 watch 模式, 监听文件变更并重新构建"
     },
     serve: {
       describe: "启动生产环境服务"

package/dist/esm/plugins/analyze/getServerRoutes.js

@@ -70,7 +70,7 @@ var applyRouteOptions = function(original, routeOptions) {
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
   var _deploy_worker;
-  var mainEntryName = config.source.mainEntryName, disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, rsc = _config_server.rsc, deploy = config.deploy;
+  var mainEntryName = config.source.mainEntryName, _config_html = config.html, disableHtmlFolder = _config_html.disableHtmlFolder, outputStructure = _config_html.outputStructure, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, rsc = _config_server.rsc, deploy = config.deploy;
   var packageName = appContext.packageName;
   var workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   var htmlRoutes = entrypoints.reduce(function(previous, param) {
@@ -85,7 +85,7 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
     var route = {
       urlPath: "/".concat(isMain ? "" : entryName),
       entryName,
-      entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
+      entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder || outputStructure === "flat" ? ".html" : "/index.html"))),
       isSPA: true,
       isStream: isStream || isRSC,
       isSSR,

package/dist/esm-node/commands/build.js

@@ -57,7 +57,9 @@ const build = async (api, options) => {
   if (!appContext.builder) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
-  await appContext.builder.build();
+  await appContext.builder.build({
+    watch: options === null || options === void 0 ? void 0 : options.watch
+  });
 };
 export {
   build

package/dist/esm-node/commands/index.js

@@ -26,7 +26,7 @@ const devCommand = async (program, api) => {
 const buildCommand = async (program, api) => {
   const hooks = api.getHooks();
   const platformBuilders = await hooks.registerBuildPlatform.call();
-  const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(async (options) => {
+  const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("-w --watch", i18n.t(localeKeys.command.build.watch)).action(async (options) => {
     const { build } = await import("./build.js");
     await build(api, options);
   });

package/dist/esm-node/locale/en.js

@@ -15,7 +15,8 @@ const EN_LOCALE = {
       requireEntry: "You must choose at least one entry"
     },
     build: {
-      describe: "build the app for production"
+      describe: "build the app for production",
+      watch: "turn on watch mode, watch for changes and rebuild"
     },
     serve: {
       describe: "preview the production build locally"

package/dist/esm-node/locale/zh.js

@@ -15,7 +15,8 @@ const ZH_LOCALE = {
       requireEntry: "请至少选择一个入口"
     },
     build: {
-      describe: "构建生产环境产物"
+      describe: "构建生产环境产物",
+      watch: "开启 watch 模式, 监听文件变更并重新构建"
     },
     serve: {
       describe: "启动生产环境服务"

package/dist/esm-node/plugins/analyze/getServerRoutes.js

@@ -69,7 +69,7 @@ const applyRouteOptions = (original, routeOptions) => {
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   var _deploy_worker;
-  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
+  const { source: { mainEntryName }, html: { disableHtmlFolder, outputStructure }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
@@ -83,7 +83,7 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,
       entryName,
-      entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
+      entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder || outputStructure === "flat" ? ".html" : "/index.html"}`)),
       isSPA: true,
       isStream: isStream || isRSC,
       isSSR,

package/dist/types/locale/en.d.ts

@@ -16,6 +16,7 @@ export declare const EN_LOCALE: {
         };
         build: {
             describe: string;
+            watch: string;
         };
         serve: {
             describe: string;

package/dist/types/locale/index.d.ts

@@ -18,6 +18,7 @@ declare const localeKeys: {
         };
         build: {
             describe: string;
+            watch: string;
         };
         serve: {
             describe: string;
@@ -57,6 +58,7 @@ declare const localeKeys: {
         };
         build: {
             describe: string;
+            watch: string;
         };
         serve: {
             describe: string;

package/dist/types/locale/zh.d.ts

@@ -16,6 +16,7 @@ export declare const ZH_LOCALE: {
         };
         build: {
             describe: string;
+            watch: string;
         };
         serve: {
             describe: string;

package/dist/types/utils/types.d.ts

@@ -7,6 +7,7 @@ export type DevOptions = {
 export type BuildOptions = {
     config?: string;
     analyze?: boolean;
+    watch?: boolean;
 };
 export type DeployOptions = {
     config?: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.65.3",
+  "version": "2.65.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,7 +80,7 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "1.2.15",
+    "@rsbuild/core": "1.2.19",
     "@rsbuild/plugin-node-polyfill": "1.3.0",
     "@swc/helpers": "0.5.13",
     "es-module-lexer": "^1.1.0",
@@ -88,26 +88,26 @@
     "esbuild-register": "^3.5.0",
     "flatted": "^3.2.9",
     "mlly": "^1.6.1",
-    "ndepe": "0.1.5",
+    "ndepe": "0.1.6",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.65.3",
-    "@modern-js/node-bundle-require": "2.65.3",
-    "@modern-js/plugin": "2.65.3",
-    "@modern-js/plugin-data-loader": "2.65.3",
-    "@modern-js/plugin-v2": "2.65.3",
-    "@modern-js/prod-server": "2.65.3",
-    "@modern-js/plugin-i18n": "2.65.3",
-    "@modern-js/rsbuild-plugin-esbuild": "2.65.3",
-    "@modern-js/server": "2.65.3",
-    "@modern-js/server-core": "2.65.3",
-    "@modern-js/server-utils": "2.65.3",
-    "@modern-js/types": "2.65.3",
-    "@modern-js/utils": "2.65.3",
-    "@modern-js/uni-builder": "2.65.3"
+    "@modern-js/core": "2.65.5",
+    "@modern-js/node-bundle-require": "2.65.5",
+    "@modern-js/plugin-data-loader": "2.65.5",
+    "@modern-js/plugin-i18n": "2.65.5",
+    "@modern-js/plugin-v2": "2.65.5",
+    "@modern-js/rsbuild-plugin-esbuild": "2.65.5",
+    "@modern-js/prod-server": "2.65.5",
+    "@modern-js/server-core": "2.65.5",
+    "@modern-js/server": "2.65.5",
+    "@modern-js/server-utils": "2.65.5",
+    "@modern-js/types": "2.65.5",
+    "@modern-js/plugin": "2.65.5",
+    "@modern-js/uni-builder": "2.65.5",
+    "@modern-js/utils": "2.65.5"
   },
   "devDependencies": {
-    "@rsbuild/plugin-webpack-swc": "1.0.11",
+    "@rsbuild/plugin-webpack-swc": "1.0.12",
     "@types/babel__traverse": "7.20.6",
     "@types/jest": "^29",
     "@types/node": "^16",
@@ -116,8 +116,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.98.0",
-    "@scripts/jest-config": "2.65.3",
-    "@scripts/build": "2.65.3"
+    "@scripts/build": "2.65.5",
+    "@scripts/jest-config": "2.65.5"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",
@@ -134,8 +134,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "new": "modern-lib new",