@modern-js/app-tools 2.46.1 → 2.47.0

package/dist/cjs/analyze/index.js

@@ -216,7 +216,7 @@ var analyze_default = ({ bundler }) => ({
               filename: rootLayoutFile
             });
             const hasAppConfig = moduleExports.some((e) => e.n === import_constants.APP_CONFIG_NAME);
-            const generateLayoutPath = (0, import_utils2.replaceWithAlias)(srcDirectory, rootLayoutFile, internalSrcAlias);
+            const generateLayoutPath = (0, import_routes.getPathWithoutExt)((0, import_utils2.replaceWithAlias)(srcDirectory, rootLayoutFile, internalSrcAlias));
             if (hasAppConfig) {
               imports.push({
                 value: generateLayoutPath,

package/dist/cjs/analyze/nestedRoutes.js

@@ -35,19 +35,16 @@ __export(nestedRoutes_exports, {
 module.exports = __toCommonJS(nestedRoutes_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_routes = require("../utils/routes");
 var import_constants = require("./constants");
 var import_utils2 = require("./utils");
 const conventionNames = Object.values(import_constants.NESTED_ROUTE);
 const replaceDynamicPath = (routePath) => {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
-const getPathWithoutExt = (filename) => {
-  const extname = path.extname(filename);
-  return filename.slice(0, -extname.length);
-};
 const getRouteId = (componentPath, routesDir, entryName, isMainEntry) => {
   const relativePath = (0, import_utils.normalizeToPosixPath)(path.relative(routesDir, componentPath));
-  const pathWithoutExt = getPathWithoutExt(relativePath);
+  const pathWithoutExt = (0, import_routes.getPathWithoutExt)(relativePath);
   let id = ``;
   if (isMainEntry) {
     id = pathWithoutExt;
@@ -143,7 +140,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   const items = await import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
-    const itemPathWithAlias = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+    const itemPathWithAlias = (0, import_routes.getPathWithoutExt)((0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name));
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await import_utils.fs.stat(itemPath)).isDirectory();

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -50,7 +50,7 @@ const builderPluginAdapterSSR = (options) => ({
       }
       return config;
     });
-    api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
+    api.modifyBundlerChain(async (chain, { target, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
       const { normalizedConfig: normalizedConfig2 } = options;
       applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
@@ -72,7 +72,6 @@ const builderPluginAdapterSSR = (options) => ({
         applyAsyncChunkHtmlPlugin({
           chain,
           modernConfig: options.normalizedConfig,
-          CHAIN_ID,
           HtmlBundlerPlugin
         });
       }
@@ -94,9 +93,9 @@ const isStreamingSSR = (userConfig) => {
   }
   return false;
 };
-function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerPlugin }) {
+function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
   if (isStreamingSSR(modernConfig)) {
-    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(import_bundlerPlugins.HtmlAsyncChunkPlugin, [
+    chain.plugin("html-async-chunk").use(import_bundlerPlugins.HtmlAsyncChunkPlugin, [
       HtmlBundlerPlugin
     ]);
   }

package/dist/cjs/config/default.js

@@ -86,24 +86,13 @@ function createDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
-  const tools = {
-    tsChecker: {
-      issue: {
-        include: [
-          {
-            file: "**/src/**/*"
-          }
-        ]
-      }
-    }
-  };
   return {
     source,
     output,
     server,
     dev,
     html,
-    tools,
+    tools: {},
     plugins: [],
     builderPlugins: [],
     runtime: {},

package/dist/cjs/utils/routes.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var routes_exports = {};
 __export(routes_exports, {
-  generateRoutes: () => generateRoutes
+  generateRoutes: () => generateRoutes,
+  getPathWithoutExt: () => getPathWithoutExt
 });
 module.exports = __toCommonJS(routes_exports);
 var import_path = __toESM(require("path"));
@@ -40,7 +41,12 @@ const generateRoutes = async (appContext) => {
   }, null, 2);
   await import_utils.fs.outputFile(import_path.default.join(distDirectory, import_utils.ROUTE_SPEC_FILE), output);
 };
+const getPathWithoutExt = (filename) => {
+  const extname = import_path.default.extname(filename);
+  return filename.slice(0, -extname.length);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  generateRoutes
+  generateRoutes,
+  getPathWithoutExt
 });

package/dist/esm/analyze/index.js

@@ -7,7 +7,7 @@ import * as path from "path";
 import { createDebugger, findExists, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { printInstructions } from "../utils/printInstructions";
-import { generateRoutes } from "../utils/routes";
+import { generateRoutes, getPathWithoutExt } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
@@ -418,7 +418,7 @@ function analyze_default(param) {
                     hasAppConfig = moduleExports.some(function(e) {
                       return e.n === APP_CONFIG_NAME;
                     });
-                    generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
+                    generateLayoutPath = getPathWithoutExt(replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias));
                     if (hasAppConfig) {
                       imports.push({
                         value: generateLayoutPath,

package/dist/esm/analyze/nestedRoutes.js

@@ -4,16 +4,13 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { fs, normalizeToPosixPath } from "@modern-js/utils";
+import { getPathWithoutExt } from "../utils/routes";
 import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
 import { hasAction, replaceWithAlias } from "./utils";
 var conventionNames = Object.values(NESTED_ROUTE);
 var replaceDynamicPath = function(routePath) {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
-var getPathWithoutExt = function(filename) {
-  var extname = path.extname(filename);
-  return filename.slice(0, -extname.length);
-};
 var getRouteId = function(componentPath, routesDir, entryName, isMainEntry) {
   var relativePath = normalizeToPosixPath(path.relative(routesDir, componentPath));
   var pathWithoutExt = getPathWithoutExt(relativePath);
@@ -150,7 +147,7 @@ var walk = function() {
             ];
           item = _step.value;
           itemPath = path.join(dirname, item);
-          itemPathWithAlias = replaceWithAlias(alias.basename, itemPath, alias.name);
+          itemPathWithAlias = getPathWithoutExt(replaceWithAlias(alias.basename, itemPath, alias.name));
           extname = path.extname(item);
           itemWithoutExt = item.slice(0, -extname.length);
           return [

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js

@@ -22,11 +22,11 @@ var builderPluginAdapterSSR = function(options) {
       });
       api.modifyBundlerChain(function() {
         var _ref = _async_to_generator(function(chain, param) {
-          var target, CHAIN_ID, isProd, HtmlBundlerPlugin, isServer, builderConfig, normalizedConfig2;
+          var target, isProd, HtmlBundlerPlugin, isServer, builderConfig, normalizedConfig2;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
-                target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
+                target = param.target, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
                 builderConfig = api.getNormalizedConfig();
                 normalizedConfig2 = options.normalizedConfig;
                 applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
@@ -58,7 +58,6 @@ var builderPluginAdapterSSR = function(options) {
                   applyAsyncChunkHtmlPlugin({
                     chain,
                     modernConfig: options.normalizedConfig,
-                    CHAIN_ID,
                     HtmlBundlerPlugin
                   });
                 }
@@ -110,9 +109,9 @@ var isStreamingSSR = function(userConfig) {
   return false;
 };
 function applyAsyncChunkHtmlPlugin(param) {
-  var chain = param.chain, modernConfig = param.modernConfig, CHAIN_ID = param.CHAIN_ID, HtmlBundlerPlugin = param.HtmlBundlerPlugin;
+  var chain = param.chain, modernConfig = param.modernConfig, HtmlBundlerPlugin = param.HtmlBundlerPlugin;
   if (isStreamingSSR(modernConfig)) {
-    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [
+    chain.plugin("html-async-chunk").use(HtmlAsyncChunkPlugin, [
       HtmlBundlerPlugin
     ]);
   }

package/dist/esm/config/default.js

@@ -59,24 +59,13 @@ function createDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
-  var tools = {
-    tsChecker: {
-      issue: {
-        include: [
-          {
-            file: "**/src/**/*"
-          }
-        ]
-      }
-    }
-  };
   return {
     source,
     output,
     server,
     dev,
     html,
-    tools,
+    tools: {},
     plugins: [],
     builderPlugins: [],
     runtime: {},

package/dist/esm/utils/routes.js

@@ -28,6 +28,11 @@ var generateRoutes = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var getPathWithoutExt = function(filename) {
+  var extname = path.extname(filename);
+  return filename.slice(0, -extname.length);
+};
 export {
-  generateRoutes
+  generateRoutes,
+  getPathWithoutExt
 };

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

@@ -2,7 +2,7 @@ import * as path from "path";
 import { createDebugger, findExists, fs, isApiOnly, minimist, isDevCommand, getArgv } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
 import { printInstructions } from "../utils/printInstructions";
-import { generateRoutes } from "../utils/routes";
+import { generateRoutes, getPathWithoutExt } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
@@ -183,7 +183,7 @@ var analyze_default = ({ bundler }) => ({
               filename: rootLayoutFile
             });
             const hasAppConfig = moduleExports.some((e) => e.n === APP_CONFIG_NAME);
-            const generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
+            const generateLayoutPath = getPathWithoutExt(replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias));
             if (hasAppConfig) {
               imports.push({
                 value: generateLayoutPath,

package/dist/esm-node/analyze/nestedRoutes.js

@@ -1,15 +1,12 @@
 import * as path from "path";
 import { fs, normalizeToPosixPath } from "@modern-js/utils";
+import { getPathWithoutExt } from "../utils/routes";
 import { JS_EXTENSIONS, NESTED_ROUTE } from "./constants";
 import { hasAction, replaceWithAlias } from "./utils";
 const conventionNames = Object.values(NESTED_ROUTE);
 const replaceDynamicPath = (routePath) => {
   return routePath.replace(/\[(.*?)\]/g, ":$1");
 };
-const getPathWithoutExt = (filename) => {
-  const extname = path.extname(filename);
-  return filename.slice(0, -extname.length);
-};
 const getRouteId = (componentPath, routesDir, entryName, isMainEntry) => {
   const relativePath = normalizeToPosixPath(path.relative(routesDir, componentPath));
   const pathWithoutExt = getPathWithoutExt(relativePath);
@@ -108,7 +105,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   const items = await fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
-    const itemPathWithAlias = replaceWithAlias(alias.basename, itemPath, alias.name);
+    const itemPathWithAlias = getPathWithoutExt(replaceWithAlias(alias.basename, itemPath, alias.name));
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await fs.stat(itemPath)).isDirectory();

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -17,7 +17,7 @@ const builderPluginAdapterSSR = (options) => ({
       }
       return config;
     });
-    api.modifyBundlerChain(async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
+    api.modifyBundlerChain(async (chain, { target, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
       const builderConfig = api.getNormalizedConfig();
       const { normalizedConfig: normalizedConfig2 } = options;
       applyRouterPlugin(chain, "route-plugin", options, HtmlBundlerPlugin);
@@ -39,7 +39,6 @@ const builderPluginAdapterSSR = (options) => ({
         applyAsyncChunkHtmlPlugin({
           chain,
           modernConfig: options.normalizedConfig,
-          CHAIN_ID,
           HtmlBundlerPlugin
         });
       }
@@ -61,9 +60,9 @@ const isStreamingSSR = (userConfig) => {
   }
   return false;
 };
-function applyAsyncChunkHtmlPlugin({ chain, modernConfig, CHAIN_ID, HtmlBundlerPlugin }) {
+function applyAsyncChunkHtmlPlugin({ chain, modernConfig, HtmlBundlerPlugin }) {
   if (isStreamingSSR(modernConfig)) {
-    chain.plugin(CHAIN_ID.PLUGIN.HTML_ASYNC_CHUNK).use(HtmlAsyncChunkPlugin, [
+    chain.plugin("html-async-chunk").use(HtmlAsyncChunkPlugin, [
       HtmlBundlerPlugin
     ]);
   }

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

@@ -62,24 +62,13 @@ function createDefaultConfig(appContext) {
     baseUrl: "/",
     port: 8080
   };
-  const tools = {
-    tsChecker: {
-      issue: {
-        include: [
-          {
-            file: "**/src/**/*"
-          }
-        ]
-      }
-    }
-  };
   return {
     source,
     output,
     server,
     dev,
     html,
-    tools,
+    tools: {},
     plugins: [],
     builderPlugins: [],
     runtime: {},

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

@@ -7,6 +7,11 @@ const generateRoutes = async (appContext) => {
   }, null, 2);
   await fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
 };
+const getPathWithoutExt = (filename) => {
+  const extname = path.extname(filename);
+  return filename.slice(0, -extname.length);
+};
 export {
-  generateRoutes
+  generateRoutes,
+  getPathWithoutExt
 };

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

@@ -1,3 +1,4 @@
 import type { IAppContext } from '@modern-js/core';
 declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
-export { generateRoutes };
+declare const getPathWithoutExt: (filename: string) => string;
+export { generateRoutes, getPathWithoutExt };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.46.1",
+  "version": "2.47.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,38 +69,39 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-esbuild": "0.3.4",
-    "@rsbuild/plugin-node-polyfill": "0.3.4",
-    "@rsbuild/shared": "0.3.4",
+    "@rsbuild/plugin-esbuild": "0.4.4",
+    "@rsbuild/plugin-node-polyfill": "0.4.4",
+    "@rsbuild/shared": "0.4.4",
+    "@rsbuild/core": "0.4.4",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/uni-builder": "2.46.1",
-    "@modern-js/core": "2.46.1",
-    "@modern-js/new-action": "2.46.1",
-    "@modern-js/node-bundle-require": "2.46.1",
-    "@modern-js/plugin-data-loader": "2.46.1",
-    "@modern-js/plugin": "2.46.1",
-    "@modern-js/plugin-i18n": "2.46.1",
-    "@modern-js/prod-server": "2.46.1",
-    "@modern-js/plugin-lint": "2.46.1",
-    "@modern-js/server": "2.46.1",
-    "@modern-js/server-utils": "2.46.1",
-    "@modern-js/types": "2.46.1",
-    "@modern-js/upgrade": "2.46.1",
-    "@modern-js/utils": "2.46.1",
-    "@modern-js/server-core": "2.46.1"
+    "@modern-js/uni-builder": "2.47.0",
+    "@modern-js/new-action": "2.47.0",
+    "@modern-js/node-bundle-require": "2.47.0",
+    "@modern-js/core": "2.47.0",
+    "@modern-js/plugin": "2.47.0",
+    "@modern-js/plugin-data-loader": "2.47.0",
+    "@modern-js/plugin-lint": "2.47.0",
+    "@modern-js/plugin-i18n": "2.47.0",
+    "@modern-js/prod-server": "2.47.0",
+    "@modern-js/server-utils": "2.47.0",
+    "@modern-js/types": "2.47.0",
+    "@modern-js/upgrade": "2.47.0",
+    "@modern-js/server": "2.47.0",
+    "@modern-js/server-core": "2.47.0",
+    "@modern-js/utils": "2.47.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.3.4",
+    "@rsbuild/plugin-swc": "0.4.4",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@scripts/jest-config": "2.46.1",
-    "@scripts/build": "2.46.1"
+    "@scripts/build": "2.47.0",
+    "@scripts/jest-config": "2.47.0"
   },
   "sideEffects": false,
   "publishConfig": {