@modern-js/module-tools 1.1.4-beta.0 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @modern-js/module-tools
 
+## 1.2.0
+
+### Minor Changes
+
+- cfe11628: Make Modern.js self bootstraping
+
+### Patch Changes
+
+- Updated dependencies [2da09c69]
+- Updated dependencies [fc71e36f]
+- Updated dependencies [2c049918]
+- Updated dependencies [c3d46ee4]
+- Updated dependencies [cfe11628]
+- Updated dependencies [1ebc7ee2]
+- Updated dependencies [146dcd85]
+- Updated dependencies [1ebc7ee2]
+  - @modern-js/utils@1.2.0
+  - @modern-js/core@1.3.0
+  - @modern-js/new-action@1.3.0
+  - @modern-js/babel-preset-module@1.2.0
+  - @modern-js/css-config@1.2.0
+  - @modern-js/i18n-cli-language-detector@1.2.0
+  - @modern-js/plugin-analyze@1.2.0
+  - @modern-js/plugin-changeset@1.2.0
+  - @modern-js/plugin-fast-refresh@1.2.0
+  - @modern-js/plugin-i18n@1.2.0
+  - @modern-js/babel-compiler@1.2.0
+  - @modern-js/style-compiler@1.2.0
+  - @modern-js/module-tools-hooks@1.2.0
+
+## 1.1.5
+
+### Patch Changes
+
+- 2da27d3b: fix sourcemap 'source' config
+- Updated dependencies [5e3de7d8]
+- Updated dependencies [2da27d3b]
+- Updated dependencies [4819a3c7]
+- Updated dependencies [b7fb82ec]
+- Updated dependencies [81d93503]
+  - @modern-js/plugin-i18n@1.1.2
+  - @modern-js/babel-compiler@1.1.4
+  - @modern-js/new-action@1.2.2
+  - @modern-js/plugin-changeset@1.1.2
+  - @modern-js/utils@1.1.6
+
 ## 1.1.4
 
 ### Patch Changes

package/dist/js/modern/tasks/build-source-code.js

@@ -63,7 +63,8 @@ export const getWillCompilerCode = (srcDirOrFile, option) => {
   const exts = getExts(isTsProject);
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
   const files = glob.sync(globPattern, {
-    ignore: [`${srcDirOrFile}/**/*.d.ts`]
+    ignore: [`${srcDirOrFile}/**/*.d.ts`],
+    absolute: true
   });
   return files;
 };

package/dist/js/modern/tasks/build-watch-source-code.js

@@ -1,3 +1,9 @@
+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 { Import, fs } from '@modern-js/utils';
 import { initEnv } from "../utils/init-env";
 const babelCompiler = Import.lazy('@modern-js/babel-compiler', require);
@@ -61,7 +67,9 @@ const runBabelCompiler = async (config, modernConfig) => {
     distDir: config.distDir,
     watchDir: config.srcRootDir,
     extensions: getExts(isTs)
-  }, babelConfig);
+  }, _objectSpread(_objectSpread({}, babelConfig), {}, {
+    sourceMaps: config.sourceMaps
+  }));
   emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
     console.info(logger.clearFlag, `Compiling...`);
   });

package/dist/js/node/tasks/build-source-code.js

@@ -79,7 +79,8 @@ const getWillCompilerCode = (srcDirOrFile, option) => {
   const exts = getExts(isTsProject);
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
   const files = glob.sync(globPattern, {
-    ignore: [`${srcDirOrFile}/**/*.d.ts`]
+    ignore: [`${srcDirOrFile}/**/*.d.ts`],
+    absolute: true
   });
   return files;
 };

package/dist/js/node/tasks/build-watch-source-code.js

@@ -4,6 +4,12 @@ var _utils = require("@modern-js/utils");
 
 var _initEnv = require("../utils/init-env");
 
+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 babelCompiler = _utils.Import.lazy('@modern-js/babel-compiler', require);
 
 const logger = _utils.Import.lazy('../features/build/logger', require);
@@ -73,7 +79,9 @@ const runBabelCompiler = async (config, modernConfig) => {
     distDir: config.distDir,
     watchDir: config.srcRootDir,
     extensions: getExts(isTs)
-  }, babelConfig);
+  }, _objectSpread(_objectSpread({}, babelConfig), {}, {
+    sourceMaps: config.sourceMaps
+  }));
   emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
     console.info(logger.clearFlag, `Compiling...`);
   });

package/dist/types/commands/build.d.ts

@@ -1,4 +1,4 @@
-import type { Platform } from "../types.d";
+import type { Platform } from '../types';
 export interface IBuildOption {
   watch: boolean;
   tsconfig: string;

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export declare const defineConfig: (config: import("@modern-js/core/config").ConfigParam) => import("@modern-js/core/config").ConfigParam;
+export declare const defineConfig: (config: import("@modern-js/core/src/config").ConfigParam) => import("@modern-js/core/src/config").ConfigParam;
 
 declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
   config: import("@modern-js/core").ParallelWorkflow<void, unknown>;

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/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.4-beta.0",
+  "version": "1.2.0",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -23,13 +23,20 @@
   "exports": {
     ".": {
       "node": {
+        "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/index.js"
     },
-    "./cli": "./dist/js/node/index.js",
-    "./build": "./dist/js/node/build.js"
+    "./cli": {
+      "jsnext:source": "./src/index.ts",
+      "default": "./dist/js/node/index.js"
+    },
+    "./build": {
+      "jsnext:source": "./src/build.ts",
+      "default": "./dist/js/node/build.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -44,19 +51,19 @@
     "@babel/runtime": "^7",
     "@babel/traverse": "^7.15.0",
     "@babel/types": "^7.15.0",
-    "@modern-js/babel-compiler": "^1.1.3",
-    "@modern-js/babel-preset-module": "^1.1.2",
-    "@modern-js/core": "^1.2.0",
-    "@modern-js/css-config": "^1.1.2",
-    "@modern-js/i18n-cli-language-detector": "^1.1.1",
-    "@modern-js/module-tools-hooks": "^1.1.2",
-    "@modern-js/new-action": "^1.2.0",
-    "@modern-js/plugin-analyze": "^1.1.2",
-    "@modern-js/plugin-changeset": "^1.1.1",
-    "@modern-js/plugin-fast-refresh": "^1.1.1",
-    "@modern-js/plugin-i18n": "^1.1.1",
-    "@modern-js/style-compiler": "^1.1.3",
-    "@modern-js/utils": "^1.1.5",
+    "@modern-js/babel-compiler": "^1.2.0",
+    "@modern-js/babel-preset-module": "^1.2.0",
+    "@modern-js/core": "^1.3.0",
+    "@modern-js/css-config": "^1.2.0",
+    "@modern-js/i18n-cli-language-detector": "^1.2.0",
+    "@modern-js/module-tools-hooks": "^1.2.0",
+    "@modern-js/new-action": "^1.3.0",
+    "@modern-js/plugin-analyze": "^1.2.0",
+    "@modern-js/plugin-changeset": "^1.2.0",
+    "@modern-js/plugin-fast-refresh": "^1.2.0",
+    "@modern-js/plugin-i18n": "^1.2.0",
+    "@modern-js/style-compiler": "^1.2.0",
+    "@modern-js/utils": "^1.2.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.2",
     "dotenv": "^10.0.0",
@@ -75,7 +82,7 @@
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.15.0",
-    "@modern-js/babel-chain": "^1.1.1",
+    "@modern-js/babel-chain": "^1.2.0",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
@@ -88,8 +95,9 @@
     "@types/signale": "^1.4.2",
     "commander": "^8.1.0",
     "typescript": "^4",
-    "@modern-js/plugin-testing": "^1.2.0",
-    "@modern-js/module-tools": "^1.1.3"
+    "@scripts/build": "0.0.0",
+    "jest": "^27",
+    "@scripts/jest-config": "0.0.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -99,12 +107,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/cli/dev.ts

@@ -1,6 +1,6 @@
 import { Import } from '@modern-js/utils';
 import type { Command } from 'commander';
-import type { IDevOption } from '@/commands/dev';
+import type { IDevOption } from '../commands/dev';
 
 const local: typeof import('../locale') = Import.lazy('../locale', require);
 const commands: typeof import('../commands') = Import.lazy(

package/src/commands/build.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { fs, Import } from '@modern-js/utils';
-import type { Platform } from '@/types';
+import type { Platform } from '../types';
 
 const tsConfigutils: typeof import('../utils/tsconfig') = Import.lazy(
   '../utils/tsconfig',

package/src/tasks/build-source-code.ts

@@ -92,6 +92,7 @@ export const getWillCompilerCode = (
   const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
   const files = glob.sync(globPattern, {
     ignore: [`${srcDirOrFile}/**/*.d.ts`],
+    absolute: true,
   });
 
   return files;

package/src/tasks/build-watch-source-code.ts

@@ -82,7 +82,7 @@ const runBabelCompiler = async (
       watchDir: config.srcRootDir,
       extensions: getExts(isTs),
     },
-    babelConfig,
+    { ...babelConfig, sourceMaps: config.sourceMaps },
   );
   emitter.on(babelCompiler.BuildWatchEvent.compiling, () => {
     console.info(logger.clearFlag, `Compiling...`);

package/src/tasks/generator-dts.ts

@@ -3,7 +3,7 @@ import * as path from 'path';
 import * as os from 'os';
 import { Import, fs } from '@modern-js/utils';
 import type { NormalizedConfig, CoreOptions } from '@modern-js/core';
-import type { ITsconfig } from '@/types';
+import type { ITsconfig } from '../types';
 
 const tsPathsTransform: typeof import('../utils/tspaths-transform') =
   Import.lazy('../utils/tspaths-transform', require);

package/tests/fixtures/tspaths/a.ts

@@ -0,0 +1 @@
+import '@/b.ts';

package/tests/fixtures/tspaths/b.ts

@@ -0,0 +1 @@
+export const b = 10;

package/tests/index.test.ts

@@ -0,0 +1,7 @@
+import plugin from '../src';
+
+describe('module-tools', () => {
+  it('default', () => {
+    expect(plugin).toBeDefined();
+  });
+});

package/tests/tspaths-transform.test.ts

@@ -0,0 +1,21 @@
+import path from 'path';
+import { transformDtsAlias } from '../src/utils/tspaths-transform';
+
+describe('tspaths-transform', () => {
+  it('transformDtsAlias', () => {
+    const filepath = path.join(__dirname, 'fixtures/tspaths/a.ts');
+    const options = {
+      filenames: [filepath],
+      baseUrl: './',
+      paths: {
+        '@/*': ['./*'],
+      },
+    };
+    expect(transformDtsAlias(options)).toEqual([
+      {
+        path: filepath,
+        content: "import '@/b.ts';",
+      },
+    ]);
+  });
+});

package/tsconfig.json

@@ -5,9 +5,7 @@
     "jsx": "preserve",
     "baseUrl": "./",
     "isolatedModules": true,
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "paths": {}
   },
   "include": ["src"]
 }