@alicloud/alfa-react 1.3.4-alpha.1 → 1.3.4

package/es/createApplication.js

@@ -11,6 +11,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 { version as loaderVersion } from './version';
 
 /**
  * container for microApp mount
@@ -48,13 +49,15 @@ export default function createApplication(loader) {
     var tagName = normalizeName(props.name);
     var sandbox = useMemo(function () {
       return _objectSpread(_objectSpread({}, customSandbox), {}, {
-        allowResources: [].concat(_toConsumableArray((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.allowResources) || []), [/^https?:\/\/at\.alicdn\.com\//]),
+        // allowResources: [
+        //   ...(customSandbox?.allowResources || []),
+        //   /^https?:\/\/at\.alicdn\.com\//,
+        // ],
         externalsVars: [].concat(_toConsumableArray((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
         '_console_base_ready_'])
       });
     }, [customSandbox]);
     useEffect(function () {
-      // eslint-disable-next-line no-useless-catch
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _yield$loader$registe, App, logger;
 
@@ -62,15 +65,7 @@ export default function createApplication(loader) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!app) {
-                  _context.next = 2;
-                  break;
-                }
-
-                return _context.abrupt("return");
-
-              case 2:
-                _context.next = 4;
+                _context.next = 2;
                 return loader.register({
                   entry: entry,
                   url: url,
@@ -90,13 +85,13 @@ export default function createApplication(loader) {
                   beforeUpdate: beforeUpdate
                 });
 
-              case 4:
+              case 2:
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
 
                 if (App) {
-                  _context.next = 9;
+                  _context.next = 7;
                   break;
                 }
 
@@ -104,9 +99,9 @@ export default function createApplication(loader) {
                   E_MSG: 'load app failed.'
                 }));
 
-              case 9:
+              case 7:
                 if (appRef.current) {
-                  _context.next = 11;
+                  _context.next = 9;
                   break;
                 }
 
@@ -114,16 +109,16 @@ export default function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 11:
-                _context.next = 13;
+              case 9:
+                _context.next = 11;
                 return App.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
+              case 11:
                 setApp(App);
 
-              case 14:
+              case 12:
               case "end":
                 return _context.stop();
             }
@@ -142,15 +137,23 @@ export default function createApplication(loader) {
       app.update(customProps);
     }
 
+    var dataAttrs = {
+      dataId: version,
+      dataVersion: version,
+      dataLoader: loaderVersion
+    };
     return /*#__PURE__*/React.createElement(React.Fragment, null, !app ? /*#__PURE__*/React.createElement(Loading, {
       loading: loading
-    }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, {
+    }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, _objectSpread({
       style: style,
       className: className,
-      ref: appRef,
-      dataId: name
-    }) : /*#__PURE__*/React.createElement(tagName, {}, /*#__PURE__*/React.createElement('div', {
       ref: appRef
+    }, dataAttrs)) : /*#__PURE__*/React.createElement(tagName, {
+      dataAttrs: dataAttrs
+    }, /*#__PURE__*/React.createElement('div', {
+      ref: appRef,
+      style: style,
+      className: className
     })));
   };
 }

package/es/version.js

@@ -1 +1 @@
-export var version = '1.3.4-alpha.1';
+export var version = '1.3.4';

package/lib/createApplication.js

@@ -25,6 +25,8 @@ var _Loading = _interopRequireDefault(require("./components/Loading"));
 
 var _utils = require("./utils");
 
+var _version = require("./version");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -69,13 +71,15 @@ function createApplication(loader) {
     var tagName = (0, _utils.normalizeName)(props.name);
     var sandbox = (0, _react.useMemo)(function () {
       return _objectSpread(_objectSpread({}, customSandbox), {}, {
-        allowResources: [].concat((0, _toConsumableArray2.default)((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.allowResources) || []), [/^https?:\/\/at\.alicdn\.com\//]),
+        // allowResources: [
+        //   ...(customSandbox?.allowResources || []),
+        //   /^https?:\/\/at\.alicdn\.com\//,
+        // ],
         externalsVars: [].concat((0, _toConsumableArray2.default)((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
         '_console_base_ready_'])
       });
     }, [customSandbox]);
     (0, _react.useEffect)(function () {
-      // eslint-disable-next-line no-useless-catch
       (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _yield$loader$registe, App, logger;
 
@@ -83,15 +87,7 @@ function createApplication(loader) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (!app) {
-                  _context.next = 2;
-                  break;
-                }
-
-                return _context.abrupt("return");
-
-              case 2:
-                _context.next = 4;
+                _context.next = 2;
                 return loader.register({
                   entry: entry,
                   url: url,
@@ -111,13 +107,13 @@ function createApplication(loader) {
                   beforeUpdate: beforeUpdate
                 });
 
-              case 4:
+              case 2:
                 _yield$loader$registe = _context.sent;
                 App = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
 
                 if (App) {
-                  _context.next = 9;
+                  _context.next = 7;
                   break;
                 }
 
@@ -125,9 +121,9 @@ function createApplication(loader) {
                   E_MSG: 'load app failed.'
                 }));
 
-              case 9:
+              case 7:
                 if (appRef.current) {
-                  _context.next = 11;
+                  _context.next = 9;
                   break;
                 }
 
@@ -135,16 +131,16 @@ function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 11:
-                _context.next = 13;
+              case 9:
+                _context.next = 11;
                 return App.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
+              case 11:
                 setApp(App);
 
-              case 14:
+              case 12:
               case "end":
                 return _context.stop();
             }
@@ -162,15 +158,23 @@ function createApplication(loader) {
       app.update(customProps);
     }
 
+    var dataAttrs = {
+      dataId: version,
+      dataVersion: version,
+      dataLoader: _version.version
+    };
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !app ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
       loading: loading
-    }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
+    }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, _objectSpread({
       style: style,
       className: className,
-      ref: appRef,
-      dataId: name
-    }) : /*#__PURE__*/_react.default.createElement(tagName, {}, /*#__PURE__*/_react.default.createElement('div', {
       ref: appRef
+    }, dataAttrs)) : /*#__PURE__*/_react.default.createElement(tagName, {
+      dataAttrs: dataAttrs
+    }, /*#__PURE__*/_react.default.createElement('div', {
+      ref: appRef,
+      style: style,
+      className: className
     })));
   };
 }

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.4-alpha.1";
+export declare const version = "1.3.4";

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.3.4-alpha.1",
+  "version": "1.3.4",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -15,7 +15,7 @@
     "babel:esm": "breezr build --engine babel --es-module",
     "build": "breezr build --engine webpack",
     "clean": "rm -rf lib yarn.lock",
-    "version": "node -p \"'export const version = \\'' + require('./package.json').version + '\\';'\" > src/version.ts && git add src/version.ts && git commit -m \"chore: gen version\""
+    "version": "node -p \"'export const version = \\'' + require('./package.json').version + '\\';'\" > src/version.ts"
   },
   "publishConfig": {
     "access": "public"