@ray-js/build-plugin-router 1.3.1-beta.7 → 1.3.2

package/lib/index.js

@@ -23,6 +23,7 @@ const ejs_1 = __importDefault(require("ejs"));
 const shared_1 = require("@ray-js/shared");
 const url_1 = __importDefault(require("url"));
 const path_to_regexp_1 = require("path-to-regexp");
+const theme_1 = __importDefault(require("./theme"));
 function ejsRender(file, data, options) {
     const str = fs_extra_1.default.readFileSync(file).toString();
     return ejs_1.default.render(str, data, Object.assign(Object.assign({}, options), { async: false }));
@@ -167,7 +168,8 @@ function normalizeTabBarConfig(config, routes, fields) {
 function PluginRouter(api) {
     let cacheThemeLocation = {};
     let timerId;
-    return {
+    let themeLocation;
+    const plugin = {
         name: '@ray-js/build-plugin-router',
         setup() {
             shared_1.log.verbose(LOG_PREFIX, 'setup');
@@ -200,14 +202,16 @@ function PluginRouter(api) {
             clearTimeout(timerId);
             const { routesConfig, globalConfig } = this.readConfigFromConfigFile();
             // target 在入口处已经统一处理，tuya 会转成 thing
-            const { target } = api.options;
+            const { target, watch } = api.options;
             // 不是这两端的，其他的默认为web端，tuya thing 其实为同一个端，统一成 thing
             if (!['wechat', 'thing'].includes(target)) {
                 // web端逻辑已经移到 @ray-js/builder-web
                 return;
             }
             const appConfig = this.getStandardAppConfigData(routesConfig, globalConfig);
-            this.generateThemeConfig(appConfig);
+            themeLocation = appConfig.themeLocation;
+            if (watch)
+                generateThemeConfig();
             // FIX: 修复初始化时找不到配置文件
             // 初始化时，需要立即生成配置文件
             if (immediate) {
@@ -241,13 +245,19 @@ function PluginRouter(api) {
             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);
-            let workers = otherConfig.workers;
-            if (workers && typeof workers !== 'string') {
-                workers = workers.root;
-            }
+            const { workers = [], root: workerRoot } = otherConfig.workers || {};
             const config = Object.assign(Object.assign(Object.assign({}, g), otherConfig), { pages, tabBar });
-            if (workers) {
-                config.workers = workers;
+            if (workerRoot) {
+                config.workers =
+                    target !== 'thing'
+                        ? workerRoot
+                        : workers.map((w) => {
+                            const ext = path_1.default.extname(w);
+                            if (ext) {
+                                w = w.replace(new RegExp(`${ext}$`), '');
+                            }
+                            return `${workerRoot}/${w}.js`;
+                        });
             }
             if (subPkgs && subPkgs.length) {
                 config.subpackages = subPkgs.map((pkg) => {
@@ -266,59 +276,66 @@ function PluginRouter(api) {
          * @param data
          */
         generateAppConfig(target, data) {
+            if (themeLocation) {
+                data.themeLocation = themeLocation.replace(/(?:\.{1,2}\/)*/, '');
+            }
             const templateFile = path_1.default.join(__dirname, '../templates/app.config.ejs');
             const context = ejsRender(templateFile, { appConfig: { [target]: data } });
             api.writeFile('src/app.config.ts', context);
             shared_1.log.verbose(LOG_PREFIX, `generate`, 'src/app.config.ts'.underline.green, `for wechat platform`);
         },
-        // todo theme 逻辑不应该在这个文件
-        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();
-                // only watch
-                if (api.options.watch) {
-                    fs_extra_1.default.watchFile(src, handle);
-                }
-            }
-            function handle() {
-                // eslint-disable-next-line prefer-const
-                let { cwd, target } = api.options;
-                // TODO 这里待优化
-                if (target === 'thing') {
-                    /**
-                     * 又是历史原因
-                     * 因老项目生成的产物目录是tuya，所以就干脆是tuya，不然会出现既 tuya 又 thing 的目录
-                     * 将开发整懵逼
-                     */
-                    // @ts-ignore
-                    target = 'tuya';
-                }
-                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.outputFileSync(output, data, 'utf-8');
-                cacheThemeLocation.dest = output;
-                cacheThemeLocation.source = src;
+    };
+    // todo theme 逻辑不应该在这个文件
+    function generateThemeConfig() {
+        const src = checkThemeConfig(themeLocation);
+        if (cacheThemeLocation.source && cacheThemeLocation.source !== src) {
+            fs_extra_1.default.unlinkSync(cacheThemeLocation.dest);
+            fs_extra_1.default.unwatchFile(cacheThemeLocation.source);
+            cacheThemeLocation = {};
+        }
+        if (src) {
+            handle();
+            // only watch
+            if (api.options.watch) {
+                fs_extra_1.default.watchFile(src, handle);
             }
-        },
-        checkThemeConfig(src) {
-            if (!src) {
-                return;
+        }
+        function handle() {
+            // eslint-disable-next-line prefer-const
+            let { cwd, target } = api.options;
+            // TODO 这里待优化
+            if (target === 'thing') {
+                /**
+                 * 又是历史原因
+                 * 因老项目生成的产物目录是tuya，所以就干脆是tuya，不然会出现既 tuya 又 thing 的目录
+                 * 将开发整懵逼
+                 */
+                // @ts-ignore
+                target = 'tuya';
             }
-            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;
-                }
+            const themeP = themeLocation.replace(/(?:\.{1,2}\/)*/, '');
+            const output = path_1.default.join(cwd, 'dist', target, themeP);
+            const data = fs_extra_1.default.readFileSync(src).toString('utf-8');
+            fs_extra_1.default.outputFileSync(output, data, 'utf-8');
+            cacheThemeLocation.dest = output;
+            cacheThemeLocation.source = src;
+        }
+    }
+    function 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;
             }
-        },
-    };
+        }
+    }
+    if (!api.options.watch) {
+        plugin.configWebpack = (0, theme_1.default)(generateThemeConfig).configWebpack;
+    }
+    return plugin;
 }
 exports.default = PluginRouter;

package/lib/theme.d.ts

@@ -0,0 +1,6 @@
+declare const _default: (handle: any) => {
+    configWebpack({ config }: {
+        config: any;
+    }): void;
+};
+export default _default;

package/lib/theme.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class OnBuildTheme {
+    constructor(opts) {
+        this.options = opts;
+    }
+    apply(compiler) {
+        const { name, handle } = this.options;
+        compiler.hooks.afterEmit.tap(name, () => {
+            handle === null || handle === void 0 ? void 0 : handle();
+        });
+    }
+}
+exports.default = (handle) => {
+    const n = `build-theme-plugin`;
+    return {
+        configWebpack({ config }) {
+            config.plugin(n).use(OnBuildTheme, [{ name: n, handle }]);
+        },
+    };
+};

package/package.json

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