@modern-js/module-tools 1.5.5 → 1.6.0-alpha.0

package/dist/js/modern/index.js

@@ -1,17 +1,19 @@
 import { Import } from '@modern-js/utils';
 import ChangesetPlugin from '@modern-js/plugin-changeset';
 import AnalyzePlugin from '@modern-js/plugin-analyze';
+import LintPlugin from '@modern-js/plugin-jarvis';
 import { hooks } from "./hooks";
 const cli = Import.lazy('./cli', require);
 const local = Import.lazy('./locale', require);
 const schema = Import.lazy('./schema', require);
 const lang = Import.lazy('./utils/language', require);
 export { defineConfig } from '@modern-js/core';
+const isBuildMode = process.argv.slice(2)[0] === 'build';
 export default (() => ({
   name: '@modern-js/module-tools',
   post: ['@modern-js/plugin-analyze', '@modern-js/plugin-changeset'],
   registerHook: hooks,
-  usePlugins: [ChangesetPlugin(), AnalyzePlugin()],
+  usePlugins: [ChangesetPlugin(), ...(isBuildMode ? [] : [AnalyzePlugin()]), LintPlugin()],
   setup: api => {
     const locale = lang.getLocaleLanguage();
     local.i18n.changeLanguage({

package/dist/js/modern/locale/en.js

@@ -5,9 +5,11 @@ export const EN_LOCALE = {
       watch: 'building module in watch mode',
       tsconfig: 'Specify a path to the tsconfig.json file',
       style_only: 'only build style',
-      platform: 'building for other platforms',
-      no_tsc: 'close tsc compiler to emit d.ts',
-      no_clear: 'disable auto clear dist dir'
+      platform: 'build the specified task or all tasks, If exist. (tasks: "storybook", "docs")',
+      no_tsc: 'close tsc compiler to emit d.ts (Deprecated)',
+      dts: 'Turn on dts generation and type checking',
+      no_clear: 'disable auto clear dist dir',
+      config: 'specify config file'
     },
     dev: {
       describe: 'start dev server'

package/dist/js/modern/locale/zh.js

@@ -5,9 +5,11 @@ export const ZH_LOCALE = {
       watch: '使用 Watch 模式构建模块',
       tsconfig: '指定 tsconfig.json 文件的路径',
       style_only: '只构建样式文件',
-      platform: '构建其他平台产物',
-      no_tsc: '关闭 tsc 编译',
-      no_clear: '不清理产物目录'
+      platform: '如果存在的话，执行指定的构建任务或者全部构建任务. (构建任务包括: "storybook", "文档")',
+      no_tsc: '关闭 tsc 编译（废弃）',
+      dts: '开启 dts 文件的生成以及类型检查',
+      no_clear: '不清理产物目录',
+      config: '指定配置文件路径，可以为相对路径或绝对路径'
     },
     dev: {
       describe: '本地开发命令'

package/dist/js/modern/schema/build-config.js

@@ -0,0 +1,104 @@
+export const targets = ['es5', 'es6', 'es2015', 'es2016', 'es2017', 'es2018', 'es2019', 'es2020', // The default target is esnext which means that by default, assume all of the latest JavaScript and CSS features are supported.
+'esnext'];
+export const presets = ['npm-library', 'npm-library-with-umd', 'npm-component', 'npm-component-with-umd', ...['npm-library', 'npm-library-with-umd', 'npm-component', 'npm-component-with-umd'].reduce((ret, crt) => {
+  return [...ret, ...targets.map(t => `${crt}-${t}`)];
+}, [])];
+const properties = {
+  target: {
+    enum: targets
+  },
+  format: {
+    enum: ['cjs', 'esm', 'umd']
+  },
+  sourceMap: {
+    enum: [true, false, 'inline', 'external']
+  },
+  buildType: {
+    enum: ['bundle', 'bundleless']
+  },
+  bundleOptions: {
+    type: 'object',
+    properties: {
+      entry: {
+        type: 'object'
+      },
+      splitting: {
+        type: 'boolean'
+      },
+      externals: {
+        type: 'array',
+        items: [{
+          type: 'string'
+        }]
+      },
+      platform: {
+        enum: ['node', 'browser']
+      },
+      minify: {
+        enum: ['esbuild', 'terser', false]
+      }
+    }
+  },
+  bundlelessOptions: {
+    type: 'object',
+    properties: {
+      sourceDir: {
+        type: 'string'
+      },
+      style: {
+        type: 'object',
+        properties: {
+          compileMode: {
+            enum: ['all', 'only-compiled-code', 'only-source-code', false]
+          },
+          path: {
+            type: 'string'
+          }
+        }
+      },
+      static: {
+        type: 'object',
+        properties: {
+          path: {
+            type: 'string'
+          }
+        }
+      }
+    }
+  },
+  tsconfig: {
+    type: 'string'
+  },
+  enableDts: {
+    type: 'boolean'
+  },
+  dtsOnly: {
+    type: 'boolean'
+  },
+  outputPath: {
+    type: 'string'
+  }
+};
+export const buildSchema = [{
+  target: 'output.buildConfig',
+  schema: {
+    if: {
+      type: 'array'
+    },
+    then: {
+      items: [{
+        type: 'object',
+        properties
+      }]
+    },
+    else: {
+      type: 'object',
+      properties
+    }
+  }
+}, {
+  target: 'output.buildPreset',
+  schema: {
+    enum: presets
+  }
+}];

package/dist/js/modern/schema/index.js

@@ -1,3 +1,4 @@
 import { sourceSchema } from "./source";
 import { outputSchema } from "./output";
-export const addSchema = () => [...sourceSchema, ...outputSchema];
+import { toolsSchema } from "./tools";
+export const addSchema = () => [...sourceSchema, ...outputSchema, ...toolsSchema];

package/dist/js/modern/schema/output.js

@@ -1,30 +1,39 @@
+import { buildSchema } from "./build-config";
 const PACKAGE_MODE_LIST = ['universal-js', 'universal-js-lite', 'browser-js', 'browser-js-lite', 'node-js'];
-export const outputSchema = [{
+export const outputSchema = [
+/** packageMode will deprecated */
+{
   target: 'output.packageMode',
   schema: {
     enum: PACKAGE_MODE_LIST
   }
-}, {
+},
+/** packageFields will deprecated */
+{
   target: 'output.packageFields',
   schema: {
     typeof: 'object'
   }
-}, {
+},
+/** enableSourceMap will deprecated */
+{
   target: 'output.enableSourceMap',
   schema: {
     typeof: 'boolean'
   }
-}, {
+},
+/** importStyle will deprecated */
+{
   target: 'output.importStyle',
   schema: {
-    enum: ['compiled-code', 'source-code'],
-    // TODO: 目前default是无效的
-    default: 'source-code'
+    enum: ['compiled-code', 'source-code']
   }
-}, {
+},
+/** assetsPath will deprecated */
+{
   target: 'output.assetsPath',
   schema: {
     typeof: 'string',
     default: 'styles'
   }
-}];
+}, ...buildSchema];

package/dist/js/modern/schema/source.js

@@ -1,15 +1,7 @@
-export const sourceSchema = [// 启动区块运行时
-{
-  target: 'source.enableBlockRuntime',
-  schema: {
-    type: 'boolean'
-  }
-}, {
+export const sourceSchema = [{
   target: 'source.jsxTransformRuntime',
   schema: {
     // https://babeljs.io/docs/en/babel-preset-react#runtime
-    enum: ['classic', 'automatic'],
-    // TODO: 目前default是无效的
-    default: 'automatic'
+    enum: ['classic', 'automatic']
   }
 }];

package/dist/js/modern/schema/tools.js

@@ -0,0 +1,6 @@
+export const toolsSchema = [{
+  target: 'tools.speedy',
+  schema: {
+    typeof: ['object', 'function']
+  }
+}];

package/dist/js/modern/utils/babel.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 { getBabelConfig } from '@modern-js/babel-preset-module';
+import { getBabelConfig, applyUserBabelConfig } from '@modern-js/babel-preset-module';
 import { applyOptionsChain, getAlias, isUseSSRBundle } from '@modern-js/utils';
 export const getFinalAlias = (modernConfig, option) => {
   const aliasConfig = getAlias(modernConfig.source.alias, option); // 排除内部别名，因为不需要处理
@@ -25,7 +25,7 @@ export const getFinalAlias = (modernConfig, option) => {
   aliasConfig.paths = finalPaths;
   return aliasConfig;
 };
-export const resolveBabelConfig = (appDirectory, modernConfig, option) => {
+export const resolveBabelConfig = (appDirectory, modernConfig, sourceMap, bundlelessOptions, option) => {
   const {
     source: {
       envVars,
@@ -60,6 +60,8 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option) => {
     lodashOptions,
     jsxTransformRuntime,
     importStyle,
+    styleDir: bundlelessOptions.style.path,
+    staticDir: bundlelessOptions.static.path,
     styledComponentsOptions: applyOptionsChain({
       pure: true,
       displayName: true,
@@ -72,6 +74,7 @@ export const resolveBabelConfig = (appDirectory, modernConfig, option) => {
   }); // Preventing warning when files are too large
 
   internalBabelConfig.compact = false;
+  internalBabelConfig.sourceMaps = sourceMap === 'external' ? true : sourceMap;
   const userBabelConfig = modernConfig.tools.babel;
-  return applyOptionsChain(internalBabelConfig, userBabelConfig);
+  return applyUserBabelConfig(internalBabelConfig, userBabelConfig);
 };

package/dist/js/modern/utils/constants.js

@@ -0,0 +1,3 @@
+// generator tsconfig file
+export const tempTsconfigName = 'tsconfig.temp.json';
+export const cliTsConfigDefaultValue = './tsconfig.json';

package/dist/js/node/cli/build.js

@@ -9,12 +9,13 @@ var _utils = require("@modern-js/utils");
 
 const local = _utils.Import.lazy('../locale/index', require);
 
-const commands = _utils.Import.lazy('../commands', require);
+const command = _utils.Import.lazy('../commands/build', require);
 
 const buildCli = (program, api) => {
-  // TODO: 初始化环境变量
-  program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)).option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).action(async subCommand => {
-    await commands.build(api, subCommand);
+  return program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform)) // @deprecated
+  // The `--no-tsc` option has been superceded by the `--no-dts` option.
+  .option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--dts', local.i18n.t(local.localeKeys.command.build.dts)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).option('-c --config <config>', local.i18n.t(local.localeKeys.command.build.config)).action(async subCommand => {
+    await command.build(api, subCommand);
   });
 };
 

package/dist/js/node/commands/build.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.build = void 0;
+exports.init = exports.build = void 0;
 
 var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
 
+var _signalExit = _interopRequireDefault(require("signal-exit"));
+
+var _constants = require("../utils/constants");
+
+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; }
@@ -18,48 +24,63 @@ const tsConfigutils = _utils.Import.lazy('../utils/tsconfig', require);
 const valid = _utils.Import.lazy('../utils/valide', require);
 
 const buildFeature = _utils.Import.lazy('../features/build', require);
+/**
+ * init work before build task.
+ * @param api
+ */
 
-const build = async (api, {
-  watch: _watch = false,
-  tsconfig: tsconfigName,
-  tsc,
-  clear: _clear = true,
-  platform,
-  styleOnly
-}) => {
+
+const init = api => {
   const {
     appDirectory
   } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
 
   _utils.dotenv.config();
 
+  (0, _signalExit.default)(() => {
+    const tempTsconfigFileAbsPath = path.join(appDirectory, './node_modules', `./${_constants.tempTsconfigName}`);
+
+    _utils.fs.removeSync(tempTsconfigFileAbsPath);
+  });
+};
+
+exports.init = init;
+
+const build = async (api, buildCommandOption) => {
+  var _modernConfig$output$;
+
+  const {
+    watch = false,
+    tsconfig: tsconfigName,
+    tsc,
+    dts = false,
+    clear,
+    platform = false,
+    styleOnly = false
+  } = buildCommandOption;
+  init(api);
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
+  const tsconfigPath = path.join(appDirectory, tsconfigName);
+  const outputPath = (_modernConfig$output$ = modernConfig.output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
   const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-  const enableTscCompiler = isTsProject && tsc && !modernConfig.output.disableTsChecker;
+  const enableDtsGen = isTsProject && dts;
   valid.valideBeforeTask({
     modernConfig,
     tsconfigPath
-  }); // TODO: 一些配置只需要从modernConfig中获取
-
+  });
   await buildFeature.build(api, {
-    appDirectory,
-    enableWatchMode: _watch,
+    enableWatchMode: watch,
+    enableDtsGen,
     isTsProject,
-    platform,
-    sourceDir: 'src',
     tsconfigName,
-    enableTscCompiler,
-    clear: _clear,
-    styleOnly
-  }, modernConfig);
-  process.on('SIGBREAK', () => {
-    console.info('exit');
-    const tempTsconfigFilePath = path.join(appDirectory, './tsconfig.temp.json');
-
-    if (_utils.fs.existsSync(tempTsconfigFilePath)) {
-      _utils.fs.removeSync(tempTsconfigFilePath);
-    }
+    outputPath,
+    styleOnly,
+    platform,
+    clear,
+    legacyTsc: tsc
   });
 };
 

package/dist/js/node/features/build/bundle/index.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.build = void 0;
+
+var _runSpeedy = require("./runSpeedy");
+
+var _runRollup = require("./runRollup");
+
+const build = async (api, config) => {
+  const tasks = config.dtsOnly ? [(0, _runRollup.startRollup)(api, config)] : [(0, _runSpeedy.runSpeedy)(api, config), (0, _runRollup.startRollup)(api, config)];
+  await Promise.all(tasks);
+};
+
+exports.build = build;

package/dist/js/node/features/build/bundle/runRollup.js

@@ -0,0 +1,174 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.startRollup = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _typescript = _interopRequireDefault(require("typescript"));
+
+var _rollupPluginHashbang = _interopRequireDefault(require("rollup-plugin-hashbang"));
+
+var _pluginJson = _interopRequireDefault(require("@rollup/plugin-json"));
+
+var _error = require("../error");
+
+var _utils = 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; }
+
+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; }
+
+// Copied from https://github.com/egoist/tsup/blob/dev/src/rollup.ts
+const loadCompilerOptions = tsconfig => {
+  if (!tsconfig) {
+    return {};
+  }
+
+  const configFile = _typescript.default.readConfigFile(tsconfig, _typescript.default.sys.readFile);
+
+  const {
+    options
+  } = _typescript.default.parseJsonConfigFileContent(configFile.config, _typescript.default.sys, './');
+
+  return options;
+};
+
+const dtsPlugin = require('rollup-plugin-dts');
+
+const getRollupConfig = async (api, options) => {
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const {
+    output: {
+      path: distPath = 'dist'
+    }
+  } = api.useResolvedConfigContext();
+  const {
+    outputPath,
+    bundleOptions,
+    tsconfig
+  } = options;
+
+  const distDir = _path.default.join(appDirectory, distPath, outputPath);
+
+  const compilerOptions = loadCompilerOptions(tsconfig);
+  const dtsOptions = {
+    entry: bundleOptions.entry
+  };
+  const ignoreFiles = {
+    name: 'ignore-files',
+
+    load(id) {
+      if (!/\.(js|cjs|mjs|jsx|ts|tsx|mts|json)$/.test(id)) {
+        return '';
+      }
+
+      return null;
+    }
+
+  };
+  return {
+    inputConfig: {
+      input: dtsOptions.entry,
+      external: bundleOptions.externals,
+
+      onwarn(warning, handler) {
+        if (warning.code === 'UNRESOLVED_IMPORT' || warning.code === 'CIRCULAR_DEPENDENCY' || warning.code === 'EMPTY_BUNDLE') {
+          return;
+        }
+
+        handler(warning);
+      },
+
+      plugins: [(0, _rollupPluginHashbang.default)(), (0, _pluginJson.default)(), ignoreFiles, dtsPlugin.default({
+        // use external to prevent them which come from node_modules from be bundled.
+        respectExternal: true,
+        compilerOptions: _objectSpread(_objectSpread({}, compilerOptions), {}, {
+          baseUrl: _path.default.resolve(compilerOptions.baseUrl || '.'),
+          // Ensure ".d.ts" modules are generated
+          declaration: true,
+          // Skip ".js" generation
+          noEmit: false,
+          emitDeclarationOnly: true,
+          // Skip code generation when error occurs
+          noEmitOnError: true,
+          // Avoid extra work
+          checkJs: false,
+          declarationMap: false,
+          skipLibCheck: true,
+          preserveSymlinks: false,
+          // Ensure we can parse the latest code
+          target: _typescript.default.ScriptTarget.ESNext
+        })
+      })].filter(Boolean)
+    },
+    outputConfig: {
+      dir: distDir,
+      format: 'esm',
+      exports: 'named'
+    }
+  };
+};
+
+async function runRollup(options, context) {
+  try {
+    const {
+      rollup
+    } = await Promise.resolve().then(() => _interopRequireWildcard(require('rollup')));
+    const bundle = await rollup(options.inputConfig);
+    await bundle.write(options.outputConfig);
+  } catch (e) {
+    if (e instanceof Error) {
+      throw new _error.InternalDTSError(e, _objectSpread({
+        buildType: 'bundle'
+      }, context));
+    }
+  }
+}
+
+async function watchRollup(options) {
+  const {
+    watch
+  } = await Promise.resolve().then(() => _interopRequireWildcard(require('rollup')));
+  const titleText = '[Bundle:DTS]';
+  watch(_objectSpread(_objectSpread({}, options.inputConfig), {}, {
+    plugins: options.inputConfig.plugins,
+    output: options.outputConfig
+  })).on('event', event => {
+    if (event.code === 'START') {
+      console.info((0, _utils.watchSectionTitle)(titleText, _utils.SectionTitleStatus.Log));
+    } else if (event.code === 'BUNDLE_END') {
+      console.info((0, _utils.watchSectionTitle)(titleText, _utils.SectionTitleStatus.Success));
+    } else if (event.code === 'ERROR') {// this is dts rollup plugin bug, error not complete message
+    }
+  });
+}
+
+const startRollup = async (api, options) => {
+  if (options.enableDts) {
+    const config = await getRollupConfig(api, options);
+
+    if (options.watch) {
+      watchRollup(config);
+    } else {
+      await runRollup(config, {
+        target: options.target,
+        format: options.format
+      });
+    }
+  }
+};
+
+exports.startRollup = startRollup;