@modern-js/app-tools 2.33.1 → 2.34.1-alpha.0

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

@@ -190,6 +190,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) {
+        route.config = itemPath;
+      }
+    }
     if (itemWithoutExt === _constants.NESTED_ROUTE.SPLATE_DATA_FILE) {
       splatData = itemPath;
     }

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

@@ -229,6 +229,11 @@ export var walk = function() {
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_CLIENT_DATA) {
             splatClientData = itemPath;
           }
+          if (itemWithoutExt === NESTED_ROUTE.SPLATE_CONFIG_FILE) {
+            if (!route.config) {
+              route.config = itemPath;
+            }
+          }
           if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
             splatData = itemPath;
           }

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

@@ -167,6 +167,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) {
+        route.config = itemPath;
+      }
+    }
     if (itemWithoutExt === NESTED_ROUTE.SPLATE_DATA_FILE) {
       splatData = itemPath;
     }

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.33.1",
+  "version": "2.34.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -66,31 +66,31 @@
     "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.21.8",
-    "@babel/traverse": "^7.21.5",
-    "@babel/types": "^7.21.5",
+    "@babel/parser": "^7.22.15",
+    "@babel/traverse": "^7.22.15",
+    "@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.33.1",
-    "@modern-js/builder-plugin-esbuild": "2.33.1",
-    "@modern-js/builder-plugin-node-polyfill": "2.33.1",
-    "@modern-js/builder-shared": "2.33.1",
-    "@modern-js/builder-webpack-provider": "2.33.1",
-    "@modern-js/core": "2.33.1",
-    "@modern-js/new-action": "2.33.1",
-    "@modern-js/node-bundle-require": "2.33.1",
-    "@modern-js/plugin": "2.33.1",
-    "@modern-js/plugin-data-loader": "2.33.1",
-    "@modern-js/plugin-i18n": "2.33.1",
-    "@modern-js/plugin-lint": "2.33.1",
-    "@modern-js/prod-server": "2.33.1",
-    "@modern-js/server": "2.33.1",
-    "@modern-js/types": "2.33.1",
-    "@modern-js/upgrade": "2.33.1",
-    "@modern-js/server-core": "2.33.1",
-    "@modern-js/utils": "2.33.1"
+    "@modern-js/builder": "2.34.0",
+    "@modern-js/builder-shared": "2.34.0",
+    "@modern-js/builder-plugin-node-polyfill": "2.34.0",
+    "@modern-js/core": "2.34.0",
+    "@modern-js/new-action": "2.34.0",
+    "@modern-js/node-bundle-require": "2.34.0",
+    "@modern-js/builder-webpack-provider": "2.34.0",
+    "@modern-js/plugin": "2.34.0",
+    "@modern-js/builder-plugin-esbuild": "2.34.0",
+    "@modern-js/plugin-data-loader": "2.34.0",
+    "@modern-js/server": "2.34.0",
+    "@modern-js/prod-server": "2.34.0",
+    "@modern-js/plugin-lint": "2.34.0",
+    "@modern-js/plugin-i18n": "2.34.0",
+    "@modern-js/upgrade": "2.34.0",
+    "@modern-js/types": "2.34.0",
+    "@modern-js/server-core": "2.34.0",
+    "@modern-js/utils": "2.34.0"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -99,13 +99,13 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/builder-plugin-swc": "2.33.1",
-    "@modern-js/builder-rspack-provider": "2.33.1",
-    "@scripts/jest-config": "2.33.1",
-    "@scripts/build": "2.33.1"
+    "@modern-js/builder-rspack-provider": "2.34.0",
+    "@scripts/build": "2.34.0",
+    "@modern-js/builder-plugin-swc": "2.34.0",
+    "@scripts/jest-config": "2.34.0"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.33.1"
+    "@modern-js/builder-rspack-provider": "^2.34.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {