@modern-js/module-tools 1.5.7 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # @modern-js/module-tools
 
+## 1.6.0
+
+### Minor Changes
+
+- b82869d: - use speedy as a bundler to support bundle, and support dts and css bundle.
+  - design `buildConfig` to support build for different scene, and design `buildPreset` to cover most of scenes.
+  - add `tools.speedy` to receive custom speedy config.
+  - remove child process to solving problems with serialisation parameters.
+  - add more test cases, improve quality construction.
+  - design a new log about build process
+
+### Patch Changes
+
+- Updated dependencies [b82869d]
+- Updated dependencies [b82869d]
+- Updated dependencies [b82869d]
+- Updated dependencies [b82869d]
+  - @modern-js/utils@1.7.10
+  - @modern-js/babel-preset-module@1.3.9
+  - @modern-js/core@1.12.3
+  - @modern-js/style-compiler@1.2.11
+  - @modern-js/css-config@1.2.7
+  - @modern-js/plugin-analyze@1.4.7
+  - @modern-js/plugin-changeset@1.3.1
+  - @modern-js/plugin-jarvis@1.2.14
+
+## 1.5.8
+
+### Patch Changes
+
+- eeedc80: feat: add plugin-jarvis to dependencies of solutions
+- f29e9ba: feat: simplify context usage, no longer depend on containers
+- Updated dependencies [f29e9ba]
+- Updated dependencies [d9564f2]
+- Updated dependencies [1a57595]
+- Updated dependencies [42741db]
+- Updated dependencies [341bb42]
+- Updated dependencies [f29e9ba]
+- Updated dependencies [a90bc96]
+  - @modern-js/core@1.12.2
+  - @modern-js/plugin-analyze@1.4.7
+  - @modern-js/plugin-jarvis@1.2.14
+  - @modern-js/plugin-changeset@1.3.1
+  - @modern-js/new-action@1.3.11
+  - @modern-js/plugin@1.4.0
+  - @modern-js/utils@1.7.9
+  - @modern-js/css-config@1.2.7
+
 ## 1.5.7
 
 ### Patch Changes

package/dist/js/modern/cli/build.js

@@ -1,9 +1,10 @@
 import { Import } from '@modern-js/utils';
 const local = Import.lazy('../locale/index', require);
-const commands = Import.lazy('../commands', require);
+const command = Import.lazy('../commands/build', require);
 export 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/modern/commands/build.js

@@ -1,46 +1,73 @@
 import * as path from 'path';
-import { fs, Import, dotenv } from '@modern-js/utils';
+import { fs, Import, dotenv, globby, slash } from '@modern-js/utils';
+import onExit from 'signal-exit';
 const tsConfigutils = Import.lazy('../utils/tsconfig', require);
 const valid = Import.lazy('../utils/valide', require);
 const buildFeature = Import.lazy('../features/build', require);
-export const build = async (api, {
-  watch: _watch = false,
-  tsconfig: tsconfigName,
-  tsc,
-  clear: _clear = true,
-  platform,
-  styleOnly
-}) => {
+/**
+ * init work before build task.
+ * @param api
+ */
+
+export const init = api => {
+  const {
+    appDirectory
+  } = api.useAppContext();
+  dotenv.config();
+  onExit(async code => {
+    if (code === 0) {
+      return;
+    }
+
+    const tempTsconfigPathPattern = path.join(appDirectory, './node_modules', `./tsconfig.**.**.json`);
+    const files = globby(slash(tempTsconfigPathPattern), {
+      stats: true,
+      absolute: true
+    });
+    const currentTime = Date.now();
+
+    for (const file of files) {
+      // over 30s, will delete it
+      if (currentTime - file.stats.birthtimeMs >= 30 * 1000) {
+        fs.unlinkSync(file.path);
+      }
+    }
+  });
+};
+export 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);
-  dotenv.config();
+  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 (fs.existsSync(tempTsconfigFilePath)) {
-      fs.removeSync(tempTsconfigFilePath);
-    }
+    outputPath,
+    styleOnly,
+    platform,
+    clear,
+    legacyTsc: tsc
   });
 };

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

@@ -0,0 +1,9 @@
+import pMap from 'p-map';
+import { runSpeedy } from "./runSpeedy";
+import { startRollup } from "./runRollup";
+export const build = async (api, config) => {
+  const tasks = config.dtsOnly ? [startRollup] : [runSpeedy, startRollup];
+  await pMap(tasks, async task => {
+    await task(api, config);
+  });
+};

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

@@ -0,0 +1,149 @@
+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 path from 'path';
+import ts from 'typescript';
+import hashbangPlugin from 'rollup-plugin-hashbang';
+import jsonPlugin from '@rollup/plugin-json';
+import { InternalDTSError } from "../error";
+import { SectionTitleStatus, watchSectionTitle } from "../utils"; // Copied from https://github.com/egoist/tsup/blob/dev/src/rollup.ts
+
+const loadCompilerOptions = tsconfig => {
+  if (!tsconfig) {
+    return {};
+  }
+
+  const configFile = ts.readConfigFile(tsconfig, ts.sys.readFile);
+  const {
+    options
+  } = ts.parseJsonConfigFileContent(configFile.config, ts.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.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: [hashbangPlugin(), jsonPlugin(), ignoreFiles, dtsPlugin.default({
+        // use external to prevent them which come from node_modules from be bundled.
+        respectExternal: true,
+        compilerOptions: _objectSpread(_objectSpread({}, compilerOptions), {}, {
+          baseUrl: path.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: ts.ScriptTarget.ESNext
+        })
+      })].filter(Boolean)
+    },
+    outputConfig: {
+      dir: distDir,
+      format: 'esm',
+      exports: 'named'
+    }
+  };
+};
+
+async function runRollup(options, context) {
+  try {
+    const {
+      rollup
+    } = await import('rollup');
+    const bundle = await rollup(options.inputConfig);
+    await bundle.write(options.outputConfig);
+  } catch (e) {
+    if (e instanceof Error) {
+      throw new InternalDTSError(e, _objectSpread({
+        buildType: 'bundle'
+      }, context));
+    }
+  }
+}
+
+async function watchRollup(options) {
+  const {
+    watch
+  } = await import('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(watchSectionTitle(titleText, SectionTitleStatus.Log));
+    } else if (event.code === 'BUNDLE_END') {
+      console.info(watchSectionTitle(titleText, SectionTitleStatus.Success));
+    } else if (event.code === 'ERROR') {// this is dts rollup plugin bug, error not complete message
+    }
+  });
+}
+
+export 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
+      });
+    }
+  }
+};

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

@@ -0,0 +1,185 @@
+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 path from 'path';
+import { SpeedyBundler } from '@speedy-js/speedy-core';
+import { es5InputPlugin } from '@speedy-js/speedy-plugin-es5';
+import { applyOptionsChain, ensureAbsolutePath } from '@modern-js/utils';
+import { InternalBuildError } from "../error";
+import { getPostcssOption, SectionTitleStatus, watchSectionTitle } from "../utils";
+export const getAlias = api => {
+  const {
+    appDirectory,
+    srcDirectory
+  } = api.useAppContext();
+  const {
+    source
+  } = api.useResolvedConfigContext(); // TODO: maybe check tsconfig `paths`
+
+  const defaultAlias = {
+    '@': srcDirectory
+  };
+  const alias = applyOptionsChain(defaultAlias, source === null || source === void 0 ? void 0 : source.alias);
+  return Object.keys(alias).reduce((o, name) => {
+    return _objectSpread(_objectSpread({}, o), {}, {
+      [name]: ensureAbsolutePath(appDirectory, alias[name])
+    });
+  }, {});
+};
+export const getDefine = api => {
+  const {
+    source: {
+      envVars,
+      globalVars
+    }
+  } = api.useResolvedConfigContext();
+  const envVarsDefine = [...(envVars || [])].reduce((memo, name) => {
+    memo[`process.env.${name}`] = JSON.stringify(process.env[name]);
+    return memo;
+  }, {});
+  const globalVarsDefine = Object.keys(globalVars || {}).reduce((memo, name) => {
+    memo[name] = globalVars ? JSON.stringify(globalVars[name]) : '';
+    return memo;
+  }, {});
+  return _objectSpread(_objectSpread({}, envVarsDefine), globalVarsDefine);
+};
+
+const getStyleOptionFromModern = async api => {
+  const runner = api.useHookRunners();
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
+  const lessOption = await runner.moduleLessConfig({
+    modernConfig
+  }, {
+    onLast: async _ => undefined
+  });
+  const sassOption = await runner.moduleSassConfig({
+    modernConfig
+  }, {
+    onLast: async _ => undefined
+  });
+  const tailwindPlugin = await runner.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);
+  }
+
+  return {
+    less: lessOption === null || lessOption === void 0 ? void 0 : lessOption.lessOption,
+    sass: sassOption,
+    postcss: _objectSpread(_objectSpread({}, postcssOption.options), {}, {
+      plugins: postcssOption.plugins
+    })
+  };
+};
+
+export const runSpeedy = async (api, config) => {
+  const {
+    appDirectory
+  } = api.useAppContext();
+  const {
+    output: {
+      path: distPath = 'dist'
+    },
+    tools: {
+      speedy: userSpeedyConfig
+    }
+  } = api.useResolvedConfigContext();
+  const {
+    target,
+    watch,
+    bundleOptions,
+    outputPath,
+    format,
+    sourceMap
+  } = config;
+  const {
+    entry,
+    platform,
+    splitting,
+    minify,
+    externals
+  } = bundleOptions;
+  const distDir = path.join(appDirectory, distPath, outputPath);
+  const titleText = `[Bundle:Speedy:${format}_${target}]`;
+  const style = await getStyleOptionFromModern(api);
+  const alias = getAlias(api);
+  const define = getDefine(api);
+
+  const watchPlugin = () => {
+    return {
+      name: 'watch-plugin',
+
+      apply(compiler) {
+        compiler.hooks.watchChange.tap('watch-plugin', async () => {
+          console.info(watchSectionTitle(titleText, SectionTitleStatus.Log));
+        });
+      }
+
+    };
+  };
+
+  const plugins = target === 'es5' ? [es5InputPlugin()] : [];
+  plugins.push(watchPlugin());
+  const internalSpeedyConfig = {
+    command: 'build',
+    mode: 'production',
+    html: false,
+    preset: 'webapp',
+    // support css and json
+    platform,
+    watch,
+    input: entry,
+    target,
+    clearScreen: false,
+    output: {
+      path: distDir,
+      format,
+      splitting,
+      filename: '[name]'
+    },
+    style,
+    resolve: {
+      alias
+    },
+    define,
+    sourceMap,
+    minify,
+    external: externals,
+    plugins
+  };
+  const speedyConfig = applyOptionsChain(internalSpeedyConfig, userSpeedyConfig);
+  const compiler = await SpeedyBundler.create(speedyConfig);
+
+  try {
+    if (watch) {
+      console.info(watchSectionTitle(titleText, SectionTitleStatus.Log));
+    }
+
+    await compiler.build();
+  } catch (e) {
+    /**
+     * in watch mode
+     * use speedy watch log
+     */
+    if (e instanceof Error) {
+      throw new InternalBuildError(e, {
+        target,
+        format,
+        buildType: 'bundle'
+      });
+    }
+  }
+};

package/dist/js/modern/{tasks → features/build/bundleless}/copy-assets.js

@@ -1,9 +1,6 @@
 import * as path from 'path';
 import { fs, watch, glob, WatchChangeType, Import } from '@modern-js/utils';
-const argv = Import.lazy('process.argv', require);
-const core = Import.lazy('@modern-js/core', require);
-const copyUtils = Import.lazy('../utils/copy', require);
-const STYLE_DIRS = 'styles';
+const copyUtils = Import.lazy('../../../utils/copy', require);
 const SRC_DIRS = 'src';
 
 const copyAssets = ({
@@ -25,11 +22,13 @@ const copyAssets = ({
   }
 };
 
-const watchAssets = ({
+const watchAssets = (api, {
   targetDir,
   outputDir
 }) => {
-  watch(`${targetDir}/**/*.*`, ({
+  const appContext = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
+  watch(`${targetDir}/**/*.*`, async ({
     changeType,
     changedFilePath
   }) => {
@@ -41,73 +40,50 @@ const watchAssets = ({
 
     const file = path.relative(targetDir, changedFilePath);
     fs.copyFileSync(changedFilePath, path.resolve(outputDir, file));
+    await copyUtils.copyTask({
+      modernConfig,
+      appContext
+    });
   }, ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']);
 };
 
-const taskMain = ({
-  modernConfig,
-  appContext
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv({});
+export const copyStaticAssets = async (api, config) => {
+  var _bundlelessOptions$so;
+
+  const appContext = api.useAppContext();
+  const modernConfig = api.useResolvedConfigContext();
   const {
     appDirectory
   } = appContext;
   const {
-    jsPath = 'js',
-    assetsPath = 'styles',
-    path: outputPath = 'dist'
+    path: distPath = 'dist'
   } = modernConfig.output;
-  const srcDir = path.join(appDirectory, SRC_DIRS);
-  const outputDirToSrc = path.join(appDirectory, outputPath, jsPath, assetsPath);
-  const styleDir = path.join(appDirectory, STYLE_DIRS);
-  const outputDirToStyle = path.join(appDirectory, outputPath, assetsPath);
+  const {
+    outputPath,
+    bundlelessOptions
+  } = config;
+  const {
+    static: {
+      path: staticPath = './'
+    } = {
+      path: './'
+    }
+  } = bundlelessOptions;
+  const srcDir = path.join(appDirectory, (_bundlelessOptions$so = bundlelessOptions.sourceDir) !== null && _bundlelessOptions$so !== void 0 ? _bundlelessOptions$so : SRC_DIRS);
+  const outputDirToSrc = path.join(appDirectory, distPath, outputPath, staticPath);
   copyAssets({
     targetDir: srcDir,
     outputDir: outputDirToSrc
   });
-  copyAssets({
-    targetDir: styleDir,
-    outputDir: outputDirToStyle
-  });
-  copyUtils.copyTask({
+  await copyUtils.copyTask({
     modernConfig,
     appContext
   });
 
   if (config.watch) {
-    watchAssets({
+    watchAssets(api, {
       targetDir: srcDir,
       outputDir: outputDirToSrc
     });
-    watchAssets({
-      targetDir: styleDir,
-      outputDir: outputDirToStyle
-    });
   }
-};
-
-(async () => {
-  let options;
-
-  if (process.env.CORE_INIT_OPTION_FILE) {
-    ({
-      options
-    } = require(process.env.CORE_INIT_OPTION_FILE));
-  }
-
-  const {
-    resolved: modernConfig,
-    appContext
-  } = await core.cli.init([], options);
-  core.manager.run(() => {
-    try {
-      taskMain({
-        modernConfig,
-        appContext
-      });
-    } catch (e) {
-      console.error(e.message);
-    }
-  });
-})();
+};