@ray-js/build-plugin-router 0.6.30 → 0.6.32-beta-1

package/lib/index.js

@@ -227,20 +227,21 @@ function PluginRouter(api) {
          * @param globalConfig - 已存在的应用配置
          */
         getStandardAppConfigData(routesConfig, globalConfig) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d;
             const { target } = api.options;
             const g = target === 'thing'
                 ? (_b = (_a = globalConfig['thing']) !== null && _a !== void 0 ? _a : globalConfig['tuya']) !== null && _b !== void 0 ? _b : {} // 因历史原因，需要兼容老项目的老配置，老项目中都是 tuya
                 : (_c = globalConfig[target]) !== null && _c !== void 0 ? _c : {};
-            const routes = ((_d = routesConfig.routes) !== null && _d !== void 0 ? _d : []).map((item) => {
+            const { routes = [], subpackages, subPackages, tabBar: _tabBar } = routesConfig, otherConfig = __rest(routesConfig, ["routes", "subpackages", "subPackages", "tabBar"]);
+            const _routes = routes.map((item) => {
                 var _a;
                 item.route = (_a = item.route) !== null && _a !== void 0 ? _a : item.path;
                 return item;
             });
-            const subPkgs = (_f = (_e = routesConfig.subPackages) !== null && _e !== void 0 ? _e : routesConfig.subpackages) !== null && _f !== void 0 ? _f : [];
-            const pages = lodash_1.default.uniq(routes.map((r) => r.path.replace(/^\//, '')));
-            const tabBar = normalizeTabBarConfig(routesConfig.tabBar, routes, standardAppConfigFieldMap);
-            const config = Object.assign(Object.assign({}, g), { pages, tabBar });
+            const subPkgs = (_d = subPackages !== null && subPackages !== void 0 ? subPackages : subpackages) !== null && _d !== void 0 ? _d : [];
+            const pages = lodash_1.default.uniq(_routes.map((r) => r.path.replace(/^\//, '')));
+            const tabBar = normalizeTabBarConfig(_tabBar, _routes, standardAppConfigFieldMap);
+            const config = Object.assign(Object.assign(Object.assign({}, g), otherConfig), { pages, tabBar });
             if (subPkgs && subPkgs.length) {
                 config.subpackages = subPkgs.map((pkg) => {
                     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/build-plugin-router",
-  "version": "0.6.30",
+  "version": "0.6.32-beta-1",
   "description": "Ray build plugin for router",
   "keywords": [
     "ray"
@@ -21,7 +21,7 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/shared": "^0.6.30",
+    "@ray-js/shared": "^0.6.32-beta-1",
     "chokidar": "^3.5.2",
     "colors": "1.4.0",
     "ejs": "^3.1.6",
@@ -30,7 +30,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@ray-js/types": "^0.6.30"
+    "@ray-js/types": "^0.6.32-beta-1"
   },
   "maintainers": [
     {
@@ -38,6 +38,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "03e187194ad2bf41d20b7796d67e12bf77ba9c7f",
+  "gitHead": "c9caf2f1a430648e4fa0ee1cdf85b6067b780d8c",
   "repository": {}
 }