fix(umi-build-dev): 404 page generate failed when exportStatic is set (…

…#276)
umijs · Mar 29, 2018 · ec637c2 · ec637c2
1 parent 30684ec
commit ec637c2
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 6 deletions.
diff --git a/examples/func-test/.umirc.js b/examples/func-test/.umirc.js
@@ -1,7 +1,8 @@
 export default {
   pages: {
     '/': { context: { title: '首页' } },
-    'list.html': { context: { title: '列表页' } },
+    '/list': { document: 'pages/list.ejs', context: { title: '列表页' } },
+    '/404': { document: 'pages/404.ejs' },
   },
   plugins: [
     'umi-plugin-dll',
@@ -12,8 +13,8 @@ export default {
   hd: 1,
   loading: './PageLoadingComponent',
   // disableServiceWorker: true,
-  // exportStatic: {
-  //   htmlSuffix: true,
-  // },
+  exportStatic: {
+    // htmlSuffix: true,
+  },
   outputPath: './www',
 };
diff --git a/examples/func-test/pages/404.ejs b/examples/func-test/pages/404.ejs
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport"
+        content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title><%= context.title %></title>
+</head>
+<body>
+
+  <h1>404 Page</h1>
+  <div id="root"></div>
+
+</body>
+</html>
diff --git a/examples/func-test/pages/list.ejs b/examples/func-test/pages/list.ejs
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport"
+        content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title><%= context.title %></title>
+</head>
+<body>
+
+  <h1>List Page</h1>
+  <div id="root"></div>
+
+</body>
+</html>
diff --git a/packages/umi-build-dev/src/plugins/404/index.js b/packages/umi-build-dev/src/plugins/404/index.js
@@ -22,9 +22,9 @@ export function patchRoutes(routes) {
 }
 
 export default function(api) {
-  const { paths } = api.service;
+  const { paths, config } = api.service;
 
-  if (process.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV === 'production' && !config.exportStatic) {
     api.register('modifyRoutes', ({ memo }) => {
       return patchRoutes(memo);
     });