@modern-js/module-tools 1.5.0 → 1.5.3

package/CHANGELOG.md

@@ -1,5 +1,68 @@
 # @modern-js/module-tools
 
+## 1.5.3
+
+### Patch Changes
+
+- b8cfc42cd: feat: prebundle tsconfig-paths and nanoid
+- Updated dependencies [b8cfc42cd]
+- Updated dependencies [804a5bb8a]
+- Updated dependencies [3680834f2]
+- Updated dependencies [a37960018]
+  - @modern-js/utils@1.7.4
+  - @modern-js/plugin-analyze@1.4.4
+  - @modern-js/core@1.10.3
+  - @modern-js/css-config@1.2.6
+  - @modern-js/plugin-changeset@1.2.7
+  - @modern-js/plugin-fast-refresh@1.2.6
+
+## 1.5.2
+
+### Patch Changes
+
+- d32f35134: chore: add modern/jest/eslint/ts config files to .npmignore
+- Updated dependencies [d5913bd96]
+- Updated dependencies [d32f35134]
+- Updated dependencies [43d9bb5fa]
+- Updated dependencies [d9d398e16]
+- Updated dependencies [6ae4a34ae]
+- Updated dependencies [b80229c79]
+- Updated dependencies [948cc4436]
+  - @modern-js/plugin@1.3.4
+  - @modern-js/babel-preset-module@1.3.5
+  - @modern-js/core@1.10.2
+  - @modern-js/css-config@1.2.6
+  - @modern-js/i18n-cli-language-detector@1.2.3
+  - @modern-js/plugin-analyze@1.4.3
+  - @modern-js/plugin-changeset@1.2.7
+  - @modern-js/plugin-fast-refresh@1.2.6
+  - @modern-js/plugin-i18n@1.2.6
+  - @modern-js/new-action@1.3.9
+  - @modern-js/babel-compiler@1.2.5
+  - @modern-js/style-compiler@1.2.6
+  - @modern-js/utils@1.7.3
+
+## 1.5.1
+
+### Patch Changes
+
+- 69a728375: fix: remove exports.jsnext:source after publish
+- Updated dependencies [cd7346b0d]
+- Updated dependencies [0e0537005]
+- Updated dependencies [6b0bb5e3b]
+- Updated dependencies [69a728375]
+  - @modern-js/utils@1.7.2
+  - @modern-js/babel-preset-module@1.3.4
+  - @modern-js/babel-compiler@1.2.4
+  - @modern-js/new-action@1.3.8
+  - @modern-js/core@1.10.1
+  - @modern-js/css-config@1.2.5
+  - @modern-js/plugin-analyze@1.4.2
+  - @modern-js/plugin-changeset@1.2.6
+  - @modern-js/plugin-fast-refresh@1.2.5
+  - @modern-js/plugin-i18n@1.2.5
+  - @modern-js/style-compiler@1.2.5
+
 ## 1.5.0
 
 ### Minor Changes

package/dist/js/modern/features/build/logger/logText.js

@@ -1,3 +1,5 @@
+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 { chalk } from '@modern-js/utils';
 export const colors = {
   title: chalk.rgb(218, 152, 92)
@@ -27,9 +29,12 @@ ${_contentColor(messageFragments.join(''))}${_noBottomBorder ? '' : `\n${_bottom
 // 处理Log内容如何展示
 export class LoggerText {
   constructor(option) {
-    this.messages = void 0;
-    this.hasErrorMessage = void 0;
-    this.option = void 0;
+    _defineProperty(this, "messages", void 0);
+
+    _defineProperty(this, "hasErrorMessage", void 0);
+
+    _defineProperty(this, "option", void 0);
+
     this.messages = [];
     this.option = option;
     this.hasErrorMessage = false;

package/dist/js/modern/features/build/logger/loggerManager.js

@@ -1,6 +1,8 @@
 let _ = t => t,
     _t;
 
+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; }
+
 /**
  * 1. 注册构建任务
  * 2. 监听各个构建任务进程中的信息：process.stdout.on('data' | 'error')
@@ -13,8 +15,11 @@ const readline = Import.lazy('../../../utils/readline', require);
 export class LoggerManager extends EventEmitter {
   constructor() {
     super();
-    this._compilering = void 0;
-    this._listeners = void 0;
+
+    _defineProperty(this, "_compilering", void 0);
+
+    _defineProperty(this, "_listeners", void 0);
+
     this._compilering = false;
     this._listeners = [];
   }

package/dist/js/modern/features/build/utils.js

@@ -1,3 +1,5 @@
+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 * as path from 'path';
 import * as os from 'os';
 import { Import, chalk } from '@modern-js/utils';
@@ -128,7 +130,8 @@ export const getDtsMapper = (api, config, logger) => {
 
 export class LogStack {
   constructor() {
-    this._codeLogStack = void 0;
+    _defineProperty(this, "_codeLogStack", void 0);
+
     this._codeLogStack = [];
   }
 
@@ -187,4 +190,5 @@ export class TimeCounter {
   }
 
 }
-TimeCounter._now = void 0;
+
+_defineProperty(TimeCounter, "_now", void 0);

package/dist/js/modern/tasks/build-style.js

@@ -118,13 +118,13 @@ const taskMain = async ({
 
 
   const srcDir = path.resolve(appDirectory, SRC_STYLE_DIRS);
-  const outputDirtoSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
+  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
 
   if (importStyle === 'compiled-code') {
     const srcStyleResult = await compiler.styleCompiler({
       projectDir: appDirectory,
       stylesDir: srcDir,
-      outDir: outputDirtoSrc,
+      outDir: outputDirToSrc,
       enableVirtualDist: true,
       compilerOption: {
         less: lessOption,
@@ -136,7 +136,7 @@ const taskMain = async ({
   } else {
     copyOriginStyleFiles({
       targetDir: srcDir,
-      outputDir: outputDirtoSrc
+      outputDir: outputDirToSrc
     });
   }
 };

package/dist/js/modern/utils/copy.js

@@ -31,7 +31,7 @@ export const copyTask = async option => {
   try {
     // 类型暂时这样处理，待之后优化copy的逻辑
     for (const copyOption of copy) {
-      // 在原来的基础上，引入了类似于 copy-webpck-plugin 的 context 属性，可以设置项目根路径
+      // 在原来的基础上，引入了类似于 copy-webpack-plugin 的 context 属性，可以设置项目根路径
       const {
         context = appDirectory,
         from,

package/dist/js/modern/utils/logger.js

@@ -1,3 +1,5 @@
+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 EventEmitter from 'events';
 import { chalk } from '@modern-js/utils';
 export const clearFlag = '\x1Bc';
@@ -25,8 +27,10 @@ ${_contentColor(messageFragments.join(''))}${_noBottomBorder ? '' : `\n${_bottom
 };
 export class LoggerText {
   constructor(option) {
-    this.messages = void 0;
-    this.option = void 0;
+    _defineProperty(this, "messages", void 0);
+
+    _defineProperty(this, "option", void 0);
+
     this.messages = [];
     this.option = option;
   }

package/dist/js/modern/utils/tspaths-transform/index.js

@@ -3,7 +3,7 @@ import * as parser from '@babel/parser';
 import traverse from '@babel/traverse';
 import generator from '@babel/generator';
 import * as t from '@babel/types';
-import { createMatchPath } from 'tsconfig-paths';
+import { createMatchPath } from '@modern-js/utils/tsconfig-paths';
 import { fs } from '@modern-js/utils';
 import { defaultTransformedFunctions } from "./constants";
 import { matchesPattern, isImportCall } from "./utils";
@@ -75,7 +75,7 @@ const transformExport = option => nodePath => {
   mapPathString(nodePath.get('source'), option);
 };
 
-const transfromSingleFileAlias = ({
+const transformSingleFileAlias = ({
   filename,
   baseUrl,
   paths
@@ -118,7 +118,7 @@ export const transformDtsAlias = option => {
   for (const filename of filenames) {
     transformResult.push({
       path: filename,
-      content: transfromSingleFileAlias({
+      content: transformSingleFileAlias({
         filename,
         baseUrl,
         paths

package/dist/js/node/features/build/logger/logText.js

@@ -7,6 +7,8 @@ exports.logTemplate = exports.colors = exports.clearFlag = exports.LoggerText =
 
 var _utils = require("@modern-js/utils");
 
+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 colors = {
   title: _utils.chalk.rgb(218, 152, 92)
 };
@@ -41,9 +43,12 @@ exports.logTemplate = logTemplate;
 // 处理Log内容如何展示
 class LoggerText {
   constructor(option) {
-    this.messages = void 0;
-    this.hasErrorMessage = void 0;
-    this.option = void 0;
+    _defineProperty(this, "messages", void 0);
+
+    _defineProperty(this, "hasErrorMessage", void 0);
+
+    _defineProperty(this, "option", void 0);
+
     this.messages = [];
     this.option = option;
     this.hasErrorMessage = false;

package/dist/js/node/features/build/logger/loggerManager.js

@@ -14,6 +14,8 @@ let _ = t => t,
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 logText = _utils.Import.lazy('./logText', require);
 
 const readline = _utils.Import.lazy('../../../utils/readline', require);
@@ -21,8 +23,11 @@ const readline = _utils.Import.lazy('../../../utils/readline', require);
 class LoggerManager extends _events.default {
   constructor() {
     super();
-    this._compilering = void 0;
-    this._listeners = void 0;
+
+    _defineProperty(this, "_compilering", void 0);
+
+    _defineProperty(this, "_listeners", void 0);
+
     this._compilering = false;
     this._listeners = [];
   }

package/dist/js/node/features/build/utils.js

@@ -15,6 +15,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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 constants = _utils.Import.lazy('./constants', require); // 硬解字符串返回相应格式的对象
 
 
@@ -152,7 +154,8 @@ exports.getDtsMapper = getDtsMapper;
 
 class LogStack {
   constructor() {
-    this._codeLogStack = void 0;
+    _defineProperty(this, "_codeLogStack", void 0);
+
     this._codeLogStack = [];
   }
 
@@ -219,4 +222,5 @@ class TimeCounter {
 }
 
 exports.TimeCounter = TimeCounter;
-TimeCounter._now = void 0;
+
+_defineProperty(TimeCounter, "_now", void 0);

package/dist/js/node/tasks/build-style.js

@@ -133,13 +133,13 @@ const taskMain = async ({
 
 
   const srcDir = path.resolve(appDirectory, SRC_STYLE_DIRS);
-  const outputDirtoSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
+  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
 
   if (importStyle === 'compiled-code') {
     const srcStyleResult = await compiler.styleCompiler({
       projectDir: appDirectory,
       stylesDir: srcDir,
-      outDir: outputDirtoSrc,
+      outDir: outputDirToSrc,
       enableVirtualDist: true,
       compilerOption: {
         less: lessOption,
@@ -151,7 +151,7 @@ const taskMain = async ({
   } else {
     copyOriginStyleFiles({
       targetDir: srcDir,
-      outputDir: outputDirtoSrc
+      outputDir: outputDirToSrc
     });
   }
 };

package/dist/js/node/utils/copy.js

@@ -45,7 +45,7 @@ const copyTask = async option => {
   try {
     // 类型暂时这样处理，待之后优化copy的逻辑
     for (const copyOption of copy) {
-      // 在原来的基础上，引入了类似于 copy-webpck-plugin 的 context 属性，可以设置项目根路径
+      // 在原来的基础上，引入了类似于 copy-webpack-plugin 的 context 属性，可以设置项目根路径
       const {
         context = appDirectory,
         from,

package/dist/js/node/utils/logger.js

@@ -11,6 +11,8 @@ var _utils = require("@modern-js/utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+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 clearFlag = '\x1Bc';
 exports.clearFlag = clearFlag;
 
@@ -41,8 +43,10 @@ exports.logTemplate = logTemplate;
 
 class LoggerText {
   constructor(option) {
-    this.messages = void 0;
-    this.option = void 0;
+    _defineProperty(this, "messages", void 0);
+
+    _defineProperty(this, "option", void 0);
+
     this.messages = [];
     this.option = option;
   }

package/dist/js/node/utils/tspaths-transform/index.js

@@ -15,7 +15,7 @@ var _generator = _interopRequireDefault(require("@babel/generator"));
 
 var t = _interopRequireWildcard(require("@babel/types"));
 
-var _tsconfigPaths = require("tsconfig-paths");
+var _tsconfigPaths = require("@modern-js/utils/tsconfig-paths");
 
 var _utils = require("@modern-js/utils");
 
@@ -97,7 +97,7 @@ const transformExport = option => nodePath => {
   mapPathString(nodePath.get('source'), option);
 };
 
-const transfromSingleFileAlias = ({
+const transformSingleFileAlias = ({
   filename,
   baseUrl,
   paths
@@ -141,7 +141,7 @@ const transformDtsAlias = option => {
   for (const filename of filenames) {
     transformResult.push({
       path: filename,
-      content: transfromSingleFileAlias({
+      content: transformSingleFileAlias({
         filename,
         baseUrl,
         paths

package/dist/types/features/dev/index.d.ts

@@ -3,7 +3,7 @@ export interface IDevConfig {
   appDirectory: string;
   isTsProject: boolean;
 }
-export declare type DevTaskType = 'storybook' | 'docsite' | 'unknow';
+export declare type DevTaskType = 'storybook' | 'docsite' | 'unknown';
 export declare const showMenu: (api: PluginAPI, config: IDevConfig) => Promise<void>;
 export declare const devStorybook: (api: PluginAPI, config: IDevConfig) => Promise<void>;
 export declare const runSubCmd: (api: PluginAPI, subCmd: string, config: IDevConfig) => Promise<void>;

package/dist/types/utils/tspaths-transform/index.d.ts

@@ -3,12 +3,12 @@ export interface TransformOption {
   baseUrl: string;
   paths: Record<string, string[] | string>;
 }
-interface TransformDtsAlaisOption {
+interface TransformDtsAliasOption {
   filenames?: string[];
   baseUrl: string;
   paths: Record<string, string[] | string>;
 }
-export declare const transformDtsAlias: (option: TransformDtsAlaisOption) => {
+export declare const transformDtsAlias: (option: TransformDtsAliasOption) => {
   path: string;
   content: string;
 }[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.0",
+  "version": "1.5.3",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -54,34 +54,33 @@
     "@babel/runtime": "^7",
     "@babel/traverse": "^7.15.0",
     "@babel/types": "^7.17.0",
-    "@modern-js/babel-compiler": "^1.2.3",
-    "@modern-js/babel-preset-module": "^1.3.3",
-    "@modern-js/core": "^1.9.0",
-    "@modern-js/css-config": "^1.2.4",
-    "@modern-js/i18n-cli-language-detector": "^1.2.2",
-    "@modern-js/new-action": "^1.3.7",
-    "@modern-js/plugin": "^1.3.3",
-    "@modern-js/plugin-analyze": "^1.4.1",
-    "@modern-js/plugin-changeset": "^1.2.5",
-    "@modern-js/plugin-fast-refresh": "^1.2.4",
-    "@modern-js/plugin-i18n": "^1.2.4",
-    "@modern-js/style-compiler": "^1.2.4",
-    "@modern-js/utils": "^1.6.0",
+    "@modern-js/babel-compiler": "^1.2.5",
+    "@modern-js/babel-preset-module": "^1.3.5",
+    "@modern-js/core": "^1.10.3",
+    "@modern-js/css-config": "^1.2.6",
+    "@modern-js/i18n-cli-language-detector": "^1.2.3",
+    "@modern-js/new-action": "^1.3.9",
+    "@modern-js/plugin": "^1.3.4",
+    "@modern-js/plugin-analyze": "^1.4.4",
+    "@modern-js/plugin-changeset": "^1.2.7",
+    "@modern-js/plugin-fast-refresh": "^1.2.6",
+    "@modern-js/plugin-i18n": "^1.2.6",
+    "@modern-js/style-compiler": "^1.2.6",
+    "@modern-js/utils": "^1.7.4",
     "normalize-path": "^3.0.0",
     "p-map": "^4",
-    "process.argv": "^0.6.0",
-    "tsconfig-paths": "^3.10.1"
+    "process.argv": "^0.6.0"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.15.0",
-    "@modern-js/babel-chain": "1.2.2",
+    "@modern-js/babel-chain": "1.2.3",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
     "@types/glob": "^7.1.4",
-    "@types/jest": "^26",
+    "@types/jest": "^27",
     "@types/node": "^14",
     "@types/normalize-path": "^3.0.0",
     "@types/react": "^17",
@@ -99,10 +98,33 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "wireit": {
+    "build": {
+      "command": "modern build",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json"
+      ],
+      "output": [
+        "dist/**/*"
+      ]
+    },
+    "test": {
+      "command": "jest --passWithNoTests",
+      "files": [
+        "src/**/*",
+        "tsconfig.json",
+        "package.json",
+        "tests/**/*"
+      ],
+      "output": []
+    }
+  },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
-    "test": "jest --passWithNoTests"
+    "build": "wireit",
+    "test": "wireit"
   },
   "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/.eslintrc.js

@@ -1,10 +0,0 @@
-module.exports = {
-  extends: ['@modern-js'],
-  parserOptions: {
-    project: [
-      require.resolve('./tsconfig.json'),
-      require.resolve('./tests/tsconfig.json'),
-    ],
-  },
-  ignorePatterns: ['types.d.ts'],
-};

package/jest.config.js

@@ -1,7 +0,0 @@
-const sharedConfig = require('@scripts/jest-config');
-
-/** @type {import('@jest/types').Config.InitialOptions} */
-module.exports = {
-  ...sharedConfig,
-  rootDir: __dirname,
-};

package/modern.config.js

@@ -1,6 +0,0 @@
-/** @type {import('@modern-js/module-tools').UserConfig} */
-module.exports = {
-  output: {
-    disableSourceMap: true,
-  },
-};

package/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "isolatedModules": true,
-    "paths": {},
-    "types": ["jest"]
-  },
-  "include": ["src"]
-}