@modern-js/module-tools 1.21.5 → 2.0.0-beta.1

package/dist/js/node/utils/json.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.safeParse = void 0;
-
 const safeParse = jsonString => {
   try {
     return {
@@ -18,5 +17,4 @@ const safeParse = jsonString => {
     };
   }
 };
-
 exports.safeParse = safeParse;

package/dist/js/node/utils/language.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getLocaleLanguage = getLocaleLanguage;
-
 var _utils = require("@modern-js/utils");
-
 const i18n = _utils.Import.lazy('@modern-js/plugin-i18n/language-detector', require);
-
 function getLocaleLanguage() {
   const detector = new i18n.I18CLILanguageDetector();
   return detector.detect();

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

@@ -4,18 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.logTemplate = exports.clearFlag = exports.LoggerText = exports.LoggerManager = void 0;
-
 var _events = _interopRequireDefault(require("events"));
-
 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;
-
 const logTemplate = (title, messageStack, maxLength, {
   noBottomBorder: _noBottomBorder = false,
   bottomBorderText: _bottomBorderText = '',
@@ -31,39 +25,29 @@ const logTemplate = (title, messageStack, maxLength, {
   .filter(s => s !== leftBorderFlag) // 过滤空字符串
   .slice(0, maxLength) // 控制长度
   .reverse(); // 调换顺序，最新的消息在最后面
-
   messageFragments[messageFragments.length - 1] = messageFragments[messageFragments.length - 1].trim();
   const template = `${title}:
 ${_contentColor(messageFragments.join(''))}${_noBottomBorder ? '' : `\n${_bottomBorderText}`}`;
   console.info('template', messageFragments);
   return template;
 };
-
 exports.logTemplate = logTemplate;
-
 class LoggerText {
   constructor(option) {
     _defineProperty(this, "messages", void 0);
-
     _defineProperty(this, "option", void 0);
-
     this.messages = [];
     this.option = option;
   }
-
   append(message) {
     var _this$option$contentC;
-
     const replace = ((_this$option$contentC = this.option.contentConfig) === null || _this$option$contentC === void 0 ? void 0 : _this$option$contentC.replace) || [];
     let content = message;
-
     for (const r of replace) {
       content = content.replace(new RegExp(r, 'g'), '');
     }
-
     this.messages.push(content);
   }
-
   get value() {
     const {
       title,
@@ -73,17 +57,14 @@ class LoggerText {
     const messages = [...new Set(this.messages)];
     return logTemplate(title, messages, maxLength, contentConfig);
   }
-
 }
-
 exports.LoggerText = LoggerText;
-
 class LoggerManager extends _events.default {
   // constructor() {}
+
   createLoggerText(option) {
     return new LoggerText(option);
   }
-
   addStdout(loggerText, stdout, config = {}) {
     const {
       event = {
@@ -96,7 +77,6 @@ class LoggerManager extends _events.default {
         warning: _utils.chalk.yellow
       }
     } = config;
-
     if (event.data) {
       stdout === null || stdout === void 0 ? void 0 : stdout.on('data', chunk => {
         const data = chunk.toString();
@@ -105,7 +85,6 @@ class LoggerManager extends _events.default {
         this.emit('data');
       });
     }
-
     if (event.error) {
       stdout === null || stdout === void 0 ? void 0 : stdout.on('error', error => {
         const data = error.message;
@@ -115,18 +94,14 @@ class LoggerManager extends _events.default {
       });
     }
   }
-
   addStderr(loggerText, stderr) {
     stderr === null || stderr === void 0 ? void 0 : stderr.on('data', chunk => {
       const data = chunk.toString();
       loggerText.append(data);
     });
   }
-
   show(loggerText) {
     console.info(loggerText.value);
   }
-
 }
-
 exports.LoggerManager = LoggerManager;

package/dist/js/node/utils/readline.js

@@ -4,30 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ReadlineUtils = void 0;
-
 var readline = _interopRequireWildcard(require("readline"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 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; }
-
 // eslint-disable-next-line @typescript-eslint/no-extraneous-class
 class ReadlineUtils {
   static clearPrevLine(output) {
     ReadlineUtils.clearLine(output, 1);
   }
-
   static clearLine(output, n = 1, dir = -1) {
     // -1 向上，1 向下
     const dx = dir === 1 ? 1 : -1;
-
     for (let i = 0; i < n; i++) {
       readline.moveCursor(output, 0, dx);
       readline.clearLine(output, 0);
       readline.cursorTo(output, 0);
     }
   }
-
 }
-
 exports.ReadlineUtils = ReadlineUtils;

package/dist/js/node/utils/tsconfig.js

@@ -4,25 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.readTsConfig = exports.existTsConfigFile = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const readTsConfig = (tsconfigPath, noExistReturn = null) => {
   // 如果不存在，则返回 noExistReturn
   if (!_utils.fs.existsSync(tsconfigPath)) {
     return noExistReturn;
   }
-
   const content = _utils.fs.readFileSync(tsconfigPath, 'utf-8');
-
   return _utils.json5.parse(content);
 };
-
 exports.readTsConfig = readTsConfig;
-
 const existTsConfigFile = tsconfigAbsolutePath => {
   const tsconfig = readTsConfig(tsconfigAbsolutePath);
   return Boolean(tsconfig);
 };
-
 exports.existTsConfigFile = existTsConfigFile;

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

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.defaultTransformedFunctions = void 0;
-const defaultTransformedFunctions = ['require', 'require.resolve', 'System.import', // Jest methods
-'jest.genMockFromModule', 'jest.mock', 'jest.unmock', 'jest.doMock', 'jest.dontMock', 'jest.setMock', 'jest.requireActual', 'jest.requireMock', // Older Jest methods
+const defaultTransformedFunctions = ['require', 'require.resolve', 'System.import',
+// Jest methods
+'jest.genMockFromModule', 'jest.mock', 'jest.unmock', 'jest.doMock', 'jest.dontMock', 'jest.setMock', 'jest.requireActual', 'jest.requireMock',
+// Older Jest methods
 'require.requireActual', 'require.requireMock'];
 exports.defaultTransformedFunctions = defaultTransformedFunctions;

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

@@ -4,50 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformDtsAlias = void 0;
-
 var path = _interopRequireWildcard(require("path"));
-
 var parser = _interopRequireWildcard(require("@babel/parser"));
-
 var _traverse = _interopRequireDefault(require("@babel/traverse"));
-
 var _generator = _interopRequireDefault(require("@babel/generator"));
-
 var t = _interopRequireWildcard(require("@babel/types"));
-
 var _tsconfigPaths = require("@modern-js/utils/tsconfig-paths");
-
 var _utils = require("@modern-js/utils");
-
 var _constants = require("./constants");
-
 var _utils2 = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 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; }
-
 const getPathsMap = (paths, sourceDirName = 'src') => {
   const pathKeys = Object.keys(paths);
   const pathsMap = {};
-
   const replaceSrcToTypes = s => s.replace(sourceDirName, 'types');
-
   for (const key of pathKeys) {
     const p = paths[key];
-
     if (typeof p === 'string') {
       pathsMap[key] = [replaceSrcToTypes(p)];
     } else {
       pathsMap[key] = paths[key].map(sp => replaceSrcToTypes(sp));
     }
   }
-
   return pathsMap;
 };
-
 function mapPathString(nodePath, {
   filename,
   baseUrl,
@@ -56,7 +38,6 @@ function mapPathString(nodePath, {
   if (!t.isStringLiteral(nodePath)) {
     return;
   }
-
   const sourcePath = nodePath.node.value;
   const currentFile = filename;
   const pathsMap = getPathsMap(paths);
@@ -65,45 +46,36 @@ function mapPathString(nodePath, {
     if (!_utils.fs.existsSync(packageJsonPath)) {
       return undefined;
     }
-
     return _utils.fs.readJSONSync(packageJsonPath);
   }, filePath => _utils.fs.existsSync(filePath), ['.d.ts']);
-
   if (result) {
     const relativePath = path.relative(path.dirname(currentFile), path.dirname(result));
-    const fileName = path.basename(result); // 如果是同级文件，则返回的是 ''
-
+    const fileName = path.basename(result);
+    // 如果是同级文件，则返回的是 ''
     const filePath = path.normalize(`${relativePath.length === 0 ? '.' : relativePath}/${fileName}`);
     const replaceString = filePath.startsWith('.') ? filePath : `./${filePath}`;
     nodePath.replaceWith(t.stringLiteral(replaceString));
   }
 }
-
 const transformCall = option => nodePath => {
   const calleePath = nodePath.get('callee');
-
   const isNormalCall = _constants.defaultTransformedFunctions.some(pattern => (0, _utils2.matchesPattern)(calleePath, pattern));
-
   if (isNormalCall || (0, _utils2.isImportCall)(nodePath)) {
     mapPathString(nodePath.get('arguments.0'), option);
   }
 };
-
 const transformImport = option => nodePath => {
   mapPathString(nodePath.get('source'), option);
 };
-
 const transformExport = option => nodePath => {
   mapPathString(nodePath.get('source'), option);
 };
-
 const transformSingleFileAlias = ({
   filename,
   baseUrl,
   paths
 }) => {
   const sourceCode = _utils.fs.readFileSync(filename, 'utf-8');
-
   const ast = parser.parse(sourceCode, {
     sourceType: 'module',
     errorRecovery: true,
@@ -129,7 +101,6 @@ const transformSingleFileAlias = ({
   });
   return (0, _generator.default)(ast).code;
 };
-
 const transformDtsAlias = option => {
   const {
     filenames = [],
@@ -137,7 +108,6 @@ const transformDtsAlias = option => {
     paths
   } = option;
   const transformResult = [];
-
   for (const filename of filenames) {
     transformResult.push({
       path: filename,
@@ -148,8 +118,6 @@ const transformDtsAlias = option => {
       })
     });
   }
-
   return transformResult;
 };
-
 exports.transformDtsAlias = transformDtsAlias;

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

@@ -5,28 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isImportCall = isImportCall;
 exports.matchesPattern = matchesPattern;
-
 var _utils = require("@modern-js/utils");
-
 const t = _utils.Import.lazy('@babel/types', require);
-
 function matchesPattern(calleePath, pattern) {
   const {
     node
   } = calleePath;
-
   if (t.isMemberExpression(node)) {
     return calleePath.matchesPattern(pattern);
   }
-
   if (!t.isIdentifier(node) || pattern.includes('.')) {
     return false;
   }
-
   const name = pattern.split('.')[0];
   return node.name === name;
 }
-
 function isImportCall(calleePath) {
   return t.isImport(calleePath.node.callee);
 }

package/dist/js/node/utils/valide.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.valideBeforeTask = exports.modernConfigValid = void 0;
-
 var _utils = require("@modern-js/utils");
-
 const valideBeforeTask = ({
   modernConfig,
   tsconfigPath
@@ -14,28 +12,21 @@ const valideBeforeTask = ({
   const modernConfigValidResult = modernConfigValid(modernConfig, {
     tsconfigPath
   });
-
   if (modernConfigValidResult) {
-    console.error(modernConfigValidResult); // eslint-disable-next-line no-process-exit
-
+    console.error(modernConfigValidResult);
+    // eslint-disable-next-line no-process-exit
     process.exit(0);
   }
 };
-
 exports.valideBeforeTask = valideBeforeTask;
-
 const modernConfigValid = (modernConfig, option) => {
   const valids = [_utils.validAlias];
-
   for (const validFn of valids) {
     const result = validFn(modernConfig, option);
-
     if (result) {
       return result;
     }
   }
-
   return null;
 };
-
 exports.modernConfigValid = modernConfigValid;

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

@@ -4,7 +4,6 @@ import type { Platform } from '../types';
  * init work before build task.
  * @param api
  */
-
 export declare const init: (api: PluginAPI) => void;
 export interface IBuildCommandOption {
   watch?: boolean;

package/dist/types/features/build/logger/loggerManager.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-
 /**
  * 1. 注册构建任务
  * 2. 监听各个构建任务进程中的信息：process.stdout.on('data' | 'error')

package/dist/types/features/build/utils.d.ts

@@ -1,9 +1,7 @@
-import type { NormalizedConfig } from '@modern-js/core';
 import type { PostcssOption } from '@modern-js/style-compiler';
 /**
  * 处理日志信息
  */
-
 export declare class LogStack {
   private _codeLogStack;
   constructor();
@@ -34,5 +32,5 @@ export declare enum SectionTitleStatus {
   Log = 2,
 }
 export declare const watchSectionTitle: (str: string, status: SectionTitleStatus) => string;
-export declare const getPostcssOption: (appDirectory: string, modernConfig: NormalizedConfig) => PostcssOption;
+export declare const getPostcssOption: (...args: any[]) => PostcssOption;
 export declare const getAllDeps: <T>(appDirectory: string) => string[];

package/dist/types/hooks/index.d.ts

@@ -26,4 +26,5 @@ export declare const hooks: {
   moduleTailwindConfig: import("@modern-js/plugin").AsyncPipeline<{
     modernConfig: import("@modern-js/core").NormalizedConfig;
   }, any>;
-};
+};
+export declare type ModuleHooks = typeof hooks;

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 import type { CliPlugin } from '@modern-js/core';
+import { ModuleHooks } from './hooks';
 export * from './types';
+export type { ModuleHooks, CliPlugin };
 export { defineConfig } from '@modern-js/core';
-
 declare const _default: () => CliPlugin;
-
 export default _default;

package/dist/types/schema/types.d.ts

@@ -15,9 +15,7 @@ export declare type BundleOptions = {
 export declare type BundlelessOptions = {
   sourceDir?: string;
   style?: {
-    compileMode?: 'all' | 'only-compiled-code' |
-    /* may be will be deprecated */
-    'only-source-code' | false;
+    compileMode?: 'all' | 'only-compiled-code' | /* may be will be deprecated */'only-source-code' | false;
     path?: string;
   };
   static?: {

package/dist/types/types.d.ts

@@ -35,7 +35,6 @@ declare module '@modern-js/core' {
     /** @deprecated Use the `buildConfig.bundlelessOptions.static.path` instead . */
     assetsPath?: string;
     /** @deprecated Use the `buildConfig.sourceMap` instead */
-
     disableSourceMap?: boolean;
     buildPreset?: BuildPreset;
     buildConfig?: BuildConfig;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -54,10 +54,11 @@
     "@babel/runtime": "^7.18.0",
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
+    "@modern-js/css-config": "1.21.1",
     "@rollup/plugin-json": "~4.1.0",
-    "@speedy-js/speedy-types": "0.13.2-modern.1",
-    "@speedy-js/speedy-core": "0.13.2-modern.3",
-    "@speedy-js/speedy-plugin-es5": "0.13.2-modern.1",
+    "@speedy-js/speedy-types": "0.13.2-modern.4",
+    "@speedy-js/speedy-core": "0.13.2-modern.4",
+    "@speedy-js/speedy-plugin-es5": "0.13.2-modern.4",
     "normalize-path": "^3.0.0",
     "p-map": "^4",
     "process.argv": "^0.6.0",
@@ -65,18 +66,17 @@
     "rollup-plugin-dts": "^4.2.1",
     "rollup-plugin-hashbang": "^3.0.0",
     "signal-exit": "^3.0.7",
-    "@modern-js/babel-compiler": "1.21.5",
-    "@modern-js/babel-preset-module": "1.21.5",
-    "@modern-js/core": "1.21.5",
-    "@modern-js/css-config": "1.21.5",
-    "@modern-js/new-action": "1.21.5",
-    "@modern-js/upgrade": "1.21.5",
-    "@modern-js/plugin": "1.21.5",
-    "@modern-js/plugin-changeset": "1.21.5",
-    "@modern-js/plugin-i18n": "1.21.5",
-    "@modern-js/plugin-jarvis": "1.21.5",
-    "@modern-js/style-compiler": "1.21.5",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/babel-preset-module": "2.0.0-beta.1",
+    "@modern-js/core": "2.0.0-beta.1",
+    "@modern-js/new-action": "2.0.0-beta.1",
+    "@modern-js/upgrade": "2.0.0-beta.1",
+    "@modern-js/plugin": "2.0.0-beta.1",
+    "@modern-js/plugin-changeset": "2.0.0-beta.1",
+    "@modern-js/plugin-i18n": "2.0.0-beta.1",
+    "@modern-js/plugin-lint": "2.0.0-beta.1",
+    "@modern-js/style-compiler": "2.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1",
+    "@modern-js/babel-compiler": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.1.15",
@@ -91,8 +91,8 @@
     "typescript": "^4",
     "ajv": "^8",
     "ajv-keywords": "^5",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -104,34 +104,10 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "./modern.config.js"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit",
+    "build": "modern build",
+    "test": "jest --passWithNoTests",
     "dev": "modern build --watch"
   }
 }