@ray-js/build-plugin-router 1.3.1 → 1.3.3

package/lib/index.js

@@ -169,6 +169,7 @@ function PluginRouter(api) {
     let cacheThemeLocation = {};
     let timerId;
     let themeLocation;
+    const { source } = api.options;
     const plugin = {
         name: '@ray-js/build-plugin-router',
         setup() {
@@ -177,10 +178,10 @@ function PluginRouter(api) {
             if (api.options.watch) {
                 chokidar_1.default
                     .watch(['**/*.config.ts', '**/*.config.js', '!app.config.{js,ts}'], {
-                    cwd: path_1.default.join(api.options.cwd, api.options.source),
+                    cwd: path_1.default.join(api.options.cwd, source),
                 })
                     .on('change', (file) => {
-                    const filePath = path_1.default.join(api.options.cwd, api.options.source, file);
+                    const filePath = path_1.default.join(api.options.cwd, source, file);
                     // 配置文件引用存在 cache
                     delete require.cache[require.resolve(filePath)];
                     // FIXME: 引用文件变更也需要重新构建
@@ -189,11 +190,11 @@ function PluginRouter(api) {
             }
         },
         readConfigFromConfigFile() {
-            const routesConfigFile = api.searchJSFile('src/routes.config');
+            const routesConfigFile = api.searchJSFile(`${source}/routes.config`);
             if (!routesConfigFile) {
                 throw new Error(`missing configuration file (routes.config.{ts|js})`);
             }
-            const globalConfigFile = api.searchJSFile('src/global.config');
+            const globalConfigFile = api.searchJSFile(`${source}/global.config`);
             const routesConfig = api.requireJSFile(routesConfigFile);
             const globalConfig = globalConfigFile ? api.requireJSFile(globalConfigFile, '*') : {};
             return { routesConfig, globalConfig };
@@ -245,13 +246,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) => {
@@ -275,8 +282,8 @@ function PluginRouter(api) {
             }
             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`);
+            api.writeFile(`${source}/app.config.ts`, context);
+            shared_1.log.verbose(LOG_PREFIX, `generate`, `${source}/app.config.ts`.underline.green, `for wechat platform`);
         },
     };
     // todo theme 逻辑不应该在这个文件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/build-plugin-router",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "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",
+    "@ray-js/shared": "^1.3.3",
     "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"
+    "@ray-js/types": "^1.3.3"
   },
   "maintainers": [
     {
@@ -38,6 +38,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "4844c0f03bb434999b2e93196dba1cd53b9b6c56",
+  "gitHead": "78ca2269ac5efb52e102029258aab74c0a700c68",
   "repository": {}
 }