@modern-js/babel-compiler 1.1.3-rc.0 → 1.2.0

package/CHANGELOG.md

@@ -1,17 +1,35 @@
 # @modern-js/babel-compiler
 
-## 1.1.3-rc.0
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- 146dcd85: fix test case in babel compiler
+- 1ebc7ee2: fix: @babel/core version
+- Updated dependencies [2da09c69]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+  - @modern-js/utils@1.2.0
+
+## 1.1.4
+
+### Patch Changes
+
+- 2da27d3b: fix sourcemap 'source' config
+- Updated dependencies [b7fb82ec]
+  - @modern-js/utils@1.1.6
+
+## 1.1.3
 
 ### Patch Changes
 
-- Updated dependencies [d927bc83]
-- Updated dependencies [d73ff455]
-- Updated dependencies [9c1ab865]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-- Updated dependencies [d73ff455]
-  - @modern-js/utils@1.1.4-rc.0
+- ca7dcb32: change watch logic
+- Updated dependencies [ca7dcb32]
+  - @modern-js/utils@1.1.5
 
 ## 1.1.2
 

package/dist/js/modern/buildWatch.js

@@ -54,7 +54,7 @@ export const runBuildWatch = async (option, babelConfig = {}, emitter) => {
     emitter.emit(BuildWatchEvent.firstCompiler, fisrtBuildResult);
   }
 
-  return watch(watchDir, async ({
+  return watch(`${watchDir}/**/*.{js,jsx,ts,tsx}`, async ({
     changeType,
     changedFilePath
   }) => {

package/dist/js/modern/compiler.js

@@ -24,6 +24,7 @@ export const getDistFilePath = option => {
 export const resolveSourceMap = option => {
   const {
     babelRes,
+    sourceFilePath,
     distFilePath,
     enableVirtualDist = false
   } = option;
@@ -32,6 +33,7 @@ export const resolveSourceMap = option => {
 
   if (babelRes.map) {
     babelRes.map.file = path.basename(distFilePath);
+    babelRes.map.sources = [path.relative(path.dirname(distFilePath), sourceFilePath)];
   }
 
   const sourceMapVirtualDist = {
@@ -85,12 +87,14 @@ export const compiler = option => {
     if (virtualDist) {
       virtualDist = _objectSpread(_objectSpread({}, virtualDist), resolveSourceMap({
         babelRes,
+        sourceFilePath: filepath,
         distFilePath,
         enableVirtualDist
       }));
     } else {
       resolveSourceMap({
         babelRes,
+        sourceFilePath: filepath,
         distFilePath,
         enableVirtualDist
       });

package/dist/js/node/buildWatch.js

@@ -75,7 +75,7 @@ const runBuildWatch = async (option, babelConfig = {}, emitter) => {
     emitter.emit(BuildWatchEvent.firstCompiler, fisrtBuildResult);
   }
 
-  return (0, _utils.watch)(watchDir, async ({
+  return (0, _utils.watch)(`${watchDir}/**/*.{js,jsx,ts,tsx}`, async ({
     changeType,
     changedFilePath
   }) => {

package/dist/js/node/compiler.js

@@ -47,6 +47,7 @@ exports.getDistFilePath = getDistFilePath;
 const resolveSourceMap = option => {
   const {
     babelRes,
+    sourceFilePath,
     distFilePath,
     enableVirtualDist = false
   } = option;
@@ -55,6 +56,7 @@ const resolveSourceMap = option => {
 
   if (babelRes.map) {
     babelRes.map.file = path.basename(distFilePath);
+    babelRes.map.sources = [path.relative(path.dirname(distFilePath), sourceFilePath)];
   }
 
   const sourceMapVirtualDist = {
@@ -113,12 +115,14 @@ const compiler = option => {
     if (virtualDist) {
       virtualDist = _objectSpread(_objectSpread({}, virtualDist), resolveSourceMap({
         babelRes,
+        sourceFilePath: filepath,
         distFilePath,
         enableVirtualDist
       }));
     } else {
       resolveSourceMap({
         babelRes,
+        sourceFilePath: filepath,
         distFilePath,
         enableVirtualDist
       });

package/dist/types/compiler.d.ts

@@ -19,6 +19,7 @@ export declare const getDistFilePath: (option: {
 }) => string;
 export declare const resolveSourceMap: (option: {
   babelRes: babel.BabelFileResult;
+  sourceFilePath: string;
   distFilePath: string;
   enableVirtualDist?: boolean;
 }) => {

package/dist/types/getFinalOption.d.ts

@@ -1,7 +1,7 @@
 import type { IOptions } from 'glob';
 import { Extensions, ExtensionsFunc, ICompilerOptions, IFinaleCompilerOptions } from './type';
 export declare const getGlobPattern: (dir: string, extensions: Extensions) => string;
-export declare const getFinalExtensions: (extensions: Extensions | ExtensionsFunc | undefined) => Extensions;
+export declare const getFinalExtensions: (extensions: Extensions | ExtensionsFunc | undefined) => string[];
 export declare const getFilesFromDir: ({
   dir,
   finalExt,

package/jest.config.js

@@ -0,0 +1,8 @@
+const sharedConfig = require('@scripts/jest-config');
+
+/** @type {import('@jest/types').Config.InitialOptions} */
+module.exports = {
+  // eslint-disable-next-line node/no-unsupported-features/es-syntax
+  ...sharedConfig,
+  rootDir: __dirname,
+};

package/modern.config.js

@@ -4,16 +4,4 @@ module.exports = {
     // enableTsChecker: true,
     disableSourceMap: true,
   },
-  testing: {
-    jest: {
-      // Reasons for setting up testRunner:
-      // https://github.com/facebook/jest/issues/10529
-      // https://jestjs.io/blog/2020/05/05/jest-26
-      testRunner: 'jest-jasmine2',
-      testEnvironment: 'node',
-      collectCoverage: true,
-      collectCoverageFrom: ['./src/**/*.ts'],
-      coveragePathIgnorePatterns: ['/node_modules/', '/tests'],
-    },
-  },
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-rc.0",
+  "version": "1.2.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -20,6 +20,7 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
@@ -27,9 +28,9 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "7.16.7",
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.1.4-rc.0",
+    "@modern-js/utils": "^1.2.0",
     "chokidar": "^3.5.2",
     "glob": "^7.1.6"
   },
@@ -42,8 +43,9 @@
     "@types/node": "^14",
     "jest-jasmine2": "^27.2.2",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/module-tools": "^1.1.1"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -53,12 +55,13 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "scripts": {
     "new": "modern new",
     "build": "modern build",
-    "test": "modern test --passWithNoTests"
+    "test": "jest --passWithNoTests"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> 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.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"
 }

package/src/buildWatch.ts

@@ -55,7 +55,7 @@ export const runBuildWatch = async (
   }
 
   return watch(
-    watchDir,
+    `${watchDir}/**/*.{js,jsx,ts,tsx}`,
     async ({ changeType, changedFilePath }) => {
       emitter.emit(BuildWatchEvent.compiling);
       if (changeType === WatchChangeType.UNLINK) {

package/src/compiler.ts

@@ -38,15 +38,24 @@ export const getDistFilePath = (option: {
 
 export const resolveSourceMap = (option: {
   babelRes: babel.BabelFileResult;
+  sourceFilePath: string;
   distFilePath: string;
   enableVirtualDist?: boolean;
 }) => {
-  const { babelRes, distFilePath, enableVirtualDist = false } = option;
+  const {
+    babelRes,
+    sourceFilePath,
+    distFilePath,
+    enableVirtualDist = false,
+  } = option;
   const mapLoc = `${distFilePath}.map`;
   babelRes.code = utils.addSourceMappingUrl(babelRes.code as string, mapLoc);
 
   if (babelRes.map) {
     babelRes.map.file = path.basename(distFilePath);
+    babelRes.map.sources = [
+      path.relative(path.dirname(distFilePath), sourceFilePath),
+    ];
   }
 
   const sourceMapVirtualDist = {
@@ -106,10 +115,20 @@ export const compiler = (option: ISingleFileCompilerOption) => {
     if (virtualDist) {
       virtualDist = {
         ...virtualDist,
-        ...resolveSourceMap({ babelRes, distFilePath, enableVirtualDist }),
+        ...resolveSourceMap({
+          babelRes,
+          sourceFilePath: filepath,
+          distFilePath,
+          enableVirtualDist,
+        }),
       };
     } else {
-      resolveSourceMap({ babelRes, distFilePath, enableVirtualDist });
+      resolveSourceMap({
+        babelRes,
+        sourceFilePath: filepath,
+        distFilePath,
+        enableVirtualDist,
+      });
     }
   }
 

package/tests/build.test.ts

@@ -24,7 +24,6 @@ describe('test build', () => {
     await build({ rootDir: srcDir, filenames, distDir });
     const globFindFiles = glob.sync(`${distDir}/**/*.js`);
     expect(globFindFiles.length).toBe(1);
-    fs.removeSync(distDir);
   });
 
   it('build with enableVirtualDist and success', async () => {
@@ -80,7 +79,6 @@ describe('test build', () => {
     });
     const globFindFiles = glob.sync(`${distDir}/**/*.js`);
     expect(globFindFiles.length).toBe(1);
-    fs.removeSync(distDir);
   });
 
   it('build multiple files and success', async () => {

package/tests/buildWatch.test.ts

@@ -39,7 +39,9 @@ describe('test build watch', () => {
     expect(ret).toBe(null);
   });
 
-  it('runBuildWatch and success', async done => {
+  it('runBuildWatch and success', async () => {
+    let done: any;
+    const promise = new Promise(resolve => (done = resolve));
     let compiling = false;
     const emitter = new BuildWatchEmitter();
     emitter.on(BuildWatchEvent.firstCompiler, (result: ICompilerResult) => {
@@ -65,9 +67,12 @@ describe('test build watch', () => {
       fs.ensureFileSync(path.join(srcDir, 'far.js'));
       compiling = true;
     });
+    return promise;
   });
 
-  it('runBuildWatch and fail', async done => {
+  it('runBuildWatch and fail', async () => {
+    let done: any;
+    const promise = new Promise(resolve => (done = resolve));
     const emitter = new BuildWatchEmitter();
     emitter.on(BuildWatchEvent.firstCompiler, (result: ICompilerResult) => {
       expect(result.code).toBe(1);
@@ -89,9 +94,12 @@ describe('test build watch', () => {
       fs.ensureFileSync(path.join(srcDir, 'error1.js'));
       fs.writeFileSync(path.join(srcDir, 'error1.js'), 'conta a = 1');
     });
+    return promise;
   });
 
-  it('buildWatch and success', async done => {
+  it('buildWatch and success', async () => {
+    let done: any;
+    const promise = new Promise(resolve => (done = resolve));
     const emitter = buildWatch({
       rootDir: srcDir,
       watchDir: srcDir,
@@ -125,9 +133,12 @@ describe('test build watch', () => {
         compiling = true;
       });
     }
+    return promise;
   });
 
-  it('buildWatch and fail', async done => {
+  it('buildWatch and fail', async () => {
+    let done: any;
+    const promise = new Promise(resolve => (done = resolve));
     const emitter = buildWatch({
       rootDir: srcDir,
       watchDir: srcDir,
@@ -161,9 +172,12 @@ describe('test build watch', () => {
         compiling = true;
       });
     }
+    return promise;
   });
 
-  it('buildWatch and remove file', async done => {
+  it('buildWatch and remove file', async () => {
+    let done: any;
+    const promise = new Promise(resolve => (done = resolve));
     const emitter = buildWatch({
       rootDir: srcDir,
       watchDir: srcDir,
@@ -190,9 +204,12 @@ describe('test build watch', () => {
         fs.removeSync(path.join(srcDir, 'far.js'));
       });
     }
+    return promise;
   });
 
-  it('buildWatch and reRight file', async done => {
+  it('buildWatch and reRight file', async () => {
+    let done: any;
+    const promise = new Promise(resolve => (done = resolve));
     fs.ensureFileSync(path.join(srcDir, 'error1.js'));
     fs.writeFileSync(path.join(srcDir, 'error1.js'), 'cast a = 1;');
     const emitter = buildWatch({
@@ -221,6 +238,7 @@ describe('test build watch', () => {
         fs.writeFileSync(path.join(srcDir, 'error1.js'), 'const a = 1;');
       });
     }
+    return promise;
   });
 
   afterEach(() => {

package/tests/compiler.test.ts

@@ -49,6 +49,7 @@ describe('compiler', () => {
     const distFilePath = path.join(projectDir, 'dist/far.js');
     const sourcemap_1 = resolveSourceMap({
       babelRes: babelRes as babel.BabelFileResult,
+      sourceFilePath: path.join(projectDir, 'src/index.js'),
       distFilePath,
       enableVirtualDist: true,
     });
@@ -59,6 +60,7 @@ describe('compiler', () => {
 
     const sourcemap_2 = resolveSourceMap({
       babelRes: babelRes as babel.BabelFileResult,
+      sourceFilePath: path.join(projectDir, 'src/index.js'),
       distFilePath,
     });
     expect(fs.readFileSync(sourcemap_2.sourceMapPath, 'utf-8')).toBe(

package/tests/tsconfig.json

@@ -7,9 +7,7 @@
     "outDir": "./out",
     "emitDeclarationOnly": true,
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["../src/*"]
-    },
+    "paths": {},
     "types": ["node", "jest"]
   }
 }

package/tsconfig.json

@@ -7,9 +7,7 @@
     "outDir": "./out",
     "emitDeclarationOnly": true,
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    },
+    "paths": {},
     "types": ["node", "jest"]
   },
   "include": ["src"]