@modern-js/app-tools 2.60.4 → 2.60.6

package/dist/cjs/commands/index.js

@@ -55,7 +55,6 @@ const devCommand = async (program, api) => {
       devProgram.command(subCmd).action(async (options = {}) => {
         const { appDirectory } = api.useAppContext();
         const { isTypescript } = await import("@modern-js/utils");
-        await runner.beforeDevTask(meta);
         await meta.action(options, {
           isTsProject: isTypescript(appDirectory)
         });
@@ -76,7 +75,6 @@ const buildCommand = async (program, api) => {
       buildProgram.command(platform).action(async () => {
         const { appDirectory } = api.useAppContext();
         const { isTypescript } = await import("@modern-js/utils");
-        await runner.beforeBuildPlatform(platformBuilders);
         await platformBuilder.build(platform, {
           isTsProject: isTypescript(appDirectory)
         });

package/dist/cjs/hooks.js

@@ -33,8 +33,6 @@ const hooks = {
   generateEntryCode: (0, import_plugin.createAsyncWorkflow)(),
   htmlPartials: (0, import_plugin.createAsyncWaterfall)(),
   beforeGenerateRoutes: (0, import_plugin.createAsyncWaterfall)(),
-  addDefineTypes: (0, import_plugin.createAsyncWaterfall)(),
-  collectServerPlugins: (0, import_plugin.createAsyncWaterfall)(),
   _internalServerPlugins: (0, import_plugin.createAsyncWaterfall)(),
   beforeDev: (0, import_plugin.createAsyncWorkflow)(),
   afterDev: (0, import_plugin.createAsyncWorkflow)(),
@@ -47,10 +45,14 @@ const hooks = {
   deploy: (0, import_plugin.createAsyncWorkflow)(),
   afterDeploy: (0, import_plugin.createAsyncWorkflow)(),
   beforeRestart: (0, import_plugin.createAsyncWorkflow)(),
+  /**
+  * @deprecated
+  */
   registerDev: (0, import_plugin.createParallelWorkflow)(),
-  beforeDevTask: (0, import_plugin.createParallelWorkflow)(),
-  registerBuildPlatform: (0, import_plugin.createParallelWorkflow)(),
-  beforeBuildPlatform: (0, import_plugin.createParallelWorkflow)()
+  /**
+  * @deprecated
+  */
+  registerBuildPlatform: (0, import_plugin.createParallelWorkflow)()
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -60,7 +60,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
     const entryName = import_path.default.basename(dir);
     const customEntryFile = hasEntry(dir);
     const customServerEntry = hasServerEntry(dir);
-    if (indexFile && !customBootstrap) {
+    if (!enableCustomEntry && indexFile && !customBootstrap) {
       return {
         entryName,
         isMainEntry: false,

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

@@ -106,8 +106,6 @@ var analyze_default = ({ bundler }) => ({
           config: resolvedConfig
         });
         debug(`html templates: %o`, htmlTemplates);
-        await hookRunners.addDefineTypes();
-        debug(`add Define Types`);
         let checkedEntries = entrypoints.map((point) => point.entryName);
         if ((0, import_utils.isDevCommand)()) {
           const { entry } = (0, import_utils.minimist)((0, import_utils.getArgv)());

package/dist/esm/commands/index.js

@@ -71,19 +71,13 @@ var devCommand = function() {
                           ];
                         case 1:
                           isTypescript = _state2.sent().isTypescript;
-                          return [
-                            4,
-                            runner.beforeDevTask(meta)
-                          ];
-                        case 2:
-                          _state2.sent();
                           return [
                             4,
                             meta.action(options, {
                               isTsProject: isTypescript(appDirectory)
                             })
                           ];
-                        case 3:
+                        case 2:
                           _state2.sent();
                           return [
                             2
@@ -195,19 +189,13 @@ var buildCommand = function() {
                           ];
                         case 1:
                           isTypescript = _state2.sent().isTypescript;
-                          return [
-                            4,
-                            runner.beforeBuildPlatform(platformBuilders)
-                          ];
-                        case 2:
-                          _state2.sent();
                           return [
                             4,
                             platformBuilder.build(platform, {
                               isTsProject: isTypescript(appDirectory)
                             })
                           ];
-                        case 3:
+                        case 2:
                           _state2.sent();
                           return [
                             2

package/dist/esm/hooks.js

@@ -10,8 +10,6 @@ var hooks = {
   generateEntryCode: createAsyncWorkflow(),
   htmlPartials: createAsyncWaterfall(),
   beforeGenerateRoutes: createAsyncWaterfall(),
-  addDefineTypes: createAsyncWaterfall(),
-  collectServerPlugins: createAsyncWaterfall(),
   _internalServerPlugins: createAsyncWaterfall(),
   beforeDev: createAsyncWorkflow(),
   afterDev: createAsyncWorkflow(),
@@ -24,10 +22,14 @@ var hooks = {
   deploy: createAsyncWorkflow(),
   afterDeploy: createAsyncWorkflow(),
   beforeRestart: createAsyncWorkflow(),
+  /**
+  * @deprecated
+  */
   registerDev: createParallelWorkflow(),
-  beforeDevTask: createParallelWorkflow(),
-  registerBuildPlatform: createParallelWorkflow(),
-  beforeBuildPlatform: createParallelWorkflow()
+  /**
+  * @deprecated
+  */
+  registerBuildPlatform: createParallelWorkflow()
 };
 export {
   hooks

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

@@ -78,7 +78,7 @@ var scanDir = function() {
                       entryName = path.basename(dir);
                       customEntryFile = hasEntry(dir);
                       customServerEntry = hasServerEntry(dir);
-                      if (indexFile && !customBootstrap) {
+                      if (!enableCustomEntry && indexFile && !customBootstrap) {
                         return [
                           2,
                           {

package/dist/esm/plugins/analyze/index.js

@@ -139,30 +139,23 @@ function analyze_default(param) {
                 case 9:
                   htmlTemplates = _state.sent();
                   debug("html templates: %o", htmlTemplates);
-                  return [
-                    4,
-                    hookRunners.addDefineTypes()
-                  ];
-                case 10:
-                  _state.sent();
-                  debug("add Define Types");
                   checkedEntries = entrypoints.map(function(point) {
                     return point.entryName;
                   });
                   if (!isDevCommand())
                     return [
                       3,
-                      12
+                      11
                     ];
                   entry = minimist(getArgv()).entry;
                   return [
                     4,
                     getSelectedEntries(typeof entry === "string" ? entry.split(",") : entry, entrypoints)
                   ];
-                case 11:
+                case 10:
                   checkedEntries = _state.sent();
-                  _state.label = 12;
-                case 12:
+                  _state.label = 11;
+                case 11:
                   appContext = _object_spread_props(_object_spread({}, api.useAppContext()), {
                     entrypoints,
                     checkedEntries,
@@ -174,7 +167,7 @@ function analyze_default(param) {
                   if (!checkIsBuildCommands())
                     return [
                       3,
-                      16
+                      15
                     ];
                   return [
                     4,
@@ -182,14 +175,14 @@ function analyze_default(param) {
                       entrypoints
                     })
                   ];
-                case 13:
+                case 12:
                   _state.sent();
                   normalizedConfig = api.useResolvedConfigContext();
                   return [
                     4,
                     createBuilderGenerator(bundler)
                   ];
-                case 14:
+                case 13:
                   createBuilderForModern = _state.sent();
                   return [
                     4,
@@ -198,7 +191,7 @@ function analyze_default(param) {
                       appContext
                     })
                   ];
-                case 15:
+                case 14:
                   builder = _state.sent();
                   builder.onBeforeBuild(function() {
                     var _ref2 = _async_to_generator(function(param2) {
@@ -347,8 +340,8 @@ function analyze_default(param) {
                     builder
                   });
                   api.setAppContext(appContext);
-                  _state.label = 16;
-                case 16:
+                  _state.label = 15;
+                case 15:
                   return [
                     2
                   ];

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

@@ -16,7 +16,6 @@ const devCommand = async (program, api) => {
       devProgram.command(subCmd).action(async (options = {}) => {
         const { appDirectory } = api.useAppContext();
         const { isTypescript } = await import("@modern-js/utils");
-        await runner.beforeDevTask(meta);
         await meta.action(options, {
           isTsProject: isTypescript(appDirectory)
         });
@@ -37,7 +36,6 @@ const buildCommand = async (program, api) => {
       buildProgram.command(platform).action(async () => {
         const { appDirectory } = api.useAppContext();
         const { isTypescript } = await import("@modern-js/utils");
-        await runner.beforeBuildPlatform(platformBuilders);
         await platformBuilder.build(platform, {
           isTsProject: isTypescript(appDirectory)
         });

package/dist/esm-node/hooks.js

@@ -10,8 +10,6 @@ const hooks = {
   generateEntryCode: createAsyncWorkflow(),
   htmlPartials: createAsyncWaterfall(),
   beforeGenerateRoutes: createAsyncWaterfall(),
-  addDefineTypes: createAsyncWaterfall(),
-  collectServerPlugins: createAsyncWaterfall(),
   _internalServerPlugins: createAsyncWaterfall(),
   beforeDev: createAsyncWorkflow(),
   afterDev: createAsyncWorkflow(),
@@ -24,10 +22,14 @@ const hooks = {
   deploy: createAsyncWorkflow(),
   afterDeploy: createAsyncWorkflow(),
   beforeRestart: createAsyncWorkflow(),
+  /**
+  * @deprecated
+  */
   registerDev: createParallelWorkflow(),
-  beforeDevTask: createParallelWorkflow(),
-  registerBuildPlatform: createParallelWorkflow(),
-  beforeBuildPlatform: createParallelWorkflow()
+  /**
+  * @deprecated
+  */
+  registerBuildPlatform: createParallelWorkflow()
 };
 export {
   hooks

package/dist/esm-node/plugins/analyze/getFileSystemEntry.js

@@ -27,7 +27,7 @@ const scanDir = async (hookRunners, dirs, enableCustomEntry) => {
     const entryName = path.basename(dir);
     const customEntryFile = hasEntry(dir);
     const customServerEntry = hasServerEntry(dir);
-    if (indexFile && !customBootstrap) {
+    if (!enableCustomEntry && indexFile && !customBootstrap) {
       return {
         entryName,
         isMainEntry: false,

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

@@ -73,8 +73,6 @@ var analyze_default = ({ bundler }) => ({
           config: resolvedConfig
         });
         debug(`html templates: %o`, htmlTemplates);
-        await hookRunners.addDefineTypes();
-        debug(`add Define Types`);
         let checkedEntries = entrypoints.map((point) => point.entryName);
         if (isDevCommand()) {
           const { entry } = minimist(getArgv());

package/dist/types/types/hooks.d.ts

@@ -42,10 +42,6 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
         entrypoint: Entrypoint;
         code: string;
     }>;
-    addDefineTypes: AsyncWaterfall<void>;
-    collectServerPlugins: AsyncWaterfall<{
-        plugins: Array<Record<string, string>>;
-    }>;
     _internalServerPlugins: AsyncWaterfall<{
         plugins: ServerPlugin[];
     }>;
@@ -73,7 +69,5 @@ export type AppToolsHooks<B extends Bundler = 'webpack'> = {
     afterDeploy: AsyncWorkflow<Record<string, any>, unknown>;
     beforeRestart: AsyncWorkflow<void, void>;
     registerDev: ParallelWorkflow<void, DevToolData>;
-    beforeDevTask: ParallelWorkflow<DevToolData, void>;
     registerBuildPlatform: ParallelWorkflow<void, RegisterBuildPlatformResult>;
-    beforeBuildPlatform: ParallelWorkflow<RegisterBuildPlatformResult[], void>;
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.4",
+  "version": "2.60.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -76,9 +76,9 @@
   "dependencies": {
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
-    "@babel/types": "^7.24.7",
+    "@babel/types": "^7.26.0",
     "@rsbuild/core": "~1.0.11",
-    "@rsbuild/plugin-node-polyfill": "~1.0.4",
+    "@rsbuild/plugin-node-polyfill": "~1.2.0",
     "@swc/helpers": "0.5.13",
     "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
@@ -88,19 +88,19 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.60.4",
-    "@modern-js/plugin": "2.60.4",
-    "@modern-js/plugin-data-loader": "2.60.4",
-    "@modern-js/node-bundle-require": "2.60.4",
-    "@modern-js/prod-server": "2.60.4",
-    "@modern-js/rsbuild-plugin-esbuild": "2.60.4",
-    "@modern-js/plugin-i18n": "2.60.4",
-    "@modern-js/server": "2.60.4",
-    "@modern-js/server-utils": "2.60.4",
-    "@modern-js/types": "2.60.4",
-    "@modern-js/server-core": "2.60.4",
-    "@modern-js/uni-builder": "2.60.4",
-    "@modern-js/utils": "2.60.4"
+    "@modern-js/node-bundle-require": "2.60.6",
+    "@modern-js/plugin": "2.60.6",
+    "@modern-js/plugin-data-loader": "2.60.6",
+    "@modern-js/prod-server": "2.60.6",
+    "@modern-js/plugin-i18n": "2.60.6",
+    "@modern-js/rsbuild-plugin-esbuild": "2.60.6",
+    "@modern-js/server": "2.60.6",
+    "@modern-js/server-utils": "2.60.6",
+    "@modern-js/server-core": "2.60.6",
+    "@modern-js/types": "2.60.6",
+    "@modern-js/uni-builder": "2.60.6",
+    "@modern-js/utils": "2.60.6",
+    "@modern-js/core": "2.60.6"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "~1.0.3",
@@ -112,8 +112,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.95.0",
-    "@scripts/build": "2.60.4",
-    "@scripts/jest-config": "2.60.4"
+    "@scripts/build": "2.60.6",
+    "@scripts/jest-config": "2.60.6"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",