@modern-js/node-bundle-require 1.0.1 → 1.1.2-canary.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @modern-js/1.0.0-rc.19
 
+## 1.1.1
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0
+
 ## 1.0.1
 
 ### Patch Changes

package/dist/js/modern/index.js

@@ -4,7 +4,7 @@ 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 fs from 'fs/promises';
+import fs from 'fs';
 import path from 'path';
 import { randomUUID } from 'crypto';
 import { build } from 'esbuild';
@@ -12,7 +12,7 @@ const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/; // Must not start with "/" or ".
 // "/test/node_modules/foo"
 // "c:/node_modules/foo"
 
-export const EXTERNAL_REGEXP = /^([[a-zA-Z\]:].*node_modules)|^[a-zA-Z]{2,}:|^[a-zA-Z]{3,}|^(\/[a-zA-Z].*node_modules.*)/;
+export const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 const CACHE_DIR = path.relative(process.cwd(), './node_modules/.node-bundle-require');
 
 function inferLoader(ext) {
@@ -94,7 +94,7 @@ export async function bundleRequire(filepath, options) {
         ctx.onLoad({
           filter: JS_EXT_RE
         }, async args => {
-          const contents = await fs.readFile(args.path, 'utf-8');
+          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))
@@ -109,10 +109,18 @@ export async function bundleRequire(filepath, options) {
       setup(_build) {
         _build.onResolve({
           filter: EXTERNAL_REGEXP
-        }, args => ({
-          path: args.path,
-          external: true
-        }));
+        }, args => {
+          let external = true; // FIXME: windows external entrypoint
+
+          if (args.kind === 'entry-point') {
+            external = false;
+          }
+
+          return {
+            path: args.path,
+            external
+          };
+        });
       }
 
     }]
@@ -124,7 +132,7 @@ export async function bundleRequire(filepath, options) {
     mod = await req(outfile);
   } finally {
     // Remove the outfile after executed
-    await fs.unlink(outfile);
+    fs.unlinkSync(outfile);
   }
 
   return mod;

package/dist/js/node/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.EXTERNAL_REGEXP = void 0;
 exports.bundleRequire = bundleRequire;
 
-var _promises = _interopRequireDefault(require("fs/promises"));
+var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
@@ -26,7 +26,7 @@ const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/; // Must not start with "/" or ".
 // "/test/node_modules/foo"
 // "c:/node_modules/foo"
 
-const EXTERNAL_REGEXP = /^([[a-zA-Z\]:].*node_modules)|^[a-zA-Z]{2,}:|^[a-zA-Z]{3,}|^(\/[a-zA-Z].*node_modules.*)/;
+const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 exports.EXTERNAL_REGEXP = EXTERNAL_REGEXP;
 
 const CACHE_DIR = _path.default.relative(process.cwd(), './node_modules/.node-bundle-require');
@@ -110,7 +110,8 @@ async function bundleRequire(filepath, options) {
         ctx.onLoad({
           filter: JS_EXT_RE
         }, async args => {
-          const contents = await _promises.default.readFile(args.path, 'utf-8');
+          const contents = _fs.default.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))
@@ -125,10 +126,18 @@ async function bundleRequire(filepath, options) {
       setup(_build) {
         _build.onResolve({
           filter: EXTERNAL_REGEXP
-        }, args => ({
-          path: args.path,
-          external: true
-        }));
+        }, args => {
+          let external = true; // FIXME: windows external entrypoint
+
+          if (args.kind === 'entry-point') {
+            external = false;
+          }
+
+          return {
+            path: args.path,
+            external
+          };
+        });
       }
 
     }]
@@ -140,7 +149,7 @@ async function bundleRequire(filepath, options) {
     mod = await req(outfile);
   } finally {
     // Remove the outfile after executed
-    await _promises.default.unlink(outfile);
+    _fs.default.unlinkSync(outfile);
   }
 
   return mod;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/node-bundle-require",
-  "version": "1.0.1",
+  "version": "1.1.2-canary.0",
   "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",
@@ -26,13 +26,19 @@
       "default": "./dist/js/treeshaking/index.js"
     }
   },
+  "scripts": {
+    "prepare": "pnpm build",
+    "new": "modern new",
+    "build": "modern build",
+    "test": "modern test --passWithNoTests"
+  },
   "dependencies": {
     "@babel/runtime": "^7",
     "esbuild": "^0.13.8"
   },
   "devDependencies": {
-    "@modern-js/plugin-testing": "^1.0.0",
-    "@modern-js/module-tools": "^1.0.0",
+    "@modern-js/plugin-testing": "^1.1.1",
+    "@modern-js/module-tools": "^1.1.1",
     "@types/jest": "^26.0.9",
     "@types/node": "^14",
     "typescript": "^4"
@@ -46,10 +52,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
-  },
-  "scripts": {
-    "new": "modern new",
-    "build": "modern build",
-    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/index.ts

@@ -1,4 +1,4 @@
-import fs from 'fs/promises';
+import fs from 'fs';
 import path from 'path';
 import { randomUUID } from 'crypto';
 import { build, Loader, Plugin, BuildOptions } from 'esbuild';
@@ -8,8 +8,7 @@ const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/;
 // Must not start with "/" or "./" or "../"
 // "/test/node_modules/foo"
 // "c:/node_modules/foo"
-export const EXTERNAL_REGEXP =
-  /^([[a-zA-Z\]:].*node_modules)|^[a-zA-Z]{2,}:|^[a-zA-Z]{3,}|^(\/[a-zA-Z].*node_modules.*)/;
+export const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
 
 const CACHE_DIR = path.relative(
   process.cwd(),
@@ -114,7 +113,7 @@ export async function bundleRequire(filepath: string, options?: Options) {
         name: 'replace-path',
         setup(ctx) {
           ctx.onLoad({ filter: JS_EXT_RE }, async args => {
-            const contents = await fs.readFile(args.path, 'utf-8');
+            const contents = fs.readFileSync(args.path, 'utf-8');
             return {
               contents: contents
                 .replace(/\b__filename\b/g, JSON.stringify(args.path))
@@ -135,10 +134,17 @@ export async function bundleRequire(filepath: string, options?: Options) {
       {
         name: 'make-all-packages-external',
         setup(_build) {
-          _build.onResolve({ filter: EXTERNAL_REGEXP }, args => ({
-            path: args.path,
-            external: true,
-          }));
+          _build.onResolve({ filter: EXTERNAL_REGEXP }, args => {
+            let external = true;
+            // FIXME: windows external entrypoint
+            if (args.kind === 'entry-point') {
+              external = false;
+            }
+            return {
+              path: args.path,
+              external,
+            };
+          });
         },
       },
     ],
@@ -150,7 +156,7 @@ export async function bundleRequire(filepath: string, options?: Options) {
     mod = await req(outfile);
   } finally {
     // Remove the outfile after executed
-    await fs.unlink(outfile);
+    fs.unlinkSync(outfile);
   }
 
   return mod;

package/tests/index.test.ts

@@ -1,5 +1,5 @@
 import path from 'path';
-import { bundleRequire, EXTERNAL_REGEXP } from '..';
+import { bundleRequire, EXTERNAL_REGEXP } from '../src';
 
 test('require', async () => {
   const result = await bundleRequire(
@@ -11,9 +11,9 @@ test('require', async () => {
 describe('external regexp', () => {
   expect(EXTERNAL_REGEXP.test('./test')).toBeFalsy();
   expect(EXTERNAL_REGEXP.test('/test')).toBeFalsy();
-  expect(EXTERNAL_REGEXP.test('c:/foo')).toBeFalsy();
-  expect(EXTERNAL_REGEXP.test('C:/foo')).toBeFalsy();
+  expect(EXTERNAL_REGEXP.test('c:/foo')).toBeTruthy();
+  expect(EXTERNAL_REGEXP.test('C:/foo')).toBeTruthy();
   expect(EXTERNAL_REGEXP.test('c:/node_modules/foo')).toBeTruthy();
   expect(EXTERNAL_REGEXP.test('foo')).toBeTruthy();
-  expect(EXTERNAL_REGEXP.test('/test/node_modules')).toBeTruthy();
+  expect(EXTERNAL_REGEXP.test('/test/node_modules')).toBeFalsy();
 });