@cloud-app-dev/vidc 2.0.0-alpha.17 → 2.0.0-alpha.18

package/.fatherrc.js

@@ -1,10 +1,6 @@
-import nodePolyfills from 'rollup-plugin-node-polyfills';
-
 export default {
   target: 'browser',
   esm: 'babel',
-  extraRollupPlugins: [nodePolyfills()],
-  lessInBabelMode: true, // babel 模式下做 less 编译
   pkgs: [
     // 组件依赖构建顺序， 例如 a组件依赖于b组件，那么需要先编译 b,在编译a,则 这里可以控制组件编译顺序
   ],
@@ -15,4 +11,15 @@ export default {
     ['import', { libraryName: 'ahooks', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'ahooks'],
     ['import', { libraryName: '@cloud-app-dev/map', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'map-components'],
   ],
+  lessInRollupMode: {
+    modifyVars: {
+      '@ant-prefix': 'cloudapp',
+    },
+  },
+  lessInBabelMode: {
+    // babel 模式下做 less 编译
+    modifyVars: {
+      '@ant-prefix': 'cloudapp',
+    },
+  },
 };

package/es/LoaderScript/index.js

@@ -10,14 +10,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { __asyncValues, __awaiter } from "tslib";
 import React, { useEffect, useState } from 'react';
-import { createAsyncIterable } from './utils';
-import { nextTick, tryCatch } from '../utils';
+import { createAsyncIterable, runAsyncIterable } from './utils';
 
 function LoaderScripts(_ref) {
-  var _this = this;
-
   var _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
       children = _ref.children,
@@ -35,90 +31,12 @@ function LoaderScripts(_ref) {
       return setInitStatus(true);
     }
 
-    var asyncIter = createAsyncIterable(options);
-    tryCatch(function () {
-      return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var e_1, _a, asyncIter_1, asyncIter_1_1, x;
-
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.prev = 0;
-                asyncIter_1 = __asyncValues(asyncIter);
-
-              case 2:
-                _context.next = 4;
-                return asyncIter_1.next();
-
-              case 4:
-                asyncIter_1_1 = _context.sent;
-
-                if (asyncIter_1_1.done) {
-                  _context.next = 10;
-                  break;
-                }
-
-                x = asyncIter_1_1.value;
-                console.log('加载完成！', options[x]);
-
-              case 8:
-                _context.next = 2;
-                break;
-
-              case 10:
-                _context.next = 15;
-                break;
-
-              case 12:
-                _context.prev = 12;
-                _context.t0 = _context["catch"](0);
-                e_1 = {
-                  error: _context.t0
-                };
-
-              case 15:
-                _context.prev = 15;
-                _context.prev = 16;
-
-                if (!(asyncIter_1_1 && !asyncIter_1_1.done && (_a = asyncIter_1.return))) {
-                  _context.next = 20;
-                  break;
-                }
-
-                _context.next = 20;
-                return _a.call(asyncIter_1);
-
-              case 20:
-                _context.prev = 20;
-
-                if (!e_1) {
-                  _context.next = 23;
-                  break;
-                }
-
-                throw e_1.error;
-
-              case 23:
-                return _context.finish(20);
-
-              case 24:
-                return _context.finish(15);
-
-              case 25:
-                nextTick(function () {
-                  return onLoadEnd ? onLoadEnd().then(function () {
-                    return setInitStatus(true);
-                  }) : setInitStatus(true);
-                });
-
-              case 26:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, null, [[0, 12, 15, 25], [16,, 20, 24]]);
-      }));
+    runAsyncIterable(createAsyncIterable(options), function (option) {
+      return console.debug('LoaderScript -> Iterable加载完成！', option);
+    }, function () {
+      return onLoadEnd ? onLoadEnd().then(function () {
+        return setInitStatus(true);
+      }) : setInitStatus(true);
     });
   }, [options]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, !initStatus ? Spin : children);

package/es/LoaderScript/utils.d.ts

@@ -10,3 +10,5 @@ export declare function createAsyncIterable(options: IOptionsLoader[]): {
         }>;
     };
 };
+export declare function tryCatch(resolveFn: () => Promise<any>, rejectFn?: (e: unknown) => void): Promise<void>;
+export declare function runAsyncIterable(Iterables: any, runtime?: (conf: any) => void, callback?: () => void): void;

package/es/LoaderScript/utils.js

@@ -1,3 +1,5 @@
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -12,7 +14,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-import { __awaiter } from "tslib";
+import { __asyncValues, __awaiter } from "tslib";
 var global = window;
 
 if (!global._LOADER_SCRIPT_URL) {
@@ -130,4 +132,116 @@ export function createAsyncIterable(options) {
       }
     };
   });
+}
+export function tryCatch(resolveFn) {
+  var rejectFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : console.error;
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
+            _context2.next = 3;
+            return resolveFn();
+
+          case 3:
+            _context2.next = 8;
+            break;
+
+          case 5:
+            _context2.prev = 5;
+            _context2.t0 = _context2["catch"](0);
+            rejectFn(_context2.t0);
+
+          case 8:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2, null, [[0, 5]]);
+  }));
+}
+export function runAsyncIterable(Iterables, runtime, callback) {
+  var _this = this;
+
+  tryCatch(function () {
+    return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+      var e_1, _a, Iterables_1, Iterables_1_1, x;
+
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) {
+          switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.prev = 0;
+              Iterables_1 = __asyncValues(Iterables);
+
+            case 2:
+              _context3.next = 4;
+              return Iterables_1.next();
+
+            case 4:
+              Iterables_1_1 = _context3.sent;
+
+              if (Iterables_1_1.done) {
+                _context3.next = 10;
+                break;
+              }
+
+              x = Iterables_1_1.value;
+              runtime && runtime(Iterables[x]);
+
+            case 8:
+              _context3.next = 2;
+              break;
+
+            case 10:
+              _context3.next = 15;
+              break;
+
+            case 12:
+              _context3.prev = 12;
+              _context3.t0 = _context3["catch"](0);
+              e_1 = {
+                error: _context3.t0
+              };
+
+            case 15:
+              _context3.prev = 15;
+              _context3.prev = 16;
+
+              if (!(Iterables_1_1 && !Iterables_1_1.done && (_a = Iterables_1.return))) {
+                _context3.next = 20;
+                break;
+              }
+
+              _context3.next = 20;
+              return _a.call(Iterables_1);
+
+            case 20:
+              _context3.prev = 20;
+
+              if (!e_1) {
+                _context3.next = 23;
+                break;
+              }
+
+              throw e_1.error;
+
+            case 23:
+              return _context3.finish(20);
+
+            case 24:
+              return _context3.finish(15);
+
+            case 25:
+              callback && _nextTick(callback);
+
+            case 26:
+            case "end":
+              return _context3.stop();
+          }
+        }
+      }, _callee3, null, [[0, 12, 15, 25], [16,, 20, 24]]);
+    }));
+  });
 }

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.0.0-alpha.17",
+  "version": "2.0.0-alpha.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",