Refact dependencies of doric

doric-cli/assets-lib/example/package.json

@@ -12,11 +12,19 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "reflect-metadata": "^0.1.13",
     "rollup": "^2.24.0",
     "typescript": "^4.2.2",
     "__$__": "file:../"
   },
+  "devDependencies": {
+    "typescript": "^4.2.2",
+    "rollup": "^2.24.0",
+    "@rollup/plugin-buble": "^0.21.3",
+    "@rollup/plugin-commonjs": "^14.0.0",
+    "@rollup/plugin-image": "^2.0.5",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^8.4.0"
+  },
   "optionalDependencies": {
     "ios-deploy": "^1.11.4"
   }

doric-cli/assets-lib/package.json

@@ -13,12 +13,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "doric": ">=__$Version__",
-    "doric-cli": ">=__$Version__",
+    "doric-cli": ">=__$Version__"
-    "reflect-metadata": "^0.1.13",
-    "rollup": "^2.24.0",
-    "typescript": "^4.2.2"
   },
   "devDependencies": {
+    "typescript": "^4.2.2",
+    "rollup": "^2.24.0",
     "@rollup/plugin-buble": "^0.21.3",
     "@rollup/plugin-commonjs": "^14.0.0",
     "@rollup/plugin-image": "^2.0.5",

doric-cli/assets/_package.json

@@ -13,12 +13,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "doric": "__$Version__",
-    "doric-cli": "__$Version__",
+    "doric-cli": "__$Version__"
-    "reflect-metadata": "^0.1.13",
-    "rollup": "^2.24.0",
-    "typescript": "^4.2.2"
   },
   "devDependencies": {
+    "typescript": "^4.2.2",
+    "rollup": "^2.40.0",
     "@rollup/plugin-buble": "^0.21.3",
     "@rollup/plugin-commonjs": "^14.0.0",
     "@rollup/plugin-image": "^2.0.5",

doric-cli/package.json

@@ -33,10 +33,9 @@
     "inquirer": "^8.0.0",
     "keypress": "^0.2.1",
     "qrcode-terminal": "^0.12.0",
-    "rollup": "^2.24.0",
+    "rollup": "^2.40.0",
     "shelljs": "^0.8.4",
     "source-map-merger": "^0.2.0",
-    "typescript": "^4.2.2",
     "ws": "^7.4.3",
     "xml-js": "^1.6.11"
   },
@@ -44,6 +43,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
+    "typescript": "^4.2.2",
     "@types/glob": "^7.1.3",
     "@types/inquirer": "^7.3.1",
     "@types/node": "^14.14.25",

doric-demo/package.json

@@ -11,13 +11,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "doric": "file:../doric-js",
-    "doric-cli": "file:../doric-cli",
+    "doric-cli": "file:../doric-cli"
-    "reflect-metadata": "^0.1.13",
-    "rollup": "^2.24.0",
-    "tslib": "^2.1.0",
-    "typescript": "^4.2.2"
   },
   "devDependencies": {
+    "typescript": "^4.2.2",
+    "rollup": "^2.40.0",
     "@rollup/plugin-buble": "^0.21.3",
     "@rollup/plugin-commonjs": "^14.0.0",
     "@rollup/plugin-image": "^2.0.5",

doric-js/bundle/doric-lib.es5.js

@@ -1115,10 +1115,14 @@ var __read$2 = (undefined && undefined.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray$2 = (undefined && undefined.__spreadArray) || function (to, from) {
+var __spreadArray$2 = (undefined && undefined.__spreadArray) || function (to, from, pack) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+    if (pack || arguments.length === 2) { for (var i = 0, l = from.length, ar; i < l; i++) {
-        { to[j] = from[i]; }
+        if (ar || !(i in from)) {
-    return to;
+            if (!ar) { ar = Array.prototype.slice.call(from, 0, i); }
+            ar[i] = from[i];
+        }
+    } }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 function NativeCall(target, propertyKey, descriptor) {
     var originVal = descriptor.value;
@@ -1263,7 +1267,7 @@ var Panel = /** @class */ (function () {
         return this.renderSnapshots.length;
     };
     Panel.prototype.__restoreRenderSnapshot__ = function (idx) {
-        return __spreadArray$2([], __read$2(this.renderSnapshots)).slice(0, idx);
+        return __spreadArray$2([], __read$2(this.renderSnapshots), false).slice(0, idx);
     };
     Panel.prototype.__enableSnapshot__ = function () {
         this.snapshotEnabled = true;
@@ -2391,10 +2395,14 @@ var __read$1 = (undefined && undefined.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray$1 = (undefined && undefined.__spreadArray) || function (to, from) {
+var __spreadArray$1 = (undefined && undefined.__spreadArray) || function (to, from, pack) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+    if (pack || arguments.length === 2) { for (var i = 0, l = from.length, ar; i < l; i++) {
-        { to[j] = from[i]; }
+        if (ar || !(i in from)) {
-    return to;
+            if (!ar) { ar = Array.prototype.slice.call(from, 0, i); }
+            ar[i] = from[i];
+        }
+    } }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var ListItem = /** @class */ (function (_super) {
     __extends$c(ListItem, _super);
@@ -2421,7 +2429,7 @@ var List = /** @class */ (function (_super) {
         return _this;
     }
     List.prototype.allSubviews = function () {
-        var ret = __spreadArray$1([], __read$1(this.cachedViews.values()));
+        var ret = __spreadArray$1([], __read$1(this.cachedViews.values()), false);
         if (this.loadMoreView) {
             ret.push(this.loadMoreView);
         }
@@ -3006,10 +3014,14 @@ var __read = (undefined && undefined.__read) || function (o, n) {
     }
     return ar;
 };
-var __spreadArray = (undefined && undefined.__spreadArray) || function (to, from) {
+var __spreadArray = (undefined && undefined.__spreadArray) || function (to, from, pack) {
-    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+    if (pack || arguments.length === 2) { for (var i = 0, l = from.length, ar; i < l; i++) {
-        { to[j] = from[i]; }
+        if (ar || !(i in from)) {
-    return to;
+            if (!ar) { ar = Array.prototype.slice.call(from, 0, i); }
+            ar[i] = from[i];
+        }
+    } }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 var FlowLayoutItem = /** @class */ (function (_super) {
     __extends$7(FlowLayoutItem, _super);
@@ -3037,7 +3049,7 @@ var FlowLayout = /** @class */ (function (_super) {
         return _this;
     }
     FlowLayout.prototype.allSubviews = function () {
-        var ret = __spreadArray([], __read(this.cachedViews.values()));
+        var ret = __spreadArray([], __read(this.cachedViews.values()), false);
         if (this.loadMoreView) {
             ret.push(this.loadMoreView);
         }
@@ -3671,7 +3683,8 @@ function navigator(context) {
                 config.extra = JSON.stringify(config.extra);
             }
             return context.callNative(moduleName, 'push', {
-                source: source, config: config
+                source: source,
+                config: config
             });
         },
         pop: function (animated) {

doric-js/bundle/doric-sandbox.js

@@ -1565,4 +1565,4 @@ var doric = (function (exports) {
 
     return exports;
 
-}({}));
+})({});

doric-js/bundle/doric-vm.js

@@ -4913,7 +4913,7 @@ function initNativeEnvironment(source) {
     return __awaiter(this, void 0, void 0, function* () {
         // dev kit client
         return new Promise((resolve, reject) => {
-            const ws = new WebSocket__default['default']('ws://localhost:7777')
+            const ws = new WebSocket__default["default"]('ws://localhost:7777')
                 .on('open', () => {
                 console.log('Connectted Devkit on port', '7777');
                 ws.send(JSON.stringify({
@@ -5049,7 +5049,7 @@ global$1.Entry = function () {
             Reflect.apply(jsObtainEntry(contextId), doric, args);
         });
         if (entryHooks.length <= 1) {
-            const source = path__default['default'].basename(jsFile);
+            const source = path__default["default"].basename(jsFile);
             console.log(`Debugging ${source}`);
             initNativeEnvironment(source).then(ret => {
                 contextId = ret;

doric-js/package.json

@@ -23,11 +23,6 @@
   },
   "homepage": "https://github.com/doric-pub/doric#readme",
   "dependencies": {
-    "@types/ws": "^7.2.6",
-    "core-js": "^3.9.1",
-    "proxy-polyfill": "^0.3.2",
-    "reflect-metadata": "^0.1.13",
-    "rollup": "^2.40.0",
     "typescript": "^4.2.2",
     "ws": "^7.4.3"
   },
@@ -35,6 +30,11 @@
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
+    "@types/ws": "^7.2.6",
+    "core-js": "^3.9.1",
+    "proxy-polyfill": "^0.3.2",
+    "reflect-metadata": "^0.1.13",
+    "rollup": "^2.40.0",
     "dts-bundle": "^0.7.3",
     "@rollup/plugin-buble": "^0.21.3",
     "@rollup/plugin-commonjs": "^14.0.0",

doric-web/dist/index.js

@@ -1567,7 +1567,7 @@ var doric = (function (exports) {
 
     return exports;
 
-}({}));
+})({});
 
 /**--------SandBox--------*/
 

doric-web/package.json

@@ -19,19 +19,22 @@
   },
   "homepage": "https://github.com/doric-pub/doric#readme",
   "dependencies": {
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^8.4.0",
     "axios": ">=0.21.1",
-    "doric": "file:../doric-js",
+    "smoothscroll-polyfill": "^0.4.4"
-    "rollup": "^2.24.0",
-    "smoothscroll-polyfill": "^0.4.4",
-    "typescript": "^4.2.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "peerDependencies": {
+    "doric": ">=0.9.0"
+  },
   "devDependencies": {
-    "@types/smoothscroll-polyfill": "^0.3.1"
+    "typescript": "^4.2.2",
+    "rollup": "^2.24.0",
+    "doric": "file:../doric-js",
+    "@types/smoothscroll-polyfill": "^0.3.1",
+    "@rollup/plugin-commonjs": "^14.0.0",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^8.4.0"
   }
 }