@ray-js/builder-mp 0.20.0-beta.0 → 0.20.0-beta.2

package/lib/build.js

@@ -17,7 +17,7 @@ const shared_1 = require("@ray-js/shared");
 const legacyExport_1 = require("@ray-core/cli/lib/legacyExport");
 const package_json_1 = __importDefault(require("@ray-core/cli/package.json"));
 const builder_1 = require("./builder");
-const build_rjs_1 = __importDefault(require("./build.rjs"));
+const builder_rjs_1 = __importDefault(require("./builder.rjs"));
 const ray_core_1 = require("./ray-core");
 colors_1.default.enable();
 const LOG_PREFIX = 'builder-mp';
@@ -32,26 +32,19 @@ const defaultCompileOptions = {
     devtools: false,
     debug: false,
     output: 'dist',
-    blended: false,
 };
 function build(options, context) {
     return __awaiter(this, void 0, void 0, function* () {
         const { api } = context;
-        const cfgFromRayConfigFile = Object.keys(defaultCompileOptions).reduce((o, k) => {
-            if (k in api.config) {
-                o[k] = api.config[k];
-            }
-            return o;
-        }, {});
-        let compileOptions = Object.assign({}, defaultCompileOptions, cfgFromRayConfigFile, options);
-        const { cwd, target, output, devtools } = compileOptions;
+        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)([output, dist], { cwd });
+        const outputPath = (0, shared_1.resolvePath)(typeof onTargetDir === 'function' ? [onTargetDir(output, dist)] : [output, dist], { cwd });
         // 上下文共享 options
         builder_1.builder.api = api;
         builder_1.builder.options = compileOptions = Object.assign({}, compileOptions, { output: outputPath });
@@ -62,11 +55,11 @@ function build(options, context) {
         if (devtools) {
             shared_1.log.info(LOG_PREFIX, '开启 devtools 开发者工具环境变量'.yellow, devtools);
         }
-        const rayCoreOpts = (0, ray_core_1.getRayCoreOptions)(build_rjs_1.default);
+        const rayCoreOpts = (0, ray_core_1.getRayCoreOptions)();
         const rayApi = new ray_core_1.RayAPI(rayCoreOpts);
         // 编译除rjs模块外的小程序模块
         const compiler = (0, legacyExport_1.buildMini)(rayApi, rayCoreOpts);
-        build_rjs_1.default.init(compiler, compileOptions); // TODO rjs 可用动态虚拟模块实现单webpack编译
+        builder_rjs_1.default.init(compiler, compileOptions); // TODO rjs 可用动态虚拟模块实现单webpack编译
         return compiler;
     });
 }

package/lib/plugins/rjs.d.ts

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

package/lib/plugins/rjs.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const builder_rjs_1 = __importDefault(require("../builder.rjs"));
+exports.default = {
+    configWebpack({ config }) {
+        builder_rjs_1.default.config(config);
+    },
+};

package/lib/ray-core.d.ts

@@ -1,7 +1,6 @@
 import type { Options, Platform } from '@ray-core/types';
 import RayCoreAPI from '@ray-core/cli/lib/API';
-import type { RjsBuilder } from './build.rjs';
-export declare function getRayCoreOptions(rjsBuilder: RjsBuilder): Options;
+export declare function getRayCoreOptions(): Options;
 export declare class RayAPI extends RayCoreAPI {
     constructor(opts: Options);
     registerAdapterPlugins(target: Platform): void;

package/lib/ray-core.js

@@ -19,10 +19,12 @@ const path_1 = __importDefault(require("path"));
 const legacyExport_1 = require("@ray-core/cli/lib/legacyExport");
 const API_1 = __importDefault(require("@ray-core/cli/lib/API"));
 const build_store_1 = __importDefault(require("@ray-core/build-store"));
+const BlendedApp_1 = __importDefault(require("@ray-core/cli/lib/plugins/BlendedApp"));
 const resolve_alias_1 = __importDefault(require("./plugins/resolve-alias"));
 const app_entry_1 = __importDefault(require("./plugins/app-entry"));
 const less_1 = __importDefault(require("./plugins/less"));
 const resolve_legacy_1 = __importDefault(require("./plugins/resolve-legacy"));
+const rjs_1 = __importDefault(require("./plugins/rjs"));
 const builder_1 = require("./builder");
 const _a = (0, legacyExport_1.getDefaultOptions)(), { UNSAFE_wechatTemplateDepth } = _a, remaxDefaultOptions = __rest(_a, ["UNSAFE_wechatTemplateDepth"]);
 const isThing = process.env.PLATFORM === 'thing';
@@ -41,17 +43,15 @@ const defaultTemplateDepth = isThing
         'navigation-bar': -1,
     }
     : {};
-const innerPlugins = [resolve_legacy_1.default, app_entry_1.default, less_1.default, resolve_alias_1.default];
-function getRayCoreOptions(rjsBuilder) {
+const innerPlugins = [resolve_legacy_1.default, app_entry_1.default, less_1.default, resolve_alias_1.default, rjs_1.default];
+function getRayCoreOptions() {
     const { cwd, source, watch, target, mini, analyze, output, blended } = builder_1.builder.options;
+    if (blended) {
+        innerPlugins.push(BlendedApp_1.default);
+    }
     const api = builder_1.builder.api;
-    const injectWebpackConfigToRjs = {
-        configWebpack({ config }) {
-            rjsBuilder.config(config);
-        },
-    };
     // @ts-ignore
-    const plugins = innerPlugins.concat(api.plugins, injectWebpackConfigToRjs);
+    const plugins = innerPlugins.concat(api.plugins);
     const remaxBuildConfig = Object.assign(Object.assign({}, remaxDefaultOptions), { UNSAFE_wechatTemplateDepth: Object.assign(UNSAFE_wechatTemplateDepth, defaultTemplateDepth), compressTemplate: mini, pxToRpx: false, minimize: mini, analyze,
         cwd, loglevel: 'warn', rootDir: source, target, output: path_1.default.relative(cwd, output), watch,
         plugins,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "0.20.0-beta.0",
+  "version": "0.20.0-beta.2",
   "description": "Ray builder for mini program",
   "keywords": [
     "ray"
@@ -24,14 +24,14 @@
     "@babel/template": "^7.16.0",
     "@babel/traverse": "^7.16.3",
     "@babel/types": "^7.16.0",
-    "@ray-core/babel-preset-remax": "^0.2.0-beta.3",
-    "@ray-core/build-store": "^0.2.0-beta.3",
-    "@ray-core/cli": "^0.2.0-beta.3",
-    "@ray-core/ray": "^0.2.0-beta.3",
-    "@ray-js/adapter": "^0.20.0-beta.0",
+    "@ray-core/babel-preset-remax": "^0.2.0-beta.7",
+    "@ray-core/build-store": "^0.2.0-beta.7",
+    "@ray-core/cli": "^0.2.0-beta.7",
+    "@ray-core/ray": "^0.2.0-beta.7",
+    "@ray-js/adapter": "^0.20.0-beta.2",
     "@ray-js/rjs-for-wechat": "^0.0.3",
-    "@ray-js/shared": "^0.20.0-beta.0",
-    "@ray-js/types": "^0.20.0-beta.0",
+    "@ray-js/shared": "^0.20.0-beta.2",
+    "@ray-js/types": "^0.20.0-beta.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 +48,7 @@
     "webpack-virtual-modules": "^0.4.4"
   },
   "devDependencies": {
-    "@ray-core/types": "^0.2.0-beta.3",
+    "@ray-core/types": "^0.2.0-beta.7",
     "@types/jest": "^27.0.2",
     "@types/node": "^16.9.1",
     "babel-plugin-tester": "^10.1.0",
@@ -62,6 +62,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "5f36d50a16fb4a25a16b04d35b211af44b677dce",
+  "gitHead": "67aa3b9aa0a8113c3965772893bdd76ed3a243bf",
   "repository": {}
 }