@umijs/plugins 4.0.0-canary.20220323.1 → 4.0.0-rc.10

package/dist/initial-state.js

@@ -30,7 +30,7 @@ exports.default = (api) => {
 import React from 'react';
 import { useModel } from '@@/plugin-model';
 ${loading
-                ? `import Loading from ${loading}`
+                ? `import Loading from '${loading}'`
                 : `function Loading() { return <div>loading</div>; }`}
 export default function InitialStateProvider(props: any) {
   const appLoaded = React.useRef(false);

package/dist/qiankun/master.js

@@ -91,7 +91,6 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                     path: file.replace(/\.tpl$/, ''),
                     tpl: getFileContent(file),
                     context: {
-                        runtimeHistory: api.config.runtimeHistory,
                         dynamicRoot: false,
                         hasModelPlugin: api.isPluginEnable('model'),
                         // dynamicRoot:

package/dist/qiankun/slave.js

@@ -35,15 +35,14 @@ exports.default = (api) => {
         },
     });
     api.modifyDefaultConfig((memo) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const initialSlaveOptions = Object.assign(Object.assign({ devSourceMap: true }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || '{}')), (memo.qiankun || {}).slave);
         const modifiedDefaultConfig = Object.assign(Object.assign({}, memo), { 
             // 默认开启 runtimePublicPath，避免出现 dynamic import 场景子应用资源地址出问题
-            runtimePublicPath: true, 
-            // TODO: runtimeHistory
-            runtimeHistory: {}, qiankun: Object.assign(Object.assign({}, memo.qiankun), { slave: initialSlaveOptions }) });
+            runtimePublicPath: true, qiankun: Object.assign(Object.assign({}, memo.qiankun), { slave: initialSlaveOptions }) });
         const shouldNotModifyDefaultBase = (_c = (_b = (_a = api.userConfig.qiankun) === null || _a === void 0 ? void 0 : _a.slave) === null || _b === void 0 ? void 0 : _b.shouldNotModifyDefaultBase) !== null && _c !== void 0 ? _c : initialSlaveOptions.shouldNotModifyDefaultBase;
-        if (!shouldNotModifyDefaultBase) {
+        const historyType = ((_d = api.userConfig.history) === null || _d === void 0 ? void 0 : _d.type) || 'browser';
+        if (!shouldNotModifyDefaultBase && historyType !== 'hash') {
             // @ts-ignore
             modifiedDefaultConfig.base = `/${api.pkg.name}`;
         }
@@ -58,17 +57,15 @@ exports.default = (api) => {
         }
         return config;
     });
-    // api.modifyPublicPathStr((publicPathStr) => {
-    //   const { runtimePublicPath } = api.config;
-    //   const { shouldNotModifyRuntimePublicPath } = (api.config.qiankun || {})
-    //     .slave!;
-    //   if (runtimePublicPath === true && !shouldNotModifyRuntimePublicPath) {
-    //     return `window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || "${
-    //       api.config.publicPath || '/'
-    //     }"`;
-    //   }
-    //   return publicPathStr;
-    // });
+    api.addHTMLHeadScripts(() => {
+        var _a;
+        const dontModify = (_a = api.config.qiankun) === null || _a === void 0 ? void 0 : _a.shouldNotModifyRuntimePublicPath;
+        return dontModify
+            ? []
+            : [
+                `window.publicPath = window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__ || "${api.config.publicPath || '/'}";`,
+            ];
+    });
     api.chainWebpack((config) => {
         (0, assert_1.default)(api.pkg.name, 'You should have name in package.json.');
         const { shouldNotAddLibraryChunkName } = (api.config.qiankun || {}).slave;

package/libs/qiankun/master/getMicroAppRouteComponent.tsx.tpl

@@ -1,8 +1,5 @@
 import React from 'react';
 import { MicroApp } from './MicroApp';
-{{#runtimeHistory}}
-import { getCreateHistoryOptions } from 'umi';
-{{/runtimeHistory}}
 import { useLocation } from 'umi';
 
 export function getMicroAppRouteComponent(opts: {
@@ -18,12 +15,6 @@ export function getMicroAppRouteComponent(opts: {
     // 默认取静态配置的 base
     let umiConfigBase = base === '/' ? '' : base;
 
-    {{#runtimeHistory}}
-    // 存在 getCreateHistoryOptions 说明当前应用开启了 runtimeHistory，此时取运行时的 history 配置的 basename
-    const { basename = '/' } = getCreateHistoryOptions();
-    umiConfigBase = basename === '/' ? '' : basename;
-    {{/runtimeHistory}}
-
     let runtimeMatchedBase =
       umiConfigBase + (url.endsWith('/') ? url.substr(0, url.length - 1) : url);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220323.1",
+  "version": "4.0.0-rc.10",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,7 +25,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.34.6",
-    "@umijs/bundler-utils": "4.0.0-canary.20220323.1",
+    "@umijs/bundler-utils": "4.0.0-rc.10",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220323.1"
+    "umi": "4.0.0-rc.10"
   },
   "publishConfig": {
     "access": "public"