@modern-js/app-tools 2.35.0 → 2.35.1

package/dist/esm-node/index.js

@@ -59,140 +59,137 @@ export const buildCommand = async (program, api) => {
 };
 export const appTools = (options = {
   bundler: "webpack"
-}) => {
-  var _options, _options1;
-  return {
-    name: "@modern-js/app-tools",
-    post: [
-      "@modern-js/plugin-initialize",
-      "@modern-js/plugin-analyze",
-      "@modern-js/plugin-ssr",
-      "@modern-js/plugin-document",
-      "@modern-js/plugin-state",
-      "@modern-js/plugin-router",
-      "@modern-js/plugin-router-v5",
-      "@modern-js/plugin-polyfill"
-    ],
-    registerHook: hooks,
-    usePlugins: [
-      initializePlugin({
-        bundler: ((_options = options) === null || _options === void 0 ? void 0 : _options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
-      }),
-      analyzePlugin({
-        bundler: ((_options1 = options) === null || _options1 === void 0 ? void 0 : _options1.bundler) === "experimental-rspack" ? "rspack" : "webpack"
-      }),
-      lintPlugin()
-    ],
-    setup: (api) => {
-      const appContext = api.useAppContext();
-      api.setAppContext({
-        ...appContext,
-        toolsType: "app-tools"
-      });
-      const nestedRoutes = {};
-      const locale = getLocaleLanguage();
-      i18n.changeLanguage({
-        locale
-      });
-      return {
-        async beforeConfig() {
-          var _userConfig_output;
-          const userConfig = api.useConfigContext();
-          const appContext2 = api.useAppContext();
-          if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
-            api.setAppContext({
-              ...appContext2,
-              internalDirectory: path.resolve(appContext2.appDirectory, userConfig.output.tempDir)
-            });
-          }
-        },
-        async commands({ program }) {
-          await devCommand(program, api);
-          await buildCommand(program, api);
-          program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async () => {
-            const { start } = await import("./commands/serve");
-            await start(api);
-          });
-          program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
-            if (!options2.skipBuild) {
-              const { build } = await import("./commands/build");
-              await build(api);
-            }
-            const { deploy } = await import("./commands/deploy");
-            await deploy(api, options2);
-            process.exit(0);
+}) => ({
+  name: "@modern-js/app-tools",
+  post: [
+    "@modern-js/plugin-initialize",
+    "@modern-js/plugin-analyze",
+    "@modern-js/plugin-ssr",
+    "@modern-js/plugin-document",
+    "@modern-js/plugin-state",
+    "@modern-js/plugin-router",
+    "@modern-js/plugin-router-v5",
+    "@modern-js/plugin-polyfill"
+  ],
+  registerHook: hooks,
+  usePlugins: [
+    initializePlugin({
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    analyzePlugin({
+      bundler: (options === null || options === void 0 ? void 0 : options.bundler) === "experimental-rspack" ? "rspack" : "webpack"
+    }),
+    lintPlugin()
+  ],
+  setup: (api) => {
+    const appContext = api.useAppContext();
+    api.setAppContext({
+      ...appContext,
+      toolsType: "app-tools"
+    });
+    const nestedRoutes = {};
+    const locale = getLocaleLanguage();
+    i18n.changeLanguage({
+      locale
+    });
+    return {
+      async beforeConfig() {
+        var _userConfig_output;
+        const userConfig = api.useConfigContext();
+        const appContext2 = api.useAppContext();
+        if ((_userConfig_output = userConfig.output) === null || _userConfig_output === void 0 ? void 0 : _userConfig_output.tempDir) {
+          api.setAppContext({
+            ...appContext2,
+            internalDirectory: path.resolve(appContext2.appDirectory, userConfig.output.tempDir)
           });
-          program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(async (options2) => {
-            const { MWANewAction } = await import("@modern-js/new-action");
-            await MWANewAction({
-              ...options2,
-              locale: options2.lang || locale
-            });
+        }
+      },
+      async commands({ program }) {
+        await devCommand(program, api);
+        await buildCommand(program, api);
+        program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async () => {
+          const { start } = await import("./commands/serve");
+          await start(api);
+        });
+        program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
+          if (!options2.skipBuild) {
+            const { build } = await import("./commands/build");
+            await build(api);
+          }
+          const { deploy } = await import("./commands/deploy");
+          await deploy(api, options2);
+          process.exit(0);
+        });
+        program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(async (options2) => {
+          const { MWANewAction } = await import("@modern-js/new-action");
+          await MWANewAction({
+            ...options2,
+            locale: options2.lang || locale
           });
-          program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options2) => {
-            const { inspect } = await import("./commands/inspect");
-            inspect(api, options2);
+        });
+        program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options2) => {
+          const { inspect } = await import("./commands/inspect");
+          inspect(api, options2);
+        });
+        const { defineCommand } = await import("@modern-js/upgrade");
+        defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)));
+      },
+      async prepare() {
+        const command = getCommand();
+        if (command === "deploy") {
+          const isSkipBuild = [
+            "-s",
+            "--skip-build"
+          ].some((tag) => {
+            return getArgv().includes(tag);
           });
-          const { defineCommand } = await import("@modern-js/upgrade");
-          defineCommand(program.command("upgrade").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)));
-        },
-        async prepare() {
-          const command = getCommand();
-          if (command === "deploy") {
-            const isSkipBuild = [
-              "-s",
-              "--skip-build"
-            ].some((tag) => {
-              return getArgv().includes(tag);
-            });
-            if (isSkipBuild) {
-              return;
-            }
+          if (isSkipBuild) {
+            return;
           }
-          if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
-            const resolvedConfig = api.useResolvedConfigContext();
-            if (resolvedConfig.output.cleanDistPath) {
-              const appContext2 = api.useAppContext();
-              await emptyDir(appContext2.distDirectory);
-            }
-          }
-        },
-        async watchFiles() {
-          const appContext2 = api.useAppContext();
-          const config = api.useResolvedConfigContext();
-          return await generateWatchFiles(appContext2, config.source.configDir);
-        },
-        // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
-        async fileChange(e) {
-          const { filename, eventType, isPrivate } = e;
-          if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
-            const { closeServer } = await import("./utils/createServer");
-            await closeServer();
-            await restart(api.useHookRunners(), filename);
+        }
+        if (command === "dev" || command === "start" || command === "build" || command === "deploy") {
+          const resolvedConfig = api.useResolvedConfigContext();
+          if (resolvedConfig.output.cleanDistPath) {
+            const appContext2 = api.useAppContext();
+            await emptyDir(appContext2.distDirectory);
           }
-        },
-        async beforeRestart() {
-          cleanRequireCache([
-            require.resolve("./analyze")
-          ]);
-        },
-        async modifyFileSystemRoutes({ entrypoint, routes }) {
-          nestedRoutes[entrypoint.entryName] = routes;
-          return {
-            entrypoint,
-            routes
-          };
-        },
-        async beforeGenerateRoutes({ entrypoint, code }) {
-          const { distDirectory } = api.useAppContext();
-          await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
-          return {
-            entrypoint,
-            code
-          };
         }
-      };
-    }
-  };
-};
+      },
+      async watchFiles() {
+        const appContext2 = api.useAppContext();
+        const config = api.useResolvedConfigContext();
+        return await generateWatchFiles(appContext2, config.source.configDir);
+      },
+      // 这里会被 core/initWatcher 监听的文件变动触发，如果是 src 目录下的文件变动，则不做 restart
+      async fileChange(e) {
+        const { filename, eventType, isPrivate } = e;
+        if (!isPrivate && (eventType === "change" || eventType === "unlink")) {
+          const { closeServer } = await import("./utils/createServer");
+          await closeServer();
+          await restart(api.useHookRunners(), filename);
+        }
+      },
+      async beforeRestart() {
+        cleanRequireCache([
+          require.resolve("./analyze")
+        ]);
+      },
+      async modifyFileSystemRoutes({ entrypoint, routes }) {
+        nestedRoutes[entrypoint.entryName] = routes;
+        return {
+          entrypoint,
+          routes
+        };
+      },
+      async beforeGenerateRoutes({ entrypoint, code }) {
+        const { distDirectory } = api.useAppContext();
+        await fs.outputJSON(path.resolve(distDirectory, NESTED_ROUTE_SPEC_FILE), nestedRoutes);
+        return {
+          entrypoint,
+          code
+        };
+      }
+    };
+  }
+});
 export default appTools;

package/dist/esm-node/utils/config.js

@@ -1,6 +1,6 @@
 import * as path from "path";
 import { bundle } from "@modern-js/node-bundle-require";
-import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from "@modern-js/utils";
+import { fs, getServerConfig, ensureAbsolutePath, OUTPUT_CONFIG_FILE, CONFIG_FILE_EXTENSIONS } from "@modern-js/utils";
 export const defineServerConfig = (config) => config;
 export const buildServerConfig = async ({ appDirectory, distDirectory, configFile, options, watch }) => {
   const configFilePath = await getServerConfig(appDirectory, configFile);
@@ -50,7 +50,7 @@ export const safeReplacer = () => {
 };
 export const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
   var _resolvedConfig_output_distPath;
-  const outputPath = path.join(appDirectory, ((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE);
+  const outputPath = ensureAbsolutePath(appDirectory, path.join(((_resolvedConfig_output_distPath = resolvedConfig.output.distPath) === null || _resolvedConfig_output_distPath === void 0 ? void 0 : _resolvedConfig_output_distPath.root) || "./dist", OUTPUT_CONFIG_FILE));
   await fs.writeJSON(outputPath, resolvedConfig, {
     spaces: 2,
     replacer: safeReplacer()

package/dist/esm-node/utils/printInstructions.js

@@ -4,5 +4,5 @@ export const printInstructions = async (hookRunners, appContext, config) => {
   const { instructions } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
-  logger.info(instructions);
+  logger.log(instructions);
 };

package/dist/types/analyze/constants.d.ts

@@ -28,6 +28,7 @@ export declare const NESTED_ROUTE: {
   PAGE_DATA_FILE: string;
   PAGE_CLIENT_LOADER: string;
   SPLATE_FILE: string;
+  SPLATE_CONFIG_FILE: string;
   SPLATE_LOADER_FILE: string;
   SPLATE_DATA_FILE: string;
   SPLATE_CLIENT_DATA: string;

package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts

@@ -19,6 +19,7 @@ type Options = {
   nonce?: string;
 };
 export declare class RouterPlugin {
+  readonly name: string;
   private HtmlBundlerPlugin;
   private enableInlineRouteManifests;
   private staticJsDir;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.0",
+  "version": "2.35.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -71,26 +71,25 @@
     "@babel/types": "^7.22.15",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
-    "rspack-plugin-virtual-module": "0.1.7",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.35.0",
-    "@modern-js/builder-plugin-esbuild": "2.35.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.35.0",
-    "@modern-js/builder-shared": "2.35.0",
-    "@modern-js/builder-webpack-provider": "2.35.0",
-    "@modern-js/core": "2.35.0",
-    "@modern-js/new-action": "2.35.0",
-    "@modern-js/node-bundle-require": "2.35.0",
-    "@modern-js/plugin": "2.35.0",
-    "@modern-js/plugin-data-loader": "2.35.0",
-    "@modern-js/plugin-i18n": "2.35.0",
-    "@modern-js/plugin-lint": "2.35.0",
-    "@modern-js/prod-server": "2.35.0",
-    "@modern-js/server": "2.35.0",
-    "@modern-js/types": "2.35.0",
-    "@modern-js/upgrade": "2.35.0",
-    "@modern-js/utils": "2.35.0",
-    "@modern-js/server-core": "2.35.0"
+    "@modern-js/builder": "2.35.1",
+    "@modern-js/builder-plugin-esbuild": "2.35.1",
+    "@modern-js/builder-plugin-node-polyfill": "2.35.1",
+    "@modern-js/builder-shared": "2.35.1",
+    "@modern-js/builder-webpack-provider": "2.35.1",
+    "@modern-js/core": "2.35.1",
+    "@modern-js/new-action": "2.35.1",
+    "@modern-js/node-bundle-require": "2.35.1",
+    "@modern-js/plugin": "2.35.1",
+    "@modern-js/plugin-data-loader": "2.35.1",
+    "@modern-js/plugin-i18n": "2.35.1",
+    "@modern-js/plugin-lint": "2.35.1",
+    "@modern-js/prod-server": "2.35.1",
+    "@modern-js/server": "2.35.1",
+    "@modern-js/types": "2.35.1",
+    "@modern-js/upgrade": "2.35.1",
+    "@modern-js/utils": "2.35.1",
+    "@modern-js/server-core": "2.35.1"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -99,13 +98,13 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.35.0",
-    "@modern-js/builder-rspack-provider": "2.35.0",
-    "@scripts/build": "2.35.0",
-    "@scripts/jest-config": "2.35.0"
+    "@modern-js/builder-plugin-swc": "2.35.1",
+    "@modern-js/builder-rspack-provider": "2.35.1",
+    "@scripts/build": "2.35.1",
+    "@scripts/jest-config": "2.35.1"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.35.0"
+    "@modern-js/builder-rspack-provider": "^2.35.1"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {