@modern-js/module-tools 2.38.0-beta.0 → 2.39.0

package/dist/builder/esbuild/adapter.js

@@ -157,8 +157,9 @@ const adapterPlugin = (compiler) => {
         if (resultPath === false) {
           (0, import_debug.debugResolve)("resolve false:", args);
           return {
-            path: "/empty-stub",
-            sideEffects: false
+            path: `${import_path.sep}empty-stub`,
+            sideEffects: false,
+            namespace: "resolve-false"
           };
         }
         const sideEffects = await getSideEffects(resultPath, isExternal);
@@ -182,17 +183,17 @@ const adapterPlugin = (compiler) => {
             contents: `module.exports = (typeof globalThis !== "undefined" ? globalThis : (typeof global !== "undefined" ? global : self || Function('return this')()))[${JSON.stringify(value)}]`
           };
         }
+        if (args.namespace === "resolve-false") {
+          return {
+            contents: "module.exports = {}"
+          };
+        }
         if (args.suffix) {
           args.path += args.suffix;
         }
         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/utils/dts.js

@@ -129,7 +129,15 @@ const writeDtsFiles = async (config, options, result) => {
   const { tempDistAbsSrcPath } = options;
   await Promise.all(result.map(({ path, content }) => {
     const relativePath = (0, import_path.relative)(tempDistAbsSrcPath, path);
-    const filepath = (0, import_path.join)(distPath, relativePath.replace(/\.d\.ts/, dtsExtension));
+    const filepath = (0, import_path.join)(
+      distPath,
+      // We confirm that users will not mix ts and c(m)ts files in their projects.
+      // If a mix is required, please configure separate buildConfig to handle different inputs.
+      // So we don't replace .d.(c|m)ts that generated by tsc directly, this can confirm that
+      // users can use c(m)ts directly rather than enable autoExtension, in this condition,
+      // users need to set esbuild out-extensions like { '.js': '.mjs' }
+      relativePath.replace(/\.d\.ts/, dtsExtension)
+    );
     import_utils.fs.ensureFileSync(filepath);
     return import_utils.fs.writeFile(
       // only replace .d.ts, if tsc generate .d.m(c)ts, keep.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.38.0-beta.0",
+  "version": "2.39.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -71,15 +71,15 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/plugin-changeset": "2.37.1",
-    "@modern-js/core": "2.37.1",
-    "@modern-js/new-action": "2.37.1",
-    "@modern-js/plugin": "2.37.1",
-    "@modern-js/plugin-i18n": "2.37.1",
-    "@modern-js/plugin-lint": "2.37.1",
-    "@modern-js/upgrade": "2.37.1",
-    "@modern-js/types": "2.37.1",
-    "@modern-js/utils": "2.37.1"
+    "@modern-js/new-action": "2.39.0",
+    "@modern-js/core": "2.39.0",
+    "@modern-js/plugin": "2.39.0",
+    "@modern-js/plugin-changeset": "2.39.0",
+    "@modern-js/plugin-i18n": "2.39.0",
+    "@modern-js/plugin-lint": "2.39.0",
+    "@modern-js/types": "2.39.0",
+    "@modern-js/upgrade": "2.39.0",
+    "@modern-js/utils": "2.39.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.4",
@@ -87,10 +87,10 @@
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.37.1",
-    "@scripts/build": "2.37.1",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.38.0-beta.0",
-    "@scripts/vitest-config": "2.37.1"
+    "@modern-js/builder-webpack-provider": "2.39.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.39.0",
+    "@scripts/build": "2.39.0",
+    "@scripts/vitest-config": "2.39.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"