@alicloud/alfa-react 1.4.28 → 1.4.30-alpha.0

package/es/createApplication.js

@@ -10,7 +10,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 import React, { useRef, useEffect, useState, useMemo } from 'react';
 import Loading from './components/Loading';
-import { normalizeName } from './utils';
+import { normalizeName, isOsContext } from './utils';
 import { version as loaderVersion } from './version';
 
 /**
@@ -40,7 +40,8 @@ export default function createApplication(loader) {
         beforeUpdate = props.beforeUpdate,
         customSandbox = props.sandbox,
         locale = props.locale,
-        dynamicConfig = props.dynamicConfig;
+        dynamicConfig = props.dynamicConfig,
+        noCache = props.noCache;
 
     var _useState = useState(null),
         _useState2 = _slicedToArray(_useState, 2),
@@ -98,8 +99,9 @@ export default function createApplication(loader) {
         afterUnmount: afterUnmount,
         beforeUpdate: beforeUpdate,
         locale: locale,
+        noCache: noCache,
         // 用户自定义 manifest 且未传入 dynamicConfig 时，默认值为 false，否则为 true
-        dynamicConfig: dynamicConfig || !manifest
+        dynamicConfig: typeof dynamicConfig === 'boolean' ? dynamicConfig : !manifest
       };
     }, []);
     useEffect(function () {
@@ -179,8 +181,12 @@ export default function createApplication(loader) {
       });
 
       return function () {
+        var _App;
+
         isUnmounted = true;
-        App && App.unmount();
+        App && App.unmount(); // 在沙箱中嵌套时，必须销毁实例，避免第二次加载时异常
+
+        if (isOsContext()) (_App = App) === null || _App === void 0 ? void 0 : _App.destroy();
       };
     }, [memoOptions]);
 

package/es/hooks/beforeLoadHook.js

@@ -18,7 +18,7 @@ function afterLoadHook(_x) {
 
 function _afterLoadHook() {
   _afterLoadHook = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
-    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, END_TIME;
+    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides, END_TIME;
 
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -71,6 +71,18 @@ function _afterLoadHook() {
             }
 
           case 22:
+            overrides = sandbox === null || sandbox === void 0 ? void 0 : sandbox.overrideGlobalVars;
+
+            if (overrides && app) {
+              Object.entries(overrides).forEach(function (_ref) {
+                var _ref2 = _slicedToArray(_ref, 2),
+                    key = _ref2[0],
+                    value = _ref2[1];
+
+                app.context.window[key] = value;
+              });
+            }
+
             END_TIME = Date.now();
             (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
               CONFIG_START_TIME: CONFIG_START_TIME,
@@ -81,7 +93,7 @@ function _afterLoadHook() {
             (logger === null || logger === void 0 ? void 0 : logger.send) && logger.send();
             return _context.abrupt("return", appConfig);
 
-          case 26:
+          case 28:
           case "end":
             return _context.stop();
         }

package/es/utils/index.js

@@ -1,3 +1,19 @@
+/**
+ * kernel 会为沙箱 context 注入 __IS_CONSOLE_OS_CONTEXT__
+ */
 export var normalizeName = function normalizeName(name) {
   return name.replace(/@/g, '').replace(/\//g, '-');
+};
+/**
+ * 判断是否在沙箱环境中运行
+ */
+
+export var isOsContext = function isOsContext() {
+  try {
+    return context.__IS_CONSOLE_OS_CONTEXT__;
+  } catch (e) {
+    // 历史逻辑问题，window.__IS_CONSOLE_OS_CONTEXT__ 会被污染导致判断异常
+    // 降级
+    return !!window.__IS_CONSOLE_OS_CONTEXT__;
+  }
 };

package/es/version.js

@@ -1 +1 @@
-export var version = '1.4.28';
+export var version = '1.4.30-alpha.0';

package/lib/createApplication.js

@@ -62,7 +62,8 @@ function createApplication(loader) {
         beforeUpdate = props.beforeUpdate,
         customSandbox = props.sandbox,
         locale = props.locale,
-        dynamicConfig = props.dynamicConfig;
+        dynamicConfig = props.dynamicConfig,
+        noCache = props.noCache;
 
     var _useState = (0, _react.useState)(null),
         _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -120,8 +121,9 @@ function createApplication(loader) {
         afterUnmount: afterUnmount,
         beforeUpdate: beforeUpdate,
         locale: locale,
+        noCache: noCache,
         // 用户自定义 manifest 且未传入 dynamicConfig 时，默认值为 false，否则为 true
-        dynamicConfig: dynamicConfig || !manifest
+        dynamicConfig: typeof dynamicConfig === 'boolean' ? dynamicConfig : !manifest
       };
     }, []);
     (0, _react.useEffect)(function () {
@@ -199,8 +201,12 @@ function createApplication(loader) {
         });
       });
       return function () {
+        var _App;
+
         isUnmounted = true;
-        App && App.unmount();
+        App && App.unmount(); // 在沙箱中嵌套时，必须销毁实例，避免第二次加载时异常
+
+        if ((0, _utils.isOsContext)()) (_App = App) === null || _App === void 0 ? void 0 : _App.destroy();
       };
     }, [memoOptions]);
 

package/lib/hooks/beforeLoadHook.js

@@ -32,7 +32,7 @@ function afterLoadHook(_x) {
 
 function _afterLoadHook() {
   _afterLoadHook = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
-    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, END_TIME;
+    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides, END_TIME;
 
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
@@ -85,6 +85,18 @@ function _afterLoadHook() {
             }
 
           case 22:
+            overrides = sandbox === null || sandbox === void 0 ? void 0 : sandbox.overrideGlobalVars;
+
+            if (overrides && app) {
+              Object.entries(overrides).forEach(function (_ref) {
+                var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+                    key = _ref2[0],
+                    value = _ref2[1];
+
+                app.context.window[key] = value;
+              });
+            }
+
             END_TIME = Date.now();
             (logger === null || logger === void 0 ? void 0 : logger.record) && logger.record({
               CONFIG_START_TIME: CONFIG_START_TIME,
@@ -95,7 +107,7 @@ function _afterLoadHook() {
             (logger === null || logger === void 0 ? void 0 : logger.send) && logger.send();
             return _context.abrupt("return", appConfig);
 
-          case 26:
+          case 28:
           case "end":
             return _context.stop();
         }

package/lib/utils/index.js

@@ -3,10 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeName = void 0;
+exports.normalizeName = exports.isOsContext = void 0;
 
+/**
+ * kernel 会为沙箱 context 注入 __IS_CONSOLE_OS_CONTEXT__
+ */
 var normalizeName = function normalizeName(name) {
   return name.replace(/@/g, '').replace(/\//g, '-');
 };
+/**
+ * 判断是否在沙箱环境中运行
+ */
 
-exports.normalizeName = normalizeName;
+
+exports.normalizeName = normalizeName;
+
+var isOsContext = function isOsContext() {
+  try {
+    return context.__IS_CONSOLE_OS_CONTEXT__;
+  } catch (e) {
+    // 历史逻辑问题，window.__IS_CONSOLE_OS_CONTEXT__ 会被污染导致判断异常
+    // 降级
+    return !!window.__IS_CONSOLE_OS_CONTEXT__;
+  }
+};
+
+exports.isOsContext = isOsContext;

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.4.28",
+  "version": "1.4.30-alpha.0",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -42,8 +42,8 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "^1.4.25",
-    "@alicloud/console-os-loader": "^1.4.14-alpha.1",
+    "@alicloud/alfa-core": "1.4.30-alpha.0",
+    "@alicloud/console-os-loader": "1.4.30-alpha.0",
     "@alicloud/widget-utils-console": "^0.1.6",
     "classnames": "^2.2.6",
     "crypto-js": "^4.1.1"
@@ -51,5 +51,5 @@
   "peerDependencies": {
     "react": ">=16.0.0"
   },
-  "gitHead": "ff9294b1d5e08b14691c8aa2bef098da2857f3df"
+  "gitHead": "971f337e52ca2ea36090f1e6f0fc6c57bb715a06"
 }

package/types/types/index.d.ts

@@ -19,6 +19,13 @@ export interface AlfaFactoryOption extends IAppConfig {
         css?: Record<string, string>;
         js?: Record<string, string>;
     };
+    /**
+     * 关闭缓存模式
+     */
+    noCache?: boolean;
+    /**
+     * 开启业务配置加载
+     */
     dynamicConfig?: boolean;
     runtimeVersion?: string;
     fallbackRender?: (error: Error) => Element;

package/types/utils/index.d.ts

@@ -1 +1,5 @@
 export declare const normalizeName: (name: string) => string;
+/**
+ * 判断是否在沙箱环境中运行
+ */
+export declare const isOsContext: () => boolean;

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.28";
+export declare const version = "1.4.30-alpha.0";