@modern-js/module-tools 1.3.0 → 1.3.1

package/src/tasks/build-watch-style.ts

@@ -1,271 +0,0 @@
-/* eslint-disable max-statements */
-import * as path from 'path';
-import type {
-  NormalizedConfig,
-  IAppContext,
-  CoreOptions,
-} from '@modern-js/core';
-import type { ICompilerResult, PostcssOption } from '@modern-js/style-compiler';
-import { fs, watch, WatchChangeType, Import } from '@modern-js/utils';
-import type { ModuleToolsOutput } from '../types';
-
-const logger: typeof import('../features/build/logger') = Import.lazy(
-  '../features/build/logger',
-  require,
-);
-const cssConfig: typeof import('@modern-js/css-config') = Import.lazy(
-  '@modern-js/css-config',
-  require,
-);
-const hooks: typeof import('@modern-js/module-tools-hooks') = Import.lazy(
-  '@modern-js/module-tools-hooks',
-  require,
-);
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-const compiler: typeof import('@modern-js/style-compiler') = Import.lazy(
-  '@modern-js/style-compiler',
-  require,
-);
-const glob: typeof import('glob') = Import.lazy('glob', require);
-
-const STYLE_DIRS = 'styles';
-const SRC_STYLE_DIRS = 'src';
-
-const checkStylesDirExist = (option: { appDirectory: string }) => {
-  const { appDirectory } = option;
-  return fs.existsSync(path.join(appDirectory, STYLE_DIRS));
-};
-
-const generatorFileAndReturnLog = (
-  result: ICompilerResult,
-  successMessage = '',
-) => {
-  if (result.code === 0) {
-    for (const file of result.dists) {
-      fs.ensureFileSync(file.filename);
-      fs.writeFileSync(file.filename, file.content);
-    }
-    return successMessage;
-  } else {
-    return result.errors.join('\n');
-  }
-};
-
-const getPostcssOption = (
-  appDirectory: string,
-  modernConfig: NormalizedConfig,
-): PostcssOption => {
-  const postcssOption = cssConfig.getPostcssConfig(
-    appDirectory,
-    modernConfig,
-    false,
-  );
-  return {
-    plugins: postcssOption?.postcssOptions?.plugins || [],
-    enableSourceMap: (postcssOption as any)?.sourceMap || false,
-    options: {},
-  } as any;
-};
-
-const copyOriginStyleFiles = ({
-  targetDir,
-  outputDir,
-}: {
-  targetDir: string;
-  outputDir: string;
-}) => {
-  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.ensureFileSync(path.join(outputDir, file));
-    fs.copyFileSync(styleFile, path.join(outputDir, file));
-  }
-};
-
-const logCompilerMessage = (compilerMessage: {
-  src: string;
-  styles: string;
-}) => {
-  console.info(logger.clearFlag);
-  console.info(compilerMessage.src);
-  console.info(compilerMessage.styles);
-};
-
-const taskMain = async ({
-  modernConfig,
-  appContext,
-}: {
-  modernConfig: NormalizedConfig;
-  appContext: IAppContext;
-}) => {
-  const {
-    assetsPath = 'styles',
-    path: outputPath = 'dist',
-    jsPath = 'js',
-    importStyle,
-  } = modernConfig.output as ModuleToolsOutput;
-  const { appDirectory } = appContext;
-
-  const lessOption = await (core.mountHook() as any).moduleLessConfig(
-    { modernConfig },
-    {
-      onLast: async (_: any) => null as any,
-    },
-  );
-  const sassOption = await (core.mountHook() as any).moduleSassConfig(
-    { modernConfig },
-    {
-      onLast: async (_: any) => null as any,
-    },
-  );
-  const postcssOption = getPostcssOption(appDirectory, modernConfig);
-  const existStylesDir = checkStylesDirExist({ appDirectory });
-  const compilerMessage = {
-    src: '',
-    styles: '',
-  };
-
-  // 编译 styles 目录样式
-  let styleEmitter = null;
-  if (existStylesDir) {
-    styleEmitter = compiler.styleCompiler({
-      watch: true,
-      projectDir: appDirectory,
-      stylesDir: path.resolve(appDirectory, STYLE_DIRS),
-      outDir: path.join(appDirectory, outputPath, assetsPath),
-      enableVirtualDist: true,
-      compilerOption: {
-        less: lessOption,
-        sass: sassOption,
-        postcss: postcssOption,
-      },
-    });
-    styleEmitter.on(
-      compiler.BuildWatchEvent.firstCompiler,
-      (styleResult: ICompilerResult) => {
-        compilerMessage.styles = generatorFileAndReturnLog(
-          styleResult,
-          `[Style Compiler] Successfully for 'styles' dir`,
-        );
-        logCompilerMessage(compilerMessage);
-      },
-    );
-    styleEmitter.on(compiler.BuildWatchEvent.compilering, () => {
-      compilerMessage.styles = `[${assetsPath}] Compiling...`;
-      logCompilerMessage(compilerMessage);
-    });
-    styleEmitter.on(
-      compiler.BuildWatchEvent.watchingCompiler,
-      (styleResult: ICompilerResult) => {
-        compilerMessage.styles = generatorFileAndReturnLog(
-          styleResult,
-          `[Style Compiler] Successfully for 'styles' dir`,
-        );
-        logCompilerMessage(compilerMessage);
-      },
-    );
-    // await styleEmitter.watch();
-  }
-  // 编译 src 内的样式代码
-  const srcDir = path.resolve(appDirectory, SRC_STYLE_DIRS);
-  const outputDirToSrc = path.join(
-    appDirectory,
-    outputPath,
-    jsPath,
-    assetsPath,
-  );
-  if (importStyle === 'compiled-code') {
-    compilerMessage.src = `[src] Compiling`;
-    const srcStyleEmitter = compiler.styleCompiler({
-      watch: true,
-      projectDir: appDirectory,
-      stylesDir: srcDir,
-      outDir: outputDirToSrc,
-      enableVirtualDist: true,
-      compilerOption: {
-        less: lessOption,
-        sass: sassOption,
-        postcss: postcssOption,
-      },
-    });
-    srcStyleEmitter.on(
-      compiler.BuildWatchEvent.firstCompiler,
-      (srcStyleResult: ICompilerResult) => {
-        compilerMessage.src = generatorFileAndReturnLog(
-          srcStyleResult,
-          `[Style Compiler] Successfully for 'src' dir`,
-        );
-        logCompilerMessage(compilerMessage);
-      },
-    );
-    srcStyleEmitter.on(compiler.BuildWatchEvent.compilering, () => {
-      compilerMessage.src = `[src] Compiling`;
-      logCompilerMessage(compilerMessage);
-    });
-    srcStyleEmitter.on(
-      compiler.BuildWatchEvent.watchingCompiler,
-      (srcStyleResult: ICompilerResult) => {
-        compilerMessage.src = generatorFileAndReturnLog(
-          srcStyleResult,
-          `[Style Compiler] Successfully for 'src' dir`,
-        );
-        logCompilerMessage(compilerMessage);
-      },
-    );
-    styleEmitter && (await styleEmitter.watch());
-    await srcStyleEmitter.watch();
-  } else {
-    compilerMessage.src = `['src' dir] Copying in progress`;
-    styleEmitter && (await styleEmitter.watch());
-    logCompilerMessage(compilerMessage);
-    copyOriginStyleFiles({ targetDir: srcDir, outputDir: outputDirToSrc });
-    compilerMessage.src = `[Style Compiler] Successfully for 'src' dir`;
-    logCompilerMessage(compilerMessage);
-    watch(
-      `${srcDir}/**/*.{css,less,sass,scss}`,
-      ({ changeType, changedFilePath }) => {
-        compilerMessage.src = `['src' dir] Copying in progress`;
-        logCompilerMessage(compilerMessage);
-        if (changeType === WatchChangeType.UNLINK) {
-          const removeFile = path.normalize(
-            `${outputDirToSrc}/${path.relative(srcDir, changedFilePath)}`,
-          );
-          fs.removeSync(removeFile);
-        } else {
-          copyOriginStyleFiles({
-            targetDir: srcDir,
-            outputDir: outputDirToSrc,
-          });
-        }
-        compilerMessage.src = `[Style Compiler] Successfully for 'src' dir`;
-        logCompilerMessage(compilerMessage);
-      },
-    );
-  }
-};
-
-(async () => {
-  let options: CoreOptions | undefined;
-  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: any) {
-      console.error(e);
-    }
-  });
-})();
-/* eslint-enable max-statements */

package/src/tasks/constants.ts

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

package/src/tasks/copy-assets.ts

@@ -1,123 +0,0 @@
-import * as path from 'path';
-import { fs, watch, WatchChangeType, Import } from '@modern-js/utils';
-import type {
-  NormalizedConfig,
-  IAppContext,
-  CoreOptions,
-} from '@modern-js/core';
-import type { ModuleToolsOutput } from '../types';
-
-const argv: typeof import('process.argv').default = Import.lazy(
-  'process.argv',
-  require,
-);
-const glob: typeof import('glob') = Import.lazy('glob', require);
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-const copyUtils: typeof import('../utils/copy') = Import.lazy(
-  '../utils/copy',
-  require,
-);
-
-const STYLE_DIRS = 'styles';
-const SRC_DIRS = 'src';
-
-const copyAssets = ({
-  targetDir,
-  outputDir,
-}: {
-  targetDir: string;
-  outputDir: string;
-}) => {
-  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 = ({
-  targetDir,
-  outputDir,
-}: {
-  targetDir: string;
-  outputDir: string;
-}) => {
-  watch(
-    `${targetDir}/**/*.*`,
-    ({ 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}'],
-  );
-};
-
-const taskMain = ({
-  modernConfig,
-  appContext,
-}: {
-  modernConfig: NormalizedConfig;
-  appContext: IAppContext;
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv<{ watch?: boolean }>({});
-  const { appDirectory } = appContext;
-  const {
-    jsPath = 'js',
-    assetsPath = 'styles',
-    path: outputPath = 'dist',
-  } = modernConfig.output as ModuleToolsOutput;
-  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);
-  copyAssets({ targetDir: srcDir, outputDir: outputDirToSrc });
-  copyAssets({ targetDir: styleDir, outputDir: outputDirToStyle });
-  copyUtils.copyTask({ modernConfig, appContext });
-  if (config.watch) {
-    watchAssets({ targetDir: srcDir, outputDir: outputDirToSrc });
-    watchAssets({ targetDir: styleDir, outputDir: outputDirToStyle });
-  }
-};
-
-(async () => {
-  let options: CoreOptions | undefined;
-  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: any) {
-      console.error(e.message);
-    }
-  });
-})();

package/src/tasks/generator-dts.ts

@@ -1,277 +0,0 @@
-import type { ChildProcess } from 'child_process';
-import * as path from 'path';
-import * as os from 'os';
-import { Import, fs } from '@modern-js/utils';
-import type { NormalizedConfig, CoreOptions } from '@modern-js/core';
-import type { ITsconfig } from '../types';
-
-const tsPathsTransform: typeof import('../utils/tspaths-transform') =
-  Import.lazy('../utils/tspaths-transform', require);
-const babel: typeof import('../utils/babel') = Import.lazy(
-  '../utils/babel',
-  require,
-);
-const constants: typeof import('./constants') = Import.lazy(
-  './constants',
-  require,
-);
-
-const core: typeof import('@modern-js/core') = Import.lazy(
-  '@modern-js/core',
-  require,
-);
-
-const execa: typeof import('execa') = Import.lazy('execa', require);
-const JSON5: typeof import('json5') = Import.lazy('json5', require);
-const argv: typeof import('process.argv').default = Import.lazy(
-  'process.argv',
-  require,
-);
-const deepMerge: typeof import('lodash.merge') = Import.lazy(
-  'lodash.merge',
-  require,
-);
-const glob: typeof import('glob') = Import.lazy('glob', require);
-
-let removeTsconfigPath = '';
-
-const generatorTsConfig = (
-  projectTsconfig: ITsconfig,
-  {
-    appDirectory,
-    distDir,
-    sourceDir = 'src',
-  }: { appDirectory: string; distDir: string; sourceDir?: string },
-) => {
-  const tempPath = path.resolve(appDirectory, './node_modules');
-  const resolvePath = path.relative(tempPath, appDirectory);
-  // const rootDir = projectTsconfig.compilerOptions?.rootDir
-  //   ? path.join(resolvePath, projectTsconfig.compilerOptions?.rootDir)
-  //   : resolvePath;
-  // 目前限制 rootDir 的路径为 sourceDir
-  const rootDir = path.join(resolvePath, sourceDir);
-  const baseUrl = projectTsconfig.compilerOptions?.baseUrl
-    ? path.join(appDirectory, projectTsconfig.compilerOptions?.baseUrl)
-    : appDirectory;
-  // if include = ['src'], final include should be ['../src']
-  const include = projectTsconfig.include?.map(includePath =>
-    path.join(resolvePath, includePath),
-  );
-  const exclude = projectTsconfig.exclude?.map(excludePath =>
-    path.join(resolvePath, excludePath),
-  );
-
-  const resetConfig: ITsconfig = {
-    compilerOptions: {
-      rootDir,
-      baseUrl,
-      // Ensure that .d.ts files are created by tsc, but not .js files
-      declaration: true,
-      emitDeclarationOnly: true,
-      outDir: distDir,
-    },
-    include,
-    exclude,
-  };
-
-  const recommendOption = {
-    // Ensure that Babel can safely transpile files in the TypeScript project
-    compilerOptions: {
-      isolatedModules: true,
-    },
-  };
-
-  const tempTsconfigPath = path.join(tempPath, constants.tempTsconfigName);
-  fs.ensureFileSync(tempTsconfigPath);
-  fs.writeJSONSync(
-    tempTsconfigPath,
-    deepMerge(
-      recommendOption,
-      projectTsconfig,
-      // 此处是必须要覆盖用户默认配置
-      resetConfig,
-    ),
-  );
-  return tempTsconfigPath;
-};
-
-const getProjectTsconfig = (tsconfigPath: string | undefined): ITsconfig => {
-  if (!tsconfigPath || !fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-
-  return JSON5.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
-};
-
-const resolveLog = (
-  childProgress: ChildProcess,
-  { tsCheck = false, watch = false } = {},
-) => {
-  /**
-   * tsc 所有的log信息都是从stdout data 事件中获取
-   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理
-   * watch 模式下，则使用这里的信息
-   */
-  childProgress.stdout?.on('data', data => {
-    if (!tsCheck) {
-      return;
-    }
-    if (watch) {
-      console.info(data.toString());
-    }
-  });
-  // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
-  childProgress.stdout?.on('error', error => {
-    console.error(error.message);
-  });
-  childProgress.stderr?.on('data', chunk => {
-    console.error(chunk.toString());
-  });
-};
-
-interface IGeneratorConfig {
-  sourceDirName?: string;
-  srcDir: string;
-  distDir: string;
-  projectData: {
-    appDirectory: string;
-  };
-  tsconfigPath?: string;
-  tsCheck?: boolean;
-  watch?: boolean;
-}
-
-const generatorDts = async (_: NormalizedConfig, config: IGeneratorConfig) => {
-  const {
-    tsconfigPath,
-    distDir,
-    sourceDirName = 'src',
-    projectData: { appDirectory },
-    tsCheck = false,
-    watch = false,
-  } = config;
-
-  const userTsconfig = getProjectTsconfig(tsconfigPath);
-  const willDeleteTsconfigPath = generatorTsConfig(userTsconfig, {
-    appDirectory,
-    distDir,
-    sourceDir: sourceDirName,
-  });
-  removeTsconfigPath = willDeleteTsconfigPath;
-  const tscBinFile = path.join(appDirectory, './node_modules/.bin/tsc');
-  const watchParams = watch ? ['-w'] : [];
-  const childProgress = execa(
-    tscBinFile,
-    ['-p', willDeleteTsconfigPath, ...watchParams],
-    {
-      stdio: 'pipe',
-      cwd: appDirectory,
-    },
-  );
-  resolveLog(childProgress, { tsCheck, watch });
-  try {
-    await childProgress;
-    console.info('[Tsc Compiler]: Successfully');
-  } catch (e) {
-    if (!tsCheck) {
-      console.warn(
-        `There are some type issues, which can be checked by configuring 'source.enableTsChecker = true' ${os.EOL} in modern.config.js`,
-      );
-    } else {
-      const isRecord = (input: any): input is Record<string, any> =>
-        typeof input === 'object';
-      // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
-      if (isRecord(e)) {
-        console.error(e.stdout);
-      }
-    }
-  }
-  fs.removeSync(willDeleteTsconfigPath);
-};
-
-const resolveAlias = (
-  modernConfig: NormalizedConfig,
-  config: IGeneratorConfig,
-  watchFilenames: string[] = [],
-) => {
-  const { output } = modernConfig;
-  const defaultPaths = { '@': ['./src'] };
-  const dtsDistPath = `${config.distDir}/**/*.d.ts`;
-  const dtsFilenames =
-    watchFilenames.length > 0
-      ? watchFilenames
-      : glob.sync(dtsDistPath, { absolute: true });
-  const alias = babel.getFinalAlias(modernConfig, {
-    appDirectory: config.projectData.appDirectory,
-    tsconfigPath:
-      config.tsconfigPath ||
-      path.join(config.projectData.appDirectory, './tsconfig.json'),
-    sourceAbsDir: config.distDir,
-  });
-  const mergedPaths = alias.isTsPath
-    ? alias.paths || {}
-    : { ...defaultPaths, ...(alias.paths || {}) };
-  const result = tsPathsTransform.transformDtsAlias({
-    filenames: dtsFilenames,
-    baseUrl: path.join(config.projectData.appDirectory, output.path || 'dist'),
-    paths: mergedPaths,
-  });
-  for (const r of result) {
-    fs.writeFileSync(r.path, r.content);
-  }
-};
-
-interface ITaskConfig {
-  srcDir: string;
-  sourceDirName: string;
-  distDir: string;
-  appDirectory: string;
-  tsconfigPath?: string;
-  tsCheck?: boolean;
-  watch?: boolean;
-  debug?: boolean;
-}
-
-const taskMain = async ({
-  modernConfig,
-}: {
-  modernConfig: NormalizedConfig;
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv<ITaskConfig>({
-    appDirectory: process.cwd(),
-    srcDir: 'src',
-    distDir: 'dist/types',
-    tsconfigPath: './tsconfig.json',
-    sourceDirName: 'src',
-  });
-
-  const option = {
-    srcDir: config.srcDir,
-    distDir: config.distDir,
-    projectData: { appDirectory: config.appDirectory },
-    tsconfigPath: config.tsconfigPath,
-    watch: config.watch,
-    tsCheck: config.tsCheck,
-    sourceDirName: config.sourceDirName,
-  };
-  await generatorDts(modernConfig, option);
-  // TODO: watch 模式下无法转换
-  resolveAlias(modernConfig, option);
-};
-
-(async () => {
-  let options: CoreOptions | undefined;
-  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: any) {
-      console.error(e.message);
-      fs.removeSync(removeTsconfigPath);
-    }
-  });
-})();

package/src/type.d.ts

@@ -1 +0,0 @@
-/// <reference types="@modern-js/module-tools-hooks" />