@modern-js/module-tools 2.57.0 → 2.58.0

package/dist/builder/esbuild/adapter.js

@@ -215,8 +215,8 @@ const adapterPlugin = (compiler) => {
           loader: result.loader
         });
         const ext = (0, import_path.extname)(args.path);
-        var _transformResult_loader;
-        const loader = (_transformResult_loader = transformResult.loader) !== null && _transformResult_loader !== void 0 ? _transformResult_loader : import_loader.loaderMap[ext];
+        var _transformResult_loader, _ref;
+        const loader = (_ref = (_transformResult_loader = transformResult.loader) !== null && _transformResult_loader !== void 0 ? _transformResult_loader : compiler.config.loader[ext]) !== null && _ref !== void 0 ? _ref : import_loader.loaderMap[ext];
         const inlineSourceMap = context2.getInlineSourceMap();
         var _result_resolveDir;
         return {

package/dist/builder/esbuild/index.js

@@ -51,10 +51,12 @@ class EsbuildCompiler {
       (0, import_watch.initWatcher)(this);
     }
     const internal = await (0, import_feature.getInternalList)(this.context);
-    const user = this.config.hooks;
+    const before = this.config.hooks.filter((hook) => !hook.applyAfterBuiltIn);
+    const after = this.config.hooks.filter((hook) => hook.applyAfterBuiltIn);
     this.hookList = [
-      ...user,
-      ...internal
+      ...before,
+      ...internal,
+      ...after
     ];
     await Promise.all(this.hookList.map((item) => item.apply(this)));
   }

package/dist/builder/feature/redirect.js

@@ -40,6 +40,22 @@ var import_file = require("../../constants/file");
 var import_utils2 = require("../../utils");
 var import_asset = require("./asset");
 var import_postcssTransformer = require("./style/postcssTransformer");
+var PathType;
+(function(PathType2) {
+  PathType2[PathType2["Absolute"] = 0] = "Absolute";
+  PathType2[PathType2["Relative"] = 1] = "Relative";
+  PathType2[PathType2["ModuleId"] = 2] = "ModuleId";
+})(PathType || (PathType = {}));
+function getTypeOfPath(path, compiler) {
+  const isSupportModuleIdAlias = Object.keys(compiler.config.resolve.alias).length > 0;
+  if ((0, import_path.isAbsolute)(path)) {
+    return 0;
+  }
+  if (!path.startsWith(".") && isSupportModuleIdAlias) {
+    return 2;
+  }
+  return 1;
+}
 async function redirectImport(compiler, code, modules, aliasRecord, filePath, outputDir, jsExtension, isModule, matchPath) {
   const str = new import_magic_string.default(code);
   const extensions = [
@@ -70,10 +86,15 @@ async function redirectImport(compiler, code, modules, aliasRecord, filePath, ou
         }
       }
       if (absoluteImportPath) {
-        const relativePath = (0, import_path.relative)((0, import_path.dirname)(filePath), absoluteImportPath);
-        const relativeImportPath = (0, import_utils2.normalizeSlashes)(relativePath.startsWith("..") ? relativePath : `./${relativePath}`);
-        str.overwrite(start, end, relativeImportPath);
-        name2 = relativeImportPath;
+        if (getTypeOfPath(absoluteImportPath, compiler) === 2) {
+          str.overwrite(start, end, absoluteImportPath);
+          name2 = absoluteImportPath;
+        } else {
+          const relativePath = (0, import_path.relative)((0, import_path.dirname)(filePath), absoluteImportPath);
+          const relativeImportPath = (0, import_utils2.normalizeSlashes)(relativePath.startsWith("..") ? relativePath : `./${relativePath}`);
+          str.overwrite(start, end, relativeImportPath);
+          name2 = relativeImportPath;
+        }
       }
     }
     if (redirect2.autoExtension) {
@@ -158,13 +179,14 @@ const redirect = {
         return args;
       }
       const { code, path: id } = args;
-      const { format, alias, sourceDir, outDir, autoExtension } = compiler.config;
+      const { format, sourceDir, outDir, autoExtension } = compiler.config;
       const { root } = compiler.context;
       if (!code || format === "iife" || format === "umd") {
         return args;
       }
+      const alias = Object.keys(compiler.config.resolve.alias).length > 0 ? compiler.config.resolve.alias : compiler.config.alias;
       const absoluteAlias = Object.entries(alias).reduce((result, [name2, target]) => {
-        if (!(0, import_path.isAbsolute)(target)) {
+        if (getTypeOfPath(target, compiler) === 1) {
           result[name2] = (0, import_path.resolve)(compiler.context.root, target);
         } else {
           result[name2] = target;

package/dist/builder/feature/swc.js

@@ -24,6 +24,7 @@ __export(swc_exports, {
 module.exports = __toCommonJS(swc_exports);
 var import_path = require("path");
 var import_swc_plugins = require("@modern-js/swc-plugins");
+var import_loader = require("../../constants/loader");
 var import_utils = require("../../utils");
 const name = "swc:transform";
 const getSwcTarget = (target) => {
@@ -67,13 +68,16 @@ const swcTransform = (userTsconfig) => ({
     } else {
       useDefineForClassFields = true;
     }
-    const { transformImport, transformLodash, externalHelpers } = compiler.config;
+    const { transformImport, transformLodash, externalHelpers, loader: userLoader } = compiler.config;
     compiler.hooks.transform.tapPromise({
       name
     }, async (source) => {
       const { path } = source;
       const isTs = (0, import_utils.isTsLoader)(source.loader) || (0, import_utils.isTsExt)(path);
-      const enableJsx = source.loader === "tsx" || source.loader === "jsx" || /\.tsx$|\.jsx$/i.test(path);
+      const ext = (0, import_path.extname)(path);
+      var _source_loader, _ref;
+      const loader = (_ref = (_source_loader = source.loader) !== null && _source_loader !== void 0 ? _source_loader : userLoader[ext]) !== null && _ref !== void 0 ? _ref : import_loader.loaderMap[ext];
+      const enableJsx = loader === "tsx" || loader === "jsx";
       if ((0, import_utils.isJsExt)(path) || (0, import_utils.isJsLoader)(source.loader)) {
         const { target, jsx } = compiler.config;
         const swcCompilerOptions = {

package/dist/config/merge.js

@@ -36,7 +36,7 @@ var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
 var import_build = require("../constants/build");
 const mergeDefaultBaseConfig = async (pConfig, options) => {
-  var _pConfig_resolve, _pConfig_resolve1, _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
+  var _pConfig_resolve, _pConfig_resolve1, _pConfig_resolve2, _pConfig_style, _pConfig_style1, _pConfig_style2, _pConfig_style3;
   const defaultConfig = (0, import_build.getDefaultBuildConfig)();
   const { context, buildCmdOptions } = options;
   const { applyOptionsChain, ensureAbsolutePath, slash } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
@@ -45,6 +45,7 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
     "@": context.srcDirectory
   };
   const mergedAlias = applyOptionsChain(defaultAlias, pConfig.alias);
+  const mergedResolveAlias = applyOptionsChain({}, (_pConfig_resolve = pConfig.resolve) === null || _pConfig_resolve === void 0 ? void 0 : _pConfig_resolve.alias);
   const alias = Object.keys(mergedAlias).reduce((prev, name) => {
     const formattedValue = (value2) => {
       if (typeof value2 === "string" && value2.startsWith(".")) {
@@ -115,13 +116,15 @@ const mergeDefaultBaseConfig = async (pConfig, options) => {
   ];
   var _pConfig_resolve_mainFields, _pConfig_resolve_jsExtensions;
   const resolve = {
-    mainFields: (_pConfig_resolve_mainFields = (_pConfig_resolve = pConfig.resolve) === null || _pConfig_resolve === void 0 ? void 0 : _pConfig_resolve.mainFields) !== null && _pConfig_resolve_mainFields !== void 0 ? _pConfig_resolve_mainFields : defaultMainFields,
-    jsExtensions: (_pConfig_resolve_jsExtensions = (_pConfig_resolve1 = pConfig.resolve) === null || _pConfig_resolve1 === void 0 ? void 0 : _pConfig_resolve1.jsExtensions) !== null && _pConfig_resolve_jsExtensions !== void 0 ? _pConfig_resolve_jsExtensions : defaultConfig.resolve.jsExtensions
+    mainFields: (_pConfig_resolve_mainFields = (_pConfig_resolve1 = pConfig.resolve) === null || _pConfig_resolve1 === void 0 ? void 0 : _pConfig_resolve1.mainFields) !== null && _pConfig_resolve_mainFields !== void 0 ? _pConfig_resolve_mainFields : defaultMainFields,
+    jsExtensions: (_pConfig_resolve_jsExtensions = (_pConfig_resolve2 = pConfig.resolve) === null || _pConfig_resolve2 === void 0 ? void 0 : _pConfig_resolve2.jsExtensions) !== null && _pConfig_resolve_jsExtensions !== void 0 ? _pConfig_resolve_jsExtensions : defaultConfig.resolve.jsExtensions,
+    alias: mergedResolveAlias
   };
   var _pConfig_esbuildOptions;
   const esbuildOptions = (_pConfig_esbuildOptions = pConfig.esbuildOptions) !== null && _pConfig_esbuildOptions !== void 0 ? _pConfig_esbuildOptions : defaultConfig.esbuildOptions;
-  var _pConfig_shims, _pConfig_autoExtension, _pConfig_footer, _pConfig_banner, _pConfig_hooks, _pConfig_format, _pConfig_target, _pConfig_sourceMap, _pConfig_copy, _pConfig_outDir, _pConfig_jsx, _pConfig_splitting, _pConfig_minify, _pConfig_umdModuleName, _pConfig_sideEffects, _pConfig_style_inject, _pConfig_style_modules, _pConfig_style_autoModules, _pConfig_style_tailwindcss, _pConfig_externalHelpers, _pConfig_transformCache, _pConfig_transformImport, _pConfig_transformLodash, _pConfig_sourceType, _pConfig_disableSwcTransform;
+  var _pConfig_loader, _pConfig_shims, _pConfig_autoExtension, _pConfig_footer, _pConfig_banner, _pConfig_hooks, _pConfig_format, _pConfig_target, _pConfig_sourceMap, _pConfig_copy, _pConfig_outDir, _pConfig_jsx, _pConfig_splitting, _pConfig_minify, _pConfig_umdModuleName, _pConfig_sideEffects, _pConfig_style_inject, _pConfig_style_modules, _pConfig_style_autoModules, _pConfig_style_tailwindcss, _pConfig_externalHelpers, _pConfig_transformCache, _pConfig_transformImport, _pConfig_transformLodash, _pConfig_sourceType, _pConfig_disableSwcTransform;
   return {
+    loader: (_pConfig_loader = pConfig.loader) !== null && _pConfig_loader !== void 0 ? _pConfig_loader : defaultConfig.loader,
     shims: (_pConfig_shims = pConfig.shims) !== null && _pConfig_shims !== void 0 ? _pConfig_shims : defaultConfig.shims,
     autoExtension: (_pConfig_autoExtension = pConfig.autoExtension) !== null && _pConfig_autoExtension !== void 0 ? _pConfig_autoExtension : defaultConfig.autoExtension,
     footer: (_pConfig_footer = pConfig.footer) !== null && _pConfig_footer !== void 0 ? _pConfig_footer : defaultConfig.footer,

package/dist/config/valid.js

@@ -44,6 +44,7 @@ const validPartialBuildConfig = (config, appDirectory) => {
   }
 };
 const validBuildConfig = (config, appDirectory) => {
+  var _config_resolve;
   var _config_format;
   if (config.buildType === "bundleless" && [
     "iife",
@@ -54,6 +55,9 @@ const validBuildConfig = (config, appDirectory) => {
   if (config.tsconfig && !import_utils.fs.existsSync(import_path.default.resolve(appDirectory, config.tsconfig))) {
     throw new Error(`${config.tsconfig} does not exist in your project`);
   }
+  if (config.alias && ((_config_resolve = config.resolve) === null || _config_resolve === void 0 ? void 0 : _config_resolve.alias)) {
+    throw new Error("alias and resolve.alias are not allowed to be used together, alias will be deprecated in the future, please use resolve.alias instead");
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/constants/build.js

@@ -57,6 +57,7 @@ const getDefaultBuildConfig = () => {
       "src/index.ts"
     ],
     jsx: "automatic",
+    loader: {},
     metafile: false,
     minify: false,
     outDir: "./dist",
@@ -78,7 +79,8 @@ const getDefaultBuildConfig = () => {
         ".js",
         ".ts",
         ".json"
-      ]
+      ],
+      alias: {}
     },
     shims: false,
     sideEffects: void 0,

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

@@ -15,6 +15,7 @@ export * from './copy';
 export type HookList = {
     name: string;
     apply: (compiler: ICompiler) => void;
+    applyAfterBuiltIn?: boolean;
 }[];
 export type EsbuildOptions = (options: BuildOptions) => BuildOptions;
 export type BuildType = 'bundleless' | 'bundle';
@@ -93,6 +94,12 @@ export type AliasOption = Record<string, string> | ((aliases: Record<string, str
 export type Resolve = {
     mainFields?: string[];
     jsExtensions?: string[];
+    alias?: AliasOption;
+};
+export type ResolveOptions = {
+    mainFields: string[];
+    jsExtensions: string[];
+    alias: Record<string, string>;
 };
 export type BaseBuildConfig = Omit<Required<PartialBaseBuildConfig>, 'dts' | 'style' | 'alias' | 'sideEffects' | 'asset' | 'resolve'> & {
     sideEffects?: SideEffects;
@@ -100,9 +107,13 @@ export type BaseBuildConfig = Omit<Required<PartialBaseBuildConfig>, 'dts' | 'st
     style: Style;
     alias: Record<string, string>;
     asset: Required<Asset>;
-    resolve: Required<Resolve>;
+    resolve: ResolveOptions;
 };
 export type PartialBaseBuildConfig = {
+    /**
+     * @experimental
+     */
+    loader?: Record<string, string>;
     shims?: boolean;
     autoExtension?: boolean;
     resolve?: Resolve;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.57.0",
+  "version": "2.58.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -70,22 +70,22 @@
     "tapable": "2.2.1",
     "terser": "^5.31.1",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.57.0",
-    "@modern-js/plugin": "2.57.0",
-    "@modern-js/plugin-i18n": "2.57.0",
-    "@modern-js/plugin-changeset": "2.57.0",
-    "@modern-js/plugin-lint": "2.57.0",
-    "@modern-js/types": "2.57.0",
-    "@modern-js/utils": "2.57.0"
+    "@modern-js/core": "2.58.0",
+    "@modern-js/plugin": "2.58.0",
+    "@modern-js/plugin-changeset": "2.58.0",
+    "@modern-js/plugin-lint": "2.58.0",
+    "@modern-js/plugin-i18n": "2.58.0",
+    "@modern-js/types": "2.58.0",
+    "@modern-js/utils": "2.58.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.0.1-beta.3",
+    "@rsbuild/core": "1.0.1-beta.9",
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.57.0",
-    "@scripts/build": "2.57.0",
-    "@scripts/vitest-config": "2.57.0"
+    "@modern-js/self": "npm:@modern-js/module-tools@2.58.0",
+    "@scripts/build": "2.58.0",
+    "@scripts/vitest-config": "2.58.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"