@ray-js/build-plugin-router 0.5.5 → 0.5.6-beta-1

package/lib/index.js

@@ -7,6 +7,7 @@ const chokidar_1 = __importDefault(require("chokidar"));
 const colors_1 = __importDefault(require("colors"));
 const path_1 = __importDefault(require("path"));
 const lodash_1 = __importDefault(require("lodash"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const plugin_utils_1 = require("@ray-js/plugin-utils");
 const shared_1 = require("@ray-js/shared");
 colors_1.default.enable();
@@ -15,6 +16,7 @@ function normalizeRoute(route) {
     return (0, shared_1.paramCase)(route);
 }
 function PluginRouter(api) {
+    let cacheThemeLocation = {};
     return {
         name: '@ray-js/build-plugin-router',
         setup() {
@@ -35,6 +37,7 @@ function PluginRouter(api) {
             }
         },
         buildRoutesConfig(immediate) {
+            var _a, _b;
             const routesConfigFile = api.searchJSFile('src/routes.config');
             const { target } = api.options;
             if (!routesConfigFile) {
@@ -47,22 +50,23 @@ function PluginRouter(api) {
             if (!['tuya', 'wechat'].includes(target)) {
                 return this.generateWebRoutes(routesConfig);
             }
-            const wechatAppConfig = this.getWechatAppConfigData(routesConfig, globalConfig['wechat'] || {});
-            const tuyaAppConfig = this.getTuyaAppConfigData(routesConfig, globalConfig['tuya'] || {});
+            const _target = lodash_1.default.capitalize(target);
+            const appConfig = (_a = this[`get${_target}AppConfigData`]) === null || _a === void 0 ? void 0 : _a.call(this, routesConfig, (_b = globalConfig[target]) !== null && _b !== void 0 ? _b : {});
+            if (lodash_1.default.isEmpty(appConfig.tabBar)) {
+                delete appConfig.tabBar; // 微信小程序tabBar不能为空对象，所以当为空对象时，索性所有小程序都删了
+            }
+            this.generateThemeConfig(appConfig);
             // FIX: 修复初始化时找不到配置文件
             // 初始化时，需要立即生成配置文件
-            if (lodash_1.default.isEmpty(wechatAppConfig.tabBar)) {
-                delete wechatAppConfig.tabBar;
-            }
             if (immediate) {
-                return this.generateAppConfig({ wechat: wechatAppConfig, tuya: tuyaAppConfig });
+                return this.generateAppConfig({ [target]: appConfig });
             }
             // FIX: 修复间接（更新routes.config.ts）更新app.config.ts文件，无法触发重新编译，导致小程序app.json未更新
             // 原因：/node_modules/@ray-core/cli/lib/build/watch.js 中的变量isRunning为true
             // 在更新routes.config.ts触发的编译未完成，又因间接更新app.config.ts的触发重新编译被remax忽略导致
             // TODO: 此为临时方案，无法确定第一次更新什么时候完成，默认延时1s
             setTimeout(() => {
-                this.generateAppConfig({ wechat: wechatAppConfig, tuya: tuyaAppConfig });
+                this.generateAppConfig({ [target]: appConfig });
             }, 1000);
         },
         /**
@@ -179,6 +183,39 @@ function PluginRouter(api) {
                 return Object.assign(Object.assign({}, route), { config: config });
             });
         },
+        generateThemeConfig(appConfig) {
+            const src = this.checkThemeConfig(appConfig.themeLocation);
+            if (cacheThemeLocation.source && cacheThemeLocation.source !== src) {
+                fs_extra_1.default.unlinkSync(cacheThemeLocation.dest);
+                fs_extra_1.default.unwatchFile(cacheThemeLocation.source);
+                cacheThemeLocation = {};
+            }
+            if (src) {
+                appConfig.themeLocation = path_1.default.basename(src);
+                handle();
+                fs_extra_1.default.watchFile(src, handle);
+            }
+            function handle() {
+                const { cwd, target } = api.options;
+                const output = path_1.default.join(cwd, 'dist', target, path_1.default.basename(src));
+                const data = fs_extra_1.default.readFileSync(src).toString('utf-8');
+                fs_extra_1.default.outputFile(output, data, 'utf-8');
+                cacheThemeLocation.dest = output;
+                cacheThemeLocation.source = src;
+            }
+        },
+        checkThemeConfig(src) {
+            if (!src) {
+                return;
+            }
+            const { cwd, source } = api.options;
+            const inputs = [path_1.default.resolve(cwd, source, src), path_1.default.resolve(cwd, src)];
+            for (const input of inputs) {
+                if (fs_extra_1.default.pathExistsSync(input)) {
+                    return input;
+                }
+            }
+        },
     };
 }
 exports.default = PluginRouter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/build-plugin-router",
-  "version": "0.5.5",
+  "version": "0.5.6-beta-1",
   "description": "Ray build plugin for router",
   "keywords": [
     "ray"
@@ -21,13 +21,13 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/plugin-utils": "^0.5.5",
-    "@ray-js/shared": "^0.5.5",
+    "@ray-js/plugin-utils": "^0.5.6-beta-1",
+    "@ray-js/shared": "^0.5.6-beta-1",
     "chokidar": "^3.5.2",
     "colors": "1.4.0"
   },
   "devDependencies": {
-    "@ray-js/types": "^0.5.5"
+    "@ray-js/types": "^0.5.6-beta-1"
   },
   "maintainers": [
     {
@@ -35,6 +35,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "a8ddeab1f4782e6b3772dc2deeae3e3e3af0de00",
+  "gitHead": "46f291d3c38bb9fa1af739d01f9513c39e3b6be9",
   "repository": {}
 }