@modern-js/app-tools 3.1.5 → 3.2.0

package/dist/cjs/builder/generator/createBuilderProviderConfig.js

@@ -56,6 +56,9 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
         resolve: {
             ...resolveConfig.resolve
         },
+        source: {
+            ...resolveConfig.source
+        },
         dev: {
             ...resolveConfig.dev,
             port: appContext.port
@@ -81,6 +84,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
             }
         }
     };
+    if (config.source?.enableAsyncEntry && config.source?.enableAsyncPreEntry) delete config.source.preEntry;
     modifyOutputConfig(config, appContext);
     return config;
 }

package/dist/cjs/builder/generator/createCopyPattern.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    createUploadPattern: ()=>createUploadPattern,
-    createPublicPattern: ()=>createPublicPattern
+    createPublicPattern: ()=>createPublicPattern,
+    createUploadPattern: ()=>createUploadPattern
 });
 const utils_namespaceObject = require("@modern-js/utils");
 const index_js_namespaceObject = require("../shared/index.js");

package/dist/cjs/builder/index.js

@@ -24,9 +24,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    createBuilderGenerator: ()=>createBuilderGenerator,
     builderPluginAdapterBasic: ()=>index_js_namespaceObject.builderPluginAdapterBasic,
     builderPluginAdapterHooks: ()=>index_js_namespaceObject.builderPluginAdapterHooks,
+    createBuilderGenerator: ()=>createBuilderGenerator,
     parseRspackConfig: ()=>builder_namespaceObject.parseRspackConfig
 });
 const builder_namespaceObject = require("@modern-js/builder");

package/dist/cjs/commands/index.js

@@ -24,12 +24,12 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    buildCommand: ()=>buildCommand,
     deployCommand: ()=>deployCommand,
     devCommand: ()=>devCommand,
     infoCommand: ()=>infoCommand,
     inspectCommand: ()=>inspectCommand,
-    serverCommand: ()=>serverCommand,
-    buildCommand: ()=>buildCommand
+    serverCommand: ()=>serverCommand
 });
 const index_js_namespaceObject = require("../locale/index.js");
 const devCommand = async (program, api)=>{

package/dist/cjs/compat/utils.js

@@ -24,9 +24,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    transformHookParams: ()=>transformHookParams,
     transformHookResult: ()=>transformHookResult,
-    transformHookRunner: ()=>transformHookRunner,
-    transformHookParams: ()=>transformHookParams
+    transformHookRunner: ()=>transformHookRunner
 });
 const getHtmlTemplate_js_namespaceObject = require("../plugins/analyze/getHtmlTemplate.js");
 function transformHookRunner(hookRunnerName) {

package/dist/cjs/config/default.js

@@ -52,6 +52,7 @@ function createDefaultConfig(appContext) {
         entries: void 0,
         mainEntryName: utils_namespaceObject.DEFAULT_ENTRY_NAME,
         enableAsyncEntry: false,
+        enableAsyncPreEntry: false,
         disableDefaultEntries: false,
         entriesDir: './src',
         configDir: './config',

package/dist/cjs/esm/ts-node-loader.js

@@ -24,8 +24,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    load: ()=>load,
     initialize: ()=>initialize,
+    load: ()=>load,
     resolve: ()=>resolve
 });
 const external_url_namespaceObject = require("url");

package/dist/cjs/plugins/analyze/getFileSystemEntry.js

@@ -34,8 +34,8 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     getFileSystemEntry: ()=>getFileSystemEntry,
-    hasServerEntry: ()=>hasServerEntry,
-    hasEntry: ()=>hasEntry
+    hasEntry: ()=>hasEntry,
+    hasServerEntry: ()=>hasServerEntry
 });
 const external_fs_namespaceObject = require("fs");
 var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);

package/dist/cjs/plugins/analyze/utils.js

@@ -33,13 +33,13 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    parseModule: ()=>parseModule,
+    checkIsBuildCommands: ()=>checkIsBuildCommands,
     checkIsServeCommand: ()=>checkIsServeCommand,
-    replaceWithAlias: ()=>replaceWithAlias,
     getServerCombinedModuleFile: ()=>getServerCombinedModuleFile,
-    walkDirectory: ()=>walkDirectory,
     isSubDirOrEqual: ()=>isSubDirOrEqual,
-    checkIsBuildCommands: ()=>checkIsBuildCommands
+    parseModule: ()=>parseModule,
+    replaceWithAlias: ()=>replaceWithAlias,
+    walkDirectory: ()=>walkDirectory
 });
 const external_fs_namespaceObject = require("fs");
 var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);

package/dist/cjs/plugins/deploy/utils/generator.js

@@ -33,11 +33,11 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    serverAppContextTemplate: ()=>serverAppContextTemplate,
-    getPluginsCode: ()=>getPluginsCode,
     genPluginImportsCode: ()=>genPluginImportsCode,
     generateHandler: ()=>generateHandler,
-    getServerConfigPath: ()=>getServerConfigPath
+    getPluginsCode: ()=>getPluginsCode,
+    getServerConfigPath: ()=>getServerConfigPath,
+    serverAppContextTemplate: ()=>serverAppContextTemplate
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);

package/dist/cjs/plugins/deploy/utils/index.js

@@ -33,8 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    getTemplatePath: ()=>getTemplatePath,
     getProjectUsage: ()=>getProjectUsage,
+    getTemplatePath: ()=>getTemplatePath,
     normalizePath: ()=>normalizePath,
     readTemplate: ()=>readTemplate,
     resolveESMDependency: ()=>resolveESMDependency

package/dist/cjs/utils/loadPlugins.js

@@ -24,9 +24,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    loadServerPlugins: ()=>loadServerPlugins,
     getServerPlugins: ()=>getServerPlugins,
-    loadInternalPlugins: ()=>loadInternalPlugins
+    loadInternalPlugins: ()=>loadInternalPlugins,
+    loadServerPlugins: ()=>loadServerPlugins
 });
 const prod_server_namespaceObject = require("@modern-js/prod-server");
 const utils_namespaceObject = require("@modern-js/utils");

package/dist/cjs/utils/register.js

@@ -33,8 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    setupTsRuntime: ()=>setupTsRuntime,
-    resolveTsRuntimeRegisterMode: ()=>resolveTsRuntimeRegisterMode
+    resolveTsRuntimeRegisterMode: ()=>resolveTsRuntimeRegisterMode,
+    setupTsRuntime: ()=>setupTsRuntime
 });
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);

package/dist/esm/builder/generator/createBuilderProviderConfig.mjs

@@ -28,6 +28,9 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
         resolve: {
             ...resolveConfig.resolve
         },
+        source: {
+            ...resolveConfig.source
+        },
         dev: {
             ...resolveConfig.dev,
             port: appContext.port
@@ -53,6 +56,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
             }
         }
     };
+    if (config.source?.enableAsyncEntry && config.source?.enableAsyncPreEntry) delete config.source.preEntry;
     modifyOutputConfig(config, appContext);
     return config;
 }

package/dist/esm/config/default.mjs

@@ -24,6 +24,7 @@ function createDefaultConfig(appContext) {
         entries: void 0,
         mainEntryName: DEFAULT_ENTRY_NAME,
         enableAsyncEntry: false,
+        enableAsyncPreEntry: false,
         disableDefaultEntries: false,
         entriesDir: './src',
         configDir: './config',

package/dist/esm-node/builder/generator/createBuilderProviderConfig.mjs

@@ -29,6 +29,9 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
         resolve: {
             ...resolveConfig.resolve
         },
+        source: {
+            ...resolveConfig.source
+        },
         dev: {
             ...resolveConfig.dev,
             port: appContext.port
@@ -54,6 +57,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
             }
         }
     };
+    if (config.source?.enableAsyncEntry && config.source?.enableAsyncPreEntry) delete config.source.preEntry;
     modifyOutputConfig(config, appContext);
     return config;
 }

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

@@ -25,6 +25,7 @@ function createDefaultConfig(appContext) {
         entries: void 0,
         mainEntryName: DEFAULT_ENTRY_NAME,
         enableAsyncEntry: false,
+        enableAsyncPreEntry: false,
         disableDefaultEntries: false,
         entriesDir: './src',
         configDir: './config',

package/dist/types/types/config/source.d.ts

@@ -15,6 +15,11 @@ export type Entry = string | {
 };
 export type Entries = Record<string, Entry>;
 export interface SourceUserConfig extends NonNullable<BuilderConfig['source']> {
+    /**
+     * Add code before each page entry. It will be executed before the page code.
+     * @default []
+     */
+    preEntry?: string | string[];
     /**
      * Used to configure custom page entries.
      */
@@ -30,6 +35,15 @@ export interface SourceUserConfig extends NonNullable<BuilderConfig['source']> {
      * @default false
      */
     enableAsyncEntry?: boolean;
+    /**
+     * When enabled, framework will inject `source.preEntry` into the top of the
+     * auto-generated entry file (`index.jsx`) and will not pass `source.preEntry`
+     * to builder config.
+     * This is useful when `source.enableAsyncEntry` is enabled and you still want
+     * preEntry to run before the real entry code.
+     * @default false
+     */
+    enableAsyncPreEntry?: boolean;
     /**
      * Used to disable the functionality of automatically identifying page entry points based on directory structure.
      * @default false

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.5",
+  "version": "3.2.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -80,11 +80,11 @@
     "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.29.2",
+    "@babel/parser": "^7.29.3",
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
     "@rsbuild/core": "2.0.0",
-    "@swc/core": "1.15.11",
+    "@swc/core": "1.15.33",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.7.0",
     "import-meta-resolve": "^4.2.0",
@@ -93,26 +93,26 @@
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.1.5",
-    "@modern-js/i18n-utils": "3.1.5",
-    "@modern-js/prod-server": "3.1.5",
-    "@modern-js/plugin-data-loader": "3.1.5",
-    "@modern-js/plugin": "3.1.5",
-    "@modern-js/server": "3.1.5",
-    "@modern-js/server-core": "3.1.5",
-    "@modern-js/types": "3.1.5",
-    "@modern-js/server-utils": "3.1.5",
-    "@modern-js/utils": "3.1.5"
+    "@modern-js/i18n-utils": "3.2.0",
+    "@modern-js/builder": "3.2.0",
+    "@modern-js/plugin": "3.2.0",
+    "@modern-js/plugin-data-loader": "3.2.0",
+    "@modern-js/server": "3.2.0",
+    "@modern-js/server-core": "3.2.0",
+    "@modern-js/prod-server": "3.2.0",
+    "@modern-js/types": "3.2.0",
+    "@modern-js/server-utils": "3.2.0",
+    "@modern-js/utils": "3.2.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.21.2",
+    "@rslib/core": "0.21.4",
     "@types/babel__traverse": "7.28.0",
     "@types/node": "^20",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0"
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/rslib": "2.68.10"
   },
   "peerDependencies": {
     "ts-node": "^10.9.2",