@modern-js/core 1.4.1 → 1.4.4

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @modern-js/core
 
+## 1.4.4
+
+### Patch Changes
+
+- 969f172f: support tools.styledComponents for module-tools,support close tsc process with disbaleTsChecker
+- 4b5d4bf4: fix: output.copy type
+- 62f5b8c8: fix: types
+- 55e18278: chore: remove unused dependencies and devDependencies
+- 4499a674: feat: support to pass options to plugins
+- 403f5169: fix source.moduleScopes type
+- Updated dependencies [4c792f68]
+- Updated dependencies [55e18278]
+- Updated dependencies [a7f42f48]
+  - @modern-js/utils@1.3.3
+  - @modern-js/load-config@1.2.2
+
+## 1.4.3
+
+### Patch Changes
+
+- 54786e58: add ts check
+- Updated dependencies [deeaa602]
+  - @modern-js/utils@1.3.2
+
+## 1.4.2
+
+### Patch Changes
+
+- b376c8d6: feat: enhance custom env
+- e62c4efd: fix error typo for 'styledComponents'
+- e2a8233f: support add schem error hook to core.init
+
 ## 1.4.1
 
 ### Patch Changes

package/dist/js/modern/config/index.js

@@ -33,8 +33,8 @@ export const loadUserConfig = async (appDirectory, filePath, packageJsonConfig)
 };
 
 const showAdditionalPropertiesError = error => {
-  if (error.keyword === 'additionalProperties' && error.instancePath && error.params.additionalProperty) {
-    const target = `${error.instancePath.substr(1)}.${error.params.additionalProperty}`;
+  if (error.keyword === 'additionalProperties' && error.params.additionalProperty) {
+    const target = [error.instancePath.slice(1), error.params.additionalProperty].filter(Boolean).join('.');
     const name = Object.keys(PLUGIN_SCHEMAS).find(key => PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
 
     if (name) {
@@ -45,7 +45,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
+export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
   var _validate$errors;
 
   const {
@@ -67,7 +67,7 @@ export const resolveConfig = async (loaded, configs, schemas, restartWithExistin
   if (!valid && (_validate$errors = validate.errors) !== null && _validate$errors !== void 0 && _validate$errors.length) {
     var _validate$errors2;
 
-    showAdditionalPropertiesError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
+    onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
     const errors = betterAjvErrors(validateSchema, userConfig, (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(e => _objectSpread(_objectSpread({}, e), {}, {
       dataPath: e.instancePath
     })), {

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

@@ -74,6 +74,9 @@ export const output = {
     scriptExt: {
       type: 'object'
     },
+    disableTsChecker: {
+      type: 'boolean'
+    },
     disableHtmlFolder: {
       type: 'boolean'
     },

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

@@ -28,6 +28,9 @@ export const tools = {
     },
     minifyCss: {
       typeof: ['object', 'function']
+    },
+    styledComponents: {
+      typeof: ['object', 'function']
     }
   }
 };

package/dist/js/modern/index.js

@@ -62,21 +62,22 @@ const createCli = () => {
   let hooksRunner;
   let isRestart = false;
   let restartWithExistingPort = 0;
-  let restartOptions; // eslint-disable-next-line max-statements
+  let restartOptions;
 
   const init = async (argv = [], options) => {
+    var _options$options$meta, _options$options;
+
     enable();
     manager.clear();
     restartOptions = options;
     const appDirectory = await initAppDir();
-    loadEnv(appDirectory);
+    const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
+    loadEnv(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
     const loaded = await loadUserConfig(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
-    let plugins = loadPlugins(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
-
-    if (options !== null && options !== void 0 && options.beforeUsePlugins) {
-      plugins = options.beforeUsePlugins(plugins, loaded.config);
-    }
-
+    const plugins = loadPlugins(appDirectory, loaded.config, {
+      internalPlugins: options === null || options === void 0 ? void 0 : options.plugins,
+      transformPlugin: options === null || options === void 0 ? void 0 : options.transformPlugin
+    });
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
     const appContext = initAppContext(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
     manager.run(() => {
@@ -100,7 +101,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
+    const config = await resolveConfig(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv, options === null || options === void 0 ? void 0 : options.onSchemaError);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({

package/dist/js/modern/loadPlugins.js

@@ -9,41 +9,27 @@ const debug = createDebugger('load-plugins');
 
 /**
  * Try to resolve plugin entry file path.
+ * @param name - Plugin name.
  * @param appDirectory - Application root directory.
- * @param plugin - Plugin name or plugin name with options.
  * @returns Resolved file path.
  */
-const resolvePlugin = (appDirectory, plugin) => {
-  const tryResolve = name => {
-    let filePath = '';
+const tryResolve = (name, appDirectory) => {
+  let filePath = '';
 
-    try {
-      filePath = require.resolve(name, {
-        paths: [appDirectory]
-      });
-      delete require.cache[filePath];
-    } catch (err) {
-      if (err.code === 'MODULE_NOT_FOUND') {
-        throw new Error(`Can not find plugin ${name}.`);
-      }
-
-      throw err;
+  try {
+    filePath = require.resolve(name, {
+      paths: [appDirectory]
+    });
+    delete require.cache[filePath];
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND') {
+      throw new Error(`Can not find plugin ${name}.`);
     }
 
-    return filePath;
-  };
-
-  const resolved = {};
-
-  if (typeof plugin === 'string' || plugin.cli) {
-    resolved.cli = typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli);
+    throw err;
   }
 
-  if (plugin.server) {
-    resolved.server = tryResolve(plugin.server);
-  }
-
-  return resolved;
+  return filePath;
 };
 
 export function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
@@ -63,36 +49,74 @@ export function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
- * @param pluginsConfig - Plugins declared in the user configuration.
+ * @param userConfig - Resolved user config.
+ * @param options.internalPlugins - Internal plugins.
+ * @param options.transformPlugin - transform plugin before using it.
  * @returns Plugin Objects has been required.
  */
 
-export const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
-  const plugins = getAppPlugins(appDirectory, pluginConfig, internalPlugins);
+export const loadPlugins = (appDirectory, userConfig, options = {}) => {
+  const {
+    internalPlugins,
+    transformPlugin
+  } = options;
+
+  const resolvePlugin = p => {
+    const pkg = typeof p === 'string' ? p : p[0];
+    const path = tryResolve(pkg, appDirectory);
+    let module = compatRequire(path);
+    const pluginOptions = Array.isArray(p) ? p[1] : undefined;
+
+    if (transformPlugin) {
+      module = transformPlugin(module, userConfig, pluginOptions);
+    } else {
+      module = typeof module === 'function' ? module(pluginOptions) : module;
+    }
+
+    return {
+      pkg,
+      path,
+      module
+    };
+  };
+
+  const plugins = getAppPlugins(appDirectory, userConfig.plugins || [], internalPlugins);
   return plugins.map(plugin => {
+    const _plugin = typeof plugin === 'string' ? {
+      cli: plugin
+    } : plugin;
+
     const {
       cli,
       server
-    } = resolvePlugin(appDirectory, plugin);
-    debug(`resolve plugin %s: %s`, plugin, {
-      cli,
-      server
-    });
+    } = _plugin;
+    const loadedPlugin = {};
+
+    if (cli) {
+      const {
+        pkg,
+        path,
+        module
+      } = resolvePlugin(cli);
+      loadedPlugin.cli = _objectSpread(_objectSpread({}, module), {}, {
+        pluginPath: path
+      });
+      loadedPlugin.cliPkg = pkg;
+    } // server plugins don't support to accept params
 
-    const cliPlugin = cli && _objectSpread(_objectSpread({}, compatRequire(cli)), {}, {
-      pluginPath: cli
-    }); // server plugin should be required by server
 
+    if (server && typeof server === 'string') {
+      const path = tryResolve(server, appDirectory);
+      loadedPlugin.server = {
+        pluginPath: path
+      };
+      loadedPlugin.serverPkg = server;
+    }
 
-    const serverPlugin = server && {
-      // ...compatRequire(server),
-      pluginPath: server
-    };
-    return {
-      cli: cliPlugin,
-      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
-      server: serverPlugin,
-      serverPath: typeof plugin === 'string' ? undefined : plugin.server
-    };
+    debug(`resolve plugin %s: %s`, plugin, {
+      cli: loadedPlugin.cli,
+      server: loadedPlugin.server
+    });
+    return loadedPlugin;
   });
 };

package/dist/js/node/config/index.js

@@ -71,8 +71,8 @@ const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
 exports.loadUserConfig = loadUserConfig;
 
 const showAdditionalPropertiesError = error => {
-  if (error.keyword === 'additionalProperties' && error.instancePath && error.params.additionalProperty) {
-    const target = `${error.instancePath.substr(1)}.${error.params.additionalProperty}`;
+  if (error.keyword === 'additionalProperties' && error.params.additionalProperty) {
+    const target = [error.instancePath.slice(1), error.params.additionalProperty].filter(Boolean).join('.');
     const name = Object.keys(_utils.PLUGIN_SCHEMAS).find(key => _utils.PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
 
     if (name) {
@@ -83,7 +83,7 @@ const showAdditionalPropertiesError = error => {
 /* eslint-disable max-statements, max-params */
 
 
-const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv) => {
+const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
   var _validate$errors;
 
   const {
@@ -105,7 +105,7 @@ const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort,
   if (!valid && (_validate$errors = validate.errors) !== null && _validate$errors !== void 0 && _validate$errors.length) {
     var _validate$errors2;
 
-    showAdditionalPropertiesError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
+    onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
     const errors = (0, _betterAjvErrors.default)(validateSchema, userConfig, (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(e => _objectSpread(_objectSpread({}, e), {}, {
       dataPath: e.instancePath
     })), {

package/dist/js/node/config/schema/output.js

@@ -82,6 +82,9 @@ const output = {
     scriptExt: {
       type: 'object'
     },
+    disableTsChecker: {
+      type: 'boolean'
+    },
     disableHtmlFolder: {
       type: 'boolean'
     },

package/dist/js/node/config/schema/tools.js

@@ -34,6 +34,9 @@ const tools = {
     },
     minifyCss: {
       typeof: ['object', 'function']
+    },
+    styledComponents: {
+      typeof: ['object', 'function']
     }
   }
 };

package/dist/js/node/index.js

@@ -183,21 +183,22 @@ const createCli = () => {
   let hooksRunner;
   let isRestart = false;
   let restartWithExistingPort = 0;
-  let restartOptions; // eslint-disable-next-line max-statements
+  let restartOptions;
 
   const init = async (argv = [], options) => {
+    var _options$options$meta, _options$options;
+
     (0, _node.enable)();
     manager.clear();
     restartOptions = options;
     const appDirectory = await initAppDir();
-    (0, _loadEnv.loadEnv)(appDirectory);
+    const metaName = (_options$options$meta = options === null || options === void 0 ? void 0 : (_options$options = options.options) === null || _options$options === void 0 ? void 0 : _options$options.metaName) !== null && _options$options$meta !== void 0 ? _options$options$meta : 'MODERN';
+    (0, _loadEnv.loadEnv)(appDirectory, process.env[`${metaName.toUpperCase()}_ENV`]);
     const loaded = await (0, _config.loadUserConfig)(appDirectory, options === null || options === void 0 ? void 0 : options.configFile, options === null || options === void 0 ? void 0 : options.packageJsonConfig);
-    let plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config.plugins || [], options === null || options === void 0 ? void 0 : options.plugins);
-
-    if (options !== null && options !== void 0 && options.beforeUsePlugins) {
-      plugins = options.beforeUsePlugins(plugins, loaded.config);
-    }
-
+    const plugins = (0, _loadPlugins.loadPlugins)(appDirectory, loaded.config, {
+      internalPlugins: options === null || options === void 0 ? void 0 : options.plugins,
+      transformPlugin: options === null || options === void 0 ? void 0 : options.transformPlugin
+    });
     plugins.forEach(plugin => plugin.cli && manager.usePlugin(plugin.cli));
     const appContext = (0, _context.initAppContext)(appDirectory, plugins, loaded.filePath, options === null || options === void 0 ? void 0 : options.options);
     manager.run(() => {
@@ -222,7 +223,7 @@ const createCli = () => {
     });
     const extraConfigs = await hooksRunner.config();
     const extraSchemas = await hooksRunner.validateSchema();
-    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv);
+    const config = await (0, _config.resolveConfig)(loaded, extraConfigs, extraSchemas, restartWithExistingPort, argv, options === null || options === void 0 ? void 0 : options.onSchemaError);
     const {
       resolved
     } = await hooksRunner.resolvedConfig({

package/dist/js/node/loadPlugins.js

@@ -18,41 +18,27 @@ const debug = (0, _utils.createDebugger)('load-plugins');
 
 /**
  * Try to resolve plugin entry file path.
+ * @param name - Plugin name.
  * @param appDirectory - Application root directory.
- * @param plugin - Plugin name or plugin name with options.
  * @returns Resolved file path.
  */
-const resolvePlugin = (appDirectory, plugin) => {
-  const tryResolve = name => {
-    let filePath = '';
+const tryResolve = (name, appDirectory) => {
+  let filePath = '';
 
-    try {
-      filePath = require.resolve(name, {
-        paths: [appDirectory]
-      });
-      delete require.cache[filePath];
-    } catch (err) {
-      if (err.code === 'MODULE_NOT_FOUND') {
-        throw new Error(`Can not find plugin ${name}.`);
-      }
-
-      throw err;
+  try {
+    filePath = require.resolve(name, {
+      paths: [appDirectory]
+    });
+    delete require.cache[filePath];
+  } catch (err) {
+    if (err.code === 'MODULE_NOT_FOUND') {
+      throw new Error(`Can not find plugin ${name}.`);
     }
 
-    return filePath;
-  };
-
-  const resolved = {};
-
-  if (typeof plugin === 'string' || plugin.cli) {
-    resolved.cli = typeof plugin === 'string' ? tryResolve(plugin) : tryResolve(plugin.cli);
-  }
-
-  if (plugin.server) {
-    resolved.server = tryResolve(plugin.server);
+    throw err;
   }
 
-  return resolved;
+  return filePath;
 };
 
 function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
@@ -72,38 +58,76 @@ function getAppPlugins(appDirectory, pluginConfig, internalPlugins) {
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
- * @param pluginsConfig - Plugins declared in the user configuration.
+ * @param userConfig - Resolved user config.
+ * @param options.internalPlugins - Internal plugins.
+ * @param options.transformPlugin - transform plugin before using it.
  * @returns Plugin Objects has been required.
  */
 
 
-const loadPlugins = (appDirectory, pluginConfig, internalPlugins) => {
-  const plugins = getAppPlugins(appDirectory, pluginConfig, internalPlugins);
+const loadPlugins = (appDirectory, userConfig, options = {}) => {
+  const {
+    internalPlugins,
+    transformPlugin
+  } = options;
+
+  const resolvePlugin = p => {
+    const pkg = typeof p === 'string' ? p : p[0];
+    const path = tryResolve(pkg, appDirectory);
+    let module = (0, _utils.compatRequire)(path);
+    const pluginOptions = Array.isArray(p) ? p[1] : undefined;
+
+    if (transformPlugin) {
+      module = transformPlugin(module, userConfig, pluginOptions);
+    } else {
+      module = typeof module === 'function' ? module(pluginOptions) : module;
+    }
+
+    return {
+      pkg,
+      path,
+      module
+    };
+  };
+
+  const plugins = getAppPlugins(appDirectory, userConfig.plugins || [], internalPlugins);
   return plugins.map(plugin => {
+    const _plugin = typeof plugin === 'string' ? {
+      cli: plugin
+    } : plugin;
+
     const {
       cli,
       server
-    } = resolvePlugin(appDirectory, plugin);
-    debug(`resolve plugin %s: %s`, plugin, {
-      cli,
-      server
-    });
+    } = _plugin;
+    const loadedPlugin = {};
+
+    if (cli) {
+      const {
+        pkg,
+        path,
+        module
+      } = resolvePlugin(cli);
+      loadedPlugin.cli = _objectSpread(_objectSpread({}, module), {}, {
+        pluginPath: path
+      });
+      loadedPlugin.cliPkg = pkg;
+    } // server plugins don't support to accept params
 
-    const cliPlugin = cli && _objectSpread(_objectSpread({}, (0, _utils.compatRequire)(cli)), {}, {
-      pluginPath: cli
-    }); // server plugin should be required by server
 
+    if (server && typeof server === 'string') {
+      const path = tryResolve(server, appDirectory);
+      loadedPlugin.server = {
+        pluginPath: path
+      };
+      loadedPlugin.serverPkg = server;
+    }
 
-    const serverPlugin = server && {
-      // ...compatRequire(server),
-      pluginPath: server
-    };
-    return {
-      cli: cliPlugin,
-      cliPath: typeof plugin === 'string' ? plugin : plugin.cli,
-      server: serverPlugin,
-      serverPath: typeof plugin === 'string' ? undefined : plugin.server
-    };
+    debug(`resolve plugin %s: %s`, plugin, {
+      cli: loadedPlugin.cli,
+      server: loadedPlugin.server
+    });
+    return loadedPlugin;
   });
 };
 

package/dist/types/config/index.d.ts

@@ -1,3 +1,4 @@
+import { ErrorObject } from 'ajv';
 import { MetaOptions } from '@modern-js/utils';
 import { PluginConfig } from '../loadPlugins';
 import { defaults } from './defaults';
@@ -18,7 +19,7 @@ interface SourceConfig {
   envVars?: Array<string>;
   globalVars?: Record<string, string>;
   alias?: Record<string, string> | ((aliases: Record<string, string>) => Record<string, unknown>);
-  moduleScopes?: Array<string | RegExp> | ((scopes: Array<string | RegExp>) => Array<string | RegExp>);
+  moduleScopes?: Array<string | RegExp> | ((scopes: Array<string | RegExp>) => void) | ((scopes: Array<string | RegExp>) => Array<string | RegExp>);
   include?: Array<string | RegExp>;
 }
 interface OutputConfig {
@@ -37,8 +38,11 @@ interface OutputConfig {
   mountId?: string;
   favicon?: string;
   faviconByEntries?: Record<string, string | undefined>;
-  copy?: Record<string, unknown>;
+  copy?: Array<Record<string, unknown> & {
+    from: string;
+  }>;
   scriptExt?: Record<string, unknown>;
+  disableTsChecker?: boolean;
   disableHtmlFolder?: boolean;
   disableCssModuleExtension?: boolean;
   disableCssExtract?: boolean;
@@ -96,6 +100,7 @@ interface ToolsConfig {
   babel?: ConfigFunction;
   autoprefixer?: ConfigFunction;
   postcss?: ConfigFunction;
+  styledComponents?: ConfigFunction;
   lodash?: ConfigFunction;
   devServer?: Record<string, unknown>;
   tsLoader?: ConfigFunction;
@@ -128,5 +133,5 @@ interface LoadedConfig {
 }
 export declare const defineConfig: (config: ConfigParam) => ConfigParam;
 export declare const loadUserConfig: (appDirectory: string, filePath?: string | undefined, packageJsonConfig?: string | undefined) => Promise<LoadedConfig>;
-export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[]) => Promise<NormalizedConfig>;
+export declare const resolveConfig: (loaded: LoadedConfig, configs: UserConfig[], schemas: PluginValidateSchema[], restartWithExistingPort: number, argv: string[], onSchemaError?: (error: ErrorObject) => void) => Promise<NormalizedConfig>;
 export type { SourceConfig, OutputConfig, ServerConfig, DevConfig, DeployConfig, ToolsConfig, RuntimeConfig, RuntimeByEntriesConfig, UserConfig, ConfigParam, LoadedConfig };

package/dist/types/config/mergeConfig.d.ts

@@ -3,10 +3,11 @@ export interface NormalizedSourceConfig extends Omit<SourceConfig, 'alias' | 'mo
   alias: SourceConfig['alias'] | Array<SourceConfig['alias']>;
   moduleScopes: SourceConfig['moduleScopes'] | Array<SourceConfig['moduleScopes']>;
 }
-export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'babel' | 'postcss' | 'autoprefixer' | 'lodash' | 'tsLoader' | 'terser' | 'minifyCss' | 'esbuild'> {
+export interface NormalizedToolsConfig extends Omit<ToolsConfig, 'webpack' | 'babel' | 'postcss' | 'autoprefixer' | 'lodash' | 'tsLoader' | 'terser' | 'minifyCss' | 'esbuild' | 'styledComponents'> {
   webpack: ToolsConfig['webpack'] | Array<NonNullable<ToolsConfig['webpack']>>;
   babel: ToolsConfig['babel'] | Array<NonNullable<ToolsConfig['babel']>>;
   postcss: ToolsConfig['postcss'] | Array<NonNullable<ToolsConfig['postcss']>>;
+  styledComponents: ToolsConfig['styledComponents'] | Array<NonNullable<ToolsConfig['styledComponents']>>;
   autoprefixer: ToolsConfig['autoprefixer'] | Array<NonNullable<ToolsConfig['autoprefixer']>>;
   lodash: ToolsConfig['lodash'] | Array<ToolsConfig['lodash']>;
   tsLoader: ToolsConfig['tsLoader'] | Array<NonNullable<ToolsConfig['tsLoader']>>;

package/dist/types/config/schema/index.d.ts

@@ -140,6 +140,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         scriptExt: {
           type: string;
         };
+        disableTsChecker: {
+          type: string;
+        };
         disableHtmlFolder: {
           type: string;
         };
@@ -456,6 +459,9 @@ export declare const patchSchema: (pluginSchemas: Array<PluginValidateSchema | P
         minifyCss: {
           typeof: string[];
         };
+        styledComponents: {
+          typeof: string[];
+        };
       };
     };
   };

package/dist/types/config/schema/output.d.ts

@@ -73,6 +73,9 @@ export declare const output: {
     scriptExt: {
       type: string;
     };
+    disableTsChecker: {
+      type: string;
+    };
     disableHtmlFolder: {
       type: string;
     };

package/dist/types/config/schema/tools.d.ts

@@ -29,5 +29,8 @@ export declare const tools: {
     minifyCss: {
       typeof: string[];
     };
+    styledComponents: {
+      typeof: string[];
+    };
   };
 };

package/dist/types/context.d.ts

@@ -1,6 +1,7 @@
 import type { IAppContext } from '@modern-js/types';
 import { UserConfig } from './config';
 import { NormalizedConfig } from './config/mergeConfig';
+import type { LoadedPlugin } from './loadPlugins';
 export type { IAppContext };
 export declare const AppContext: import("@modern-js/plugin").Context<IAppContext>;
 export declare const ConfigContext: import("@modern-js/plugin").Context<UserConfig>;
@@ -8,10 +9,7 @@ export declare const ResolvedConfigContext: import("@modern-js/plugin").Context<
 export declare const useAppContext: () => IAppContext;
 export declare const useConfigContext: () => UserConfig;
 export declare const useResolvedConfigContext: () => NormalizedConfig;
-export declare const initAppContext: (appDirectory: string, plugins: Array<{
-  cli: any;
-  server: any;
-}>, configFile: string | false, options?: {
+export declare const initAppContext: (appDirectory: string, plugins: Array<LoadedPlugin>, configFile: string | false, options?: {
   metaName?: string | undefined;
   srcDir?: string | undefined;
   distDir?: string | undefined;

package/dist/types/index.d.ts

@@ -1,7 +1,9 @@
 import { INTERNAL_PLUGINS } from '@modern-js/utils';
 import { ParallelWorkflow, AsyncWorkflow, Progresses2Runners, AsyncWaterfall } from '@modern-js/plugin';
 import type { Hooks } from '@modern-js/types';
+import { ErrorObject } from 'ajv';
 import { Command } from './utils/commander';
+import { TransformPlugin } from './loadPlugins';
 import { AppContext, ConfigContext, IAppContext, initAppContext, ResolvedConfigContext, useAppContext, useConfigContext, useResolvedConfigContext } from './context';
 import { NormalizedConfig } from './config/mergeConfig';
 export type { Hooks };
@@ -103,12 +105,8 @@ export interface CoreOptions {
   configFile?: string;
   packageJsonConfig?: string;
   plugins?: typeof INTERNAL_PLUGINS;
-  beforeUsePlugins?: (plugins: any, config: any) => {
-    cli: any;
-    cliPath: any;
-    server: any;
-    serverPath: any;
-  }[];
+  transformPlugin?: TransformPlugin;
+  onSchemaError?: (error: ErrorObject) => void;
   options?: {
     metaName?: string;
     srcDir?: string;

package/dist/types/loadPlugins.d.ts

@@ -1,30 +1,30 @@
 import { INTERNAL_PLUGINS } from '@modern-js/utils';
-export interface PluginConfigItem {
-  cli?: string;
-  server?: string;
-}
+import type { UserConfig } from './config';
+declare type Plugin = string | [string, any];
+export declare type LoadedPlugin = {
+  cli?: any;
+  cliPkg?: string;
+  server?: any;
+  serverPkg?: string;
+};
+export declare type PluginConfigItem = {
+  cli?: Plugin;
+  server?: Plugin;
+} | string;
 export declare type PluginConfig = Array<PluginConfigItem>;
-export declare function getAppPlugins(appDirectory: string, pluginConfig: PluginConfig, internalPlugins?: typeof INTERNAL_PLUGINS): {
-  cli?: string | undefined;
-  server?: string | undefined;
-}[];
+export declare type TransformPlugin = (plugin: PluginConfig, resolvedConfig: UserConfig, pluginOptions?: any) => PluginConfig;
+export declare function getAppPlugins(appDirectory: string, pluginConfig: PluginConfig, internalPlugins?: typeof INTERNAL_PLUGINS): PluginConfigItem[];
 /**
  * Load internal plugins which in @modern-js scope and user's custom plugins.
  * @param appDirectory - Application root directory.
- * @param pluginsConfig - Plugins declared in the user configuration.
+ * @param userConfig - Resolved user config.
+ * @param options.internalPlugins - Internal plugins.
+ * @param options.transformPlugin - transform plugin before using it.
  * @returns Plugin Objects has been required.
  */
 
-export declare const loadPlugins: (appDirectory: string, pluginConfig: PluginConfig, internalPlugins?: {
-  [name: string]: {
-    cli?: string | undefined;
-    server?: string | undefined;
-  };
-} | undefined) => {
-  cli: any;
-  cliPath: string | undefined;
-  server: "" | {
-    pluginPath: string;
-  } | undefined;
-  serverPath: string | undefined;
-}[];
+export declare const loadPlugins: (appDirectory: string, userConfig: UserConfig, options?: {
+  internalPlugins?: typeof INTERNAL_PLUGINS;
+  transformPlugin?: TransformPlugin;
+}) => LoadedPlugin[];
+export {};

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.1",
+  "version": "1.4.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -42,9 +42,9 @@
   "dependencies": {
     "@babel/code-frame": "^7.14.5",
     "@babel/runtime": "^7",
-    "@modern-js/load-config": "^1.2.1",
+    "@modern-js/load-config": "^1.2.2",
     "@modern-js/plugin": "^1.2.1",
-    "@modern-js/utils": "^1.3.1",
+    "@modern-js/utils": "^1.3.3",
     "address": "^1.1.2",
     "ajv": "^8.6.2",
     "ajv-keywords": "^5.0.0",
@@ -55,14 +55,13 @@
     "dotenv-expand": "^5.1.0",
     "lodash.clonedeep": "^4.5.0",
     "lodash.mergewith": "^4.6.2",
-    "minimist": "^1.2.5",
     "signale": "^1.4.0",
     "v8-compile-cache": "^2.3.0"
   },
   "devDependencies": {
     "btsm": "2.2.2",
     "@types/babel__code-frame": "^7.0.3",
-    "@modern-js/types": "^1.3.1",
+    "@modern-js/types": "^1.3.4",
     "@types/jest": "^26",
     "@types/lodash.clonedeep": "^4.5.6",
     "@types/lodash.mergewith": "^4.6.6",

package/tests/fixtures/load-plugin/user-plugins/test-plugin-c.js

@@ -0,0 +1,3 @@
+Object.defineProperty(exports, '__esModule', { value: true });
+
+exports.default = name => ({ name });

package/tests/index.test.ts

@@ -62,13 +62,8 @@ describe('@modern-js/core test', () => {
 
   it('test cli init dev', async () => {
     cwdSpy.mockReturnValue(path.join(cwd, 'nested-folder'));
-    const options = {
-      beforeUsePlugins: jest.fn(),
-    };
-    options.beforeUsePlugins.mockImplementation((plugins, _) => plugins);
-    await cli.init(['dev'], options);
-    expect(loadEnv).toHaveBeenCalledWith(cwd);
-    expect(options.beforeUsePlugins).toHaveBeenCalledWith([], {});
+    await cli.init(['dev']);
+    expect(loadEnv).toHaveBeenCalledWith(cwd, undefined);
     // TODO: add more test cases
   });
 });

package/tests/loadEnv.test.ts

@@ -124,6 +124,34 @@ describe('load environment variables', () => {
     delete process.env.NODE_ENV;
   });
 
+  test(`get custom .env file by MODERN_ENV`, () => {
+    createFixtures('custom_environment', [
+      {
+        name: '.env',
+        content: `DB_HOST=localhost
+        DB_USER=root
+        DB_PASS=root
+        `,
+      },
+      {
+        name: '.env.staging',
+        content: `DB_HOST=localhost
+        DB_USER=root-local-dev
+        `,
+      },
+    ]);
+
+    loadEnv(path.join(fixture, 'custom_environment'), 'staging');
+
+    expect(process.env.DB_HOST).toBe('localhost');
+
+    expect(process.env.DB_USER).toBe('root-local-dev');
+
+    expect(process.env.DB_PASS).toBe('root');
+
+    delete process.env.MODERN_ENV;
+  });
+
   test(`support dotenv-expand`, () => {
     createFixtures('expand', [
       {

package/tests/loadPlugin.test.ts

@@ -22,10 +22,12 @@ describe('load plugins', () => {
       './fixtures/load-plugin/user-plugins',
     );
 
-    const plugins = loadPlugins(fixture, [
-      { cli: path.join(fixture, './test-plugin-a.js') },
-      { server: './test-plugin-b' },
-    ]);
+    const plugins = loadPlugins(fixture, {
+      plugins: [
+        { cli: path.join(fixture, './test-plugin-a.js') },
+        { server: './test-plugin-b' },
+      ],
+    });
 
     expect(plugins).toEqual([
       {
@@ -33,26 +35,47 @@ describe('load plugins', () => {
           name: 'a',
           pluginPath: path.join(fixture, './test-plugin-a.js'),
         },
-        cliPath: path.join(fixture, './test-plugin-a.js'),
+        cliPkg: path.join(fixture, './test-plugin-a.js'),
       },
       {
         server: {
           pluginPath: path.join(fixture, './test-plugin-b.js'),
         },
-        serverPath: './test-plugin-b',
+        serverPkg: './test-plugin-b',
       },
     ]);
   });
 
-  test('should load user string plugin successfully', () => {
+  test('should pass options to Plugin', () => {
     const fixture = path.resolve(
       __dirname,
       './fixtures/load-plugin/user-plugins',
     );
 
-    const plugins = loadPlugins(fixture, [
-      path.join(fixture, './test-plugin-a.js') as any,
+    const plugins = loadPlugins(fixture, {
+      plugins: [{ cli: ['./test-plugin-c', 'c'] }],
+    });
+
+    expect(plugins).toEqual([
+      {
+        cli: {
+          name: 'c',
+          pluginPath: path.join(fixture, './test-plugin-c.js'),
+        },
+        cliPkg: './test-plugin-c',
+      },
     ]);
+  });
+
+  test('should load user string plugin successfully', () => {
+    const fixture = path.resolve(
+      __dirname,
+      './fixtures/load-plugin/user-plugins',
+    );
+
+    const plugins = loadPlugins(fixture, {
+      plugins: [path.join(fixture, './test-plugin-a.js') as any],
+    });
 
     expect(plugins).toEqual([
       {
@@ -60,16 +83,38 @@ describe('load plugins', () => {
           name: 'a',
           pluginPath: path.join(fixture, './test-plugin-a.js'),
         },
-        cliPath: path.join(fixture, './test-plugin-a.js'),
+        cliPkg: path.join(fixture, './test-plugin-a.js'),
       },
     ]);
   });
 
+  test('should call transformPlugin', () => {
+    const fixture = path.resolve(
+      __dirname,
+      './fixtures/load-plugin/user-plugins',
+    );
+
+    const options = {
+      transformPlugin: jest.fn(),
+    };
+    options.transformPlugin.mockImplementation((plugins, _) => plugins);
+
+    loadPlugins(
+      fixture,
+      { plugins: [{ cli: path.join(fixture, './test-plugin-a.js') }] },
+      options,
+    );
+
+    expect(options.transformPlugin).toHaveBeenCalled();
+  });
+
   test(`should throw error when plugin not found `, () => {
     const fixture = path.resolve(__dirname, './fixtures/load-plugin/not-found');
 
     expect(() => {
-      loadPlugins(fixture, [{ cli: './test-plugin-a' }, { cli: './plugin-b' }]);
+      loadPlugins(fixture, {
+        plugins: [{ cli: './test-plugin-a' }, { cli: './plugin-b' }],
+      });
     }).toThrowError(/^Can not find plugin /);
   });
 });