@ray-js/builder-mp 1.3.1-beta.7 → 1.3.2

package/lib/build.rjs.js

@@ -21,9 +21,7 @@ class RjsBuild {
         this.options = options;
         this.parent = parent;
         this.initRjsBuilder();
-        parent.hooks.afterCompile.tap(LOG_PREFIX_RJS, () => {
-            this.run();
-        });
+        this.run();
     }
     createWebpackConfig() {
         const { cwd, output, mini, target } = this.options;
@@ -139,19 +137,21 @@ class RjsBuild {
     }
     run() {
         const cb = this.runOrWatch();
-        if (this.options.watch) {
-            if (!this.watcher) {
-                this.watcher = this.compiler.watch({}, cb);
+        this.parent.hooks.afterCompile.tap(LOG_PREFIX_RJS, () => {
+            if (this.options.watch) {
+                if (!this.watcher) {
+                    this.watcher = this.compiler.watch({}, cb);
+                }
+                else {
+                    this.watcher.close(() => {
+                        this.watcher = this.compiler.watch({}, cb);
+                    });
+                }
             }
             else {
-                this.watcher.close(() => {
-                    this.watcher = this.compiler.watch({}, cb);
-                });
+                this.compiler.run(cb);
             }
-        }
-        else {
-            this.compiler.run(cb);
-        }
+        });
         return this.compiler;
     }
 }

package/lib/build.worker.d.ts

@@ -8,6 +8,7 @@ declare class WorkerBuild {
     private routesConfigFile;
     constructor(options: CliOptions, parent: webpack.Compiler);
     private createWebpackConfig;
+    private readConfig;
     private initWorkerBuilder;
     private runOrWatch;
     run(): webpack.Compiler;

package/lib/build.worker.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const colors_1 = __importDefault(require("colors"));
 const shared_1 = require("@ray-js/shared");
 const legacyExport_1 = require("@ray-core/cli/lib/legacyExport");
+const slash_1 = __importDefault(require("slash"));
 const builder_1 = require("./builder");
 const onBuildEnd_1 = __importDefault(require("./plugins/onBuildEnd"));
 const utils_1 = require("./utils");
@@ -15,6 +16,7 @@ colors_1.default.enable();
 const extensions = ['.mjs', '.js', '.jsx', '.ts', '.tsx'];
 const moduleMatcher = new RegExp(`(${extensions.join('|')})$`);
 const LOG_PREFIX_WORKER = 'build-worker';
+const BUILD_WORKER_PLUGIN = `${LOG_PREFIX_WORKER}-plugin`;
 const innerPlugins = [(0, onBuildEnd_1.default)(LOG_PREFIX_WORKER)];
 class WorkerBuild {
     constructor(options, parent) {
@@ -47,12 +49,13 @@ class WorkerBuild {
             .options({
             configFile: path_1.default.resolve(__dirname, './babel/configs/babel.config.js'),
         });
+        const { root } = this.readConfig();
         config.output
             .set('filename', '[name].js')
             .set('libraryTarget', 'commonjs2')
             .set('clean', false)
             .set('globalObject', 'worker')
-            .set('path', output)
+            .set('path', root ? path_1.default.join(output, root) : output)
             .set('publicPath', '/')
             .end()
             .optimization.set('runtimeChunk', { name: 'runtime-worker' })
@@ -77,29 +80,39 @@ class WorkerBuild {
                 'process.env.PLATFORM': JSON.stringify(target),
             },
         ])
+            .end()
+            .plugin(BUILD_WORKER_PLUGIN)
+            .use(BuildWorkerPlugin)
             .end()
             .watchOptions({ aggregateTimeout: 1000 });
         innerPlugins.forEach((p) => p.configWebpack({ config }));
         config.resolve.merge(this.parent.options.resolve);
         return config.toConfig();
     }
+    readConfig() {
+        this.routesConfigFile = builder_1.builder.api.searchJSFile('src/routes.config');
+        if (!this.routesConfigFile) {
+            shared_1.log.error(LOG_PREFIX_WORKER, `missing configuration file (routes.config.{ts|js})`);
+            return {};
+        }
+        delete require.cache[this.routesConfigFile];
+        const data = builder_1.builder.api.requireJSFile(this.routesConfigFile).workers || {};
+        const { root } = data;
+        if (!root) {
+            shared_1.log.verbose(LOG_PREFIX_WORKER, `missing prop 'workers' in ${this.routesConfigFile}`);
+            return {};
+        }
+        return data;
+    }
     initWorkerBuilder() {
         const cfg = this.createWebpackConfig();
         cfg.entry = () => {
-            this.routesConfigFile = builder_1.builder.api.searchJSFile('src/routes.config');
-            if (!this.routesConfigFile) {
-                shared_1.log.error(LOG_PREFIX_WORKER, `missing configuration file (routes.config.{ts|js})`);
-                return {};
-            }
-            delete require.cache[this.routesConfigFile];
-            const { root, workers = [] } = builder_1.builder.api.requireJSFile(this.routesConfigFile).workers || {};
-            if (!root) {
-                shared_1.log.verbose(LOG_PREFIX_WORKER, `missing prop 'workers' in ${this.routesConfigFile}`);
-                return {};
-            }
+            const { root, workers = [] } = this.readConfig();
             const entries = workers.reduce((o, k) => {
                 const { source: rootDir, target, cwd } = this.options;
                 const name = path_1.default.join(root, k);
+                const ext = path_1.default.extname(k);
+                const outputName = k.replace(new RegExp(`${ext}$`), '');
                 const f = path_1.default.join(cwd, rootDir, name);
                 const m = (0, utils_1.getModuleOfPlatform)(f, {
                     rootDir,
@@ -108,7 +121,7 @@ class WorkerBuild {
                     extensions: ['ts', 'js', 'tsx', 'jsx'],
                 });
                 if (m) {
-                    o[name] = m[1];
+                    o[outputName] = m[1];
                 }
                 else {
                     shared_1.log.warn(LOG_PREFIX_WORKER, `Can't resolve module ${k} in ${root}`);
@@ -167,9 +180,46 @@ class WorkerBuild {
             });
         }
         else {
-            this.compiler.run(cb);
+            this.parent.hooks.afterCompile.tap(LOG_PREFIX_WORKER, () => {
+                this.compiler.run(cb);
+            });
         }
         return this.compiler;
     }
 }
 exports.default = WorkerBuild;
+const { ConcatSource } = legacyExport_1.customWebpack.sources;
+class BuildWorkerPlugin {
+    apply(compiler) {
+        compiler.hooks.thisCompilation.tap(BUILD_WORKER_PLUGIN, (compilation) => {
+            compilation.hooks.processAssets.tapAsync({
+                name: BUILD_WORKER_PLUGIN,
+                stage: legacyExport_1.customWebpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+            }, (chunks, callback) => {
+                compilation.chunkGroups.forEach((group) => {
+                    group.chunks.reverse().forEach((chunk) => {
+                        this.requireChunks(compilation, chunk, group);
+                    });
+                });
+                callback();
+            });
+        });
+    }
+    requireChunks(compilation, chunk, group) {
+        var _a;
+        // require 相关的 chunk
+        if (chunk.name !== group.name) {
+            const requires = [];
+            const files = Array.from(chunk.files);
+            files.forEach((file) => {
+                if (file.endsWith('.js')) {
+                    const relativePath = (0, slash_1.default)(path_1.default.relative(path_1.default.dirname(group.name), file));
+                    requires.push(`require('./${relativePath}');\n`);
+                }
+            });
+            const assetPath = group.name + '.js';
+            const source = (_a = compilation.assets[assetPath]) !== null && _a !== void 0 ? _a : '';
+            compilation.assets[assetPath] = new ConcatSource(...requires, source);
+        }
+    }
+}

package/lib/plugins/resolve-alias.js

@@ -65,7 +65,9 @@ exports.default = {
             .options({ builder: builder_1.builder })
             .end();
         config.plugin('webpack-define-plugin').tap(([args]) => {
-            return [Object.assign(Object.assign({}, args), { 'process.env.PLATFORM': JSON.stringify(target) })];
+            return [
+                Object.assign(Object.assign({}, args), { 'process.env.PLATFORM': JSON.stringify(target), 'process.env.RAY_DEBUG': JSON.stringify(`${process.env.RAY_DEBUG === 'true'}`) }),
+            ];
         });
         config.resolve.alias.set('@ray-core/ray', path_1.default.dirname(require.resolve('@ray-core/ray/package.json')));
         config.resolve.alias.set('@ray-js/rjs-for-wechat', path_1.default.dirname(require.resolve('@ray-js/rjs-for-wechat/package.json')));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "1.3.1-beta.7",
+  "version": "1.3.2",
   "description": "Ray builder for mini program",
   "keywords": [
     "ray"
@@ -21,17 +21,19 @@
     "test": "jest"
   },
   "dependencies": {
+    "@babel/plugin-proposal-private-methods": "^7.18.6",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/template": "^7.16.0",
     "@babel/traverse": "^7.16.3",
     "@babel/types": "^7.16.0",
-    "@ray-core/babel-preset-remax": "^0.3.0-beta.6",
-    "@ray-core/build-store": "^0.3.0-beta.6",
-    "@ray-core/cli": "^0.3.0-beta.6",
-    "@ray-core/ray": "^0.3.0-beta.6",
-    "@ray-js/adapter": "^1.3.1-beta.7",
+    "@ray-core/babel-preset-remax": "^0.3.0",
+    "@ray-core/build-store": "^0.3.0",
+    "@ray-core/cli": "^0.3.0",
+    "@ray-core/ray": "^0.3.0",
+    "@ray-js/adapter": "^1.3.2",
     "@ray-js/rjs-for-wechat": "^0.0.3",
-    "@ray-js/shared": "^1.3.1-beta.7",
-    "@ray-js/types": "^1.3.1-beta.7",
+    "@ray-js/shared": "^1.3.2",
+    "@ray-js/types": "^1.3.2",
     "babel-loader": "^8.2.3",
     "babel-plugin-minify-dead-code-elimination": "^0.5.1",
     "babel-plugin-transform-prune-unused-imports": "^1.0.1",
@@ -48,7 +50,7 @@
     "webpack-virtual-modules": "^0.4.4"
   },
   "devDependencies": {
-    "@ray-core/types": "^0.3.0-beta.6",
+    "@ray-core/types": "^0.3.0",
     "@types/jest": "^27.0.2",
     "@types/node": "^16.9.1",
     "babel-plugin-tester": "^10.1.0",
@@ -62,6 +64,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "3d68284d96ae18ddf2eaffa46f5d3607a51d60f8",
+  "gitHead": "a6af0026d8770839d9c1209a9e933b23ed77bf4a",
   "repository": {}
 }