@modern-js/app-tools 2.34.0 → 2.34.1-alpha.1

package/bin/modern.js

@@ -11,5 +11,5 @@ require('@modern-js/core/runBin').run({
     server: INTERNAL_SERVER_PLUGINS,
     autoLoad: INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
   },
-  initialLog: `@modern-js/app-tools v${require('../package.json').version}`,
+  initialLog: `Modern.js Framework v${require('../package.json').version}`,
 });

package/dist/cjs/analyze/constants.js

@@ -116,6 +116,7 @@ const NESTED_ROUTE = {
   PAGE_DATA_FILE: "page.data",
   PAGE_CLIENT_LOADER: "page.data.client",
   SPLATE_FILE: "$",
+  SPLATE_CONFIG_FILE: "$.config",
   SPLATE_LOADER_FILE: "$.loader",
   SPLATE_DATA_FILE: "$.data",
   SPLATE_CLIENT_DATA: "$.data.client",

package/dist/cjs/analyze/nestedRoutes.js

@@ -124,6 +124,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   let splatData = "";
   let splatRoute = null;
   let pageConfigFile = "";
+  let splatConfigFile = "";
   const items = await _utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = _path.join(dirname, item);
@@ -190,6 +191,11 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_CLIENT_DATA) {
       splatClientData = itemPath;
     }
+    if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_CONFIG_FILE) {
+      if (!route.config) {
+        splatConfigFile = itemPath;
+      }
+    }
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_DATA_FILE) {
       splatData = itemPath;
     }
@@ -208,6 +214,9 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
       if (splatData) {
         splatRoute.data = splatData;
       }
+      if (splatConfigFile) {
+        splatRoute.config = splatConfigFile;
+      }
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === _constants.NESTED_ROUTE.LOADING_FILE) {

package/dist/esm/analyze/constants.js

@@ -37,6 +37,7 @@ export var NESTED_ROUTE = {
   PAGE_DATA_FILE: "page.data",
   PAGE_CLIENT_LOADER: "page.data.client",
   SPLATE_FILE: "$",
+  SPLATE_CONFIG_FILE: "$.config",
   SPLATE_LOADER_FILE: "$.loader",
   SPLATE_DATA_FILE: "$.data",
   SPLATE_CLIENT_DATA: "$.data.client",

package/dist/esm/analyze/nestedRoutes.js

@@ -73,7 +73,7 @@ export var optimizeRoute = function(routeTree) {
 };
 export var walk = function() {
   var _ref = _async_to_generator(function(dirname, rootDir, alias, entryName, isMainEntry, oldVersion) {
-    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatClientData, splatData, splatRoute, pageConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
+    var _routePath, _finalRoute_children, isDirectory, relativeDir, pathSegments, lastSegment, isRoot, isPathlessLayout, isWithoutLayoutPath, routePath, route, pageLoaderFile, pageRoute, splatLoaderFile, splatClientData, splatData, splatRoute, pageConfigFile, splatConfigFile, items, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, item, itemPath, extname, itemWithoutExt, isDirectory1, childRoute, _route_children, _route_children1, _route_children2, err, finalRoute, childRoutes, childRoute1, _$path, optimizedRoutes;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -123,6 +123,7 @@ export var walk = function() {
           splatData = "";
           splatRoute = null;
           pageConfigFile = "";
+          splatConfigFile = "";
           return [
             4,
             fs.readdir(dirname)
@@ -229,6 +230,11 @@ export var walk = function() {
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
             splatClientData = itemPath;
           }
+          if (itemWithoutExt === NESTED_ROUTE.SPLATE_CONFIG_FILE) {
+            if (!route.config) {
+              splatConfigFile = itemPath;
+            }
+          }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
             splatData = itemPath;
           }
@@ -247,6 +253,9 @@ export var walk = function() {
             if (splatData) {
               splatRoute.data = splatData;
             }
+            if (splatConfigFile) {
+              splatRoute.config = splatConfigFile;
+            }
             (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
           }
           if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {

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

@@ -37,6 +37,7 @@ export const NESTED_ROUTE = {
   PAGE_DATA_FILE: "page.data",
   PAGE_CLIENT_LOADER: "page.data.client",
   SPLATE_FILE: "$",
+  SPLATE_CONFIG_FILE: "$.config",
   SPLATE_LOADER_FILE: "$.loader",
   SPLATE_DATA_FILE: "$.data",
   SPLATE_CLIENT_DATA: "$.data.client",

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

@@ -101,6 +101,7 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
   let splatData = "";
   let splatRoute = null;
   let pageConfigFile = "";
+  let splatConfigFile = "";
   const items = await fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
@@ -167,6 +168,11 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
       splatClientData = itemPath;
     }
+    if (itemWithoutExt === NESTED_ROUTE.SPLATE_CONFIG_FILE) {
+      if (!route.config) {
+        splatConfigFile = itemPath;
+      }
+    }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
       splatData = itemPath;
     }
@@ -185,6 +191,9 @@ export const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldV
       if (splatData) {
         splatRoute.data = splatData;
       }
+      if (splatConfigFile) {
+        splatRoute.config = splatConfigFile;
+      }
       (_route_children2 = route.children) === null || _route_children2 === void 0 ? void 0 : _route_children2.push(splatRoute);
     }
     if (itemWithoutExt === NESTED_ROUTE.LOADING_FILE) {

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/analyze/generateCode.d.ts

@@ -1,6 +1,7 @@
 import { IAppContext, PluginAPI } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-import { AppNormalizedConfig, AppTools, ImportStatement, Rspack, webpack } from '../types';
+import { BundlerConfig } from '@modern-js/builder-shared';
+import { AppNormalizedConfig, AppTools, ImportStatement } from '../types';
 export declare const createImportStatements: (statements: ImportStatement[]) => string;
 export declare const generateCode: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: PluginAPI<AppTools<'shared'>>) => Promise<{
   importsStatemets: Map<string, ImportStatement[]>;
@@ -18,5 +19,5 @@ export declare const generateIndexCode: ({
   entrypoints: Entrypoint[];
   config: AppNormalizedConfig<'shared'>;
   importsStatemets: Map<string, ImportStatement[]>;
-  bundlerConfigs?: webpack.Configuration[] | Rspack.RspackOptions[] | undefined;
+  bundlerConfigs?: BundlerConfig[] | undefined;
 }) => Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.34.0",
+  "version": "2.34.1-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -73,24 +73,24 @@
     "esbuild": "0.17.19",
     "rspack-plugin-virtual-module": "0.1.7",
     "@swc/helpers": "0.5.1",
-    "@modern-js/builder": "2.34.0",
-    "@modern-js/builder-plugin-esbuild": "2.34.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.34.0",
-    "@modern-js/builder-shared": "2.34.0",
     "@modern-js/builder-webpack-provider": "2.34.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.34.0",
     "@modern-js/core": "2.34.0",
+    "@modern-js/builder": "2.34.0",
+    "@modern-js/builder-shared": "2.34.0",
     "@modern-js/new-action": "2.34.0",
     "@modern-js/node-bundle-require": "2.34.0",
     "@modern-js/plugin": "2.34.0",
     "@modern-js/plugin-data-loader": "2.34.0",
     "@modern-js/plugin-i18n": "2.34.0",
-    "@modern-js/plugin-lint": "2.34.0",
+    "@modern-js/builder-plugin-esbuild": "2.34.0",
     "@modern-js/prod-server": "2.34.0",
-    "@modern-js/server": "2.34.0",
+    "@modern-js/plugin-lint": "2.34.0",
     "@modern-js/types": "2.34.0",
     "@modern-js/upgrade": "2.34.0",
-    "@modern-js/utils": "2.34.0",
-    "@modern-js/server-core": "2.34.0"
+    "@modern-js/server": "2.34.0",
+    "@modern-js/server-core": "2.34.0",
+    "@modern-js/utils": "2.34.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -100,8 +100,8 @@
     "typescript": "^5",
     "webpack": "^5.88.1",
     "@modern-js/builder-plugin-swc": "2.34.0",
-    "@modern-js/builder-rspack-provider": "2.34.0",
     "@scripts/build": "2.34.0",
+    "@modern-js/builder-rspack-provider": "2.34.0",
     "@scripts/jest-config": "2.34.0"
   },
   "peerDependencies": {