feat(umi-build-dev): load files in mock/ automatically if .umirc.mock…

….js don't exists (#260)
umijs · Mar 26, 2018 · 733f228 · 733f228
1 parent e31ce03
commit 733f228
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/examples/func-test/.umirc.js b/examples/func-test/.umirc.js
@@ -9,7 +9,7 @@ export default {
     ['./plugin2', 'hihi'],
     // 'umi-plugin-yunfengdie',
   ],
-  // hd: 1,
+  hd: 1,
   loading: './PageLoadingComponent',
   // disableServiceWorker: true,
   // exportStatic: {

diff --git a/examples/func-test/.umirc.mock.js b/examples/func-test/.umirc.mock.js
diff --git a/examples/func-test/mock/user.js b/examples/func-test/mock/user.js
@@ -2,4 +2,7 @@ export default {
   '/api/users': {
     list: [1, 2, 3, 4],
   },
+  '/api/users2': {
+    list: [1, 2, 3, 4],
+  },
 };
diff --git a/packages/umi-build-dev/src/plugins/mock/HttpMock.js b/packages/umi-build-dev/src/plugins/mock/HttpMock.js
@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import assert from 'assert';
 import bodyParser from 'body-parser';
 import chokidar from 'chokidar';
+import glob from 'glob';
 
 function MOCK_START(req, res, next) {
   next();
@@ -33,7 +34,7 @@ class HttpMock {
   }
 
   watch() {
-    const { devServer, api: { utils: { debug } } } = this;
+    const { api: { utils: { debug } } } = this;
     const watcher = chokidar.watch([this.configPath, this.absMockPath], {
       ignoreInitial: true,
     });
@@ -145,15 +146,33 @@ class HttpMock {
     return { method, path };
   }
 
+  disableRequireCache() {
+    Object.keys(require.cache).forEach(file => {
+      if (file === this.configPath || file.indexOf(this.absMockPath) > -1) {
+        delete require.cache[file];
+      }
+    });
+  }
+
   getConfig() {
+    const { debug } = this.api.utils;
+
     if (existsSync(this.configPath)) {
-      // disable require cache
-      Object.keys(require.cache).forEach(file => {
-        if (file === this.configPath || file.indexOf(this.absMockPath) > -1) {
-          delete require.cache[file];
-        }
-      });
+      this.disableRequireCache();
       return require(this.configPath); // eslint-disable-line
+    } else if (existsSync(this.absMockPath)) {
+      this.disableRequireCache();
+      const mockFiles = glob.sync('**/*.js', {
+        cwd: this.absMockPath,
+      });
+      debug(`mockFiles: ${JSON.stringify(mockFiles)}`);
+      return mockFiles.reduce((memo, mockFile) => {
+        memo = {
+          ...memo,
+          ...require(join(this.absMockPath, mockFile)),
+        };
+        return memo;
+      }, {});
     } else {
       return {};
     }