@alicloud/alfa-react 1.3.0-canary.1 → 1.3.0-canary.5

package/lib/createApplication.js

@@ -0,0 +1,133 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = createApplication;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _Loading = _interopRequireDefault(require("./components/Loading"));
+
+var _utils = require("./utils");
+
+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; }
+
+/**
+ * container for microApp mount
+ * @param loader alfa-core loader
+ * @returns
+ */
+function createApplication(loader) {
+  function Application(props) {
+    var name = props.name,
+        manifest = props.manifest,
+        loading = props.loading,
+        sandbox = props.sandbox,
+        customProps = props.customProps,
+        className = props.className,
+        style = props.style;
+
+    var _useState = (0, _react.useState)(null),
+        _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+        app = _useState2[0],
+        setApp = _useState2[1];
+
+    var appRef = (0, _react.useRef)(null);
+    var tagName = (0, _utils.normalizeName)(props.name);
+    (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;
+
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return loader.register({
+                  name: name,
+                  manifest: manifest,
+                  container: appRef.current,
+                  props: customProps,
+                  sandbox: sandbox
+                });
+
+              case 2:
+                _yield$loader$registe = _context.sent;
+                App = _yield$loader$registe.app;
+
+                if (App) {
+                  _context.next = 6;
+                  break;
+                }
+
+                throw new Error('[alfa-react] load app failed.');
+
+              case 6:
+                _context.next = 8;
+                return App.load();
+
+              case 8:
+                if (appRef.current) {
+                  _context.next = 10;
+                  break;
+                }
+
+                throw new Error('[alfa-react] container not found');
+
+              case 10:
+                _context.next = 12;
+                return App.mount(appRef.current, {
+                  customProps: customProps
+                });
+
+              case 12:
+                setApp(App);
+                return _context.abrupt("return", function () {
+                  App && App.unmount();
+                });
+
+              case 14:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))().catch(function (e) {
+        throw e;
+      });
+    }, [name, manifest, customProps, sandbox]);
+
+    if (app) {
+      app.update(customProps);
+    }
+
+    return /*#__PURE__*/_react.default.createElement(_react.Suspense, {
+      fallback: /*#__PURE__*/_react.default.createElement(_Loading.default, {
+        loading: loading
+      })
+    }, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, sandbox && sandbox !== true && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, {
+      style: style,
+      className: className,
+      ref: appRef,
+      dataId: name
+    }) : /*#__PURE__*/_react.default.createElement(tagName, {}, /*#__PURE__*/_react.default.createElement('div', {
+      ref: appRef
+    }))));
+  }
+
+  return Application;
+}

package/lib/types/base.d.ts

@@ -0,0 +1,11 @@
+import React, { HTMLAttributes } from 'react';
+import { IAppConfig, IOptions, AlfaEnvEnum } from '@alicloud/alfa-core';
+export interface IProps<T = any> extends HTMLAttributes<Element>, IAppConfig, IOptions {
+    loading?: boolean | React.ReactChild;
+    consoleConfig?: any;
+    i18nMessages?: any;
+    env?: AlfaEnvEnum;
+    dependencies?: any;
+}
+export default class MicroAppBase<T> extends React.Component<Partial<IProps<T>>> {
+}

package/lib/types/base.js

@@ -0,0 +1,37 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _react = _interopRequireDefault(require("react"));
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+var MicroAppBase = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2.default)(MicroAppBase, _React$Component);
+
+  var _super = _createSuper(MicroAppBase);
+
+  function MicroAppBase() {
+    (0, _classCallCheck2.default)(this, MicroAppBase);
+    return _super.apply(this, arguments);
+  }
+
+  return MicroAppBase;
+}(_react.default.Component);
+
+exports.default = MicroAppBase;

package/lib/types/index.d.ts

@@ -0,0 +1,86 @@
+/// <reference types="react" />
+import React from 'React';
+import { createMicroApp, IAppConfig } from '@alicloud/alfa-core';
+export interface AlfaVersion {
+    entry: string;
+}
+declare type Version = string;
+export interface AlfaReleaseConfig {
+    versions: Record<Version, AlfaVersion>;
+    'dist-tag': Record<string, string>;
+}
+export declare type EnvEnum = 'prod' | 'local' | 'pre' | 'daily';
+export interface AlfaFactoryOption extends IAppConfig {
+    loading?: boolean | React.ReactChild;
+    dependencies?: Record<string, any>;
+    className?: string;
+    style?: Record<string, any>;
+    unstable_runtime?: {
+        css?: Record<string, string>;
+        js?: Record<string, string>;
+    };
+}
+declare type OmitKeys = 'manifest';
+export interface WidgetFactoryOption extends Omit<AlfaFactoryOption, OmitKeys> {
+    runtimeVersion?: string;
+    alfaLoader?: boolean;
+    theme?: string;
+}
+export interface AlfaEnvConfigDescriptor {
+    releaseUrl: string;
+    configUrl?: string;
+    cdnBackupUrl?: string;
+    resourceUrl?: string;
+}
+export interface AlfaEnvConfig {
+    daily: AlfaEnvConfigDescriptor;
+    local: AlfaEnvConfigDescriptor;
+    pre: AlfaEnvConfigDescriptor;
+    prod: AlfaEnvConfigDescriptor;
+}
+export interface WidgetReleaseConfig {
+    [id: string]: {
+        [version: string]: {
+            latest: string;
+        };
+    };
+}
+export interface WidgetCWSConfig {
+    conf: {
+        [channel: string]: {
+            [key: string]: string;
+        };
+    };
+    features: {
+        [channel: string]: {
+            [key: string]: boolean;
+        };
+    };
+    links: {
+        [channel: string]: {
+            [key: string]: string;
+        };
+    };
+    locales: {
+        [locale: string]: {
+            messages: {
+                [key: string]: string;
+            };
+        };
+    };
+}
+export interface WidgetRuntime {
+    react: any;
+    reactDom: any;
+    axios: any;
+    'prop-types': any;
+    '@ali/wind': any;
+    '@ali/wind-utils-console': any;
+    '@ali/wind-intl': any;
+    '@ali/wind-intl/lib/Provider': any;
+    '@ali/wind-intl/lib/withRcIntl': any;
+    '@ali/widget-utils-console': any;
+}
+declare type ThenArg<T> = T extends PromiseLike<infer U> ? U : T;
+export declare type MicroApplication = ThenArg<ReturnType<typeof createMicroApp>>;
+export {};

package/lib/types/index.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/types.d.ts

@@ -24,7 +24,6 @@ declare type OmitKeys = 'manifest';
 export interface WidgetFactoryOption extends Omit<AlfaFactoryOption, OmitKeys> {
     runtimeVersion?: string;
     alfaLoader?: boolean;
-    theme?: string;
 }
 export interface AlfaEnvConfigDescriptor {
     releaseUrl: string;

package/lib/utils/getConsoleConfig.d.ts

@@ -1,2 +1,21 @@
-import { AlfaFactoryOption } from '@alicloud/alfa-core';
-export declare const getConsoleConfig: (option: AlfaFactoryOption, consoleConfig: any) => Promise<any>;
+import { IAppConfig } from '@alicloud/alfa-core';
+export declare const getConsoleConfig: (config: IAppConfig, consoleConfig: any) => Promise<{
+    CHANNEL_LINKS: Partial<Record<string, string>>;
+    CHANNEL_FEATURE_STATUS: Partial<Record<string, {
+        status: boolean;
+        attribute: {
+            customAttrs: Record<string, unknown>;
+            regions: {
+                region: string[];
+            };
+        };
+    }>>;
+    FEATURE_STATUS: Partial<Record<string, boolean>>;
+    fEnv?: string | undefined;
+    LOCALE?: string | undefined;
+    CHANNEL?: string | undefined;
+    SEC_TOKEN?: string | undefined;
+    portalType?: string | undefined;
+    MAIN_ACCOUNT_PK?: string | undefined;
+    CURRENT_PK?: string | undefined;
+}>;

package/lib/utils/getConsoleConfig.js

@@ -73,14 +73,14 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
 };
 
 var getConsoleConfig = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(option, consoleConfig) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config, consoleConfig) {
     var configData;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return (0, _alfaCore.getConfig)(option);
+            return (0, _alfaCore.getConfig)(config);
 
           case 2:
             configData = _context.sent;

package/lib/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const normalizeName: (name: string) => string;

package/lib/utils/index.js

@@ -0,0 +1,12 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.normalizeName = void 0;
+
+var normalizeName = function normalizeName(name) {
+  return name.replace(/@/g, '').replace(/\//g, '-');
+};
+
+exports.normalizeName = normalizeName;

package/lib/widget/emitter.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 declare class WidgetEventEmitter extends EventEmitter {
+    constructor();
     refersh(widgetId: string): boolean;
     refershWidget(widgetId: string): boolean;
 }

package/lib/widget/emitter.js

@@ -30,13 +30,13 @@ var WidgetEventEmitter = /*#__PURE__*/function (_EventEmitter) {
 
   function WidgetEventEmitter() {
     (0, _classCallCheck2.default)(this, WidgetEventEmitter);
-    return _super.apply(this, arguments);
-  }
+    return _super.call(this);
+  } // Compatible with the old api, this may get removed at sometime later.
+
 
   (0, _createClass2.default)(WidgetEventEmitter, [{
     key: "refersh",
-    value: // Compatible with the old api, this may get removed at sometime later.
-    function refersh(widgetId) {
+    value: function refersh(widgetId) {
       return this.emit("".concat(widgetId, ":REFRESH"));
     }
   }, {

package/lib/widget/getWidgetConfigById.js

@@ -27,25 +27,26 @@ var getWidgetConfigById = /*#__PURE__*/function () {
         switch (_context.prev = _context.next) {
           case 0:
             env = _env.ENV[option.env || (0, _env.getConsoleEnv)()];
+            console.log(env.configUrl);
 
             if (cachedConfig[option.name]) {
-              _context.next = 6;
+              _context.next = 7;
               break;
             }
 
-            _context.next = 4;
+            _context.next = 5;
             return _axios.default.get((0, _template.default)(env.configUrl)({
               id: option.name
             }));
 
-          case 4:
+          case 5:
             resp = _context.sent;
             cachedConfig[option.name] = resp.data;
 
-          case 6:
+          case 7:
             return _context.abrupt("return", cachedConfig[option.name]);
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/lib/widget/getWidgetDeps.js

@@ -185,7 +185,7 @@ var getWidgetDeps = /*#__PURE__*/function () {
               react: _react.default,
               'react-dom': _reactDom.default,
               'prop-types': propTypes,
-              axios: _axios.default
+              'axios': _axios.default
             }, cachedRuntime[version].default), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, WIDGET_UTILS_PKG_NAME, injectedWidgetUtils), (0, _defineProperty2.default)(_objectSpread2, '@ali/widget-utils-config', injectedWidgetUtils), (0, _defineProperty2.default)(_objectSpread2, '@ali/widget-loader', createWidget), _objectSpread2)));
 
           case 31:

package/lib/widget.js

@@ -21,8 +21,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _consoleOsLoader = require("@alicloud/console-os-loader");
 
-var _app = require("./app");
-
 var _index = require("./widget/index");
 
 var _ErrorBoundary = _interopRequireDefault(require("./components/ErrorBoundary"));
@@ -40,11 +38,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function createAlfaWidget(option) {
-  if (!option.name.match(/@ali\/widget-/)) {
-    // TODO load style
-    return (0, _app.createAlfaApp)(option);
-  }
-
   var AlfaWidget = /*#__PURE__*/(0, _react.lazy)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var url, config, _yield$getWidgetVersi, version, entryUrl, deps;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.3.0-canary.1",
+  "version": "1.3.0-canary.5",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -23,9 +23,7 @@
     "@alicloud/console-toolkit-preset-wind-component": "^1.0.0",
     "@types/chai": "^4.1.7",
     "@types/classnames": "^2.2.9",
-    "@types/crypto-js": "^4.0.2",
     "@types/jest": "^23.3.13",
-    "@types/lodash": "^4.14.176",
     "@types/react": "^16.9.2",
     "@types/react-dom": "^16.9.0",
     "@types/single-spa-react": "^2.8.3",
@@ -37,14 +35,13 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "1.3.0-canary.1",
-    "@alicloud/console-os-loader": "1.3.0-canary.0",
+    "@alicloud/alfa-core": "1.3.0-canary.5",
+    "@alicloud/console-os-loader": "1.3.0-canary.5",
     "@alicloud/widget-utils-console": "^0.1.6",
-    "classnames": "^2.2.6",
-    "crypto-js": "^4.1.1"
+    "classnames": "^2.2.6"
   },
   "peerDependencies": {
     "react": "^16 | ^17"
   },
-  "gitHead": "631484c0b2517e289c8531cc556af11135905674"
+  "gitHead": "02863a2388162a395d3e51f54d122745d10e2a75"
 }