@modern-js/node-bundle-require 2.0.0-beta.3 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # @modern-js/node-bundle-require
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+
+  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+
+- Updated dependencies [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.6
+
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- a2509bfbdb: feat: bump esbuild from 0.14.38 to 0.15.7
+
+  feat: 将 esbuild 从 0.14.38 版本升级至 0.15.7 版本
+
+- Updated dependencies [7879e8f]
+- Updated dependencies [6aca875]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/bundle.js

@@ -1,145 +1,172 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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, pkgUp, nanoid, CONFIG_CACHE_DIR, createDebugger } from '@modern-js/utils';
-import { build } from 'esbuild';
-const debug = createDebugger('node-bundle');
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import path from "path";
+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)$/;
 const BUNDLED_EXT_RE = /\.(ts|mts|cts|tsx|mjs)$/;
-
-// Must not start with "/" or "./" or "../"
-// "/test/node_modules/foo"
-// "c:/node_modules/foo"
-export const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
+const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 function inferLoader(ext) {
-  if (ext === '.mjs' || ext === '.cjs') {
-    return 'js';
+  if (ext === ".mjs" || ext === ".cjs") {
+    return "js";
   }
   return ext.slice(1);
 }
-async function isTypeModulePkg(cwd) {
-  const pkgJsonPath = await pkgUp({
-    cwd
+function isTypeModulePkg(cwd) {
+  return __async(this, null, function* () {
+    const pkgJsonPath = yield pkgUp({ cwd });
+    if (pkgJsonPath) {
+      const pkgJson = yield fs.readJSON(pkgJsonPath);
+      return pkgJson.type === "module";
+    }
+    return false;
   });
-  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)) {
-    throw new Error(`${filepath} is not a valid JS file`);
-  }
-  debug('bundle', filepath, options);
-  const getOutputFile = (options === null || options === void 0 ? void 0 : options.getOutputFile) || defaultGetOutputFile;
-  const outfile = await getOutputFile(path.basename(filepath));
-  await build(_objectSpread(_objectSpread({
-    entryPoints: [filepath],
-    outfile,
-    format: 'cjs',
-    platform: 'node',
-    bundle: true,
-    // fix transforming error when the project's tsconfig.json
-    // sets `target: "es5"`
-    // reference: https://github.com/evanw/esbuild/releases/tag/v0.12.6
-    target: 'esnext'
-  }, options === null || options === void 0 ? void 0 : options.esbuildOptions), {}, {
-    plugins: [...((options === null || options === void 0 ? void 0 : options.esbuildPlugins) || []),
-    // https://github.com/evanw/esbuild/issues/1051#issuecomment-806325487
-    {
-      name: 'native-node-modules',
-      setup(build) {
-        // If a ".node" file is imported within a module in the "file" namespace, resolve
-        // it to an absolute path and put it into the "node-file" virtual namespace.
-        build.onResolve({
-          filter: /\.node$/,
-          namespace: 'file'
-        }, args => ({
-          path: require.resolve(args.path, {
-            paths: [args.resolveDir]
-          }),
-          namespace: 'node-file'
-        }));
-
-        // Files in the "node-file" virtual namespace call "require()" on the
-        // path from esbuild of the ".node" file in the output directory.
-        build.onLoad({
-          filter: /.*/,
-          namespace: 'node-file'
-        }, args => ({
-          contents: `
+const defaultGetOutputFile = (filepath) => __async(void 0, null, function* () {
+  return path.resolve(
+    CONFIG_CACHE_DIR,
+    `${filepath}-${Date.now()}.${nanoid()}.bundled.cjs`
+  );
+});
+function bundle(filepath, options) {
+  return __async(this, null, function* () {
+    if (!JS_EXT_RE.test(filepath)) {
+      throw new Error(`${filepath} is not a valid JS file`);
+    }
+    debug("bundle", filepath, options);
+    const getOutputFile = (options == null ? void 0 : options.getOutputFile) || defaultGetOutputFile;
+    const outfile = yield getOutputFile(path.basename(filepath));
+    yield build(__spreadProps(__spreadValues({
+      entryPoints: [filepath],
+      outfile,
+      format: "cjs",
+      platform: "node",
+      bundle: true,
+      target: "esnext"
+    }, options == null ? void 0 : options.esbuildOptions), {
+      plugins: [
+        ...(options == null ? void 0 : options.esbuildPlugins) || [],
+        {
+          name: "native-node-modules",
+          setup(build2) {
+            build2.onResolve({ filter: /\.node$/, namespace: "file" }, (args) => ({
+              path: require.resolve(args.path, { paths: [args.resolveDir] }),
+              namespace: "node-file"
+            }));
+            build2.onLoad({ filter: /.*/, namespace: "node-file" }, (args) => ({
+              contents: `
               import path from ${JSON.stringify(args.path)}
               try { module.exports = require(path) }
               catch {}
             `
-        }));
-
-        // If a ".node" file is imported within a module in the "node-file" namespace, put
-        // it in the "file" namespace where esbuild's default loading behavior will handle
-        // it. It is already an absolute path since we resolved it to one above.
-        build.onResolve({
-          filter: /\.node$/,
-          namespace: 'node-file'
-        }, args => ({
-          path: args.path,
-          namespace: 'file'
-        }));
-
-        // Tell esbuild's default loading behavior to use the "file" loader for
-        // these ".node" files.
-        const opts = build.initialOptions;
-        opts.loader = opts.loader || {};
-        opts.loader['.node'] = 'file';
-      }
-    }, {
-      name: 'replace-path',
-      setup(ctx) {
-        ctx.onLoad({
-          filter: JS_EXT_RE
-        }, async args => {
-          const contents = fs.readFileSync(args.path, 'utf-8');
-          return {
-            contents: contents.replace(/\b__filename\b/g, JSON.stringify(args.path)).replace(/\b__dirname\b/g, JSON.stringify(path.dirname(args.path))).replace(/\bimport\.meta\.url\b/g, JSON.stringify(`file://${args.path}`)),
-            loader: inferLoader(path.extname(args.path))
-          };
-        });
-      }
-    },
-    // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
-    {
-      name: 'make-all-packages-external',
-      setup(_build) {
-        _build.onResolve({
-          filter: EXTERNAL_REGEXP
-        }, async args => {
-          let external = true;
-          // FIXME: windows external entrypoint
-          if (args.kind === 'entry-point') {
-            external = false;
+            }));
+            build2.onResolve(
+              { filter: /\.node$/, namespace: "node-file" },
+              (args) => ({
+                path: args.path,
+                namespace: "file"
+              })
+            );
+            const opts = build2.initialOptions;
+            opts.loader = opts.loader || {};
+            opts.loader[".node"] = "file";
           }
-          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))) {
+        },
+        {
+          name: "replace-path",
+          setup(ctx) {
+            ctx.onLoad({ filter: JS_EXT_RE }, (args) => __async(this, null, function* () {
+              const contents = fs.readFileSync(args.path, "utf-8");
               return {
-                external: false
+                contents: contents.replace(/\b__filename\b/g, JSON.stringify(args.path)).replace(
+                  /\b__dirname\b/g,
+                  JSON.stringify(path.dirname(args.path))
+                ).replace(
+                  /\bimport\.meta\.url\b/g,
+                  JSON.stringify(`file://${args.path}`)
+                ),
+                loader: inferLoader(path.extname(args.path))
               };
-            }
-          } catch (err) {
-            // If the package can not be resolved, do nothing.
+            }));
           }
-          return {
-            path: args.path,
-            external
-          };
-        });
-      }
-    }]
-  }));
-  return outfile;
-}
+        },
+        {
+          name: "make-all-packages-external",
+          setup(_build) {
+            _build.onResolve({ filter: EXTERNAL_REGEXP }, (args) => __async(this, null, function* () {
+              let external = true;
+              if (args.kind === "entry-point") {
+                external = false;
+              }
+              try {
+                const resolvedPath = require.resolve(args.path, {
+                  paths: [args.resolveDir]
+                });
+                if (BUNDLED_EXT_RE.test(resolvedPath) || (yield isTypeModulePkg(resolvedPath))) {
+                  return {
+                    external: false
+                  };
+                }
+              } catch (err) {
+              }
+              return {
+                path: args.path,
+                external
+              };
+            }));
+          }
+        }
+      ]
+    }));
+    return outfile;
+  });
+}
+export {
+  EXTERNAL_REGEXP,
+  bundle,
+  defaultGetOutputFile
+};

package/dist/js/modern/index.js

@@ -1,30 +1,51 @@
-import { fs } from '@modern-js/utils';
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { fs } from "@modern-js/utils";
 import { bundle, defaultGetOutputFile } from "./bundle";
-export { bundle, defaultGetOutputFile };
 function deleteRequireCache(path) {
   if (require.cache[path]) {
     delete require.cache[path];
   }
   if (module.children) {
-    module.children = module.children.filter(item => item.filename !== path);
+    module.children = module.children.filter((item) => item.filename !== path);
   }
 }
-export async function bundleRequire(filepath, options) {
-  const configFile = await bundle(filepath, options);
-  let mod;
-  const req = (options === null || options === void 0 ? void 0 : options.require) || require;
-  try {
-    mod = await req(configFile);
-
-    // Webpack will check require history for persistent cache.
-    // If webpack can not resolve the file, the previous cache pack will become invalid.
-    // The bundled file is temporary, so we should clear the require history to avoid breaking the webpack cache.
-    deleteRequireCache(configFile);
-  } finally {
-    // default auto clear configFile
-    if ((options === null || options === void 0 ? void 0 : options.autoClear) === undefined || options.autoClear) {
-      fs.unlinkSync(configFile);
+function bundleRequire(filepath, options) {
+  return __async(this, null, function* () {
+    const configFile = yield bundle(filepath, options);
+    let mod;
+    const req = (options == null ? void 0 : options.require) || require;
+    try {
+      mod = yield req(configFile);
+      deleteRequireCache(configFile);
+    } finally {
+      if ((options == null ? void 0 : options.autoClear) === void 0 || options.autoClear) {
+        fs.unlinkSync(configFile);
+      }
     }
-  }
-  return mod;
-}
+    return mod;
+  });
+}
+export {
+  bundle,
+  bundleRequire,
+  defaultGetOutputFile
+};

package/dist/js/node/bundle.js

@@ -1,156 +1,195 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var bundle_exports = {};
+__export(bundle_exports, {
+  EXTERNAL_REGEXP: () => EXTERNAL_REGEXP,
+  bundle: () => bundle,
+  defaultGetOutputFile: () => defaultGetOutputFile
 });
-exports.EXTERNAL_REGEXP = void 0;
-exports.bundle = bundle;
-exports.defaultGetOutputFile = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _utils = require("@modern-js/utils");
-var _esbuild = require("esbuild");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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');
+module.exports = __toCommonJS(bundle_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_esbuild = require("esbuild");
+const debug = (0, import_utils.createDebugger)("node-bundle");
 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"
 const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
-exports.EXTERNAL_REGEXP = EXTERNAL_REGEXP;
 function inferLoader(ext) {
-  if (ext === '.mjs' || ext === '.cjs') {
-    return 'js';
+  if (ext === ".mjs" || ext === ".cjs") {
+    return "js";
   }
   return ext.slice(1);
 }
-async function isTypeModulePkg(cwd) {
-  const pkgJsonPath = await (0, _utils.pkgUp)({
-    cwd
+function isTypeModulePkg(cwd) {
+  return __async(this, null, function* () {
+    const pkgJsonPath = yield (0, import_utils.pkgUp)({ cwd });
+    if (pkgJsonPath) {
+      const pkgJson = yield import_utils.fs.readJSON(pkgJsonPath);
+      return pkgJson.type === "module";
+    }
+    return false;
   });
-  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;
-async function bundle(filepath, options) {
-  if (!JS_EXT_RE.test(filepath)) {
-    throw new Error(`${filepath} is not a valid JS file`);
-  }
-  debug('bundle', filepath, options);
-  const getOutputFile = (options === null || options === void 0 ? void 0 : options.getOutputFile) || defaultGetOutputFile;
-  const outfile = await getOutputFile(_path.default.basename(filepath));
-  await (0, _esbuild.build)(_objectSpread(_objectSpread({
-    entryPoints: [filepath],
-    outfile,
-    format: 'cjs',
-    platform: 'node',
-    bundle: true,
-    // fix transforming error when the project's tsconfig.json
-    // sets `target: "es5"`
-    // reference: https://github.com/evanw/esbuild/releases/tag/v0.12.6
-    target: 'esnext'
-  }, options === null || options === void 0 ? void 0 : options.esbuildOptions), {}, {
-    plugins: [...((options === null || options === void 0 ? void 0 : options.esbuildPlugins) || []),
-    // https://github.com/evanw/esbuild/issues/1051#issuecomment-806325487
-    {
-      name: 'native-node-modules',
-      setup(build) {
-        // If a ".node" file is imported within a module in the "file" namespace, resolve
-        // it to an absolute path and put it into the "node-file" virtual namespace.
-        build.onResolve({
-          filter: /\.node$/,
-          namespace: 'file'
-        }, args => ({
-          path: require.resolve(args.path, {
-            paths: [args.resolveDir]
-          }),
-          namespace: 'node-file'
-        }));
-
-        // Files in the "node-file" virtual namespace call "require()" on the
-        // path from esbuild of the ".node" file in the output directory.
-        build.onLoad({
-          filter: /.*/,
-          namespace: 'node-file'
-        }, args => ({
-          contents: `
+const defaultGetOutputFile = (filepath) => __async(void 0, null, function* () {
+  return import_path.default.resolve(
+    import_utils.CONFIG_CACHE_DIR,
+    `${filepath}-${Date.now()}.${(0, import_utils.nanoid)()}.bundled.cjs`
+  );
+});
+function bundle(filepath, options) {
+  return __async(this, null, function* () {
+    if (!JS_EXT_RE.test(filepath)) {
+      throw new Error(`${filepath} is not a valid JS file`);
+    }
+    debug("bundle", filepath, options);
+    const getOutputFile = (options == null ? void 0 : options.getOutputFile) || defaultGetOutputFile;
+    const outfile = yield getOutputFile(import_path.default.basename(filepath));
+    yield (0, import_esbuild.build)(__spreadProps(__spreadValues({
+      entryPoints: [filepath],
+      outfile,
+      format: "cjs",
+      platform: "node",
+      bundle: true,
+      target: "esnext"
+    }, options == null ? void 0 : options.esbuildOptions), {
+      plugins: [
+        ...(options == null ? void 0 : options.esbuildPlugins) || [],
+        {
+          name: "native-node-modules",
+          setup(build2) {
+            build2.onResolve({ filter: /\.node$/, namespace: "file" }, (args) => ({
+              path: require.resolve(args.path, { paths: [args.resolveDir] }),
+              namespace: "node-file"
+            }));
+            build2.onLoad({ filter: /.*/, namespace: "node-file" }, (args) => ({
+              contents: `
               import path from ${JSON.stringify(args.path)}
               try { module.exports = require(path) }
               catch {}
             `
-        }));
-
-        // If a ".node" file is imported within a module in the "node-file" namespace, put
-        // it in the "file" namespace where esbuild's default loading behavior will handle
-        // it. It is already an absolute path since we resolved it to one above.
-        build.onResolve({
-          filter: /\.node$/,
-          namespace: 'node-file'
-        }, args => ({
-          path: args.path,
-          namespace: 'file'
-        }));
-
-        // Tell esbuild's default loading behavior to use the "file" loader for
-        // these ".node" files.
-        const opts = build.initialOptions;
-        opts.loader = opts.loader || {};
-        opts.loader['.node'] = 'file';
-      }
-    }, {
-      name: 'replace-path',
-      setup(ctx) {
-        ctx.onLoad({
-          filter: JS_EXT_RE
-        }, async args => {
-          const contents = _utils.fs.readFileSync(args.path, 'utf-8');
-          return {
-            contents: contents.replace(/\b__filename\b/g, JSON.stringify(args.path)).replace(/\b__dirname\b/g, JSON.stringify(_path.default.dirname(args.path))).replace(/\bimport\.meta\.url\b/g, JSON.stringify(`file://${args.path}`)),
-            loader: inferLoader(_path.default.extname(args.path))
-          };
-        });
-      }
-    },
-    // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
-    {
-      name: 'make-all-packages-external',
-      setup(_build) {
-        _build.onResolve({
-          filter: EXTERNAL_REGEXP
-        }, async args => {
-          let external = true;
-          // FIXME: windows external entrypoint
-          if (args.kind === 'entry-point') {
-            external = false;
+            }));
+            build2.onResolve(
+              { filter: /\.node$/, namespace: "node-file" },
+              (args) => ({
+                path: args.path,
+                namespace: "file"
+              })
+            );
+            const opts = build2.initialOptions;
+            opts.loader = opts.loader || {};
+            opts.loader[".node"] = "file";
           }
-          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))) {
+        },
+        {
+          name: "replace-path",
+          setup(ctx) {
+            ctx.onLoad({ filter: JS_EXT_RE }, (args) => __async(this, null, function* () {
+              const contents = import_utils.fs.readFileSync(args.path, "utf-8");
               return {
-                external: false
+                contents: contents.replace(/\b__filename\b/g, JSON.stringify(args.path)).replace(
+                  /\b__dirname\b/g,
+                  JSON.stringify(import_path.default.dirname(args.path))
+                ).replace(
+                  /\bimport\.meta\.url\b/g,
+                  JSON.stringify(`file://${args.path}`)
+                ),
+                loader: inferLoader(import_path.default.extname(args.path))
               };
-            }
-          } catch (err) {
-            // If the package can not be resolved, do nothing.
+            }));
           }
-          return {
-            path: args.path,
-            external
-          };
-        });
-      }
-    }]
-  }));
-  return outfile;
-}
+        },
+        {
+          name: "make-all-packages-external",
+          setup(_build) {
+            _build.onResolve({ filter: EXTERNAL_REGEXP }, (args) => __async(this, null, function* () {
+              let external = true;
+              if (args.kind === "entry-point") {
+                external = false;
+              }
+              try {
+                const resolvedPath = require.resolve(args.path, {
+                  paths: [args.resolveDir]
+                });
+                if (BUNDLED_EXT_RE.test(resolvedPath) || (yield isTypeModulePkg(resolvedPath))) {
+                  return {
+                    external: false
+                  };
+                }
+              } catch (err) {
+              }
+              return {
+                path: args.path,
+                external
+              };
+            }));
+          }
+        }
+      ]
+    }));
+    return outfile;
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  EXTERNAL_REGEXP,
+  bundle,
+  defaultGetOutputFile
+});

package/dist/js/node/index.js

@@ -1,47 +1,76 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "bundle", {
-  enumerable: true,
-  get: function () {
-    return _bundle.bundle;
-  }
-});
-exports.bundleRequire = bundleRequire;
-Object.defineProperty(exports, "defaultGetOutputFile", {
-  enumerable: true,
-  get: function () {
-    return _bundle.defaultGetOutputFile;
+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 __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var src_exports = {};
+__export(src_exports, {
+  bundle: () => import_bundle.bundle,
+  bundleRequire: () => bundleRequire,
+  defaultGetOutputFile: () => import_bundle.defaultGetOutputFile
 });
-var _utils = require("@modern-js/utils");
-var _bundle = require("./bundle");
+module.exports = __toCommonJS(src_exports);
+var import_utils = require("@modern-js/utils");
+var import_bundle = require("./bundle");
 function deleteRequireCache(path) {
   if (require.cache[path]) {
     delete require.cache[path];
   }
   if (module.children) {
-    module.children = module.children.filter(item => item.filename !== path);
+    module.children = module.children.filter((item) => item.filename !== path);
   }
 }
-async function bundleRequire(filepath, options) {
-  const configFile = await (0, _bundle.bundle)(filepath, options);
-  let mod;
-  const req = (options === null || options === void 0 ? void 0 : options.require) || require;
-  try {
-    mod = await req(configFile);
-
-    // Webpack will check require history for persistent cache.
-    // If webpack can not resolve the file, the previous cache pack will become invalid.
-    // The bundled file is temporary, so we should clear the require history to avoid breaking the webpack cache.
-    deleteRequireCache(configFile);
-  } finally {
-    // default auto clear configFile
-    if ((options === null || options === void 0 ? void 0 : options.autoClear) === undefined || options.autoClear) {
-      _utils.fs.unlinkSync(configFile);
+function bundleRequire(filepath, options) {
+  return __async(this, null, function* () {
+    const configFile = yield (0, import_bundle.bundle)(filepath, options);
+    let mod;
+    const req = (options == null ? void 0 : options.require) || require;
+    try {
+      mod = yield req(configFile);
+      deleteRequireCache(configFile);
+    } finally {
+      if ((options == null ? void 0 : options.autoClear) === void 0 || options.autoClear) {
+        import_utils.fs.unlinkSync(configFile);
+      }
     }
-  }
-  return mod;
-}
+    return mod;
+  });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  bundle,
+  bundleRequire,
+  defaultGetOutputFile
+});

package/dist/types/bundle.d.ts

@@ -10,19 +10,23 @@ export interface Options {
   /**
    * esbuild options
    */
+
   esbuildOptions?: BuildOptions;
   /**
    * esbuild plugin
    */
+
   esbuildPlugins?: Plugin[];
   /**
    * Get the path to the output file
    * By default we simply replace the extension with `.bundled.cjs`
    */
+
   getOutputFile?: (filepath: string) => Promise<string>;
   /**
    * auto clear bundle file
    */
+
   autoClear?: boolean;
 }
 export declare const defaultGetOutputFile: (filepath: string) => Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/node-bundle-require",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.6",
   "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",
@@ -40,15 +40,15 @@
   "dependencies": {
     "@babel/runtime": "^7.18.0",
     "esbuild": "0.15.7",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@scripts/build": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "publishConfig": {