@modern-js/module-tools 1.5.7 → 1.6.0

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.7",
+  "version": "1.6.0",
   "bin": {
     "modern": "./bin/modern.js"
   },
@@ -55,24 +55,34 @@
     "@babel/traverse": "^7.18.0",
     "@babel/types": "^7.18.0",
     "@modern-js/babel-compiler": "^1.2.6",
-    "@modern-js/babel-preset-module": "^1.3.8",
-    "@modern-js/core": "^1.12.0",
+    "@modern-js/babel-preset-module": "^1.3.9",
+    "@modern-js/core": "^1.12.3",
     "@modern-js/css-config": "^1.2.7",
     "@modern-js/i18n-cli-language-detector": "^1.2.4",
-    "@modern-js/new-action": "^1.3.10",
-    "@modern-js/plugin": "^1.3.7",
-    "@modern-js/plugin-analyze": "^1.4.6",
-    "@modern-js/plugin-changeset": "^1.2.8",
+    "@modern-js/new-action": "^1.3.11",
+    "@modern-js/plugin": "^1.4.0",
+    "@modern-js/plugin-analyze": "^1.4.7",
+    "@modern-js/plugin-changeset": "^1.3.1",
     "@modern-js/plugin-i18n": "^1.2.7",
-    "@modern-js/style-compiler": "^1.2.10",
-    "@modern-js/utils": "^1.7.7",
+    "@modern-js/plugin-jarvis": "^1.2.14",
+    "@modern-js/style-compiler": "^1.2.11",
+    "@modern-js/utils": "^1.7.10",
+    "@rollup/plugin-json": "~4.1.0",
+    "@speedy-js/speedy-types": "0.13.2-alpha.3",
+    "@speedy-js/speedy-core": "0.13.2-alpha.3",
+    "@speedy-js/speedy-plugin-es5": "0.13.2-alpha.3",
     "normalize-path": "^3.0.0",
     "p-map": "^4",
-    "process.argv": "^0.6.0"
+    "process.argv": "^0.6.0",
+    "rollup": "^2.70.2",
+    "rollup-plugin-dts": "^4.2.1",
+    "rollup-plugin-hashbang": "^3.0.0",
+    "signal-exit": "^3.0.7"
   },
   "devDependencies": {
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
+    "@speedy-js/speedy-types": "0.13.2-alpha.3",
     "@types/babel__core": "^7.1.15",
     "@types/babel__generator": "^7.6.3",
     "@types/babel__traverse": "^7.14.2",
@@ -82,8 +92,11 @@
     "@types/normalize-path": "^3.0.0",
     "@types/react": "^17",
     "@types/react-dom": "^17",
+    "@types/signal-exit": "^3.0.1",
     "jest": "^27",
-    "typescript": "^4"
+    "typescript": "^4",
+    "ajv": "^8",
+    "ajv-keywords": "^5"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -101,7 +114,8 @@
       "files": [
         "src/**/*",
         "tsconfig.json",
-        "package.json"
+        "package.json",
+        "./modern.config.js"
       ],
       "output": [
         "dist/**/*"
@@ -121,7 +135,8 @@
   "scripts": {
     "new": "modern new",
     "build": "wireit",
-    "test": "wireit"
+    "test": "wireit",
+    "dev": "modern build --watch"
   },
   "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/dist/js/modern/features/build/build-watch.js

@@ -1,101 +0,0 @@
-import * as path from 'path';
-import * as os from 'os';
-import { execa, Import } from '@modern-js/utils';
-const lg = Import.lazy('./logger', require);
-const pMap = Import.lazy('p-map', require);
-const utils = Import.lazy('./utils', require);
-const constants = Import.lazy('./constants', require);
-export const buildInWatchMode = async (api, config, _) => {
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const {
-    sourceDir,
-    enableTscCompiler
-  } = config;
-  const srcRootDir = path.join(appDirectory, sourceDir);
-  const concurrency = os.cpus().length;
-  const lm = new lg.LoggerManager();
-  const codeLog = lm.createLoggerText({
-    title: constants.runBabelCompilerTitle
-  });
-  const dtsLog = lm.createLoggerText({
-    title: constants.runTscWatchTitle
-  });
-  const styleLog = lm.createLoggerText({
-    title: constants.runStyleCompilerTitle
-  });
-  const copyLog = lm.createLoggerText({
-    title: 'Copy Log:'
-  });
-  const initCodeMapper = utils.getCodeInitMapper(api, config);
-  const taskMapper = [...utils.getCodeMapper(api, {
-    logger: codeLog,
-    taskPath: require.resolve("../../tasks/build-watch-source-code"),
-    config,
-    willCompilerDirOrFile: sourceDir,
-    initMapper: initCodeMapper,
-    srcRootDir
-  }), ...(enableTscCompiler ? utils.getDtsMapper(api, config, dtsLog) : []), {
-    logger: styleLog,
-    taskPath: require.resolve("../../tasks/build-watch-style")
-  }, {
-    logger: copyLog,
-    taskPath: require.resolve("../../tasks/copy-assets"),
-    params: ['--watch']
-  }];
-  lm.on('data', () => {
-    console.info(constants.clearFlag);
-    enableTscCompiler && console.info(dtsLog.value);
-    console.info(codeLog.value);
-    console.info(styleLog.value);
-  });
-  await pMap(taskMapper, async ({
-    logger,
-    taskPath,
-    params
-  }) => {
-    const childProcess = execa.node(taskPath, params, {
-      stdio: 'pipe'
-    });
-
-    if (logger === codeLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          error: true,
-          data: true
-        } // colors: { data: s => s },
-
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    if (logger === dtsLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        },
-        colors: {
-          // tsc 的log信息无论是错误还是正确都是从 data event 中获取到的
-          data: s => s
-        }
-      });
-    }
-
-    if (logger === styleLog || logger === copyLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          error: true,
-          data: true
-        } // colors: { data: s => s },
-
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    await childProcess;
-  }, {
-    concurrency
-  });
-};

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

@@ -1,123 +0,0 @@
-import * as path from 'path';
-import * as os from 'os';
-import { execa, Import } from '@modern-js/utils';
-const pMap = Import.lazy('p-map', require);
-const utils = Import.lazy('./utils', require);
-const lg = Import.lazy('./logger', require);
-const constants = Import.lazy('./constants', require);
-export const buildSourceCode = async (api, config, _) => {
-  const {
-    sourceDir,
-    enableTscCompiler,
-    styleOnly
-  } = config;
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const concurrency = os.cpus().length;
-  const srcRootDir = path.join(appDirectory, sourceDir);
-  const lm = new lg.LoggerManager();
-  const codeLog = lm.createLoggerText({
-    title: constants.runBabelCompilerTitle
-  });
-  const dtsLog = lm.createLoggerText({
-    title: constants.runTscTitle
-  });
-  const styleLog = lm.createLoggerText({
-    title: constants.runStyleCompilerTitle
-  });
-  const copyLog = lm.createLoggerText({
-    title: 'Copy Log:'
-  });
-  const initCodeMapper = utils.getCodeInitMapper(api, config);
-  let taskMapper = [];
-
-  if (styleOnly) {
-    taskMapper = [{
-      logger: styleLog,
-      taskPath: require.resolve("../../tasks/build-style")
-    }, {
-      logger: copyLog,
-      taskPath: require.resolve("../../tasks/copy-assets")
-    }];
-  } else {
-    taskMapper = [...utils.getCodeMapper(api, {
-      logger: codeLog,
-      taskPath: require.resolve("../../tasks/build-source-code"),
-      config,
-      willCompilerDirOrFile: sourceDir,
-      initMapper: initCodeMapper,
-      srcRootDir
-    }), ...(enableTscCompiler ? utils.getDtsMapper(api, config, dtsLog) : []), {
-      logger: styleLog,
-      taskPath: require.resolve("../../tasks/build-style")
-    }, {
-      logger: copyLog,
-      taskPath: require.resolve("../../tasks/copy-assets")
-    }];
-  }
-
-  lm.showCompiling();
-  await pMap(taskMapper, async ({
-    logger,
-    taskPath,
-    params
-  }) => {
-    const childProcess = execa.node(taskPath, params, {
-      stdio: 'pipe'
-    });
-
-    if (logger === codeLog || logger === copyLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        }
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    if (logger === dtsLog) {
-      lm.addStdout(dtsLog, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        }
-      });
-      lm.addStderr(dtsLog, childProcess.stderr);
-    }
-
-    if (logger === styleLog) {
-      lm.addStdout(logger, childProcess.stdout, {
-        event: {
-          data: true,
-          error: true
-        }
-      });
-      lm.addStderr(logger, childProcess.stderr);
-    }
-
-    await childProcess;
-  }, {
-    concurrency
-  });
-  lm.disappearCompiling();
-
-  if (!styleOnly) {
-    enableTscCompiler && console.info(dtsLog.value);
-    console.info(codeLog.value);
-  }
-
-  if (styleLog.hasMessages()) {
-    console.info(styleLog.value);
-  }
-
-  if (copyLog.hasMessages()) {
-    console.info(copyLog.value);
-  }
-
-  if (dtsLog.hasErrorMessage || codeLog.hasErrorMessage || styleLog.hasErrorMessage || copyLog.hasErrorMessage) {
-    // eslint-disable-next-line no-process-exit
-    process.exit(1);
-  }
-};

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

@@ -1,207 +0,0 @@
-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, glob, fs } from '@modern-js/utils';
-import { initEnv } from "../utils/init-env";
-const babelCompiler = Import.lazy('@modern-js/babel-compiler', require);
-const argv = Import.lazy('process.argv', require);
-const core = Import.lazy('@modern-js/core', require);
-const bc = Import.lazy('../utils/babel', require);
-const ts = Import.lazy('../utils/tsconfig', require);
-export let Compiler;
-
-(function (Compiler) {
-  Compiler[Compiler["babel"] = 0] = "babel";
-  Compiler[Compiler["esbuild"] = 1] = "esbuild";
-  Compiler[Compiler["swc"] = 2] = "swc";
-})(Compiler || (Compiler = {}));
-
-const runBabelCompiler = async (willCompilerFiles, config, babelConfig = {}) => {
-  const {
-    srcRootDir,
-    distDir
-  } = config; // TODO: 判断lynx模式下，修改distFileExtMap: {'js': 'js', 'jsx': 'jsx', 'ts': 'js', 'tsx': 'jsx'}
-
-  return babelCompiler.compiler({
-    quiet: true,
-    enableVirtualDist: true,
-    rootDir: srcRootDir,
-    filenames: willCompilerFiles,
-    distDir,
-    ignore: ['*.d.ts']
-  }, babelConfig);
-};
-
-export const getWillCompilerCode = (srcDirOrFile, option) => {
-  const {
-    tsconfig,
-    isTsProject
-  } = option; // 如果是一个文件路径，则直接返回
-
-  if (fs.existsSync(srcDirOrFile) && fs.lstatSync(srcDirOrFile).isFile()) {
-    return [srcDirOrFile];
-  }
-
-  const getExts = isTs => {
-    // TODO: 是否受控tsconfig.json 里的jsx配置
-    let exts = [];
-
-    if (isTs) {
-      var _tsconfig$compilerOpt;
-
-      exts = tsconfig !== null && tsconfig !== void 0 && (_tsconfig$compilerOpt = tsconfig.compilerOptions) !== null && _tsconfig$compilerOpt !== void 0 && _tsconfig$compilerOpt.allowJs ? ['.ts', '.tsx', '.js', '.jsx'] : ['.ts', '.tsx'];
-    } else {
-      exts = ['.js', '.jsx'];
-    }
-
-    return exts;
-  };
-
-  const exts = getExts(isTsProject);
-  const globPattern = `${srcDirOrFile}/**/*{${exts.join(',')}}`;
-  const files = glob.sync(globPattern, {
-    ignore: [`${srcDirOrFile}/**/*.d.ts`],
-    absolute: true
-  });
-  return files;
-};
-export const buildSourceCode = async config => {
-  const {
-    compiler,
-    willCompilerDirOrFile,
-    tsconfigPath,
-    sourceMaps,
-    babelConfig
-  } = config;
-  const tsconfig = ts.readTsConfig(tsconfigPath);
-  const willCompilerFiles = getWillCompilerCode(willCompilerDirOrFile, {
-    tsconfig,
-    isTsProject: Boolean(tsconfig)
-  });
-  let distSet = null;
-
-  if (compiler === Compiler.babel) {
-    distSet = await runBabelCompiler(willCompilerFiles, config, _objectSpread(_objectSpread({}, babelConfig), {}, {
-      sourceMaps
-    }));
-  } else {
-    distSet = {
-      code: 1,
-      message: 'no compiler'
-    };
-  }
-
-  return distSet;
-};
-
-const generatorRealFiles = virtualDists => {
-  for (const virtualDist of virtualDists) {
-    const {
-      distPath,
-      code,
-      sourcemap,
-      sourceMapPath
-    } = virtualDist;
-    fs.ensureFileSync(distPath);
-    fs.writeFileSync(distPath, code);
-
-    if (sourcemap.length > 0) {
-      fs.ensureFileSync(sourceMapPath);
-      fs.writeFileSync(sourceMapPath, sourcemap);
-    }
-  }
-};
-
-const defaultConfig = {
-  srcRootDir: `${process.cwd()}/src`,
-  willCompilerDirOrFile: `${process.cwd()}/src`,
-  distDir: './dist/js/temp',
-  compiler: 'babel',
-  appDirectory: '',
-  sourceMaps: false,
-  tsconfigPath: '',
-  syntax: 'es5',
-  type: 'module',
-  watch: false
-};
-
-const taskMain = async ({
-  modernConfig
-}) => {
-  // Execution of the script's parameter handling and related required configuration acquisition
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv(defaultConfig);
-  process.env.BUILD_FORMAT = initEnv(config);
-  const compiler = Compiler.babel; // Currently, only babel is supported.
-
-  const babelConfig = bc.resolveBabelConfig(config.appDirectory, modernConfig, {
-    sourceAbsDir: config.srcRootDir,
-    tsconfigPath: config.tsconfigPath,
-    syntax: config.syntax,
-    type: config.type
-  });
-  const {
-    code,
-    message,
-    messageDetails,
-    virtualDists = []
-  } = await buildSourceCode({
-    distDir: config.distDir,
-    srcRootDir: config.srcRootDir,
-    willCompilerDirOrFile: config.willCompilerDirOrFile,
-    sourceMaps: config.sourceMaps,
-    compiler,
-    projectData: {
-      appDirectory: config.appDirectory
-    },
-    tsconfigPath: config.tsconfigPath,
-    babelConfig
-  });
-
-  if (code === 0) {
-    generatorRealFiles(virtualDists); // 执行成功log使用 console.info
-
-    console.info('[Babel Compiler]: Successfully');
-  } else if (messageDetails && messageDetails.length > 0) {
-    console.error(message);
-
-    for (const detail of messageDetails || []) {
-      console.error(detail.content);
-    }
-  }
-
-  if (code === 0 && config.copyDirs) {
-    const copyList = config.copyDirs.split(',');
-
-    for (const copyDir of copyList) {
-      fs.ensureDirSync(copyDir);
-      fs.copySync(config.distDir, copyDir);
-    }
-  }
-};
-
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  const {
-    resolved
-  } = await core.cli.init([], options);
-  await core.manager.run(async () => {
-    try {
-      await taskMain({
-        modernConfig: resolved
-      });
-    } catch (e) {
-      console.error(e);
-    }
-  });
-})();

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

@@ -1,168 +0,0 @@
-import * as path from 'path';
-import { fs, glob, Import } from '@modern-js/utils';
-const cssConfig = Import.lazy('@modern-js/css-config', require);
-const core = Import.lazy('@modern-js/core', require);
-const compiler = Import.lazy('@modern-js/style-compiler', require);
-const hooks = Import.lazy('../hooks', require);
-const STYLE_DIRS = 'styles';
-const SRC_STYLE_DIRS = 'src';
-
-const checkStylesDirExist = option => {
-  const {
-    appDirectory
-  } = option;
-  return fs.existsSync(path.join(appDirectory, STYLE_DIRS));
-};
-
-const generatorFileOrLogError = (result, successMessage = '') => {
-  if (result.code === 0 && result.dists.length > 0) {
-    for (const file of result.dists) {
-      fs.ensureFileSync(file.filename);
-      fs.writeFileSync(file.filename, file.content);
-    }
-
-    if (successMessage) {
-      console.info(successMessage);
-    }
-  } else {
-    for (const file of result.errors) {
-      console.error(file.error);
-    }
-  }
-};
-
-const getPostcssOption = (appDirectory, modernConfig) => {
-  var _postcssOption$postcs;
-
-  const postcssOption = cssConfig.getPostcssConfig(appDirectory, modernConfig, false);
-  return {
-    plugins: (postcssOption === null || postcssOption === void 0 ? void 0 : (_postcssOption$postcs = postcssOption.postcssOptions) === null || _postcssOption$postcs === void 0 ? void 0 : _postcssOption$postcs.plugins) || [],
-    enableSourceMap: (postcssOption === null || postcssOption === void 0 ? void 0 : postcssOption.sourceMap) || false,
-    options: {}
-  };
-};
-
-const copyOriginStyleFiles = ({
-  targetDir,
-  outputDir
-}) => {
-  const styleFiles = glob.sync(`${targetDir}/**/*.{css,sass,scss,less}`);
-
-  if (styleFiles.length > 0) {
-    fs.ensureDirSync(outputDir);
-  }
-
-  for (const styleFile of styleFiles) {
-    const file = path.relative(targetDir, styleFile);
-    fs.ensureDirSync(path.dirname(path.join(outputDir, file)));
-    fs.copyFileSync(styleFile, path.join(outputDir, file));
-  }
-};
-
-const taskMain = async ({
-  modernConfig,
-  appContext
-}) => {
-  const {
-    assetsPath = 'styles',
-    path: outputPath = 'dist',
-    jsPath = 'js'
-  } = modernConfig.output;
-  const {
-    appDirectory
-  } = appContext;
-  const lessOption = await core.mountHook().moduleLessConfig({
-    modernConfig
-  }, {
-    onLast: async _ => undefined
-  });
-  const sassOption = await core.mountHook().moduleSassConfig({
-    modernConfig
-  }, {
-    onLast: async _ => undefined
-  });
-  const tailwindPlugin = await core.mountHook().moduleTailwindConfig({
-    modernConfig
-  }, {
-    onLast: async _ => undefined
-  });
-  const postcssOption = getPostcssOption(appDirectory, modernConfig);
-
-  if (tailwindPlugin) {
-    var _postcssOption$plugin;
-
-    (_postcssOption$plugin = postcssOption.plugins) === null || _postcssOption$plugin === void 0 ? void 0 : _postcssOption$plugin.push(tailwindPlugin);
-  }
-
-  const {
-    importStyle
-  } = modernConfig.output;
-  const existStylesDir = checkStylesDirExist({
-    appDirectory
-  }); // 编译 styles 目录样式
-
-  if (existStylesDir) {
-    const styleResult = await compiler.styleCompiler({
-      projectDir: appDirectory,
-      stylesDir: path.resolve(appDirectory, STYLE_DIRS),
-      outDir: path.join(appDirectory, outputPath, assetsPath),
-      enableVirtualDist: true,
-      compilerOption: {
-        less: lessOption,
-        sass: sassOption,
-        postcss: postcssOption
-      }
-    });
-    generatorFileOrLogError(styleResult, `[Style Compiler] Successfully for 'styles' dir`);
-  } // 编译 src 内的样式代码
-
-
-  const srcDir = path.resolve(appDirectory, SRC_STYLE_DIRS);
-  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
-
-  if (importStyle === 'compiled-code') {
-    const srcStyleResult = await compiler.styleCompiler({
-      projectDir: appDirectory,
-      stylesDir: srcDir,
-      outDir: outputDirToSrc,
-      enableVirtualDist: true,
-      compilerOption: {
-        less: lessOption,
-        sass: sassOption,
-        postcss: postcssOption
-      }
-    });
-    generatorFileOrLogError(srcStyleResult, `[Style Compiler] Successfully for 'src' dir`);
-  } else {
-    copyOriginStyleFiles({
-      targetDir: srcDir,
-      outputDir: outputDirToSrc
-    });
-  }
-};
-
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  hooks.buildLifeCycle();
-  const {
-    resolved: modernConfig,
-    appContext
-  } = await core.cli.init([], options);
-  await core.manager.run(async () => {
-    try {
-      await taskMain({
-        modernConfig,
-        appContext
-      });
-    } catch (e) {
-      console.error(e.toString());
-    }
-  });
-})();