@modern-js/app-tools 2.63.2 → 2.63.3

package/dist/cjs/compat/hooks.js

@@ -71,6 +71,14 @@ function getHookRunners(context) {
       const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.appendEntryCode.call(params));
       return result;
     },
+    // test plugin hooks
+    jestConfig: async (utils) => {
+      const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.jestConfig.call(utils, (utils2) => utils2));
+      return result;
+    },
+    afterTest: async () => {
+      return hooks.afterTest.call();
+    },
     /**
     * common hooks
     */
@@ -160,7 +168,14 @@ function handleSetupResult(setupResult, api) {
     if (typeof fn === "function") {
       const newAPI = (0, import_utils.transformHookRunner)(key);
       if (api[newAPI]) {
-        api[newAPI](async (params) => (0, import_utils.transformHookResult)(key, await fn((0, import_utils.transformHookParams)(key, params))));
+        api[newAPI](async (...params) => {
+          const { isMultiple, params: transformParams } = (0, import_utils.transformHookParams)(key, params);
+          if (isMultiple) {
+            return (0, import_utils.transformHookResult)(key, await fn(...transformParams));
+          } else {
+            return (0, import_utils.transformHookResult)(key, await fn(transformParams));
+          }
+        });
       }
     }
   });

package/dist/cjs/compat/index.js

@@ -49,7 +49,9 @@ const compatPlugin = () => ({
     };
   },
   registryHooks: {
-    appendEntryCode: (0, import_plugin_v2.createCollectAsyncHook)()
+    appendEntryCode: (0, import_plugin_v2.createCollectAsyncHook)(),
+    jestConfig: (0, import_plugin_v2.createAsyncHook)(),
+    afterTest: (0, import_plugin_v2.createAsyncHook)()
   },
   setup: (api) => {
     api.updateAppContext({

package/dist/cjs/compat/utils.js

@@ -23,6 +23,7 @@ __export(utils_exports, {
   transformHookRunner: () => transformHookRunner
 });
 module.exports = __toCommonJS(utils_exports);
+var import_getHtmlTemplate = require("../plugins/analyze/getHtmlTemplate");
 function transformHookRunner(hookRunnerName) {
   switch (hookRunnerName) {
     case "beforeConfig":
@@ -73,25 +74,45 @@ function transformHookParams(hookRunnerName, params) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return {
-        resolved: params
+        isMultiple: false,
+        params: {
+          resolved: params[0]
+        }
       };
     case "htmlPartials":
       return {
-        partials: {
-          top: params.partials.top.current,
-          head: params.partials.head.current,
-          body: params.partials.body.current
-        },
-        entrypoint: params.entrypoint
+        isMultiple: false,
+        params: {
+          partials: {
+            top: params[0].partials.top.current,
+            head: params[0].partials.head.current,
+            body: params[0].partials.body.current
+          },
+          entrypoint: params[0].entrypoint
+        }
       };
+    case "jestConfig": {
+      return {
+        isMultiple: true,
+        params
+      };
+    }
     default:
-      return params;
+      return {
+        isMultiple: false,
+        params: params[0]
+      };
   }
 }
 function transformHookResult(hookRunnerName, result) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return result.resolved;
+    case "htmlPartials":
+      return {
+        partials: (0, import_getHtmlTemplate.getModifyHtmlPartials)(result.partials),
+        entrypoint: result.entrypoint
+      };
     default:
       return result;
   }

package/dist/cjs/plugins/deploy/platforms/netlify.js

@@ -33,8 +33,8 @@ __export(netlify_exports, {
 module.exports = __toCommonJS(netlify_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
+var import_ndepe = require("ndepe");
 var import_routes = require("../../../utils/routes");
-var import_dependencies = require("../dependencies");
 var import_utils2 = require("../utils");
 async function cleanDistDirectory(dir) {
   try {
@@ -136,12 +136,15 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await (0, import_dependencies.handleDependencies)({
+      await (0, import_ndepe.nodeDepEmit)({
         appDir: appDirectory,
-        serverRootDir: funcsDirectory,
+        sourceDir: funcsDirectory,
         includeEntries: [
           require.resolve("@modern-js/prod-server")
-        ]
+        ],
+        copyWholePackage(pkgName) {
+          return pkgName === "@modern-js/utils";
+        }
       });
     }
   };

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -33,7 +33,7 @@ __export(node_exports, {
 module.exports = __toCommonJS(node_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
-var import_dependencies = require("../dependencies");
+var import_ndepe = require("ndepe");
 var import_utils2 = require("../utils");
 const createNodePreset = (appContext, config) => {
   const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
@@ -90,12 +90,15 @@ const createNodePreset = (appContext, config) => {
       const filter = (filePath) => {
         return !filePath.startsWith(staticDirectory);
       };
-      await (0, import_dependencies.handleDependencies)({
+      await (0, import_ndepe.nodeDepEmit)({
         appDir: appDirectory,
-        serverRootDir: outputDirectory,
+        sourceDir: outputDirectory,
         includeEntries: [
           require.resolve("@modern-js/prod-server")
         ],
+        copyWholePackage(pkgName) {
+          return pkgName === "@modern-js/utils";
+        },
         entryFilter: filter
       });
     }

package/dist/cjs/plugins/deploy/platforms/vercel.js

@@ -33,8 +33,8 @@ __export(vercel_exports, {
 module.exports = __toCommonJS(vercel_exports);
 var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
+var import_ndepe = require("ndepe");
 var import_routes = require("../../../utils/routes");
-var import_dependencies = require("../dependencies");
 var import_utils2 = require("../utils");
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
@@ -148,12 +148,15 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       if (!needModernServer) {
         return;
       }
-      await (0, import_dependencies.handleDependencies)({
+      await (0, import_ndepe.nodeDepEmit)({
         appDir: appDirectory,
-        serverRootDir: funcsDirectory,
+        sourceDir: funcsDirectory,
         includeEntries: [
           require.resolve("@modern-js/prod-server")
-        ]
+        ],
+        copyWholePackage(pkgName) {
+          return pkgName === "@modern-js/utils";
+        }
       });
     }
   };

package/dist/esm/compat/hooks.js

@@ -1,4 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 import { transformHookParams, transformHookResult, transformHookRunner } from "./utils";
@@ -173,6 +174,40 @@ function getHookRunners(context) {
         return _ref.apply(this, arguments);
       };
     }(),
+    // test plugin hooks
+    jestConfig: function() {
+      var _ref = _async_to_generator(function(utils) {
+        var result;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                hooks === null || hooks === void 0 ? void 0 : hooks.jestConfig.call(utils, function(utils2) {
+                  return utils2;
+                })
+              ];
+            case 1:
+              result = _state.sent();
+              return [
+                2,
+                result
+              ];
+          }
+        });
+      });
+      return function(utils) {
+        return _ref.apply(this, arguments);
+      };
+    }(),
+    afterTest: /* @__PURE__ */ _async_to_generator(function() {
+      return _ts_generator(this, function(_state) {
+        return [
+          2,
+          hooks.afterTest.call()
+        ];
+      });
+    }),
     /**
     * common hooks
     */
@@ -415,33 +450,57 @@ function handleSetupResult(setupResult, api) {
     if (typeof fn === "function") {
       var newAPI = transformHookRunner(key);
       if (api[newAPI]) {
-        api[newAPI](function() {
-          var _ref = _async_to_generator(function(params) {
-            var _tmp;
-            return _ts_generator(this, function(_state) {
-              switch (_state.label) {
-                case 0:
-                  _tmp = [
-                    key
-                  ];
-                  return [
-                    4,
-                    fn(transformHookParams(key, params))
-                  ];
-                case 1:
+        api[newAPI](/* @__PURE__ */ _async_to_generator(function() {
+          var _len, params, _key, _transformHookParams, isMultiple, transformParams, _tmp, _tmp1;
+          var _arguments = arguments;
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                for (_len = _arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+                  params[_key] = _arguments[_key];
+                }
+                _transformHookParams = transformHookParams(key, params), isMultiple = _transformHookParams.isMultiple, transformParams = _transformHookParams.params;
+                if (!isMultiple)
                   return [
-                    2,
-                    transformHookResult.apply(void 0, _tmp.concat([
-                      _state.sent()
-                    ]))
+                    3,
+                    2
                   ];
-              }
-            });
+                _tmp = [
+                  key
+                ];
+                return [
+                  4,
+                  fn.apply(void 0, _to_consumable_array(transformParams))
+                ];
+              case 1:
+                return [
+                  2,
+                  transformHookResult.apply(void 0, _tmp.concat([
+                    _state.sent()
+                  ]))
+                ];
+              case 2:
+                _tmp1 = [
+                  key
+                ];
+                return [
+                  4,
+                  fn(transformParams)
+                ];
+              case 3:
+                return [
+                  2,
+                  transformHookResult.apply(void 0, _tmp1.concat([
+                    _state.sent()
+                  ]))
+                ];
+              case 4:
+                return [
+                  2
+                ];
+            }
           });
-          return function(params) {
-            return _ref.apply(this, arguments);
-          };
-        }());
+        }));
       }
     }
   });

package/dist/esm/compat/index.js

@@ -1,5 +1,5 @@
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import { createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
 import { getHookRunners } from "./hooks";
 var compatPlugin = function() {
   return {
@@ -30,7 +30,9 @@ var compatPlugin = function() {
       };
     },
     registryHooks: {
-      appendEntryCode: createCollectAsyncHook()
+      appendEntryCode: createCollectAsyncHook(),
+      jestConfig: createAsyncHook(),
+      afterTest: createAsyncHook()
     },
     setup: function(api) {
       api.updateAppContext({

package/dist/esm/compat/utils.js

@@ -1,3 +1,4 @@
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 function transformHookRunner(hookRunnerName) {
   switch (hookRunnerName) {
     case "beforeConfig":
@@ -48,25 +49,45 @@ function transformHookParams(hookRunnerName, params) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return {
-        resolved: params
+        isMultiple: false,
+        params: {
+          resolved: params[0]
+        }
       };
     case "htmlPartials":
       return {
-        partials: {
-          top: params.partials.top.current,
-          head: params.partials.head.current,
-          body: params.partials.body.current
-        },
-        entrypoint: params.entrypoint
+        isMultiple: false,
+        params: {
+          partials: {
+            top: params[0].partials.top.current,
+            head: params[0].partials.head.current,
+            body: params[0].partials.body.current
+          },
+          entrypoint: params[0].entrypoint
+        }
       };
+    case "jestConfig": {
+      return {
+        isMultiple: true,
+        params
+      };
+    }
     default:
-      return params;
+      return {
+        isMultiple: false,
+        params: params[0]
+      };
   }
 }
 function transformHookResult(hookRunnerName, result) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return result.resolved;
+    case "htmlPartials":
+      return {
+        partials: getModifyHtmlPartials(result.partials),
+        entrypoint: result.entrypoint
+      };
     default:
       return result;
   }

package/dist/esm/plugins/deploy/platforms/netlify.js

@@ -2,8 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
-import { handleDependencies } from "../dependencies";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 function cleanDistDirectory(dir) {
   return _cleanDistDirectory.apply(this, arguments);
@@ -306,10 +306,13 @@ var createNetlifyPreset = function(appContext, modernConfig, needModernServer) {
                 4,
                 handleDependencies({
                   appDir: appDirectory,
-                  serverRootDir: funcsDirectory,
+                  sourceDir: funcsDirectory,
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
-                  ]
+                  ],
+                  copyWholePackage: function copyWholePackage(pkgName) {
+                    return pkgName === "@modern-js/utils";
+                  }
                 })
               ];
             case 3:

package/dist/esm/plugins/deploy/platforms/node.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
-import { handleDependencies } from "../dependencies";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createNodePreset = function(appContext, config) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
@@ -139,10 +139,13 @@ var createNodePreset = function(appContext, config) {
                 4,
                 handleDependencies({
                   appDir: appDirectory,
-                  serverRootDir: outputDirectory,
+                  sourceDir: outputDirectory,
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
                   ],
+                  copyWholePackage: function copyWholePackage(pkgName) {
+                    return pkgName === "@modern-js/utils";
+                  },
                   entryFilter: filter
                 })
               ];

package/dist/esm/plugins/deploy/platforms/vercel.js

@@ -2,8 +2,8 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
-import { handleDependencies } from "../dependencies";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 var createVercelPreset = function(appContext, modernConfig, needModernServer) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, entrypoints = appContext.entrypoints, serverPlugins = appContext.serverPlugins, moduleType = appContext.moduleType;
@@ -240,10 +240,13 @@ var createVercelPreset = function(appContext, modernConfig, needModernServer) {
                 4,
                 handleDependencies({
                   appDir: appDirectory,
-                  serverRootDir: funcsDirectory,
+                  sourceDir: funcsDirectory,
                   includeEntries: [
                     require.resolve("@modern-js/prod-server")
-                  ]
+                  ],
+                  copyWholePackage: function copyWholePackage(pkgName) {
+                    return pkgName === "@modern-js/utils";
+                  }
                 })
               ];
             case 1:

package/dist/esm-node/compat/hooks.js

@@ -47,6 +47,14 @@ function getHookRunners(context) {
       const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.appendEntryCode.call(params));
       return result;
     },
+    // test plugin hooks
+    jestConfig: async (utils) => {
+      const result = await (hooks === null || hooks === void 0 ? void 0 : hooks.jestConfig.call(utils, (utils2) => utils2));
+      return result;
+    },
+    afterTest: async () => {
+      return hooks.afterTest.call();
+    },
     /**
     * common hooks
     */
@@ -136,7 +144,14 @@ function handleSetupResult(setupResult, api) {
     if (typeof fn === "function") {
       const newAPI = transformHookRunner(key);
       if (api[newAPI]) {
-        api[newAPI](async (params) => transformHookResult(key, await fn(transformHookParams(key, params))));
+        api[newAPI](async (...params) => {
+          const { isMultiple, params: transformParams } = transformHookParams(key, params);
+          if (isMultiple) {
+            return transformHookResult(key, await fn(...transformParams));
+          } else {
+            return transformHookResult(key, await fn(transformParams));
+          }
+        });
       }
     }
   });

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

@@ -1,4 +1,4 @@
-import { createCollectAsyncHook } from "@modern-js/plugin-v2";
+import { createAsyncHook, createCollectAsyncHook } from "@modern-js/plugin-v2";
 import { getHookRunners } from "./hooks";
 const compatPlugin = () => ({
   name: "@modern-js/app-tools-compat",
@@ -26,7 +26,9 @@ const compatPlugin = () => ({
     };
   },
   registryHooks: {
-    appendEntryCode: createCollectAsyncHook()
+    appendEntryCode: createCollectAsyncHook(),
+    jestConfig: createAsyncHook(),
+    afterTest: createAsyncHook()
   },
   setup: (api) => {
     api.updateAppContext({

package/dist/esm-node/compat/utils.js

@@ -1,3 +1,4 @@
+import { getModifyHtmlPartials } from "../plugins/analyze/getHtmlTemplate";
 function transformHookRunner(hookRunnerName) {
   switch (hookRunnerName) {
     case "beforeConfig":
@@ -48,25 +49,45 @@ function transformHookParams(hookRunnerName, params) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return {
-        resolved: params
+        isMultiple: false,
+        params: {
+          resolved: params[0]
+        }
       };
     case "htmlPartials":
       return {
-        partials: {
-          top: params.partials.top.current,
-          head: params.partials.head.current,
-          body: params.partials.body.current
-        },
-        entrypoint: params.entrypoint
+        isMultiple: false,
+        params: {
+          partials: {
+            top: params[0].partials.top.current,
+            head: params[0].partials.head.current,
+            body: params[0].partials.body.current
+          },
+          entrypoint: params[0].entrypoint
+        }
       };
+    case "jestConfig": {
+      return {
+        isMultiple: true,
+        params
+      };
+    }
     default:
-      return params;
+      return {
+        isMultiple: false,
+        params: params[0]
+      };
   }
 }
 function transformHookResult(hookRunnerName, result) {
   switch (hookRunnerName) {
     case "resolvedConfig":
       return result.resolved;
+    case "htmlPartials":
+      return {
+        partials: getModifyHtmlPartials(result.partials),
+        entrypoint: result.entrypoint
+      };
     default:
       return result;
   }

package/dist/esm-node/plugins/deploy/platforms/netlify.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
-import { handleDependencies } from "../dependencies";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 async function cleanDistDirectory(dir) {
   try {
@@ -105,10 +105,13 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       }
       await handleDependencies({
         appDir: appDirectory,
-        serverRootDir: funcsDirectory,
+        sourceDir: funcsDirectory,
         includeEntries: [
           require.resolve("@modern-js/prod-server")
-        ]
+        ],
+        copyWholePackage(pkgName) {
+          return pkgName === "@modern-js/utils";
+        }
       });
     }
   };

package/dist/esm-node/plugins/deploy/platforms/node.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, chalk, fs as fse } from "@modern-js/utils";
-import { handleDependencies } from "../dependencies";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 const createNodePreset = (appContext, config) => {
   const { appDirectory, distDirectory, serverPlugins, moduleType } = appContext;
@@ -59,10 +59,13 @@ const createNodePreset = (appContext, config) => {
       };
       await handleDependencies({
         appDir: appDirectory,
-        serverRootDir: outputDirectory,
+        sourceDir: outputDirectory,
         includeEntries: [
           require.resolve("@modern-js/prod-server")
         ],
+        copyWholePackage(pkgName) {
+          return pkgName === "@modern-js/utils";
+        },
         entryFilter: filter
       });
     }

package/dist/esm-node/plugins/deploy/platforms/vercel.js

@@ -1,7 +1,7 @@
 import path from "node:path";
 import { DEFAULT_SERVER_CONFIG, ROUTE_SPEC_FILE, fs as fse } from "@modern-js/utils";
+import { nodeDepEmit as handleDependencies } from "ndepe";
 import { isMainEntry } from "../../../utils/routes";
-import { handleDependencies } from "../dependencies";
 import { genPluginImportsCode, getPluginsCode, serverAppContenxtTemplate } from "../utils";
 const createVercelPreset = (appContext, modernConfig, needModernServer) => {
   const { appDirectory, distDirectory, entrypoints, serverPlugins, moduleType } = appContext;
@@ -117,10 +117,13 @@ const createVercelPreset = (appContext, modernConfig, needModernServer) => {
       }
       await handleDependencies({
         appDir: appDirectory,
-        serverRootDir: funcsDirectory,
+        sourceDir: funcsDirectory,
         includeEntries: [
           require.resolve("@modern-js/prod-server")
-        ]
+        ],
+        copyWholePackage(pkgName) {
+          return pkgName === "@modern-js/utils";
+        }
       });
     }
   };