@umijs/bundler-webpack 4.0.1 → 4.0.2

package/dist/config/assetRules.js

@@ -14,9 +14,6 @@ async function addAssetRules(opts) {
         dataUrlCondition: {
             maxSize: inlineLimit,
         },
-    })
-        .generator({
-        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
     });
     rule
         .oneOf('image')
@@ -26,9 +23,6 @@ async function addAssetRules(opts) {
         dataUrlCondition: {
             maxSize: inlineLimit,
         },
-    })
-        .generator({
-        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
     });
     const fallback = rule
         .oneOf('fallback')
@@ -40,11 +34,6 @@ async function addAssetRules(opts) {
     if (userConfig.mdx) {
         fallback.add(/\.mdx?$/);
     }
-    fallback
-        .end()
-        .type('asset/resource')
-        .generator({
-        filename: `${opts.staticPathPrefix}[name].[hash:8].[ext]`,
-    });
+    fallback.end().type('asset/resource');
 }
 exports.addAssetRules = addAssetRules;

package/dist/config/config.js

@@ -78,7 +78,8 @@ async function getConfig(opts) {
         .filename(useHash ? `[name].[contenthash:8].js` : `[name].js`)
         .chunkFilename(useHash ? `[name].[contenthash:8].async.js` : `[name].async.js`)
         .publicPath(userConfig.publicPath || 'auto')
-        .pathinfo(isDev || disableCompress);
+        .pathinfo(isDev || disableCompress)
+        .set('assetModuleFilename', `${applyOpts.staticPathPrefix}[name].[hash:8][ext]`);
     // resolve
     // prettier-ignore
     config.resolve

package/dist/config/svgRules.js

@@ -35,20 +35,14 @@ async function addSVGRules(opts) {
             .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'))
             .end();
     }
-    if (svgo === false) {
+    if (svgo !== false) {
         const svgRule = config.module.rule('svg');
         svgRule
             .test(/\.svg$/)
-            .use('url-loader')
-            .loader(require.resolve('@umijs/bundler-webpack/compiled/url-loader'));
-        return;
+            .use('svgo-loader')
+            .loader(require.resolve('@umijs/bundler-webpack/compiled/svgo-loader'))
+            .options({ configFile: false, ...svgo })
+            .end();
     }
-    const svgRule = config.module.rule('svg');
-    svgRule
-        .test(/\.svg$/)
-        .use('svgo-loader')
-        .loader(require.resolve('@umijs/bundler-webpack/compiled/svgo-loader'))
-        .options({ configFile: false, ...svgo })
-        .end();
 }
 exports.addSVGRules = addSVGRules;

package/dist/schema.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="hapi__joi" />
-import type { Root } from '@hapi/joi';
+import type { Root } from '@umijs/utils/compiled/@hapi/joi';
 export declare function getSchemas(): Record<string, (Joi: Root) => any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-webpack",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "@umijs/bundler-webpack",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/bundler-webpack#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,7 +24,7 @@
     "build": "pnpm tsc",
     "build:client": "pnpm tsc --project ./tsconfig.client.json",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build -- --watch",
+    "dev": "pnpm build --watch",
     "generate:webpackPackages": "zx ./scripts/generateWebpackPackages.mjs",
     "test": "umi-scripts jest-turbo"
   },
@@ -35,10 +35,10 @@
     "@svgr/plugin-jsx": "^6.2.1",
     "@svgr/plugin-svgo": "^6.2.0",
     "@types/hapi__joi": "17.1.8",
-    "@umijs/babel-preset-umi": "4.0.1",
-    "@umijs/bundler-utils": "4.0.1",
-    "@umijs/mfsu": "4.0.1",
-    "@umijs/utils": "4.0.1",
+    "@umijs/babel-preset-umi": "4.0.2",
+    "@umijs/bundler-utils": "4.0.2",
+    "@umijs/mfsu": "4.0.2",
+    "@umijs/utils": "4.0.2",
     "cors": "^2.8.5",
     "css-loader": "6.7.1",
     "es5-imcompatible-versions": "^0.1.73",