@ray-js/build-plugin-router 1.6.24 → 1.6.26

package/lib/index.js

@@ -81,7 +81,7 @@ function normalizeTabBarConfig(config, routes, fields) {
     let { list } = config, rest = __rest(config, ["list"]);
     let cfg;
     if (!lodash_1.default.isArray(list)) {
-        printError(`tabBar.list 数据结构不对`.red);
+        printError(shared_1.i18n.__('tabBarInvalidStructure').red);
         return cfg;
     }
     list = list.map((tab) => {
@@ -107,13 +107,17 @@ function normalizeTabBarConfig(config, routes, fields) {
         var _a;
         const m = routes.find((i) => tab.pagePath === i.path);
         if (!m) {
-            printError(`tabBar.list[${index}].pagePath: ${tab.pagePath} 需要在路由配置中: \n${JSON.stringify(routes, null, 2)}`.red);
+            printError(shared_1.i18n.__('tabBarPagePathNotInRoutes', {
+                index,
+                pagePath: tab.pagePath,
+                routes: JSON.stringify(routes, null, 2),
+            }).red);
             return;
         }
         let pagePath = tab.pagePath.replace(/^\//, '');
         const urlObj = url_1.default.parse(pagePath);
         if (urlObj.hash || urlObj.search) {
-            printError(`tabBar.list[${index}]: ${tab.pagePath} 不能携带参数`.red);
+            printError(shared_1.i18n.__('tabBarNoParams', { index, pagePath: tab.pagePath }).red);
             return;
         }
         pagePath = urlObj.pathname;
@@ -124,7 +128,12 @@ function normalizeTabBarConfig(config, routes, fields) {
         // 判断是否能被路由命中
         const matched = (0, path_to_regexp_1.match)((_a = m.route) !== null && _a !== void 0 ? _a : m.path)(tab.route);
         if (!matched) {
-            printError(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n无法被路由命中: \n${JSON.stringify(m, null, 2)}`.red);
+            printError(shared_1.i18n.__('tabBarRouteNotMatched', {
+                index,
+                route: tab.route,
+                pagePath: tab.pagePath,
+                routeInfo: JSON.stringify(m, null, 2),
+            }).red);
             return;
         }
         // 判断是否还被其他路由命中
@@ -133,12 +142,23 @@ function normalizeTabBarConfig(config, routes, fields) {
             .filter((r) => { var _a; return (0, path_to_regexp_1.match)((_a = r.route) !== null && _a !== void 0 ? _a : r.path)(tab.route); });
         const unusable = otherMatched.filter((r) => r.path !== tab.pagePath);
         if (unusable.length) {
-            printError(`tabBar.list[${index}]\n.route: ${tab.route}\n.pagePath: ${tab.pagePath}\n应被路由命中：\n${JSON.stringify(m, null, 2)}\n但同时又被其它路由命中：\n${JSON.stringify(unusable, null, 2)}`.red);
+            printError(shared_1.i18n.__('tabBarRouteMatchedMultiple', {
+                index,
+                route: tab.route,
+                pagePath: tab.pagePath,
+                matchedRoute: JSON.stringify(m, null, 2),
+                otherRoutes: JSON.stringify(unusable, null, 2),
+            }).red);
             return;
         }
         // tab中配置的页面.route 匹配的页面为模式匹配，需给出告警
         if (!lodash_1.default.isEmpty(matched.params)) {
-            console.warn(LOG_PREFIX, `tabBar.list[${index}].route: ${tab.route} 命中的路由 \n${JSON.stringify(m, null, 2)}.route: ${m.route} 为模式匹配\ntab页不能携带参数`.yellow);
+            console.warn(LOG_PREFIX, shared_1.i18n.__('tabBarPatternMatchWarning', {
+                index,
+                route: tab.route,
+                routeInfo: JSON.stringify(m, null, 2),
+                mRoute: m.route,
+            }).yellow);
         }
         return {
             pagePath,
@@ -149,14 +169,14 @@ function normalizeTabBarConfig(config, routes, fields) {
     })
         .filter((tab) => !!tab);
     if (tabs.length < 2 || tabs.length > 5) {
-        printError(`tabBar.list 最少 2 个、最多 5 个 tab`.red);
+        printError(shared_1.i18n.__('tabBarCountLimit').red);
         return cfg;
     }
     _cfg.list = tabs;
     // 找出 tabBar.list[number].pagePath 重复的配置
     const _list = duplicates(tabs, (a, b) => (a.pagePath > b.pagePath ? 1 : a.pagePath == b.pagePath ? 0 : -1), 'pagePath');
     if (_list.length) {
-        console.error(LOG_PREFIX, `tabBar.list不能有重复的页面: \n${JSON.stringify(_list, null, 2)}`.red);
+        console.error(LOG_PREFIX, shared_1.i18n.__('tabBarDuplicatePages', { duplicates: JSON.stringify(_list, null, 2) }).red);
     }
     cfg = fields.reduce((o, next) => {
         const [src, t] = typeof next === 'string' ? [next] : next;
@@ -194,7 +214,7 @@ function PluginRouter(api) {
         readConfigFromConfigFile() {
             const routesConfigFile = api.searchJSFile(`${source}/routes.config`);
             if (!routesConfigFile) {
-                throw new Error(`missing configuration file (routes.config.{ts|js})`);
+                throw new Error(shared_1.i18n.__('missingConfigFile'));
             }
             const globalConfigFile = api.searchJSFile(`${source}/global.config`);
             const routesConfig = api.requireJSFile(routesConfigFile);
@@ -285,7 +305,7 @@ function PluginRouter(api) {
             const templateFile = path_1.default.join(__dirname, '../templates/app.config.ejs');
             const context = ejsRender(templateFile, { appConfig: { [target]: data } });
             api.writeFile(`${source}/app.config.ts`, context);
-            shared_1.log.verbose(LOG_PREFIX, `generate`, `${source}/app.config.ts`.underline.green, `for wechat platform`);
+            shared_1.log.verbose(LOG_PREFIX, `generate`, `${source}/app.config.ts`.underline.green, shared_1.i18n.__('forWechatPlatform'));
         },
     };
     // todo theme 逻辑不应该在这个文件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/build-plugin-router",
-  "version": "1.6.24",
+  "version": "1.6.26",
   "description": "Ray build plugin for router",
   "keywords": [
     "ray"
@@ -24,7 +24,7 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/shared": "1.6.24",
+    "@ray-js/shared": "1.6.26",
     "chokidar": "^3.6.0",
     "colors": "1.4.0",
     "ejs": "^3.1.10",
@@ -33,11 +33,11 @@
     "url": "^0.11.4"
   },
   "devDependencies": {
-    "@ray-js/types": "1.6.24"
+    "@ray-js/types": "1.6.26"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "9d1aef04d0004295179fb3d9f011b0d3e4018f87"
+  "gitHead": "d842231dd15303495069483a809a71dbc640ebaf"
 }