fix: font files should be compiled via file-loader, Close #4047

umijs · Mar 4, 2020 · 7cbcc63 · 7cbcc63
1 parent 243301c
commit 7cbcc63
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/packages/bundler-webpack/src/fixtures/font/a.css b/packages/bundler-webpack/src/fixtures/font/a.css
@@ -0,0 +1,4 @@
+@font-face {
+  font-family: 'foo';
+  src: url("./a.eot?v=2.4.0");
+}
diff --git a/packages/bundler-webpack/src/fixtures/font/a.eot b/packages/bundler-webpack/src/fixtures/font/a.eot
@@ -0,0 +1 @@
+eoteot
diff --git a/packages/bundler-webpack/src/fixtures/font/expect.ts b/packages/bundler-webpack/src/fixtures/font/expect.ts
@@ -0,0 +1,6 @@
+import { IExpectOpts } from '../types';
+
+export default ({ indexCSS }: IExpectOpts) => {
+  expect(indexCSS).toContain(`src: url(./static/a.`);
+  expect(indexCSS).toContain(`.eot);`);
+}
diff --git a/packages/bundler-webpack/src/fixtures/font/index.ts b/packages/bundler-webpack/src/fixtures/font/index.ts
@@ -0,0 +1 @@
+import './a.css';
diff --git a/packages/bundler-webpack/src/getConfig/getConfig.ts b/packages/bundler-webpack/src/getConfig/getConfig.ts
@@ -224,6 +224,17 @@ export default async function getConfig(
         esModule: false,
       });
 
+  // prettier-ignore
+  webpackConfig.module
+    .rule('fonts')
+    .test(/\.(eot|woff|woff2|ttf)(\?.*)?$/)
+    .use('file-loader')
+      .loader(require.resolve('file-loader'))
+      .options({
+        name: 'static/[name].[hash:8].[ext]',
+        esModule: false,
+      });
+
   // css
   css({
     config,
@@ -265,9 +276,6 @@ export default async function getConfig(
   //     },
   //   ]);
 
-  // copy
-  // TODO
-
   // define
   webpackConfig.plugin('define').use(bundleImplementor.DefinePlugin, [
     {