@modern-js/module-tools 1.4.0 → 1.4.3

package/dist/js/node/tasks/generator-dts/index.js

@@ -0,0 +1,158 @@
+"use strict";
+
+var path = _interopRequireWildcard(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+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; }
+
+const core = _utils.Import.lazy('@modern-js/core', require);
+
+const execa = _utils.Import.lazy('execa', require);
+
+const JSON5 = _utils.Import.lazy('json5', require);
+
+const argv = _utils.Import.lazy('process.argv', require);
+
+const utils = _utils.Import.lazy('./utils', require);
+
+let removeTsconfigPath = '';
+
+const getProjectTsconfig = tsconfigPath => {
+  if (!tsconfigPath || !_utils.fs.existsSync(tsconfigPath)) {
+    return {};
+  }
+
+  return JSON5.parse(_utils.fs.readFileSync(tsconfigPath, 'utf-8'));
+};
+
+const resolveLog = (childProgress, {
+  tsCheck: _tsCheck = false,
+  watch: _watch = false
+} = {}) => {
+  var _childProgress$stdout, _childProgress$stdout2, _childProgress$stderr;
+
+  /**
+   * tsc 所有的log信息都是从stdout data 事件中获取
+   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理
+   * watch 模式下，则使用这里的信息
+   */
+  (_childProgress$stdout = childProgress.stdout) === null || _childProgress$stdout === void 0 ? void 0 : _childProgress$stdout.on('data', data => {
+    if (!_tsCheck) {
+      return;
+    }
+
+    if (_watch) {
+      console.info(data.toString());
+    }
+  }); // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
+
+  (_childProgress$stdout2 = childProgress.stdout) === null || _childProgress$stdout2 === void 0 ? void 0 : _childProgress$stdout2.on('error', error => {
+    console.error(error.message);
+  });
+  (_childProgress$stderr = childProgress.stderr) === null || _childProgress$stderr === void 0 ? void 0 : _childProgress$stderr.on('data', chunk => {
+    console.error(chunk.toString());
+  });
+};
+
+const generatorDts = async (_, config) => {
+  const {
+    tsconfigPath,
+    distDir,
+    sourceDirName = 'src',
+    projectData: {
+      appDirectory
+    },
+    tsCheck = false,
+    watch = false
+  } = config;
+  const userTsconfig = getProjectTsconfig(tsconfigPath);
+  const willDeleteTsconfigPath = utils.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.info(`There are some type warnings, which can be checked by configuring 'output.disableTsChecker = false'`);
+    } else {
+      const isRecord = input => typeof input === 'object'; // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
+
+
+      if (isRecord(e)) {
+        console.error(e.stdout);
+      }
+    }
+  }
+
+  _utils.fs.removeSync(willDeleteTsconfigPath);
+};
+
+const taskMain = async ({
+  modernConfig
+}) => {
+  const processArgv = argv(process.argv.slice(2));
+  const config = processArgv({
+    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 模式下无法转换
+
+  utils.resolveAlias(modernConfig, option);
+};
+
+(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.message);
+
+      _utils.fs.removeSync(removeTsconfigPath);
+    }
+  });
+})();

package/dist/js/node/tasks/{generator-dts.js → generator-dts/utils.js}

@@ -1,8 +1,11 @@
 "use strict";
 
-var path = _interopRequireWildcard(require("path"));
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.resolveAlias = exports.generatorTsConfig = void 0;
 
-var os = _interopRequireWildcard(require("os"));
+var path = _interopRequireWildcard(require("path"));
 
 var _utils = require("@modern-js/utils");
 
@@ -16,26 +19,16 @@ 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; }
 
-const tsPathsTransform = _utils.Import.lazy('../utils/tspaths-transform', require);
-
-const babel = _utils.Import.lazy('../utils/babel', require);
-
-const constants = _utils.Import.lazy('./constants', require);
-
-const core = _utils.Import.lazy('@modern-js/core', require);
+const glob = _utils.Import.lazy('glob', require);
 
-const execa = _utils.Import.lazy('execa', require);
+const babel = _utils.Import.lazy('../../utils/babel', require);
 
-const JSON5 = _utils.Import.lazy('json5', require);
+const tsPathsTransform = _utils.Import.lazy('../../utils/tspaths-transform', require);
 
-const argv = _utils.Import.lazy('process.argv', require);
+const constants = _utils.Import.lazy('../constants', require);
 
 const deepMerge = _utils.Import.lazy('lodash.merge', require);
 
-const glob = _utils.Import.lazy('glob', require);
-
-let removeTsconfigPath = '';
-
 const generatorTsConfig = (projectTsconfig, {
   appDirectory,
   distDir,
@@ -82,90 +75,7 @@ const generatorTsConfig = (projectTsconfig, {
   return tempTsconfigPath;
 };
 
-const getProjectTsconfig = tsconfigPath => {
-  if (!tsconfigPath || !_utils.fs.existsSync(tsconfigPath)) {
-    return {};
-  }
-
-  return JSON5.parse(_utils.fs.readFileSync(tsconfigPath, 'utf-8'));
-};
-
-const resolveLog = (childProgress, {
-  tsCheck: _tsCheck = false,
-  watch: _watch = false
-} = {}) => {
-  var _childProgress$stdout, _childProgress$stdout2, _childProgress$stderr;
-
-  /**
-   * tsc 所有的log信息都是从stdout data 事件中获取
-   * 正常模式下，如果有报错信息，交给 resolveLog 后面的逻辑来处理
-   * watch 模式下，则使用这里的信息
-   */
-  (_childProgress$stdout = childProgress.stdout) === null || _childProgress$stdout === void 0 ? void 0 : _childProgress$stdout.on('data', data => {
-    if (!_tsCheck) {
-      return;
-    }
-
-    if (_watch) {
-      console.info(data.toString());
-    }
-  }); // 正常以下内容都不会触发，因为tsc 不会产生以下类型的log信息，不过防止意外情况
-
-  (_childProgress$stdout2 = childProgress.stdout) === null || _childProgress$stdout2 === void 0 ? void 0 : _childProgress$stdout2.on('error', error => {
-    console.error(error.message);
-  });
-  (_childProgress$stderr = childProgress.stderr) === null || _childProgress$stderr === void 0 ? void 0 : _childProgress$stderr.on('data', chunk => {
-    console.error(chunk.toString());
-  });
-};
-
-const generatorDts = async (_, config) => {
-  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 => typeof input === 'object'; // 通过使用 execa，可以将tsc 的 data 类型的报错信息变为异常错误信息
-
-
-      if (isRecord(e)) {
-        console.error(e.stdout);
-      }
-    }
-  }
-
-  _utils.fs.removeSync(willDeleteTsconfigPath);
-};
+exports.generatorTsConfig = generatorTsConfig;
 
 const resolveAlias = (modernConfig, config, watchFilenames = []) => {
   const {
@@ -195,54 +105,4 @@ const resolveAlias = (modernConfig, config, watchFilenames = []) => {
   }
 };
 
-const taskMain = async ({
-  modernConfig
-}) => {
-  const processArgv = argv(process.argv.slice(2));
-  const config = processArgv({
-    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;
-
-  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.message);
-
-      _utils.fs.removeSync(removeTsconfigPath);
-    }
-  });
-})();
+exports.resolveAlias = resolveAlias;

package/dist/js/node/utils/babel.js

@@ -48,7 +48,8 @@ const resolveBabelConfig = (appDirectory, modernConfig, option) => {
       importStyle
     },
     tools: {
-      lodash: userLodashOption
+      lodash: userLodashOption,
+      styledComponents
     }
   } = modernConfig; // alias config
 
@@ -70,7 +71,13 @@ const resolveBabelConfig = (appDirectory, modernConfig, option) => {
     globalVars,
     lodashOptions,
     jsxTransformRuntime,
-    importStyle
+    importStyle,
+    styledComponentsOptions: (0, _utils.applyOptionsChain)({
+      pure: true,
+      displayName: true,
+      ssr: (0, _utils.isUseSSRBundle)(modernConfig),
+      transpileTemplateLiterals: true
+    }, styledComponents)
   }, {
     type: option.type,
     syntax: option.syntax

package/dist/types/cli/build.d.ts

@@ -1,2 +1,3 @@
 import type { Command } from 'commander';
-export declare const buildCli: (program: Command) => void;
+import type { PluginAPI } from '@modern-js/core';
+export declare const buildCli: (program: Command, api: PluginAPI) => void;

package/dist/types/cli/dev.d.ts

@@ -1,2 +1,3 @@
+import type { PluginAPI } from '@modern-js/core';
 import type { Command } from 'commander';
-export declare const devCli: (program: Command) => void;
+export declare const devCli: (program: Command, api: PluginAPI) => void;

package/dist/types/commands/build.d.ts

@@ -1,3 +1,4 @@
+import type { PluginAPI } from '@modern-js/core';
 import type { Platform } from '../types';
 export interface IBuildOption {
   watch: boolean;
@@ -7,7 +8,7 @@ export interface IBuildOption {
   tsc: boolean;
   clear: boolean;
 }
-export declare const build: ({
+export declare const build: (api: PluginAPI, {
   watch,
   tsconfig: tsconfigName,
   tsc,

package/dist/types/commands/dev.d.ts

@@ -1,4 +1,5 @@
+import type { PluginAPI } from '@modern-js/core';
 export interface IDevOption {
   tsconfig: string;
 }
-export declare const dev: (option: IDevOption, subCmd?: string) => Promise<void>;
+export declare const dev: (api: PluginAPI, option: IDevOption, subCmd?: string) => Promise<void>;

package/dist/types/features/build/build-platform.d.ts

@@ -1,6 +1,7 @@
+import type { PluginAPI } from '@modern-js/core';
 export declare type Platform = 'all' | 'docs' | 'storybook';
 export interface IBuildPlatformOption {
   platform: Platform;
   isTsProject?: boolean;
 }
-export declare const buildPlatform: (option: IBuildPlatformOption) => Promise<void>;
+export declare const buildPlatform: (api: PluginAPI, option: IBuildPlatformOption) => Promise<void>;

package/dist/types/features/build/build-watch.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { IBuildConfig } from '../../types';
-export declare const buildInWatchMode: (config: IBuildConfig, _: NormalizedConfig) => Promise<void>;
+export declare const buildInWatchMode: (api: PluginAPI, config: IBuildConfig, _: NormalizedConfig) => Promise<void>;

package/dist/types/features/build/build.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { IBuildConfig } from '../../types';
-export declare const buildSourceCode: (config: IBuildConfig, _: NormalizedConfig) => Promise<void>;
+export declare const buildSourceCode: (api: PluginAPI, config: IBuildConfig, _: NormalizedConfig) => Promise<void>;

package/dist/types/features/build/index.d.ts

@@ -1,3 +1,3 @@
-import type { NormalizedConfig } from '@modern-js/core';
+import type { NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { IBuildConfig } from '../../types';
-export declare const build: (config: IBuildConfig, modernConfig: NormalizedConfig) => Promise<void>;
+export declare const build: (api: PluginAPI, config: IBuildConfig, modernConfig: NormalizedConfig) => Promise<void>;

package/dist/types/features/build/utils.d.ts

@@ -1,7 +1,8 @@
+import type { PluginAPI } from '@modern-js/core';
 import type { IBuildConfig, IPackageModeValue, ITaskMapper } from '../../types';
 import type { LoggerText } from './logger';
-export declare const getCodeInitMapper: (_: IBuildConfig) => IPackageModeValue[];
-export declare const getCodeMapper: ({
+export declare const getCodeInitMapper: (api: PluginAPI, _: IBuildConfig) => IPackageModeValue[];
+export declare const getCodeMapper: (api: PluginAPI, {
   logger,
   taskPath,
   config,
@@ -18,7 +19,7 @@ export declare const getCodeMapper: ({
   taskPath: string;
   params: string[];
 }[];
-export declare const getDtsMapper: (config: IBuildConfig, logger: LoggerText) => {
+export declare const getDtsMapper: (api: PluginAPI, config: IBuildConfig, logger: LoggerText) => {
   logger: LoggerText;
   taskPath: string;
   params: string[];

package/dist/types/features/dev/index.d.ts

@@ -1,8 +1,9 @@
+import type { PluginAPI } from '@modern-js/core';
 export interface IDevConfig {
   appDirectory: string;
   isTsProject: boolean;
 }
 export declare type DevTaskType = 'storybook' | 'docsite' | 'unknow';
-export declare const showMenu: (config: IDevConfig) => Promise<void>;
-export declare const devStorybook: (config: IDevConfig) => Promise<void>;
-export declare const runSubCmd: (subCmd: string, config: IDevConfig) => Promise<void>;
+export declare const showMenu: (api: PluginAPI, config: IDevConfig) => Promise<void>;
+export declare const devStorybook: (api: PluginAPI, config: IDevConfig) => Promise<void>;
+export declare const runSubCmd: (api: PluginAPI, subCmd: string, config: IDevConfig) => Promise<void>;

package/dist/types/index.d.ts

@@ -1,22 +1,6 @@
-export declare const defineConfig: (config: import("@modern-js/core/src/config").ConfigParam) => import("@modern-js/core/src/config").ConfigParam;
+import type { CliPlugin } from '@modern-js/core';
+export { defineConfig } from '@modern-js/core';
 
-declare const _default: import("@modern-js/core").AsyncPlugin<Partial<import("@modern-js/core").Progresses2Threads<{
-  config: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  resolvedConfig: import("@modern-js/core").AsyncWaterfall<{
-    resolved: import("@modern-js/core").NormalizedConfig;
-  }>;
-  validateSchema: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  prepare: import("@modern-js/core").AsyncWorkflow<void, void>;
-  commands: import("@modern-js/core").AsyncWorkflow<{
-    program: import("commander").Command;
-  }, void>;
-  watchFiles: import("@modern-js/core").ParallelWorkflow<void, unknown>;
-  fileChange: import("@modern-js/core").AsyncWorkflow<{
-    filename: string;
-    eventType: "add" | "unlink" | "change";
-  }, void>;
-  beforeExit: import("@modern-js/core").AsyncWorkflow<void, void>;
-  beforeRestart: import("@modern-js/core").AsyncWorkflow<void, void>;
-} & import("@modern-js/core").ClearDraftProgress<import("@modern-js/core").Hooks>>>>;
+declare const _default: () => CliPlugin;
 
 export default _default;

package/dist/types/tasks/generator-dts/utils.d.ts

@@ -0,0 +1,23 @@
+import type { NormalizedConfig } from '@modern-js/core';
+import type { ITsconfig } from '../../types';
+export interface IGeneratorConfig {
+  sourceDirName?: string;
+  srcDir: string;
+  distDir: string;
+  projectData: {
+    appDirectory: string;
+  };
+  tsconfigPath?: string;
+  tsCheck?: boolean;
+  watch?: boolean;
+}
+export declare const generatorTsConfig: (projectTsconfig: ITsconfig, {
+  appDirectory,
+  distDir,
+  sourceDir
+}: {
+  appDirectory: string;
+  distDir: string;
+  sourceDir?: string | undefined;
+}) => string;
+export declare const resolveAlias: (modernConfig: NormalizedConfig, config: IGeneratorConfig, watchFilenames?: string[]) => void;

package/jest.config.js

@@ -1,5 +1,7 @@
 const sharedConfig = require('@scripts/jest-config');
 
+console.info(sharedConfig.coveragePathIgnorePatterns);
+
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
   // eslint-disable-next-line node/no-unsupported-features/es-syntax

package/lib/types.d.ts

@@ -55,6 +55,98 @@ declare module '*.svg' {
   export default src;
 }
 
+declare module '*.bmp?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ico?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg?inline' {
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  const src: string;
+  export default src;
+}
+
+declare module '*.bmp?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ico?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg?url' {
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  const src: string;
+  export default src;
+}
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;