@alicloud/alfa-react 1.5.1-alpha.1 → 1.5.1-alpha.3

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Alibaba Cloud
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/es/components/ErrorBoundary/ErrorPanel.js

@@ -2,11 +2,11 @@ import React from 'react';
 var padding = 24;
 var containerBackground = '#fcebea';
 var containerStyle = {
+  display: 'none',
   background: containerBackground,
   padding: padding
 };
 var commonErrorStyle = {
-  display: 'none',
   lineHeight: '22px',
   color: '#d93026',
   fontSize: 14

package/es/createApplication.js

@@ -171,7 +171,7 @@ export default function createApplication(loader) {
       var dispatchFramePopstate = function dispatchFramePopstate() {
         var _App, _App$context$baseFram, _App$context$baseFram2;
         var popstateEvent = new Event('popstate');
-        popstateEvent.state = 'mock';
+        popstateEvent.state = history.state;
         (_App = App) === null || _App === void 0 ? void 0 : (_App$context$baseFram = _App.context.baseFrame) === null || _App$context$baseFram === void 0 ? void 0 : (_App$context$baseFram2 = _App$context$baseFram.contentWindow) === null || _App$context$baseFram2 === void 0 ? void 0 : _App$context$baseFram2.dispatchEvent(popstateEvent);
       };
       var updateAppHistory = function updateAppHistory() {
@@ -192,19 +192,21 @@ export default function createApplication(loader) {
       };
 
       // 受控模式下，返回不会触发子应用内的路由更新，需要主动通知
+      // 这段逻辑不一定生效，因为我们已经劫持了沙箱内的 history.go 方法
       if ($syncHistory.current) window.addEventListener('popstate', updateAppHistory);
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _app$context$updateBo, _app$context, _app$context$baseFram;
-        var _yield$loader$registe, app, logger, realVersion, _ref2, path, frameWindow;
+        var fakeBody, _yield$loader$registe, app, logger, realVersion, _ref2, path, frameWindow;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               countRegister(memoOptions.name);
-              _context.next = 3;
+              fakeBody = memoOptions.container || appRef.current || document.body;
+              _context.next = 4;
               return loader.register(_objectSpread(_objectSpread({}, memoOptions), {}, {
-                container: memoOptions.container || appRef.current
+                container: fakeBody
               }));
-            case 3:
+            case 4:
               _yield$loader$registe = _context.sent;
               app = _yield$loader$registe.app;
               logger = _yield$loader$registe.logger;
@@ -214,31 +216,31 @@ export default function createApplication(loader) {
 
               // container has been unmounted
               if (!isUnmounted) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               return _context.abrupt("return");
-            case 11:
+            case 12:
               if (app) {
-                _context.next = 13;
+                _context.next = 14;
                 break;
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
                 E_MSG: 'load app failed.'
               }));
-            case 13:
+            case 14:
               if (appRef.current) {
-                _context.next = 15;
+                _context.next = 16;
                 break;
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
                 E_MSG: 'cannot find container.'
               }));
-            case 15:
+            case 16:
               // update body in sandbox context
-              (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : appRef.current);
+              (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : fakeBody);
               _ref2 = memoOptions.props, path = _ref2.path;
               frameWindow = (_app$context$baseFram = app.context.baseFrame) === null || _app$context$baseFram === void 0 ? void 0 : _app$context$baseFram.contentWindow;
               if (frameWindow) {
@@ -270,14 +272,16 @@ export default function createApplication(loader) {
                   // 劫持微应用的返回
                   frameWindow.history.go = function (n) {
                     window.history.go(n);
+                    // 同步更新子应用的 state
+                    originalReplaceState(history.state, '', peelPath(frameWindow.location));
                   };
                 }
               }
-              _context.next = 21;
-              return app.mount(appRef.current, {
+              _context.next = 22;
+              return app.mount(fakeBody, {
                 customProps: customProps
               });
-            case 21:
+            case 22:
               if (frameWindow) {
                 // 每次挂载后主动触发子应用内的 popstate 事件，借此触发 react-router history 的检查逻辑
                 dispatchFramePopstate();
@@ -285,7 +289,7 @@ export default function createApplication(loader) {
 
               // just run once
               setAppInstance(app);
-            case 23:
+            case 24:
             case "end":
               return _context.stop();
           }

package/es/version.js

@@ -1 +1 @@
-export var version = '1.5.0';
+export var version = '1.5.1-alpha.3';

package/lib/components/ErrorBoundary/ErrorPanel.js

@@ -9,11 +9,11 @@ var _react = _interopRequireDefault(require("react"));
 var padding = 24;
 var containerBackground = '#fcebea';
 var containerStyle = {
+  display: 'none',
   background: containerBackground,
   padding: padding
 };
 var commonErrorStyle = {
-  display: 'none',
   lineHeight: '22px',
   color: '#d93026',
   fontSize: 14

package/lib/createApplication.js

@@ -181,7 +181,7 @@ function createApplication(loader) {
       var dispatchFramePopstate = function dispatchFramePopstate() {
         var _App, _App$context$baseFram, _App$context$baseFram2;
         var popstateEvent = new Event('popstate');
-        popstateEvent.state = 'mock';
+        popstateEvent.state = history.state;
         (_App = App) === null || _App === void 0 ? void 0 : (_App$context$baseFram = _App.context.baseFrame) === null || _App$context$baseFram === void 0 ? void 0 : (_App$context$baseFram2 = _App$context$baseFram.contentWindow) === null || _App$context$baseFram2 === void 0 ? void 0 : _App$context$baseFram2.dispatchEvent(popstateEvent);
       };
       var updateAppHistory = function updateAppHistory() {
@@ -202,19 +202,21 @@ function createApplication(loader) {
       };
 
       // 受控模式下，返回不会触发子应用内的路由更新，需要主动通知
+      // 这段逻辑不一定生效，因为我们已经劫持了沙箱内的 history.go 方法
       if ($syncHistory.current) window.addEventListener('popstate', updateAppHistory);
       (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _app$context$updateBo, _app$context, _app$context$baseFram;
-        var _yield$loader$registe, app, logger, realVersion, _ref2, path, frameWindow;
+        var fakeBody, _yield$loader$registe, app, logger, realVersion, _ref2, path, frameWindow;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               (0, _counter.countRegister)(memoOptions.name);
-              _context.next = 3;
+              fakeBody = memoOptions.container || appRef.current || document.body;
+              _context.next = 4;
               return loader.register(_objectSpread(_objectSpread({}, memoOptions), {}, {
-                container: memoOptions.container || appRef.current
+                container: fakeBody
               }));
-            case 3:
+            case 4:
               _yield$loader$registe = _context.sent;
               app = _yield$loader$registe.app;
               logger = _yield$loader$registe.logger;
@@ -224,31 +226,31 @@ function createApplication(loader) {
 
               // container has been unmounted
               if (!isUnmounted) {
-                _context.next = 11;
+                _context.next = 12;
                 break;
               }
               return _context.abrupt("return");
-            case 11:
+            case 12:
               if (app) {
-                _context.next = 13;
+                _context.next = 14;
                 break;
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
                 E_MSG: 'load app failed.'
               }));
-            case 13:
+            case 14:
               if (appRef.current) {
-                _context.next = 15;
+                _context.next = 16;
                 break;
               }
               return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                 E_CODE: 'RuntimeError',
                 E_MSG: 'cannot find container.'
               }));
-            case 15:
+            case 16:
               // update body in sandbox context
-              (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : appRef.current);
+              (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : fakeBody);
               _ref2 = memoOptions.props, path = _ref2.path;
               frameWindow = (_app$context$baseFram = app.context.baseFrame) === null || _app$context$baseFram === void 0 ? void 0 : _app$context$baseFram.contentWindow;
               if (frameWindow) {
@@ -280,14 +282,16 @@ function createApplication(loader) {
                   // 劫持微应用的返回
                   frameWindow.history.go = function (n) {
                     window.history.go(n);
+                    // 同步更新子应用的 state
+                    originalReplaceState(history.state, '', peelPath(frameWindow.location));
                   };
                 }
               }
-              _context.next = 21;
-              return app.mount(appRef.current, {
+              _context.next = 22;
+              return app.mount(fakeBody, {
                 customProps: customProps
               });
-            case 21:
+            case 22:
               if (frameWindow) {
                 // 每次挂载后主动触发子应用内的 popstate 事件，借此触发 react-router history 的检查逻辑
                 dispatchFramePopstate();
@@ -295,7 +299,7 @@ function createApplication(loader) {
 
               // just run once
               setAppInstance(app);
-            case 23:
+            case 24:
             case "end":
               return _context.stop();
           }

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.5.0';
+var version = '1.5.1-alpha.3';
 exports.version = version;

package/package.json

@@ -1,24 +1,12 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.5.1-alpha.1",
+  "version": "1.5.1-alpha.3",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "types/index.d.ts",
   "author": "pushiming",
   "license": "MIT",
-  "scripts": {
-    "prepublish": "npm run version && npm run build && npm run babel && npm run babel:esm && npm run types",
-    "build": "breezr build --engine webpack",
-    "babel": "breezr build --engine babel",
-    "babel:esm": "breezr build --engine babel --es-module",
-    "types": "tsc --emitDeclarationOnly -d --declarationDir ./types",
-    "storybook": "breezr start-storybook",
-    "clean": "rm -rf lib es dist types yarn.lock",
-    "start": "breezr start-storybook",
-    "precommit": "npm run version",
-    "version": "node -p \"'export const version = \\'' + require('./package.json').version + '\\';'\" > src/version.ts && git add src/version.ts"
-  },
   "publishConfig": {
     "access": "public"
   },
@@ -43,16 +31,28 @@
     "typescript": "^4.0.0"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "workspace:*",
-    "@alicloud/console-os-loader": "workspace:*",
     "@alicloud/widget-utils-console": "^0.1.6",
     "axios": "^1.4.0",
     "classnames": "^2.2.6",
     "crypto-js": "^4.1.1",
-    "prop-types": "^15.8.1"
+    "prop-types": "^15.8.1",
+    "@alicloud/alfa-core": "1.4.32",
+    "@alicloud/console-os-loader": "1.4.30-alpha.0"
   },
   "peerDependencies": {
     "react": ">=16.0.0"
   },
-  "gitHead": "ff9294b1d5e08b14691c8aa2bef098da2857f3df"
-}
+  "gitHead": "ff9294b1d5e08b14691c8aa2bef098da2857f3df",
+  "scripts": {
+    "prepublish": "npm run version && npm run build && npm run babel && npm run babel:esm && npm run types",
+    "build": "breezr build --engine webpack",
+    "babel": "breezr build --engine babel",
+    "babel:esm": "breezr build --engine babel --es-module",
+    "types": "tsc --emitDeclarationOnly -d --declarationDir ./types",
+    "storybook": "breezr start-storybook",
+    "clean": "rm -rf lib es dist types yarn.lock",
+    "start": "breezr start-storybook",
+    "precommit": "npm run version",
+    "version": "node -p \"'export const version = \\'' + require('./package.json').version + '\\';'\" > src/version.ts && git add src/version.ts"
+  }
+}

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.5.0";
+export declare const version = "1.5.1-alpha.3";