@modern-js/app-tools 2.0.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # @modern-js/app-tools
 
+## 2.0.2
+
+### Patch Changes
+
+- 39988b2: feat: advance the timing of static resource loading
+  feat: 将嵌套路由下静态资源加载时机提前
+- Updated dependencies [39988b2]
+  - @modern-js/types@2.0.2
+  - @modern-js/new-action@2.0.2
+  - @modern-js/builder-shared@2.0.2
+  - @modern-js/builder-webpack-provider@2.0.2
+  - @modern-js/core@2.0.2
+  - @modern-js/plugin-data-loader@2.0.2
+  - @modern-js/prod-server@2.0.2
+  - @modern-js/server@2.0.2
+  - @modern-js/utils@2.0.2
+  - @modern-js/builder@2.0.2
+  - @modern-js/builder-plugin-esbuild@2.0.2
+  - @modern-js/builder-plugin-node-polyfill@2.0.2
+  - @modern-js/plugin-i18n@2.0.2
+  - @modern-js/plugin-lint@2.0.2
+  - @modern-js/node-bundle-require@2.0.2
+  - @modern-js/plugin@2.0.2
+  - @modern-js/upgrade@2.0.2
+
+## 2.0.1
+
+### Patch Changes
+
+- @modern-js/builder@2.0.1
+- @modern-js/builder-shared@2.0.1
+- @modern-js/builder-webpack-provider@2.0.1
+- @modern-js/builder-plugin-esbuild@2.0.1
+- @modern-js/builder-plugin-node-polyfill@2.0.1
+- @modern-js/core@2.0.1
+- @modern-js/plugin-data-loader@2.0.1
+- @modern-js/plugin-i18n@2.0.1
+- @modern-js/plugin-lint@2.0.1
+- @modern-js/new-action@2.0.1
+- @modern-js/prod-server@2.0.1
+- @modern-js/server@2.0.1
+- @modern-js/node-bundle-require@2.0.1
+- @modern-js/plugin@2.0.1
+- @modern-js/types@2.0.1
+- @modern-js/upgrade@2.0.1
+- @modern-js/utils@2.0.1
+
 ## 2.0.0
 
 ### Major Changes

package/dist/js/modern/analyze/index.js

@@ -217,7 +217,7 @@ var analyze_default = () => ({
       modifyEntryImports(_0) {
         return __async(this, arguments, function* ({ entrypoint, imports }) {
           const appContext = api.useAppContext();
-          const { srcDirectory } = appContext;
+          const { srcDirectory, internalSrcAlias } = appContext;
           const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
           if (fileSystemRoutes && nestedRoutesEntry) {
             const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
@@ -239,7 +239,7 @@ var analyze_default = () => ({
               const generateLayoutPath = replaceWithAlias(
                 srcDirectory,
                 rootLayoutFile,
-                "@_modern_js_src"
+                internalSrcAlias
               );
               if (hasAppConfig) {
                 imports.push({

package/dist/js/modern/analyze/templates.js

@@ -236,6 +236,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     let error;
     let loader;
     let component = "";
+    let lazyImport = null;
     if (route.type === "nested") {
       if (route.loading) {
         loadings.push(route.loading);
@@ -256,15 +257,19 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          component = `loadable(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          component = `loadable(${lazyImport})`;
         } else {
-          component = `lazy(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {
-      component = `loadable(() => import('${route._component}'))`;
+      lazyImport = `() => import('${route._component}')`;
+      component = `loadable(${lazyImport})`;
     }
     const finalRoute = __spreadProps(__spreadValues({}, route), {
+      lazyImport,
       loading,
       loader,
       error,
@@ -281,7 +286,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(lazy.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = __spreadProps(__spreadValues({}, route), {

package/dist/js/modern/analyze/utils.js

@@ -107,7 +107,7 @@ const isPageComponentFile = (filePath) => {
 };
 const isNestedRouteComponent = (nestedRouteEntries, absoluteFilePath) => {
   const reg = new RegExp(
-    `(${NESTED_ROUTE.LAYOUT_FILE}|${NESTED_ROUTE.PAGE_FILE}})\\.tsx?$`
+    `(${NESTED_ROUTE.LAYOUT_FILE}|${NESTED_ROUTE.PAGE_FILE})\\.tsx?$`
   );
   return nestedRouteEntries.some((nestedRoutesEntry) => {
     if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {

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

@@ -234,7 +234,7 @@ var analyze_default = () => ({
       modifyEntryImports(_0) {
         return __async(this, arguments, function* ({ entrypoint, imports }) {
           const appContext = api.useAppContext();
-          const { srcDirectory } = appContext;
+          const { srcDirectory, internalSrcAlias } = appContext;
           const { fileSystemRoutes, nestedRoutesEntry } = entrypoint;
           if (fileSystemRoutes && nestedRoutesEntry) {
             const rootLayoutPath = path.join(nestedRoutesEntry, "layout");
@@ -256,7 +256,7 @@ var analyze_default = () => ({
               const generateLayoutPath = (0, import_utils2.replaceWithAlias)(
                 srcDirectory,
                 rootLayoutFile,
-                "@_modern_js_src"
+                internalSrcAlias
               );
               if (hasAppConfig) {
                 imports.push({

package/dist/js/node/analyze/templates.js

@@ -266,6 +266,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
     let error;
     let loader;
     let component = "";
+    let lazyImport = null;
     if (route.type === "nested") {
       if (route.loading) {
         loadings.push(route.loading);
@@ -286,15 +287,19 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          component = `loadable(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          component = `loadable(${lazyImport})`;
         } else {
-          component = `lazy(() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}'))`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${componentLoaderPath}${route._component}')`;
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {
-      component = `loadable(() => import('${route._component}'))`;
+      lazyImport = `() => import('${route._component}')`;
+      component = `loadable(${lazyImport})`;
     }
     const finalRoute = __spreadProps(__spreadValues({}, route), {
+      lazyImport,
       loading,
       loader,
       error,
@@ -311,7 +316,7 @@ const fileSystemRoutes = (_0) => __async(void 0, [_0], function* ({
   for (const route of routes) {
     if ("type" in route) {
       const newRoute = traverseRouteTree(route);
-      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(lazy.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
+      routeComponentsCode += `${JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"')},`;
     } else {
       const component = `loadable(() => import('${route._component}'))`;
       const finalRoute = __spreadProps(__spreadValues({}, route), {

package/dist/js/node/analyze/utils.js

@@ -136,7 +136,7 @@ const isPageComponentFile = (filePath) => {
 };
 const isNestedRouteComponent = (nestedRouteEntries, absoluteFilePath) => {
   const reg = new RegExp(
-    `(${import_constants.NESTED_ROUTE.LAYOUT_FILE}|${import_constants.NESTED_ROUTE.PAGE_FILE}})\\.tsx?$`
+    `(${import_constants.NESTED_ROUTE.LAYOUT_FILE}|${import_constants.NESTED_ROUTE.PAGE_FILE})\\.tsx?$`
   );
   return nestedRouteEntries.some((nestedRoutesEntry) => {
     if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {

package/dist/js/treeshaking/analyze/index.js

@@ -536,12 +536,12 @@ var analyze_default = function() {
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;
                     return _asyncToGenerator(function() {
-                        var appContext, srcDirectory, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
+                        var appContext, srcDirectory, internalSrcAlias, fileSystemRoutes, nestedRoutesEntry, rootLayoutPath, rootLayoutFile, rootLayoutBuffer, rootLayout, ref, moduleExports, hasAppConfig, generateLayoutPath, hasAppInit;
                         return __generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     appContext = api.useAppContext();
-                                    srcDirectory = appContext.srcDirectory;
+                                    srcDirectory = appContext.srcDirectory, internalSrcAlias = appContext.internalSrcAlias;
                                     fileSystemRoutes = entrypoint.fileSystemRoutes, nestedRoutesEntry = entrypoint.nestedRoutesEntry;
                                     if (!(fileSystemRoutes && nestedRoutesEntry)) return [
                                         3,
@@ -582,7 +582,7 @@ var analyze_default = function() {
                                     hasAppConfig = moduleExports.some(function(e) {
                                         return e.n === APP_CONFIG_NAME;
                                     });
-                                    generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, "@_modern_js_src");
+                                    generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
                                     if (hasAppConfig) {
                                         imports.push({
                                             value: generateLayoutPath,

package/dist/js/treeshaking/analyze/templates.js

@@ -283,6 +283,7 @@ var fileSystemRoutes = function() {
                         var error;
                         var loader;
                         var component = "";
+                        var lazyImport = null;
                         if (route.type === "nested") {
                             if (route.loading) {
                                 loadings.push(route.loading);
@@ -303,15 +304,19 @@ var fileSystemRoutes = function() {
                                     rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
                                     component = "RootLayout";
                                 } else if (ssrMode === "string") {
-                                    component = 'loadable(() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "'))");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    component = "loadable(".concat(lazyImport, ")");
                                 } else {
-                                    component = 'lazy(() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "'))");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(componentLoaderPath).concat(route._component, "')");
+                                    component = "lazy(".concat(lazyImport, ")");
                                 }
                             }
                         } else if (route._component) {
-                            component = "loadable(() => import('".concat(route._component, "'))");
+                            lazyImport = "() => import('".concat(route._component, "')");
+                            component = "loadable(".concat(lazyImport, ")");
                         }
                         var finalRoute = _objectSpreadProps(_objectSpread({}, route), {
+                            lazyImport: lazyImport,
                             loading: loading,
                             loader: loader,
                             error: error,
@@ -329,7 +334,7 @@ var fileSystemRoutes = function() {
                             route = _step.value;
                             if ("type" in route) {
                                 newRoute = traverseRouteTree(route);
-                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(lazy.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
+                                routeComponentsCode += "".concat(JSON.stringify(newRoute, null, 2).replace(/"(loadable.*\))"/g, "$1").replace(/"(loadableLazy.*\))"/g, "$1").replace(/"(\(\)[^,]+)",/g, "$1,").replace(/"(lazy\(.*\))"/g, "$1").replace(/"(loading_[^"])"/g, "$1").replace(/"(loader_[^"])"/g, "$1").replace(/"(RootLayout)"/g, "$1").replace(/"(error_[^"])"/g, "$1").replace(/\\"/g, '"'), ",");
                             } else {
                                 component = "loadable(() => import('".concat(route._component, "'))");
                                 finalRoute = _objectSpreadProps(_objectSpread({}, route), {

package/dist/js/treeshaking/analyze/utils.js

@@ -287,7 +287,7 @@ var isPageComponentFile = function(filePath) {
     return false;
 };
 var isNestedRouteComponent = function(nestedRouteEntries, absoluteFilePath) {
-    var reg = new RegExp("(".concat(NESTED_ROUTE.LAYOUT_FILE, "|").concat(NESTED_ROUTE.PAGE_FILE, "})\\.tsx?$"));
+    var reg = new RegExp("(".concat(NESTED_ROUTE.LAYOUT_FILE, "|").concat(NESTED_ROUTE.PAGE_FILE, ")\\.tsx?$"));
     return nestedRouteEntries.some(function(nestedRoutesEntry) {
         if (absoluteFilePath.includes(nestedRoutesEntry) && reg.test(absoluteFilePath)) {
             return true;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0",
+  "version": "2.0.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -65,23 +65,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "2.0.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.0.0",
-    "@modern-js/builder-plugin-esbuild": "2.0.0",
-    "@modern-js/builder-shared": "2.0.0",
-    "@modern-js/builder-webpack-provider": "2.0.0",
-    "@modern-js/core": "2.0.0",
-    "@modern-js/new-action": "2.0.0",
-    "@modern-js/node-bundle-require": "2.0.0",
-    "@modern-js/plugin": "2.0.0",
-    "@modern-js/plugin-data-loader": "2.0.0",
-    "@modern-js/plugin-i18n": "2.0.0",
-    "@modern-js/plugin-lint": "2.0.0",
-    "@modern-js/prod-server": "2.0.0",
-    "@modern-js/server": "2.0.0",
-    "@modern-js/types": "2.0.0",
-    "@modern-js/upgrade": "2.0.0",
-    "@modern-js/utils": "2.0.0"
+    "@modern-js/builder": "2.0.2",
+    "@modern-js/builder-plugin-esbuild": "2.0.2",
+    "@modern-js/builder-plugin-node-polyfill": "2.0.2",
+    "@modern-js/builder-shared": "2.0.2",
+    "@modern-js/builder-webpack-provider": "2.0.2",
+    "@modern-js/core": "2.0.2",
+    "@modern-js/new-action": "2.0.2",
+    "@modern-js/node-bundle-require": "2.0.2",
+    "@modern-js/plugin": "2.0.2",
+    "@modern-js/plugin-data-loader": "2.0.2",
+    "@modern-js/plugin-i18n": "2.0.2",
+    "@modern-js/plugin-lint": "2.0.2",
+    "@modern-js/prod-server": "2.0.2",
+    "@modern-js/server": "2.0.2",
+    "@modern-js/types": "2.0.2",
+    "@modern-js/upgrade": "2.0.2",
+    "@modern-js/utils": "2.0.2"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -90,10 +90,10 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "2.0.0",
-    "@modern-js/server-core": "2.0.0",
-    "@scripts/jest-config": "2.0.0",
-    "@scripts/build": "2.0.0"
+    "@modern-js/builder-plugin-swc": "2.0.2",
+    "@modern-js/server-core": "2.0.2",
+    "@scripts/jest-config": "2.0.2",
+    "@scripts/build": "2.0.2"
   },
   "sideEffects": false,
   "publishConfig": {