@modern-js/module-tools 2.39.2 → 2.41.0

package/dist/build.js

@@ -39,21 +39,23 @@ const build = async (api, options, context) => {
     return;
   }
   const runner = api.useHookRunners();
+  const resolvedConfig = await runner.resolveModuleUserConfig(api.useConfigContext());
+  (0, import_debug.debug)("resolvedConfig", resolvedConfig);
   (0, import_debug.debug)("normalize build config");
   const { normalizeBuildConfig } = await Promise.resolve().then(() => __toESM(require("./config/normalize")));
-  const resolvedBuildConfig = await normalizeBuildConfig(api, context, options);
+  const normalizedBuildConfig = await normalizeBuildConfig(resolvedConfig, context, options);
   (0, import_debug.debug)("normalize build config done");
-  (0, import_debug.debug)("normalizedBuildConfig", resolvedBuildConfig);
+  (0, import_debug.debug)("normalizedBuildConfig", normalizedBuildConfig);
   (0, import_debug.debug)("run beforeBuild hooks");
   await runner.beforeBuild({
-    config: resolvedBuildConfig,
+    config: normalizedBuildConfig,
     cliOptions: options
   });
   (0, import_debug.debug)("run beforeBuild hooks done");
   const builder = await Promise.resolve().then(() => __toESM(require("./builder")));
   await builder.run({
     cmdOptions: options,
-    resolvedBuildConfig,
+    normalizedBuildConfig,
     context
   }, api);
 };

package/dist/builder/feature/style/lessAliasPlugin.js

@@ -34,7 +34,8 @@ module.exports = __toCommonJS(lessAliasPlugin_exports);
 var import_define_property = require("@swc/helpers/_/_define_property");
 var import_fs = __toESM(require("fs"));
 var import_utils = require("./utils");
-class LessAliasesPlugin {
+var LessAliasesPlugin;
+LessAliasesPlugin = class LessAliasesPlugin2 {
   install(less, pluginManager) {
     const getResolve = (filename, currentDirectory) => {
       return this.compiler.css_resolve(filename, currentDirectory || this.stdinDir);
@@ -67,4 +68,4 @@ class LessAliasesPlugin {
     this.compiler = options.compiler;
     this.stdinDir = options.stdinDir;
   }
-}
+};

package/dist/builder/index.d.ts

@@ -3,6 +3,6 @@ import type { ModuleContext } from '../types/context';
 import type { BuildCommandOptions, BaseBuildConfig, ModuleTools } from '../types';
 export declare const run: (options: {
   cmdOptions: BuildCommandOptions;
-  resolvedBuildConfig: BaseBuildConfig[];
+  normalizedBuildConfig: BaseBuildConfig[];
   context: ModuleContext;
 }, api: PluginAPI<ModuleTools>) => Promise<void>;

package/dist/builder/index.js

@@ -38,15 +38,15 @@ var import_debug = require("../debug");
 var import_build = require("./build");
 var import_clear = require("./clear");
 const run = async (options, api) => {
-  const { resolvedBuildConfig, context, cmdOptions } = options;
+  const { normalizedBuildConfig, context, cmdOptions } = options;
   const { watch, clear } = cmdOptions;
   const runner = api.useHookRunners();
   let totalDuration = 0;
-  if (resolvedBuildConfig.length !== 0) {
+  if (normalizedBuildConfig.length !== 0) {
     totalDuration = Date.now();
     if (clear) {
       (0, import_debug.debug)("clear output paths");
-      await (0, import_clear.clearBuildConfigPaths)(resolvedBuildConfig, context.appDirectory);
+      await (0, import_clear.clearBuildConfigPaths)(normalizedBuildConfig, context.appDirectory);
       (0, import_debug.debug)("clear output paths done");
     }
     await (0, import_clear.clearDtsTemp)();
@@ -54,7 +54,7 @@ const run = async (options, api) => {
       import_utils.logger.info("Start build in watch mode...");
     }
     try {
-      await (0, import_p_map.default)(resolvedBuildConfig, async (config) => {
+      await (0, import_p_map.default)(normalizedBuildConfig, async (config) => {
         (0, import_debug.debug)("run beforeBuildTask hooks");
         const buildConfig = await runner.beforeBuildTask(config);
         (0, import_debug.debug)("run beforeBuildTask hooks done");
@@ -92,7 +92,7 @@ const run = async (options, api) => {
   (0, import_debug.debug)("run afterBuild hooks");
   await runner.afterBuild({
     status: "success",
-    config: resolvedBuildConfig,
+    config: normalizedBuildConfig,
     commandOptions: cmdOptions,
     totalDuration
   });

package/dist/cli.js

@@ -35,10 +35,7 @@ var import_utils = require("@modern-js/utils");
 var import_hooks = require("./hooks");
 var import_plugins = require("./plugins");
 var import_command = require("./command");
-var import_merge = require("./config/merge");
 var import_onExit = require("./utils/onExit");
-var import_legacySchema = require("./config/legacySchema");
-var import_schema = require("./config/schema");
 const moduleTools = () => ({
   name: "@modern-js/module-tools",
   registerHook: import_hooks.registerHook,
@@ -67,13 +64,8 @@ const setup = async (api) => {
       await hookRunners.afterDev();
     });
   };
-  const validateSchema = async () => {
-    const userConfig = api.useConfigContext();
-    return (0, import_merge.isLegacyUserConfig)(userConfig) ? import_legacySchema.legacySchema : import_schema.schema;
-  };
   return {
     prepare,
-    validateSchema,
     async commands({ program }) {
       await (0, import_command.buildCommand)(program, api);
       await (0, import_command.devCommand)(program, api);

package/dist/config/normalize.d.ts

@@ -1,8 +1,7 @@
-import type { PluginAPI } from '@modern-js/core';
-import type { BaseBuildConfig, BuildPreset, PartialBuildConfig, PartialBaseBuildConfig, ModuleContext, BuildCommandOptions, ModuleTools } from '../types';
+import type { ModuleUserConfig, BaseBuildConfig, BuildPreset, PartialBuildConfig, PartialBaseBuildConfig, ModuleContext, BuildCommandOptions } from '../types';
 export declare const presetToConfig: (preset?: BuildPreset) => Promise<PartialBaseBuildConfig[] | undefined>;
 export declare const mergeConfig: (low?: PartialBaseBuildConfig[], high?: PartialBuildConfig) => PartialBaseBuildConfig[];
-export declare const normalizeBuildConfig: (api: PluginAPI<ModuleTools>, context: ModuleContext, buildCmdOptions: BuildCommandOptions) => Promise<BaseBuildConfig[]>;
+export declare const normalizeBuildConfig: (resolvedConfig: ModuleUserConfig, context: ModuleContext, buildCmdOptions: BuildCommandOptions) => Promise<BaseBuildConfig[]>;
 export declare const transformToAbsPath: (baseConfig: BaseBuildConfig, options: {
   context: ModuleContext;
   buildCmdOptions: BuildCommandOptions;

package/dist/config/normalize.js

@@ -74,8 +74,8 @@ const mergeConfig = (low, high = {}) => {
     return import_lodash.default.merge(config, high);
   });
 };
-const normalizeBuildConfig = async (api, context, buildCmdOptions) => {
-  let config = api.useConfigContext();
+const normalizeBuildConfig = async (resolvedConfig, context, buildCmdOptions) => {
+  let config = resolvedConfig;
   if ((0, import_merge.isLegacyUserConfig)(config)) {
     const { createUserConfigFromLegacy } = await Promise.resolve().then(() => __toESM(require("./transformLegacyConfig")));
     config = await createUserConfigFromLegacy(config);

package/dist/hooks/build.d.ts

@@ -1,9 +1,9 @@
 import type { RegisterBuildPlatformResult } from '@modern-js/core';
 import { BuildCommandOptions } from '../types';
-import type { BuildTaskResult, BuildResult, BuildPlatformResult, WatchDtsHookContext, WatchJsHookContext, BuildConfig, BaseBuildConfig } from '../types';
+import type { BuildTaskResult, BuildResult, BuildPlatformResult, WatchDtsHookContext, WatchJsHookContext, BaseBuildConfig } from '../types';
 export declare const buildHooks: {
   beforeBuild: import("@modern-js/plugin").ParallelWorkflow<{
-    config: BuildConfig;
+    config: BaseBuildConfig[];
     cliOptions: BuildCommandOptions;
   }, void>;
   beforeBuildTask: import("@modern-js/plugin").AsyncWaterfall<BaseBuildConfig>;

package/dist/hooks/index.d.ts

@@ -2,6 +2,7 @@ export declare const registerHook: {
   buildWatchJs: import("@modern-js/plugin").ParallelWorkflow<import("..").WatchJsHookContext, void>;
   buildWatchDts: import("@modern-js/plugin").ParallelWorkflow<import("..").WatchDtsHookContext, void>;
   addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+  resolveModuleUserConfig: import("@modern-js/plugin").AsyncWaterfall<import("..").ModuleUserConfig>;
   modifyLibuild: import("@modern-js/plugin").AsyncPipeline<unknown, unknown>;
   registerDev: import("@modern-js/plugin").ParallelWorkflow<void, import("..").DevToolData>;
   beforeDev: import("@modern-js/plugin").ParallelWorkflow<import("..").DevToolData[], void>;
@@ -14,7 +15,7 @@ export declare const registerHook: {
   afterDev: import("@modern-js/plugin").ParallelWorkflow<void, void>;
   noDevTools: import("@modern-js/plugin").AsyncWaterfall<string>;
   beforeBuild: import("@modern-js/plugin").ParallelWorkflow<{
-    config: import("..").BuildConfig;
+    config: import("..").BaseBuildConfig[];
     cliOptions: import("..").BuildCommandOptions;
   }, void>;
   beforeBuildTask: import("@modern-js/plugin").AsyncWaterfall<import("..").BaseBuildConfig>;

package/dist/hooks/misc.d.ts

@@ -1,5 +1,10 @@
+import { ModuleUserConfig } from '../types';
 export declare const miscHooks: {
   addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+  /**
+   * Change user configuration
+   */
+  resolveModuleUserConfig: import("@modern-js/plugin").AsyncWaterfall<ModuleUserConfig>;
   /**
    * @deprecated
    * use buildConfig.hooks and buildConfig.esbuildOptions instead.

package/dist/hooks/misc.js

@@ -25,6 +25,10 @@ var import_plugin = require("@modern-js/plugin");
 const miscHooks = {
   addRuntimeExports: (0, import_plugin.createAsyncWaterfall)(),
   /**
+  * Change user configuration
+  */
+  resolveModuleUserConfig: (0, import_plugin.createAsyncWaterfall)(),
+  /**
   * @deprecated
   * use buildConfig.hooks and buildConfig.esbuildOptions instead.
   */

package/lib/types.d.ts

@@ -1,6 +1,4 @@
 /// <reference types="node" />
-/// <reference types="react" />
-/// <reference types="react-dom" />
 
 declare namespace NodeJS {
   interface ProcessEnv {
@@ -9,11 +7,6 @@ declare namespace NodeJS {
   }
 }
 
-declare module '*.bmp' {
-  const src: string;
-  export default src;
-}
-
 declare module '*.gif' {
   const src: string;
   export default src;
@@ -34,10 +27,6 @@ declare module '*.png' {
   export default src;
 }
 
-declare module '*.ico' {
-  const src: string;
-  export default src;
-}
 
 declare module '*.webp' {
   const src: string;
@@ -89,29 +78,4 @@ declare module '*.module.sass' {
   export default classes;
 }
 
-declare module '*.md' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.hbs' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.yaml' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.toml' {
-  const src: string;
-  export default src;
-}
-
-declare module '*.xml' {
-  const src: string;
-  export default src;
-}
-
 declare module '@modern-js/runtime/*' {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.39.2",
+  "version": "2.41.0",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -50,18 +50,18 @@
     "@ast-grep/napi": "0.12.0",
     "@babel/generator": "^7.22.15",
     "@babel/parser": "^7.22.15",
-    "@babel/traverse": "7.23.2",
+    "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.22.15",
-    "@modern-js/swc-plugins": "0.6.4",
+    "@modern-js/swc-plugins": "0.6.5",
     "@rollup/pluginutils": "4.1.1",
     "@svgr/core": "8.0.0",
     "@svgr/plugin-jsx": "8.0.1",
     "@svgr/plugin-svgo": "8.0.1",
-    "@swc/helpers": "0.5.1",
+    "@swc/helpers": "0.5.3",
     "convert-source-map": "1.8.0",
-    "enhanced-resolve": "5.8.3",
+    "enhanced-resolve": "5.12.0",
     "esbuild": "0.19.2",
-    "magic-string": "0.26.4",
+    "magic-string": "0.30.5",
     "postcss": "8.4.31",
     "postcss-modules": "4.3.0",
     "safe-identifier": "0.4.2",
@@ -71,15 +71,15 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.39.2",
-    "@modern-js/plugin": "2.39.2",
-    "@modern-js/new-action": "2.39.2",
-    "@modern-js/plugin-lint": "2.39.2",
-    "@modern-js/plugin-changeset": "2.39.2",
-    "@modern-js/types": "2.39.2",
-    "@modern-js/upgrade": "2.39.2",
-    "@modern-js/plugin-i18n": "2.39.2",
-    "@modern-js/utils": "2.39.2"
+    "@modern-js/new-action": "2.41.0",
+    "@modern-js/core": "2.41.0",
+    "@modern-js/plugin-changeset": "2.41.0",
+    "@modern-js/plugin": "2.41.0",
+    "@modern-js/plugin-i18n": "2.41.0",
+    "@modern-js/plugin-lint": "2.41.0",
+    "@modern-js/types": "2.41.0",
+    "@modern-js/utils": "2.41.0",
+    "@modern-js/upgrade": "2.41.0"
   },
   "devDependencies": {
     "@types/babel__generator": "7.6.4",
@@ -87,10 +87,10 @@
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.39.2",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.39.2",
-    "@scripts/vitest-config": "2.39.2",
-    "@scripts/build": "2.39.2"
+    "@modern-js/builder-webpack-provider": "2.41.0",
+    "@modern-js/self": "npm:@modern-js/module-tools@2.41.0",
+    "@scripts/vitest-config": "2.41.0",
+    "@scripts/build": "2.41.0"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"