@modern-js/node-bundle-require 2.0.0-beta.0 → 2.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @modern-js/node-bundle-require
 
+## 2.0.0-beta.2
+
+### 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 [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.2
+
+## 2.0.0-beta.1
+
+### Major Changes
+
+- dda38c9: 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 [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+
 ## 2.0.0-beta.0
 
 ### Major Changes

package/dist/js/modern/bundle.js

@@ -1,47 +1,38 @@
 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');
 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 "../"
+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 = /^[^./]|^\.[^./]|^\.\.[^/]/;
-
 function inferLoader(ext) {
   if (ext === '.mjs' || ext === '.cjs') {
     return 'js';
   }
-
   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)) {
     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));
@@ -56,10 +47,10 @@ export async function bundle(filepath, options) {
     // 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
+    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.
@@ -71,9 +62,10 @@ export async function bundle(filepath, options) {
             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.
+        }));
 
+        // 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'
@@ -83,27 +75,27 @@ export async function bundle(filepath, options) {
               try { module.exports = require(path) }
               catch {}
             `
-        })); // If a ".node" file is imported within a module in the "node-file" namespace, put
+        }));
+
+        // 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.
+        }));
 
+        // 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
@@ -115,42 +107,38 @@ export async function bundle(filepath, options) {
           };
         });
       }
-
-    }, // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
+    },
+    // 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
-
+          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 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.
+          } catch (err) {
+            // If the package can not be resolved, do nothing.
           }
-
           return {
             path: args.path,
             external
           };
         });
       }
-
     }]
   }));
   return outfile;

package/dist/js/modern/index.js

@@ -1,27 +1,24 @@
 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);
   }
 }
-
 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.
+    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
@@ -29,6 +26,5 @@ export async function bundleRequire(filepath, options) {
       fs.unlinkSync(configFile);
     }
   }
-
   return mod;
 }

package/dist/js/node/bundle.js

@@ -6,60 +6,44 @@ Object.defineProperty(exports, "__esModule", {
 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');
 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 "../"
+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';
   }
-
   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;
-
 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));
@@ -74,10 +58,10 @@ async function bundle(filepath, options) {
     // 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
+    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.
@@ -89,9 +73,10 @@ async function bundle(filepath, options) {
             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.
+        }));
 
+        // 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'
@@ -101,75 +86,70 @@ async function bundle(filepath, options) {
               try { module.exports = require(path) }
               catch {}
             `
-        })); // If a ".node" file is imported within a module in the "node-file" namespace, put
+        }));
+
+        // 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.
+        }));
 
+        // 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
+    },
+    // 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
-
+          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 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.
+          } catch (err) {
+            // If the package can not be resolved, do nothing.
           }
-
           return {
             path: args.path,
             external
           };
         });
       }
-
     }]
   }));
   return outfile;

package/dist/js/node/index.js

@@ -16,31 +16,26 @@ Object.defineProperty(exports, "defaultGetOutputFile", {
     return _bundle.defaultGetOutputFile;
   }
 });
-
 var _utils = require("@modern-js/utils");
-
 var _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);
   }
 }
-
 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.
+    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
@@ -48,6 +43,5 @@ async function bundleRequire(filepath, options) {
       _utils.fs.unlinkSync(configFile);
     }
   }
-
   return mod;
 }

package/dist/types/bundle.d.ts

@@ -10,23 +10,19 @@ 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.0",
+  "version": "2.0.0-beta.2",
   "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,16 +39,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.0.0-beta.0",
-    "esbuild": "0.15.7"
+    "esbuild": "0.15.7",
+    "@modern-js/utils": "2.0.0-beta.2"
   },
   "devDependencies": {
-    "@scripts/build": "2.0.0-beta.0",
-    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
-    "typescript": "^4"
+    "typescript": "^4",
+    "@scripts/build": "2.0.0-beta.2",
+    "@scripts/jest-config": "2.0.0-beta.2"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -56,8 +56,8 @@
     "access": "public"
   },
   "scripts": {
-    "new": "modern new",
-    "build": "modern build",
+    "new": "modern-lib new",
+    "build": "modern-lib build",
     "test": "jest --passWithNoTests"
   }
 }