@modern-js/node-bundle-require 1.20.1 → 1.21.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @modern-js/node-bundle-require
 
+## 1.21.1
+
+### Patch Changes
+
+- @modern-js/utils@1.21.1
+
+## 1.21.0
+
+### Patch Changes
+
+- 7b3a482: fix(bundle-require): should bundle ts or esm files inside node_modules
+
+  fix(bundle-require): 修复无法打包 node_modules 下的 ts 和 esm 文件的问题
+
+  - @modern-js/utils@1.21.0
+
 ## 1.20.1
 
 ### Patch Changes

package/dist/js/modern/bundle.js

@@ -5,10 +5,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import path from 'path';
-import { fs, nanoid, CONFIG_CACHE_DIR, createDebugger } from '@modern-js/utils';
+import { fs, pkgUp, nanoid, CONFIG_CACHE_DIR, createDebugger } from '@modern-js/utils';
 import { build } from 'esbuild';
 const debug = createDebugger('node-bundle');
-const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/; // Must not start with "/" or "./" or "../"
+const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/;
+const BUNDLED_EXT_RE = /\.(ts|mts|cts|tsx|mjs)$/; // Must not start with "/" or "./" or "../"
 // "/test/node_modules/foo"
 // "c:/node_modules/foo"
 
@@ -22,6 +23,19 @@ function inferLoader(ext) {
   return ext.slice(1);
 }
 
+async function isTypeModulePkg(cwd) {
+  const pkgJsonPath = await pkgUp({
+    cwd
+  });
+
+  if (pkgJsonPath) {
+    const pkgJson = await fs.readJSON(pkgJsonPath);
+    return pkgJson.type === 'module';
+  }
+
+  return false;
+}
+
 export const defaultGetOutputFile = async filepath => path.resolve(CONFIG_CACHE_DIR, `${filepath}-${Date.now()}.${nanoid()}.bundled.cjs`);
 export async function bundle(filepath, options) {
   if (!JS_EXT_RE.test(filepath)) {
@@ -109,13 +123,27 @@ export async function bundle(filepath, options) {
       setup(_build) {
         _build.onResolve({
           filter: EXTERNAL_REGEXP
-        }, args => {
+        }, async args => {
           let external = true; // FIXME: windows external entrypoint
 
           if (args.kind === 'entry-point') {
             external = false;
           }
 
+          try {
+            const resolvedPath = require.resolve(args.path, {
+              paths: [args.resolveDir]
+            }); // If it is a typescript or esm package, we should bundle it.
+
+
+            if (BUNDLED_EXT_RE.test(resolvedPath) || (await isTypeModulePkg(resolvedPath))) {
+              return {
+                external: false
+              };
+            }
+          } catch (err) {// If the package can not be resolved, do nothing.
+          }
+
           return {
             path: args.path,
             external

package/dist/js/node/bundle.js

@@ -22,7 +22,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 const debug = (0, _utils.createDebugger)('node-bundle');
-const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/; // Must not start with "/" or "./" or "../"
+const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/;
+const BUNDLED_EXT_RE = /\.(ts|mts|cts|tsx|mjs)$/; // Must not start with "/" or "./" or "../"
 // "/test/node_modules/foo"
 // "c:/node_modules/foo"
 
@@ -37,6 +38,19 @@ function inferLoader(ext) {
   return ext.slice(1);
 }
 
+async function isTypeModulePkg(cwd) {
+  const pkgJsonPath = await (0, _utils.pkgUp)({
+    cwd
+  });
+
+  if (pkgJsonPath) {
+    const pkgJson = await _utils.fs.readJSON(pkgJsonPath);
+    return pkgJson.type === 'module';
+  }
+
+  return false;
+}
+
 const defaultGetOutputFile = async filepath => _path.default.resolve(_utils.CONFIG_CACHE_DIR, `${filepath}-${Date.now()}.${(0, _utils.nanoid)()}.bundled.cjs`);
 
 exports.defaultGetOutputFile = defaultGetOutputFile;
@@ -128,13 +142,27 @@ async function bundle(filepath, options) {
       setup(_build) {
         _build.onResolve({
           filter: EXTERNAL_REGEXP
-        }, args => {
+        }, async args => {
           let external = true; // FIXME: windows external entrypoint
 
           if (args.kind === 'entry-point') {
             external = false;
           }
 
+          try {
+            const resolvedPath = require.resolve(args.path, {
+              paths: [args.resolveDir]
+            }); // If it is a typescript or esm package, we should bundle it.
+
+
+            if (BUNDLED_EXT_RE.test(resolvedPath) || (await isTypeModulePkg(resolvedPath))) {
+              return {
+                external: false
+              };
+            }
+          } catch (err) {// If the package can not be resolved, do nothing.
+          }
+
           return {
             path: args.path,
             external

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/node-bundle-require",
-  "version": "1.20.1",
+  "version": "1.21.1",
   "description": "The meta-framework suite designed from scratch for frontend-focused modern web development.",
   "homepage": "https://modernjs.dev",
   "bugs": "https://github.com/modern-js-dev/modern.js/issues",
@@ -39,12 +39,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "1.20.1",
+    "@modern-js/utils": "1.21.1",
     "esbuild": "^0.14.38"
   },
   "devDependencies": {
-    "@scripts/build": "1.20.1",
-    "@scripts/jest-config": "1.20.1",
+    "@scripts/build": "1.21.1",
+    "@scripts/jest-config": "1.21.1",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",