@modern-js/app-tools 2.64.2 → 2.64.3-alpha.0

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

@@ -53,11 +53,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderHookPlugin } = await import("../shared/builderPlugins/index.js");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderHookPlugin(options)
   ]);
   builder.addPlugins([
     (0, import_adapterCopy.builderPluginAdapterCopy)(options)

package/dist/cjs/builder/shared/builderPlugins/builderHooks.js

@@ -0,0 +1,50 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var builderHooks_exports = {};
+__export(builderHooks_exports, {
+  builderHookPlugin: () => builderHookPlugin
+});
+module.exports = __toCommonJS(builderHooks_exports);
+const builderHookPlugin = (options) => ({
+  name: "builder-plugin-support-modern-hooks",
+  setup(api) {
+    var _internalContext_pluginAPI;
+    const _internalContext = options.appContext._internalContext;
+    const hooks = (_internalContext_pluginAPI = _internalContext.pluginAPI) === null || _internalContext_pluginAPI === void 0 ? void 0 : _internalContext_pluginAPI.getHooks();
+    api.modifyBundlerChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyBundlerChain.call(chain, utils));
+    });
+    api.modifyRsbuildConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRsbuildConfig.call(config, utils));
+    });
+    api.modifyRspackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRspackConfig.call(config, utils));
+    });
+    api.modifyWebpackChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackChain.call(chain, utils));
+    });
+    api.modifyWebpackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackConfig.call(config, utils));
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  builderHookPlugin
+});

package/dist/cjs/builder/shared/builderPlugins/index.js

@@ -18,9 +18,11 @@ module.exports = __toCommonJS(builderPlugins_exports);
 __reExport(builderPlugins_exports, require("./adapterBasic"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterHtml"), module.exports);
 __reExport(builderPlugins_exports, require("./adapterSSR"), module.exports);
+__reExport(builderPlugins_exports, require("./builderHooks"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./adapterBasic"),
   ...require("./adapterHtml"),
-  ...require("./adapterSSR")
+  ...require("./adapterSSR"),
+  ...require("./builderHooks")
 });

package/dist/cjs/esm/esbuild-loader.mjs

@@ -1,4 +1,5 @@
 import { pathToFileURL } from 'url';
+import { load as esbuildLoad } from 'esbuild-register/loader';
 import { createMatchPath } from './utils.mjs';
 
 let matchPath;
@@ -17,4 +18,16 @@ export function resolve(specifier, context, defaultResolve) {
     : defaultResolve(specifier, context);
 }
 
-export { load } from 'esbuild-register/loader';
+export function load(url, context, defaultLoad) {
+  const filePath = new URL(url).pathname;
+
+  if (url.startsWith('node:')) {
+    return defaultLoad(url, context);
+  }
+
+  if (filePath.includes('node_modules')) {
+    return defaultLoad(url, context);
+  }
+
+  return esbuildLoad(url, context, defaultLoad);
+}

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

@@ -1,5 +1,6 @@
 import { pathToFileURL } from 'url';
 import { resolve as tsNodeResolve } from 'ts-node/esm';
+import { load as tsNodeLoad } from 'ts-node/esm';
 import { createMatchPath } from './utils.mjs';
 
 let matchPath;
@@ -18,4 +19,16 @@ export function resolve(specifier, context, defaultResolve) {
     : tsNodeResolve(specifier, context, defaultResolve);
 }
 
-export { transformSource, load } from 'ts-node/esm';
+export function load(url, context, defaultLoad) {
+  const filePath = new URL(url).pathname;
+
+  if (url.startsWith('node:')) {
+    return defaultLoad(url, context);
+  }
+
+  if (filePath.includes('node_modules')) {
+    return defaultLoad(url, context);
+  }
+
+  return tsNodeLoad(url, context, defaultLoad);
+}

package/dist/esm/builder/generator/index.js

@@ -51,7 +51,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
   _applyBuilderPlugins = _async_to_generator(function(builder, options) {
-    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, pluginNodePolyfill;
+    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderHookPlugin, normalizedConfig, pluginNodePolyfill;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -60,11 +60,12 @@ function _applyBuilderPlugins() {
             import("../shared/builderPlugins/index.js")
           ];
         case 1:
-          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR;
+          _ref = _state.sent(), builderPluginAdapterBasic = _ref.builderPluginAdapterBasic, builderPluginAdapterHtml = _ref.builderPluginAdapterHtml, builderPluginAdapterSSR = _ref.builderPluginAdapterSSR, builderHookPlugin = _ref.builderHookPlugin;
           builder.addPlugins([
             builderPluginAdapterBasic(),
             builderPluginAdapterSSR(options),
-            builderPluginAdapterHtml(options)
+            builderPluginAdapterHtml(options),
+            builderHookPlugin(options)
           ]);
           builder.addPlugins([
             builderPluginAdapterCopy(options)

package/dist/esm/builder/shared/builderPlugins/builderHooks.js

@@ -0,0 +1,120 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+var builderHookPlugin = function(options) {
+  return {
+    name: "builder-plugin-support-modern-hooks",
+    setup: function setup(api) {
+      var _internalContext_pluginAPI;
+      var _internalContext = options.appContext._internalContext;
+      var hooks = (_internalContext_pluginAPI = _internalContext.pluginAPI) === null || _internalContext_pluginAPI === void 0 ? void 0 : _internalContext_pluginAPI.getHooks();
+      api.modifyBundlerChain(function() {
+        var _ref = _async_to_generator(function(chain, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyBundlerChain.call(chain, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(chain, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyRsbuildConfig(function() {
+        var _ref = _async_to_generator(function(config, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyRsbuildConfig.call(config, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(config, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyRspackConfig(function() {
+        var _ref = _async_to_generator(function(config, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyRspackConfig.call(config, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(config, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyWebpackChain(function() {
+        var _ref = _async_to_generator(function(chain, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackChain.call(chain, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(chain, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      api.modifyWebpackConfig(function() {
+        var _ref = _async_to_generator(function(config, utils) {
+          return _ts_generator(this, function(_state) {
+            switch (_state.label) {
+              case 0:
+                return [
+                  4,
+                  hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackConfig.call(config, utils)
+                ];
+              case 1:
+                _state.sent();
+                return [
+                  2
+                ];
+            }
+          });
+        });
+        return function(config, utils) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+    }
+  };
+};
+export {
+  builderHookPlugin
+};

package/dist/esm/builder/shared/builderPlugins/index.js

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./builderHooks";

package/dist/esm/esm/esbuild-loader.mjs

@@ -1,4 +1,5 @@
 import { pathToFileURL } from 'url';
+import { load as esbuildLoad } from 'esbuild-register/loader';
 import { createMatchPath } from './utils.mjs';
 
 let matchPath;
@@ -17,4 +18,16 @@ export function resolve(specifier, context, defaultResolve) {
     : defaultResolve(specifier, context);
 }
 
-export { load } from 'esbuild-register/loader';
+export function load(url, context, defaultLoad) {
+  const filePath = new URL(url).pathname;
+
+  if (url.startsWith('node:')) {
+    return defaultLoad(url, context);
+  }
+
+  if (filePath.includes('node_modules')) {
+    return defaultLoad(url, context);
+  }
+
+  return esbuildLoad(url, context, defaultLoad);
+}

package/dist/esm/esm/ts-node-loader.mjs

@@ -1,5 +1,6 @@
 import { pathToFileURL } from 'url';
 import { resolve as tsNodeResolve } from 'ts-node/esm';
+import { load as tsNodeLoad } from 'ts-node/esm';
 import { createMatchPath } from './utils.mjs';
 
 let matchPath;
@@ -18,4 +19,16 @@ export function resolve(specifier, context, defaultResolve) {
     : tsNodeResolve(specifier, context, defaultResolve);
 }
 
-export { transformSource, load } from 'ts-node/esm';
+export function load(url, context, defaultLoad) {
+  const filePath = new URL(url).pathname;
+
+  if (url.startsWith('node:')) {
+    return defaultLoad(url, context);
+  }
+
+  if (filePath.includes('node_modules')) {
+    return defaultLoad(url, context);
+  }
+
+  return tsNodeLoad(url, context, defaultLoad);
+}

package/dist/esm-node/builder/generator/index.js

@@ -20,11 +20,12 @@ async function generateBuilder(options, bundlerType) {
   return builder;
 }
 async function applyBuilderPlugins(builder, options) {
-  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR } = await import("../shared/builderPlugins/index.js");
+  const { builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, builderHookPlugin } = await import("../shared/builderPlugins/index.js");
   builder.addPlugins([
     builderPluginAdapterBasic(),
     builderPluginAdapterSSR(options),
-    builderPluginAdapterHtml(options)
+    builderPluginAdapterHtml(options),
+    builderHookPlugin(options)
   ]);
   builder.addPlugins([
     builderPluginAdapterCopy(options)

package/dist/esm-node/builder/shared/builderPlugins/builderHooks.js

@@ -0,0 +1,26 @@
+const builderHookPlugin = (options) => ({
+  name: "builder-plugin-support-modern-hooks",
+  setup(api) {
+    var _internalContext_pluginAPI;
+    const _internalContext = options.appContext._internalContext;
+    const hooks = (_internalContext_pluginAPI = _internalContext.pluginAPI) === null || _internalContext_pluginAPI === void 0 ? void 0 : _internalContext_pluginAPI.getHooks();
+    api.modifyBundlerChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyBundlerChain.call(chain, utils));
+    });
+    api.modifyRsbuildConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRsbuildConfig.call(config, utils));
+    });
+    api.modifyRspackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyRspackConfig.call(config, utils));
+    });
+    api.modifyWebpackChain(async (chain, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackChain.call(chain, utils));
+    });
+    api.modifyWebpackConfig(async (config, utils) => {
+      await (hooks === null || hooks === void 0 ? void 0 : hooks.modifyWebpackConfig.call(config, utils));
+    });
+  }
+});
+export {
+  builderHookPlugin
+};

package/dist/esm-node/builder/shared/builderPlugins/index.js

@@ -1,3 +1,4 @@
 export * from "./adapterBasic";
 export * from "./adapterHtml";
 export * from "./adapterSSR";
+export * from "./builderHooks";

package/dist/esm-node/esm/esbuild-loader.mjs

@@ -1,4 +1,5 @@
 import { pathToFileURL } from 'url';
+import { load as esbuildLoad } from 'esbuild-register/loader';
 import { createMatchPath } from './utils.mjs';
 
 let matchPath;
@@ -17,4 +18,16 @@ export function resolve(specifier, context, defaultResolve) {
     : defaultResolve(specifier, context);
 }
 
-export { load } from 'esbuild-register/loader';
+export function load(url, context, defaultLoad) {
+  const filePath = new URL(url).pathname;
+
+  if (url.startsWith('node:')) {
+    return defaultLoad(url, context);
+  }
+
+  if (filePath.includes('node_modules')) {
+    return defaultLoad(url, context);
+  }
+
+  return esbuildLoad(url, context, defaultLoad);
+}

package/dist/esm-node/esm/ts-node-loader.mjs

@@ -1,5 +1,6 @@
 import { pathToFileURL } from 'url';
 import { resolve as tsNodeResolve } from 'ts-node/esm';
+import { load as tsNodeLoad } from 'ts-node/esm';
 import { createMatchPath } from './utils.mjs';
 
 let matchPath;
@@ -18,4 +19,16 @@ export function resolve(specifier, context, defaultResolve) {
     : tsNodeResolve(specifier, context, defaultResolve);
 }
 
-export { transformSource, load } from 'ts-node/esm';
+export function load(url, context, defaultLoad) {
+  const filePath = new URL(url).pathname;
+
+  if (url.startsWith('node:')) {
+    return defaultLoad(url, context);
+  }
+
+  if (filePath.includes('node_modules')) {
+    return defaultLoad(url, context);
+  }
+
+  return tsNodeLoad(url, context, defaultLoad);
+}

package/dist/types/builder/shared/builderPlugins/builderHooks.d.ts

@@ -0,0 +1,4 @@
+import type { RsbuildPlugin } from '@rsbuild/core';
+import type { Bundler } from '../../../types';
+import type { BuilderOptions } from '../types';
+export declare const builderHookPlugin: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/index.d.ts

@@ -1,3 +1,4 @@
 export * from './adapterBasic';
 export * from './adapterHtml';
 export * from './adapterSSR';
+export * from './builderHooks';

package/dist/types/esm/esbuild-loader.d.mts

@@ -4,3 +4,4 @@ export function initialize({ appDir, alias, tsconfigPath }: {
     tsconfigPath: any;
 }): Promise<void>;
 export function resolve(specifier: any, context: any, defaultResolve: any): any;
+export function load(url: any, context: any, defaultLoad: any): any;

package/dist/types/esm/ts-node-loader.d.mts

@@ -4,3 +4,4 @@ export function initialize({ appDir, alias, tsconfigPath }: {
     tsconfigPath: any;
 }): Promise<void>;
 export function resolve(specifier: any, context: any, defaultResolve: any): any;
+export function load(url: any, context: any, defaultLoad: any): any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.64.2",
+  "version": "2.64.3-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,7 +80,7 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "1.2.7",
+    "@rsbuild/core": "1.2.8",
     "@rsbuild/plugin-node-polyfill": "1.3.0",
     "@swc/helpers": "0.5.13",
     "es-module-lexer": "^1.1.0",
@@ -91,20 +91,20 @@
     "ndepe": "0.1.5",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.64.2",
-    "@modern-js/node-bundle-require": "2.64.2",
-    "@modern-js/plugin-data-loader": "2.64.2",
-    "@modern-js/plugin": "2.64.2",
-    "@modern-js/plugin-i18n": "2.64.2",
-    "@modern-js/plugin-v2": "2.64.2",
-    "@modern-js/rsbuild-plugin-esbuild": "2.64.2",
-    "@modern-js/prod-server": "2.64.2",
-    "@modern-js/server": "2.64.2",
-    "@modern-js/server-core": "2.64.2",
-    "@modern-js/server-utils": "2.64.2",
-    "@modern-js/types": "2.64.2",
-    "@modern-js/uni-builder": "2.64.2",
-    "@modern-js/utils": "2.64.2"
+    "@modern-js/core": "2.64.3",
+    "@modern-js/plugin": "2.64.3",
+    "@modern-js/plugin-i18n": "2.64.3",
+    "@modern-js/plugin-v2": "2.64.3",
+    "@modern-js/prod-server": "2.64.3",
+    "@modern-js/server": "2.64.3",
+    "@modern-js/rsbuild-plugin-esbuild": "2.64.3",
+    "@modern-js/node-bundle-require": "2.64.3",
+    "@modern-js/server-core": "2.64.3",
+    "@modern-js/server-utils": "2.64.3",
+    "@modern-js/uni-builder": "2.64.3",
+    "@modern-js/types": "2.64.3",
+    "@modern-js/utils": "2.64.3",
+    "@modern-js/plugin-data-loader": "2.64.3"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.9",
@@ -115,9 +115,9 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "webpack": "^5.97.1",
-    "@scripts/build": "2.64.2",
-    "@scripts/jest-config": "2.64.2"
+    "webpack": "^5.98.0",
+    "@scripts/build": "2.64.3",
+    "@scripts/jest-config": "2.64.3"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",
@@ -134,8 +134,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "new": "modern-lib new",