@modern-js/module-tools 2.46.1 → 2.47.1

package/dist/builder/feature/asset.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ICompiler } from '../../types';
+import type { ICompiler } from '../../types';
 export declare const asset: {
     name: string;
     apply(compiler: ICompiler): void;
@@ -14,5 +14,5 @@ export declare const asset: {
  */
 export declare function getAssetContents(this: ICompiler, assetPath: string, rebaseFrom: string, calledOnLoad?: boolean): Promise<{
     contents: string | Buffer;
-    loader: "copy" | "text" | "jsx";
+    loader: "text" | "jsx" | "copy";
 }>;

package/dist/builder/feature/asset.js

@@ -34,6 +34,7 @@ __export(asset_exports, {
 module.exports = __toCommonJS(asset_exports);
 var import_path = require("path");
 var import_fs = __toESM(require("fs"));
+var import_lodash = __toESM(require("@modern-js/utils/lodash"));
 var import_pluginutils = require("@rollup/pluginutils");
 var import_core = require("../../../compiled/@svgr/core");
 var import_plugin_svgo = __toESM(require("../../../compiled/@svgr/plugin-svgo"));
@@ -67,6 +68,24 @@ const asset = {
 function encodeSVG(buffer) {
   return encodeURIComponent(buffer.toString("utf-8").replace(/[\n\r]/gim, "").replace(/\t/gim, " ").replace(/<!--(.*(?=-->))-->/gim, "").replace(/'/gim, "\\i")).replace(/\(/g, "%28").replace(/\)/g, "%29");
 }
+const getDefaultSVGRConfig = () => ({
+  svgo: true,
+  svgoConfig: {
+    plugins: [
+      {
+        name: "preset-default",
+        params: {
+          overrides: {
+            // viewBox is required to resize SVGs with CSS.
+            // @see https://github.com/svg/svgo/issues/1128
+            removeViewBox: false
+          }
+        }
+      },
+      "prefixIds"
+    ]
+  }
+});
 async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
   const fileContent = await import_fs.default.promises.readFile(assetPath);
   const { buildType, format, outDir } = this.config;
@@ -80,7 +99,8 @@ async function getAssetContents(assetPath, rebaseFrom, calledOnLoad) {
   let emitAsset = true;
   let contents = normalizedPublicPath;
   let loader = "text";
-  const config = typeof svgr === "boolean" ? {} : svgr;
+  const defaultConfig = getDefaultSVGRConfig();
+  const config = typeof svgr === "boolean" ? defaultConfig : import_lodash.default.merge(defaultConfig, svgr);
   const filter = (0, import_pluginutils.createFilter)(config.include || SVG_REGEXP, config.exclude);
   if (svgr && filter(assetPath)) {
     const previousExport = config.exportType === "named" ? `export default "${normalizedPublicPath}"` : null;

package/dist/builder/feature/redirect.js

@@ -40,7 +40,7 @@ var import_file = require("../../constants/file");
 var import_utils2 = require("../../utils");
 var import_asset = require("./asset");
 var import_postcssTransformer = require("./style/postcssTransformer");
-async function redirectImport(compiler, code, modules, aliasRecord, filePath, outputDir, jsExtension, matchPath) {
+async function redirectImport(compiler, code, modules, aliasRecord, filePath, outputDir, jsExtension, isModule, matchPath) {
   const str = new import_magic_string.default(code);
   const extensions = [
     ".ts",
@@ -77,7 +77,7 @@ async function redirectImport(compiler, code, modules, aliasRecord, filePath, ou
       }
     }
     if (redirect2.autoExtension) {
-      if (ext === "" && jsExtension !== ".js" && name2.startsWith(".")) {
+      if (ext === "" && name2.startsWith(".") && (jsExtension !== ".js" || isModule)) {
         str.overwrite(start, end, `${name2}${jsExtension}`);
         return;
       }
@@ -214,13 +214,13 @@ const redirect = {
       if (!matchModule.length) {
         return args;
       }
-      const { jsExtension } = (0, import_utils2.getDefaultOutExtension)({
+      const { jsExtension, isModule } = (0, import_utils2.getDefaultOutExtension)({
         format,
         root,
         autoExtension
       });
       const outputPath = (0, import_path.resolve)(outDir, (0, import_path.relative)(sourceDir, id));
-      const str = await redirectImport(compiler, code, matchModule, absoluteAlias, id, (0, import_path.dirname)(outputPath), jsExtension, matchPath);
+      const str = await redirectImport(compiler, code, matchModule, absoluteAlias, id, (0, import_path.dirname)(outputPath), jsExtension, isModule, matchPath);
       return {
         ...args,
         code: str.toString(),

package/dist/builder/feature/style/transformStyle.d.ts

@@ -9,5 +9,5 @@ export type PreprocessRender = (content: string, stdinPath: string, stdinDir: st
 }>;
 export declare function transformStyle(this: ICompiler, source: Source): Promise<{
     code: string;
-    loader: "js" | "css";
+    loader: "css" | "js";
 }>;

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

@@ -1,7 +1,7 @@
-import type { ToolsConfig as WebpackBuilderToolsConfig } from '@modern-js/builder-webpack-provider';
+import type { ToolsConfig } from '@rsbuild/core';
 export interface StorybookBuildConfig {
-    webpack?: WebpackBuilderToolsConfig['webpack'];
-    webpackChain?: WebpackBuilderToolsConfig['webpackChain'];
+    webpack?: ToolsConfig['webpack'];
+    webpackChain?: ToolsConfig['webpackChain'];
 }
 export interface Dev {
     storybook?: StorybookBuildConfig;

package/dist/utils/outExtension.d.ts

@@ -6,4 +6,9 @@ export declare const getDefaultOutExtension: (options: {
 }) => {
     jsExtension: string;
     dtsExtension: string;
+    isModule?: undefined;
+} | {
+    jsExtension: string;
+    dtsExtension: string;
+    isModule: boolean;
 };

package/dist/utils/outExtension.js

@@ -64,7 +64,8 @@ const getDefaultOutExtension = (options) => {
   }
   return {
     jsExtension,
-    dtsExtension
+    dtsExtension,
+    isModule
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/types.d.ts

@@ -34,8 +34,18 @@ declare module '*.webp' {
 }
 
 declare module '*.svg' {
-  const src: string;
-  export default src;
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  /**
+   * The default export type depends on the asset.svgr.exportType config,
+   * it can be a string or a ReactComponent
+   * */
+  const content: any;
+  export default content;
 }
 
 declare module '*.css' {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/module-tools",
-  "version": "2.46.1",
+  "version": "2.47.1",
   "description": "Simple, powerful, high-performance modern npm package development solution.",
   "keywords": [
     "modern",
@@ -66,24 +66,24 @@
     "tapable": "2.2.1",
     "terser": "5.19.2",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "@modern-js/core": "2.46.1",
-    "@modern-js/new-action": "2.46.1",
-    "@modern-js/plugin-changeset": "2.46.1",
-    "@modern-js/plugin": "2.46.1",
-    "@modern-js/plugin-i18n": "2.46.1",
-    "@modern-js/plugin-lint": "2.46.1",
-    "@modern-js/types": "2.46.1",
-    "@modern-js/upgrade": "2.46.1",
-    "@modern-js/utils": "2.46.1"
+    "@modern-js/core": "2.47.1",
+    "@modern-js/new-action": "2.47.1",
+    "@modern-js/plugin": "2.47.1",
+    "@modern-js/plugin-changeset": "2.47.1",
+    "@modern-js/plugin-i18n": "2.47.1",
+    "@modern-js/types": "2.47.1",
+    "@modern-js/plugin-lint": "2.47.1",
+    "@modern-js/upgrade": "2.47.1",
+    "@modern-js/utils": "2.47.1"
   },
   "devDependencies": {
+    "@rsbuild/core": "0.4.6",
     "@types/convert-source-map": "1.5.2",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/builder-webpack-provider": "2.46.1",
-    "@modern-js/self": "npm:@modern-js/module-tools@2.46.1",
-    "@scripts/vitest-config": "2.46.1",
-    "@scripts/build": "2.46.1"
+    "@modern-js/self": "npm:@modern-js/module-tools@2.47.1",
+    "@scripts/build": "2.47.1",
+    "@scripts/vitest-config": "2.47.1"
   },
   "peerDependencies": {
     "typescript": "^4 || ^5"