@modern-js/node-bundle-require 1.0.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @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
+
+- fix(require): external regexp
+
 ## 1.0.0
 
 ### Patch Changes

package/README.md

@@ -17,10 +17,7 @@
 
 > The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
 
-- 介绍 Modern.js (即将上线)
-- [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
-- [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
-- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
 ## Getting Started
 

package/dist/js/modern/index.js

@@ -8,7 +8,11 @@ import fs from 'fs/promises';
 import path from 'path';
 import { randomUUID } from 'crypto';
 import { build } from 'esbuild';
-const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/;
+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 = /^[^./]|^\.[^./]|^\.\.[^/]/;
 const CACHE_DIR = path.relative(process.cwd(), './node_modules/.node-bundle-require');
 
 function inferLoader(ext) {
@@ -102,15 +106,21 @@ export async function bundleRequire(filepath, options) {
     {
       name: 'make-all-packages-external',
 
-      setup(build) {
-        const filter = /^[^.\/]|^\.[^.\/]|^\.\.[^\/]/; // Must not start with "/" or "./" or "../"
+      setup(_build) {
+        _build.onResolve({
+          filter: EXTERNAL_REGEXP
+        }, args => {
+          let external = true; // FIXME: windows external entrypoint
 
-        build.onResolve({
-          filter
-        }, args => ({
-          path: args.path,
-          external: true
-        }));
+          if (args.kind === 'entry-point') {
+            external = false;
+          }
+
+          return {
+            path: args.path,
+            external
+          };
+        });
       }
 
     }]

package/dist/js/node/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.EXTERNAL_REGEXP = void 0;
 exports.bundleRequire = bundleRequire;
 
 var _promises = _interopRequireDefault(require("fs/promises"));
@@ -21,7 +22,12 @@ 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 JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/;
+const JS_EXT_RE = /\.(mjs|cjs|ts|js|tsx|jsx)$/; // Must not start with "/" or "./" or "../"
+// "/test/node_modules/foo"
+// "c:/node_modules/foo"
+
+const EXTERNAL_REGEXP = /^[^./]|^\.[^./]|^\.\.[^/]/;
+exports.EXTERNAL_REGEXP = EXTERNAL_REGEXP;
 
 const CACHE_DIR = _path.default.relative(process.cwd(), './node_modules/.node-bundle-require');
 
@@ -116,15 +122,21 @@ async function bundleRequire(filepath, options) {
     {
       name: 'make-all-packages-external',
 
-      setup(build) {
-        const filter = /^[^.\/]|^\.[^.\/]|^\.\.[^\/]/; // Must not start with "/" or "./" or "../"
+      setup(_build) {
+        _build.onResolve({
+          filter: EXTERNAL_REGEXP
+        }, args => {
+          let external = true; // FIXME: windows external entrypoint
 
-        build.onResolve({
-          filter
-        }, args => ({
-          path: args.path,
-          external: true
-        }));
+          if (args.kind === 'entry-point') {
+            external = false;
+          }
+
+          return {
+            path: args.path,
+            external
+          };
+        });
       }
 
     }]

package/dist/types/index.d.ts

@@ -1,4 +1,5 @@
 import { Plugin, BuildOptions } from 'esbuild';
+export declare const EXTERNAL_REGEXP: RegExp;
 export interface Options {
   /**
    * The `require` function that is used to load the output file

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/node-bundle-require",
-  "version": "1.0.0",
+  "version": "1.1.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",
@@ -31,8 +31,8 @@
     "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.0",
+    "@modern-js/module-tools": "^1.1.0",
     "@types/jest": "^26.0.9",
     "@types/node": "^14",
     "typescript": "^4"

package/src/index.ts

@@ -5,6 +5,11 @@ import { build, Loader, Plugin, BuildOptions } from 'esbuild';
 
 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 = /^[^./]|^\.[^./]|^\.\.[^/]/;
+
 const CACHE_DIR = path.relative(
   process.cwd(),
   './node_modules/.node-bundle-require',
@@ -128,12 +133,18 @@ export async function bundleRequire(filepath: string, options?: Options) {
       // https://github.com/evanw/esbuild/issues/619#issuecomment-751995294
       {
         name: 'make-all-packages-external',
-        setup(build) {
-          const filter = /^[^.\/]|^\.[^.\/]|^\.\.[^\/]/; // Must not start with "/" or "./" or "../"
-          build.onResolve({ filter }, args => ({
-            path: args.path,
-            external: true,
-          }));
+        setup(_build) {
+          _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,
+            };
+          });
         },
       },
     ],

package/tests/.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
-  extends: "@modern-js-app",
+  extends: '@modern-js',
   parserOptions: {
-    project: require.resolve('tsconfig.json')
-  }
-}
+    project: require.resolve('./tsconfig.json'),
+  },
+};

package/tests/fixture/a.ts

@@ -1 +1 @@
-export const filename: string = __filename
+export const filename: string = __filename;

package/tests/fixture/input.ts

@@ -1,5 +1,5 @@
-import * as a from './a'
+import * as a from './a';
 
 export default {
   a,
-}
+};

package/tests/index.test.ts

@@ -1,7 +1,19 @@
-import path from 'path'
-import { bundleRequire } from '..'
+import path from 'path';
+import { bundleRequire, EXTERNAL_REGEXP } from '../src';
 
-test('main', async () => {
-  const result = await bundleRequire(path.join(__dirname, './fixture/input.ts'))
-  expect(result.default.a.filename.endsWith('a.ts')).toEqual(true)
-})
+test('require', async () => {
+  const result = await bundleRequire(
+    path.join(__dirname, './fixture/input.ts'),
+  );
+  expect(result.default.a.filename.endsWith('a.ts')).toEqual(true);
+});
+
+describe('external regexp', () => {
+  expect(EXTERNAL_REGEXP.test('./test')).toBeFalsy();
+  expect(EXTERNAL_REGEXP.test('/test')).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')).toBeFalsy();
+});

package/tests/modern-app-env.d.ts

@@ -1,2 +1,2 @@
-///<reference types="@modern-js/module-tools/types" />
-///<reference types="@modern-js/plugin-testing/type" />
+/// <reference types="@modern-js/module-tools/types" />
+/// <reference types="@modern-js/plugin-testing/type" />