Merge pull request #3736 from alibaba/fix/mutilple-task-resource

feat: support browser history
alibaba · Oct 29, 2020 · 8846aff · 8846aff
2 parents 9c23841 + 4f69919
commit 8846aff
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/packages/plugin-app-base/src/config/default.config.js b/packages/plugin-app-base/src/config/default.config.js
@@ -21,6 +21,9 @@ module.exports = {
       ignored: /node_modules/,
       aggregateTimeout: 600,
     },
+    // For mutilple task, web will occupy the server root route
+    writeToDisk: true,
+    historyApiFallback: true,
     before(app) {
       app.use((req, res, next) => {
         // set cros for all served files

diff --git a/packages/plugin-app-base/src/setBuild.js b/packages/plugin-app-base/src/setBuild.js
@@ -18,9 +18,9 @@ module.exports = (api) => {
   const { context, onHook } = api;
   const { rootDir, userConfig } = context;
 
-  onHook('before.build.run', ({ config }) => {
+  onHook('before.build.run', ({ config: configs }) => {
     try {
-      debug(config[0]);
+      debug(configs);
     // eslint-disable-next-line no-empty
     } catch (err) {}
   });

diff --git a/packages/plugin-app-base/src/setDev.js b/packages/plugin-app-base/src/setDev.js
@@ -3,6 +3,7 @@ const openBrowser = require('react-dev-utils/openBrowser');
 const chalk = require('chalk');
 const qrcode = require('qrcode-terminal');
 const path = require('path');
+const fs = require('fs-extra');
 
 const {
   MINIAPP,
@@ -34,15 +35,22 @@ module.exports = function(api) {
     }
     return taskConfig.entry;
   };
-  onHook('before.start.run', ({ config }) => {
-    webEntryKeys = Object.keys(getWebpackEntry(config, 'web'));
-    weexEntryKeys = Object.keys(getWebpackEntry(config, 'weex'));
-    krakenEntryKeys = Object.keys(getWebpackEntry(config, 'kraken'));
+  onHook('before.start.run', ({ config: configs }) => {
+    webEntryKeys = Object.keys(getWebpackEntry(configs, 'web'));
+    weexEntryKeys = Object.keys(getWebpackEntry(configs, 'weex'));
+    krakenEntryKeys = Object.keys(getWebpackEntry(configs, 'kraken'));
     webMpa = userConfig.web && userConfig.web.mpa;
     weexMpa = userConfig.weex && userConfig.weex.mpa;
     krakenMpa = userConfig.kraken && userConfig.kraken.mpa;
+
+    // Remove outputDir when start devServer
+    const { outputDir = 'build' } = userConfig;
+    configs.forEach(config => {
+      fs.removeSync(path.resolve(rootDir, outputDir, config.name));
+    });
+
     try {
-      debug(config);
+      debug(configs);
     // eslint-disable-next-line no-empty
     } catch (err) {}
   });

diff --git a/packages/plugin-app-base/src/setTest.js b/packages/plugin-app-base/src/setTest.js
@@ -6,8 +6,8 @@ module.exports = (api) => {
   const { onGetJestConfig, context, onHook } = api;
   const { rootDir } = context;
 
-  onHook('before.test.run', ({ config }) => {
-    debug(JSON.stringify(config, null, 2));
+  onHook('before.test.run', ({ config: configs }) => {
+    debug(configs);
   });
 
   onGetJestConfig((jestConfig) => {