@ray-js/builder-mp 1.3.0-beta.2-beta-2 → 1.3.0

package/lib/build.js

@@ -22,50 +22,25 @@ const build_rjs_1 = __importDefault(require("./build.rjs"));
 const build_worker_1 = __importDefault(require("./build.worker"));
 colors_1.default.enable();
 const LOG_PREFIX = 'builder-mp';
-const defaultCompileOptions = {
-    cwd: process.cwd(),
-    source: 'src',
-    mode: 'development',
-    watch: false,
-    target: 'wechat',
-    mini: false,
-    analyze: false,
-    devtools: false,
-    debug: false,
-    output: 'dist',
-};
 function build(options, context) {
     return __awaiter(this, void 0, void 0, function* () {
         const { api } = context;
-        let compileOptions = Object.assign({}, defaultCompileOptions, api.config, options);
-        const { cwd, target, output, devtools, onTargetDir } = compileOptions;
-        /**
-         * 又是历史原因
-         * 因老项目生成的产物目录是tuya，所以就干脆是tuya，不然会出现既 tuya 又 thing 的目录
-         * 将开发整懵逼
-         */
-        const dist = target === 'thing' ? 'tuya' : target;
-        const outputPath = (0, shared_1.resolvePath)(typeof onTargetDir === 'function' ? [onTargetDir(output, dist)] : [output, dist], { cwd });
+        const { cwd, target, output, devtools } = options;
         // 上下文共享 options
         builder_1.builder.api = api;
-        builder_1.builder.options = compileOptions = Object.assign({}, compileOptions, { output: outputPath });
-        shared_1.log.verbose(LOG_PREFIX, `compileOptions:`, compileOptions);
+        builder_1.builder.options = options;
         shared_1.log.info(LOG_PREFIX, '@ray-core/cli:'.green, `v${package_json_1.default.version}`);
         shared_1.log.info(LOG_PREFIX, 'cwd:'.green, cwd.underline);
-        shared_1.log.info(LOG_PREFIX, 'outputDir:'.green, outputPath.underline);
+        shared_1.log.info(LOG_PREFIX, 'outputDir:'.green, output.underline);
         if (devtools) {
             shared_1.log.info(LOG_PREFIX, '开启 devtools 开发者工具环境变量'.yellow, devtools);
         }
         const rayCoreOpts = (0, ray_core_1.getRayCoreOptions)();
         const rayApi = new ray_core_1.RayAPI(rayCoreOpts);
         const compiler = (0, legacyExport_1.buildMini)(rayApi, rayCoreOpts);
-        const workerBuild = new build_worker_1.default(compileOptions, compiler);
-        workerBuild.run();
+        new build_worker_1.default(options, compiler);
         if (target === 'thing') {
-            const rjsBuild = new build_rjs_1.default(compileOptions, compiler);
-            compiler.hooks.afterCompile.tap(LOG_PREFIX, () => {
-                rjsBuild.run();
-            });
+            new build_rjs_1.default(options, compiler);
         }
         return compiler;
     });

package/lib/build.rjs.js

@@ -21,6 +21,7 @@ class RjsBuild {
         this.options = options;
         this.parent = parent;
         this.initRjsBuilder();
+        this.run();
     }
     createWebpackConfig() {
         const { cwd, output, mini, target } = this.options;
@@ -136,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.js

@@ -21,6 +21,7 @@ class WorkerBuild {
         this.options = options;
         this.parent = parent;
         this.initWorkerBuilder();
+        this.run();
     }
     createWebpackConfig() {
         const { cwd, output, mini, target } = this.options;
@@ -166,7 +167,9 @@ class WorkerBuild {
             });
         }
         else {
-            this.compiler.run(cb);
+            this.parent.hooks.afterCompile.tap(LOG_PREFIX_WORKER, () => {
+                this.compiler.run(cb);
+            });
         }
         return this.compiler;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "1.3.0-beta.2-beta-2",
+  "version": "1.3.0",
   "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.2.6",
-    "@ray-core/build-store": "^0.2.6",
-    "@ray-core/cli": "^0.2.6",
-    "@ray-core/ray": "^0.2.6",
-    "@ray-js/adapter": "^1.3.0-beta.2-beta-2",
+    "@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.0",
     "@ray-js/rjs-for-wechat": "^0.0.3",
-    "@ray-js/shared": "^1.3.0-beta.2-beta-2",
-    "@ray-js/types": "^1.3.0-beta.2-beta-2",
+    "@ray-js/shared": "^1.3.0",
+    "@ray-js/types": "^1.3.0",
     "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.2.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": "067ce2e382196cd995ebc4774fc5e977ac21115c",
+  "gitHead": "f7f96c375a429a2fa94452b0a9af3f841572921a",
   "repository": {}
 }