@modern-js/module-tools 2.36.0 → 2.37.0

package/dist/builder/build.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="mocha" />
 import type { BuildCommandOptions, BaseBuildConfig, ModuleTools, PluginAPI, DTSOptions, ModuleContext } from '../types';
 export declare const runBuildTask: (options: {
   buildConfig: BaseBuildConfig;

package/dist/builder/esbuild/adapter.js

@@ -33,7 +33,6 @@ __export(adapter_exports, {
 module.exports = __toCommonJS(adapter_exports);
 var import_path = require("path");
 var import_module = __toESM(require("module"));
-var import_picomatch = __toESM(require("picomatch"));
 var import_utils = require("@modern-js/utils");
 var import_pluginutils = require("@rollup/pluginutils");
 var import_utils2 = require("../../utils");
@@ -64,8 +63,7 @@ const adapterPlugin = (compiler) => {
           };
         }
         for (const [key] of Object.entries(config.umdGlobals)) {
-          const isMatch = (0, import_picomatch.default)(key);
-          if (isMatch(args.path)) {
+          if (args.path === key) {
             (0, import_debug.debugResolve)("resolve umdGlobals:", key);
             return {
               path: args.path,
@@ -155,9 +153,17 @@ const adapterPlugin = (compiler) => {
         const isExternal = getIsExternal(originalFilePath);
         var _args_resolveDir;
         const dir = (_args_resolveDir = args.resolveDir) !== null && _args_resolveDir !== void 0 ? _args_resolveDir : args.importer ? (0, import_path.dirname)(args.importer) : root;
-        const sideEffects = await getSideEffects(originalFilePath, isExternal);
+        const resultPath = isExternal ? args.path : getResultPath(originalFilePath, dir, args.kind);
+        if (resultPath === false) {
+          (0, import_debug.debugResolve)("empty resolve:", args);
+          return {
+            path: "/empty-stub",
+            sideEffects: false
+          };
+        }
+        const sideEffects = await getSideEffects(resultPath, isExternal);
         const result = {
-          path: isExternal ? args.path : getResultPath(originalFilePath, dir, args.kind),
+          path: resultPath,
           external: isExternal,
           namespace: isExternal ? void 0 : "file",
           sideEffects,
@@ -182,6 +188,11 @@ const adapterPlugin = (compiler) => {
         if (args.namespace !== "file") {
           return;
         }
+        if (args.path === "/empty-stub") {
+          return {
+            contents: "module.exports = {}"
+          };
+        }
         compiler.addWatchFile(args.path);
         let result = await compiler.hooks.load.promise(args);
         if (!result) {

package/dist/builder/esbuild/index.d.ts

@@ -16,7 +16,7 @@ export declare class EsbuildCompiler implements ICompiler {
   outputChunk: Map<string, Chunk>;
   watchedFiles: Set<string>;
   css_resolve: (id: string, dir: string) => string;
-  node_resolve: (id: string, dir: string, kind: ImportKind) => string;
+  node_resolve: (id: string, dir: string, kind: ImportKind) => string | false;
   watcher?: FSWatcher;
   virtualModule: Map<string, string>;
   private transformContextMap;

package/dist/builder/esbuild/index.js

@@ -243,13 +243,13 @@ class EsbuildCompiler {
       tsconfig: config.tsconfig,
       mainFields: config.resolve.mainFields
     };
-    this.css_resolve = (0, import_resolve.createResolver)({
+    this.css_resolve = (0, import_resolve.createCssResolver)({
       ...resolveOptions,
       resolveType: "css",
       extensions: import_build.cssExtensions,
       preferRelative: true
     });
-    this.node_resolve = (0, import_resolve.createResolver)({
+    this.node_resolve = (0, import_resolve.createJsResolver)({
       ...resolveOptions,
       resolveType: "js",
       extensions: config.resolve.jsExtensions

package/dist/builder/esbuild/resolve.d.ts

@@ -3,7 +3,8 @@ import { ImportKind, Platform } from 'esbuild';
  * supports require js plugin in less file
  */
 export declare const cssExtensions: string[];
-export declare const createResolver: (options: ResolverOptions) => (id: string, dir: string, kind?: ImportKind) => string;
+export declare const createJsResolver: (options: ResolverOptions) => (id: string, dir: string, kind?: ImportKind) => string | false;
+export declare const createCssResolver: (options: ResolverOptions) => (id: string, dir: string, kind?: ImportKind) => string;
 interface ResolverOptions {
   platform: Platform;
   resolveType: 'js' | 'css';

package/dist/builder/esbuild/resolve.js

@@ -28,7 +28,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var resolve_exports = {};
 __export(resolve_exports, {
-  createResolver: () => createResolver,
+  createCssResolver: () => createCssResolver,
+  createJsResolver: () => createJsResolver,
   cssExtensions: () => cssExtensions
 });
 module.exports = __toCommonJS(resolve_exports);
@@ -47,7 +48,6 @@ function createEnhancedResolve(options) {
   const { tsconfig } = options;
   if (import_fs.default.existsSync(tsconfig)) {
     plugins.push(new import_tsconfig_paths_webpack_plugin.default({
-      baseUrl: options.root,
       configFile: tsconfig
     }));
   }
@@ -87,7 +87,7 @@ function createEnhancedResolve(options) {
     esmResolveSync
   };
 }
-const createResolver = (options) => {
+const createJsResolver = (options) => {
   const resolveCache = /* @__PURE__ */ new Map();
   const { resolveSync, esmResolveSync } = createEnhancedResolve(options);
   const resolver = (id, dir, kind) => {
@@ -97,18 +97,32 @@ const createResolver = (options) => {
       return cacheResult;
     }
     let result;
-    if (options.resolveType === "js") {
-      if (kind === "import-statement" || kind === "dynamic-import") {
-        result = esmResolveSync(dir, id);
-      } else {
-        result = resolveSync(dir, id);
-      }
+    if (kind === "import-statement" || kind === "dynamic-import") {
+      result = esmResolveSync(dir, id);
     } else {
-      try {
-        result = resolveSync(dir, id);
-      } catch (err) {
-        result = resolveSync(dir, id.replace(/^~/, ""));
-      }
+      result = resolveSync(dir, id);
+    }
+    if (result) {
+      resolveCache.set(cacheKey, result);
+    }
+    return result;
+  };
+  return resolver;
+};
+const createCssResolver = (options) => {
+  const resolveCache = /* @__PURE__ */ new Map();
+  const { resolveSync } = createEnhancedResolve(options);
+  const resolver = (id, dir, kind) => {
+    const cacheKey = id + dir + (kind || "");
+    const cacheResult = resolveCache.get(cacheKey);
+    if (cacheResult) {
+      return cacheResult;
+    }
+    let result;
+    try {
+      result = resolveSync(dir, id);
+    } catch (err) {
+      result = resolveSync(dir, id.replace(/^~/, ""));
     }
     if (!result) {
       throw new Error(`can not resolve ${id} from ${dir}`);
@@ -120,6 +134,7 @@ const createResolver = (options) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createResolver,
+  createCssResolver,
+  createJsResolver,
   cssExtensions
 });

package/dist/builder/feature/index.js

@@ -49,9 +49,6 @@ async function getInternalList(context) {
     const { json } = await Promise.resolve().then(() => __toESM(require("./json")));
     internal.push(redirect, json);
   }
-  if (config.minify && config.minify !== "esbuild") {
-    internal.push(import_terser.minify);
-  }
   const userTsconfig = await (0, import_dts.getProjectTsconfig)(context.config.tsconfig);
   var _userTsconfig_compilerOptions_emitDecoratorMetadata;
   const emitDecoratorMetadata = (_userTsconfig_compilerOptions_emitDecoratorMetadata = userTsconfig === null || userTsconfig === void 0 ? void 0 : (_userTsconfig_compilerOptions = userTsconfig.compilerOptions) === null || _userTsconfig_compilerOptions === void 0 ? void 0 : _userTsconfig_compilerOptions.emitDecoratorMetadata) !== null && _userTsconfig_compilerOptions_emitDecoratorMetadata !== void 0 ? _userTsconfig_compilerOptions_emitDecoratorMetadata : false;
@@ -66,6 +63,9 @@ async function getInternalList(context) {
     const { swcRenderChunk } = await Promise.resolve().then(() => __toESM(require("./swc")));
     internal.push(swcRenderChunk);
   }
+  if (config.minify && config.minify !== "esbuild") {
+    internal.push(import_terser.minify);
+  }
   return internal;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/builder/feature/redirect.js

@@ -165,8 +165,14 @@ const redirect = {
           `import($MATCH)`
         ];
         const staticPattern = [
-          `import $$VAR from '$MATCH'`,
-          `import $$VAR from "$MATCH"`,
+          `import $VAR from '$MATCH'`,
+          `import $VAR from "$MATCH"`,
+          `export {$$$VAR} from '$MATCH'`,
+          `export {$$$VAR} from "$MATCH"`,
+          `export * from '$MATCH'`,
+          `export * from "$MATCH"`,
+          `export * as $VAR from '$MATCH'`,
+          `export * as $VAR from "$MATCH"`,
           `import '$MATCH'`,
           `import "$MATCH"`
         ];

package/dist/builder/feature/style/utils.js

@@ -77,16 +77,22 @@ async function rebaseUrls(filepath, rootDir, resolver) {
       file
     };
   }
-  const rebased = await rewriteCssUrls(content, import_path.default.extname(file).slice(1), (url) => {
-    if (url.startsWith("/")) {
-      return url;
-    }
-    return resolver(url, fileDir);
-  });
-  return {
-    file,
-    contents: rebased
-  };
+  try {
+    const rebased = await rewriteCssUrls(content, import_path.default.extname(file).slice(1), (url) => {
+      if (url.startsWith("/")) {
+        return url;
+      }
+      return resolver(url, fileDir);
+    });
+    return {
+      file,
+      contents: rebased
+    };
+  } catch (e) {
+    return {
+      file
+    };
+  }
 }
 function rewriteCssUrls(css, type, replacer) {
   return asyncReplace(css, cssUrlRE, async (match) => {

package/dist/builder/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="mocha" />
 import type { PluginAPI } from '@modern-js/core';
 import type { ModuleContext } from '../types/context';
 import type { BuildCommandOptions, BaseBuildConfig, ModuleTools } from '../types';

package/dist/config/merge.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="mocha" />
 import { ModuleContext } from '../types';
 import type { BaseBuildConfig, PartialBaseBuildConfig, ModuleLegacyUserConfig, BuildCommandOptions } from '../types';
 export declare const mergeDefaultBaseConfig: (pConfig: PartialBaseBuildConfig, options: {

package/dist/config/normalize.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="mocha" />
 import type { PluginAPI } from '@modern-js/core';
 import type { BaseBuildConfig, BuildPreset, PartialBuildConfig, PartialBaseBuildConfig, ModuleContext, BuildCommandOptions, ModuleTools } from '../types';
 export declare const presetToConfig: (preset?: BuildPreset) => Promise<PartialBaseBuildConfig[] | undefined>;

package/dist/constants/preset.d.ts

@@ -7,19 +7,19 @@ export declare const npmComponentWithUmdPresetConfig: PartialBaseBuildConfig[];
 export declare const libraryPreset: {
   'npm-library': PartialBaseBuildConfig[];
 };
-export declare const libraryPresetWithTarget: Record<"npm-library-es5" | "npm-library-es6" | "npm-library-esnext" | "npm-library-es2015" | "npm-library-es2016" | "npm-library-es2017" | "npm-library-es2018" | "npm-library-es2019" | "npm-library-es2020" | "npm-library-es2021" | "npm-library-es2022", PartialBaseBuildConfig[]>;
+export declare const libraryPresetWithTarget: Record<"npm-library-es6" | "npm-library-esnext" | "npm-library-es5" | "npm-library-es2015" | "npm-library-es2016" | "npm-library-es2017" | "npm-library-es2018" | "npm-library-es2019" | "npm-library-es2020" | "npm-library-es2021" | "npm-library-es2022", PartialBaseBuildConfig[]>;
 export declare const libraryUmdPreset: {
   'npm-library-with-umd': PartialBaseBuildConfig[];
 };
-export declare const libraryUmdPresetWithTarget: Record<"npm-library-with-umd-es5" | "npm-library-with-umd-es6" | "npm-library-with-umd-esnext" | "npm-library-with-umd-es2015" | "npm-library-with-umd-es2016" | "npm-library-with-umd-es2017" | "npm-library-with-umd-es2018" | "npm-library-with-umd-es2019" | "npm-library-with-umd-es2020" | "npm-library-with-umd-es2021" | "npm-library-with-umd-es2022", PartialBaseBuildConfig[]>;
+export declare const libraryUmdPresetWithTarget: Record<"npm-library-with-umd-es6" | "npm-library-with-umd-esnext" | "npm-library-with-umd-es5" | "npm-library-with-umd-es2015" | "npm-library-with-umd-es2016" | "npm-library-with-umd-es2017" | "npm-library-with-umd-es2018" | "npm-library-with-umd-es2019" | "npm-library-with-umd-es2020" | "npm-library-with-umd-es2021" | "npm-library-with-umd-es2022", PartialBaseBuildConfig[]>;
 export declare const componentPreset: {
   'npm-component': PartialBaseBuildConfig[];
 };
-export declare const componentPresetWithTarget: Record<"npm-component-es5" | "npm-component-es6" | "npm-component-esnext" | "npm-component-es2015" | "npm-component-es2016" | "npm-component-es2017" | "npm-component-es2018" | "npm-component-es2019" | "npm-component-es2020" | "npm-component-es2021" | "npm-component-es2022", PartialBaseBuildConfig[]>;
+export declare const componentPresetWithTarget: Record<"npm-component-es6" | "npm-component-esnext" | "npm-component-es5" | "npm-component-es2015" | "npm-component-es2016" | "npm-component-es2017" | "npm-component-es2018" | "npm-component-es2019" | "npm-component-es2020" | "npm-component-es2021" | "npm-component-es2022", PartialBaseBuildConfig[]>;
 export declare const componentUmdPreset: {
   'npm-component-with-umd': PartialBaseBuildConfig[];
 };
-export declare const componentUmdPresetWithTarget: Record<"npm-component-with-umd-es5" | "npm-component-with-umd-es6" | "npm-component-with-umd-esnext" | "npm-component-with-umd-es2015" | "npm-component-with-umd-es2016" | "npm-component-with-umd-es2017" | "npm-component-with-umd-es2018" | "npm-component-with-umd-es2019" | "npm-component-with-umd-es2020" | "npm-component-with-umd-es2021" | "npm-component-with-umd-es2022", PartialBaseBuildConfig[]>;
+export declare const componentUmdPresetWithTarget: Record<"npm-component-with-umd-es6" | "npm-component-with-umd-esnext" | "npm-component-with-umd-es5" | "npm-component-with-umd-es2015" | "npm-component-with-umd-es2016" | "npm-component-with-umd-es2017" | "npm-component-with-umd-es2018" | "npm-component-with-umd-es2019" | "npm-component-with-umd-es2020" | "npm-component-with-umd-es2021" | "npm-component-with-umd-es2022", PartialBaseBuildConfig[]>;
 export declare const nodeBuildConfig: PartialBaseBuildConfig[];
 export declare const universalBuildConfig: PartialBaseBuildConfig[];
 export declare const presetList: Record<string, PartialBaseBuildConfig[]>;

package/dist/types/esbuild.d.ts

@@ -37,7 +37,7 @@ export type Context = {
 export interface ICompiler {
   reBuild: (type: 'link' | 'change', config: BaseBuildConfig) => Promise<void>;
   css_resolve: (id: string, dir: string) => string;
-  node_resolve: (id: string, dir: string, kind: ImportKind) => string;
+  node_resolve: (id: string, dir: string, kind: ImportKind) => string | false;
   init: () => Promise<void>;
   watcher?: FSWatcher;
   instance?: BuildContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.36.0",
+  "version": "2.37.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -50,7 +50,7 @@
     "@ast-grep/napi": "0.12.0",
     "@babel/generator": "^7.22.15",
     "@babel/parser": "^7.22.15",
-    "@babel/traverse": "7.22.15",
+    "@babel/traverse": "7.23.2",
     "@babel/types": "^7.22.15",
     "@modern-js/swc-plugins": "0.6.4",
     "@rollup/pluginutils": "4.1.1",
@@ -62,7 +62,6 @@
     "enhanced-resolve": "5.8.3",
     "esbuild": "0.19.2",
     "magic-string": "0.26.4",
-    "picomatch": "2.3.0",
     "postcss": "8.4.31",
     "postcss-modules": "4.3.0",
     "safe-identifier": "0.4.2",
@@ -72,28 +71,26 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.36.0",
-    "@modern-js/new-action": "2.36.0",
-    "@modern-js/types": "2.36.0",
-    "@modern-js/plugin": "2.36.0",
-    "@modern-js/plugin-changeset": "2.36.0",
-    "@modern-js/plugin-i18n": "2.36.0",
-    "@modern-js/plugin-lint": "2.36.0",
-    "@modern-js/upgrade": "2.36.0",
-    "@modern-js/utils": "2.36.0"
+    "@modern-js/core": "2.37.0",
+    "@modern-js/new-action": "2.37.0",
+    "@modern-js/plugin": "2.37.0",
+    "@modern-js/plugin-changeset": "2.37.0",
+    "@modern-js/plugin-i18n": "2.37.0",
+    "@modern-js/plugin-lint": "2.37.0",
+    "@modern-js/types": "2.37.0",
+    "@modern-js/upgrade": "2.37.0",
+    "@modern-js/utils": "2.37.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.4",
     "@types/babel__traverse": "7.18.5",
     "@types/convert-source-map": "1.5.2",
-    "@types/mocha": "9.0.0",
     "@types/node": "^14",
-    "@types/picomatch": "2.3.0",
     "typescript": "^5",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.36.0",
-    "@modern-js/builder-webpack-provider": "2.36.0",
-    "@scripts/build": "2.36.0",
-    "@scripts/vitest-config": "2.36.0"
+    "@modern-js/builder-webpack-provider": "2.37.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.37.0",
+    "@scripts/build": "2.37.0",
+    "@scripts/vitest-config": "2.37.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"
@@ -117,6 +114,6 @@
     "new": "modern-lib new",
     "test": "vitest run",
     "test:ui": "vitest --ui",
-    "test:watch": "vitest dev --no-coverage"
+    "test:watch": "vitest dev"
   }
 }