@modern-js/module-tools 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/js/modern/cli/new.js

@@ -1,13 +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 } from '@modern-js/utils';
-const newAction = Import.lazy('@modern-js/new-action', require);
-const local = Import.lazy('../locale', require);
-export const newCli = (program, locale) => {
-  program.command('new').usage('[options]').description(local.i18n.t(local.localeKeys.command.new.describe)).option('-d, --debug', local.i18n.t(local.localeKeys.command.new.debug), false).option('-c, --config <config>', local.i18n.t(local.localeKeys.command.new.config)).option('--dist-tag <tag>', local.i18n.t(local.localeKeys.command.new.distTag)).option('--registry', local.i18n.t(local.localeKeys.command.new.registry)).action(async options => {
-    await newAction.ModuleNewAction(_objectSpread(_objectSpread({}, options), {}, {
-      locale
-    }));
-  });
-};

package/dist/js/modern/commands/build.js

@@ -1,69 +0,0 @@
-import * as path from 'path';
-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);
-/**
- * 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$, _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 === null || modernConfig === void 0 ? void 0 : (_modernConfig$output = modernConfig.output) === null || _modernConfig$output === void 0 ? void 0 : _modernConfig$output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
-  const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-  const enableDtsGen = isTsProject && dts;
-  valid.valideBeforeTask({
-    modernConfig,
-    tsconfigPath
-  });
-  await buildFeature.build(api, {
-    enableWatchMode: watch,
-    enableDtsGen,
-    isTsProject,
-    tsconfigName,
-    outputPath,
-    styleOnly,
-    platform,
-    clear,
-    legacyTsc: tsc
-  });
-};

package/dist/js/modern/commands/dev.js

@@ -1,43 +0,0 @@
-import * as path from 'path';
-import { dotenv, Import } from '@modern-js/utils';
-const devFeature = Import.lazy('../features/dev', require);
-const tsConfigutils = Import.lazy('../utils/tsconfig', require);
-const valid = Import.lazy('../utils/valide', require);
-const existSubCmd = subCmd => subCmd.length > 0;
-export const dev = async (api, option, subCmd = '') => {
-  const {
-    tsconfig: tsconfigName
-  } = option;
-  const appContext = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    appDirectory
-  } = appContext;
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-  dotenv.config();
-  valid.valideBeforeTask({
-    modernConfig,
-    tsconfigPath
-  });
-  const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-  if (existSubCmd(subCmd)) {
-    await devFeature.runSubCmd(api, subCmd, {
-      isTsProject,
-      appDirectory
-    });
-    return;
-  }
-
-  // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
-  if (process.env.RUN_PLATFORM) {
-    await devFeature.showMenu(api, {
-      isTsProject,
-      appDirectory
-    });
-  } else {
-    await devFeature.devStorybook(api, {
-      isTsProject,
-      appDirectory
-    });
-  }
-};

package/dist/js/modern/commands/index.js

@@ -1,2 +0,0 @@
-export { dev } from "./dev";
-export { build } from "./build";

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

@@ -1,69 +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 { execa, Import, chalk } from '@modern-js/utils';
-const lg = Import.lazy('./logger', require);
-const pMap = Import.lazy('p-map', require);
-export const buildPlatform = async (api, option) => {
-  const {
-    isTsProject = false,
-    platform
-  } = option;
-  const lm = new lg.LoggerManager();
-  // 获取platforms的参数
-  const runners = api.useHookRunners();
-  const buildTasks = await runners.platformBuild({
-    isTsProject
-  });
-  if (buildTasks.length <= 0) {
-    console.info(chalk.yellow('No build tasks detected.\nYou can use the `new` command to enable the more features'));
-    return;
-  }
-  const loggerMap = {};
-  const taskMapper = buildTasks.filter(task => platform === 'all' || task.name === platform).map(params => {
-    const logger = lm.createLoggerText({
-      title: params.title
-    });
-    loggerMap[params.name] = logger;
-    return _objectSpread({
-      logger
-    }, params);
-  });
-  if (taskMapper.length <= 0) {
-    console.info(chalk.yellow(`'${platform}' is undefined task`));
-    return;
-  }
-  lm.showCompiling();
-  await pMap(taskMapper, async ({
-    taskPath,
-    params,
-    logger: _
-  }) => {
-    const childProcess = execa.node(taskPath, params, {
-      stdio: 'inherit',
-      all: true
-    });
-
-    // lm.addStdout(logger, childProcess.stdout, {
-    //   event: { data: true, error: true },
-    // });
-
-    // lm.addStderr(logger, childProcess.stderr);
-    try {
-      await childProcess;
-    } catch (_unused) {
-      // eslint-disable-next-line no-process-exit
-      process.exit(1);
-    }
-    // lm.disappearCompiling();
-    // console.info(lg.colors.title(title));
-    // console.info(a.all);
-  }, {
-    concurrency: 1
-  });
-
-  // lm.disappearCompiling();
-  // for (const key of Object.keys(loggerMap)) {
-  //   console.info(loggerMap[key].value);
-  // }
-};

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

@@ -1,9 +0,0 @@
-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

@@ -1,136 +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 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|jsx|ts|tsx|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

@@ -1,176 +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 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
-    } = {
-      speedy: undefined
-    }
-  } = api.useResolvedConfigContext();
-  const {
-    target,
-    watch,
-    bundleOptions,
-    outputPath,
-    format,
-    sourceMap
-  } = config;
-  const {
-    entry,
-    platform,
-    splitting,
-    minify,
-    externals,
-    getModuleId
-  } = 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());
-  // TODO: add speedy plugin about react
-  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,
-    getModuleId
-  };
-  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/features/build/bundleless/copy-assets.js

@@ -1,75 +0,0 @@
-import * as path from 'path';
-import { fs, watch, glob, WatchChangeType, Import } from '@modern-js/utils';
-const copyUtils = Import.lazy('../../../utils/copy', require);
-const SRC_DIRS = 'src';
-const copyAssets = ({
-  targetDir,
-  outputDir
-}) => {
-  const assetsFiles = glob.sync(`${targetDir}/**/*.*`, {
-    ignore: ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']
-  });
-  if (assetsFiles.length > 0) {
-    fs.ensureDirSync(outputDir);
-  }
-  for (const resource of assetsFiles) {
-    const file = path.relative(targetDir, resource);
-    fs.ensureDirSync(path.dirname(path.resolve(outputDir, file)));
-    fs.copyFileSync(resource, path.resolve(outputDir, file));
-  }
-};
-const watchAssets = (api, {
-  targetDir,
-  outputDir
-}) => {
-  watch(`${targetDir}/**/*.*`, async ({
-    changeType,
-    changedFilePath
-  }) => {
-    if (changeType === WatchChangeType.UNLINK) {
-      const removeFile = path.normalize(`${outputDir}/${path.relative(targetDir, changedFilePath)}`);
-      fs.removeSync(removeFile);
-      return;
-    }
-    const file = path.relative(targetDir, changedFilePath);
-    fs.copyFileSync(changedFilePath, path.resolve(outputDir, file));
-  }, ['**/*.{js,jsx,ts,tsx,d.ts,scss,less,css,sass}']);
-};
-export const copyStaticAssets = async (api, config) => {
-  var _bundlelessOptions$so;
-  const appContext = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    appDirectory
-  } = appContext;
-  const {
-    path: distPath = 'dist'
-  } = modernConfig.output;
-  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
-  });
-  await copyUtils.copyTask({
-    modernConfig,
-    appContext
-  });
-  if (config.watch) {
-    watchAssets(api, {
-      targetDir: srcDir,
-      outputDir: outputDirToSrc
-    });
-  }
-};