@ray-js/builder-mp 0.10.2 → 0.20.0-beta.1

package/lib/babel/plugins/ray-page-context/index.js

@@ -152,13 +152,24 @@ function ContextAndHoc() {
     let exportDefaultDeclarationName;
     return {
         pre(state) {
+            isPage = false;
             exportDefaultDeclarationName = '';
             entries = Object.keys(builder_1.builder.entry);
             const sourceDir = (0, slash_1.default)(P.join(builder_1.builder.options.cwd, builder_1.builder.options.source));
             const filename = (0, slash_1.default)(state.opts.filename);
             const fileName = P.relative(sourceDir, filename);
-            const fileEntryName = fileName.replace(P.extname(fileName), '');
-            isPage = fileEntryName.toLowerCase() !== 'app' && entries.some((e) => e === fileEntryName);
+            const ext = P.extname(fileName);
+            const entryNames = ['.mini', `.${builder_1.builder.options.target}`, ''].map((x) => fileName.replace(`${x}${ext}`, ''));
+            for (const p of entryNames) {
+                if (p.toLowerCase() === 'app')
+                    return;
+                for (const e of entries) {
+                    if (e === p) {
+                        isPage = true;
+                        return;
+                    }
+                }
+            }
         },
         visitor: {
             ExportDefaultDeclaration(path, state) {

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';
@@ -36,15 +36,15 @@ const defaultCompileOptions = {
 function build(options, context) {
     return __awaiter(this, void 0, void 0, function* () {
         const { api } = context;
-        let compileOptions = Object.assign({}, defaultCompileOptions, 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 });
@@ -55,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/{build.rjs.js → builder.rjs.js}

@@ -105,6 +105,7 @@ class RjsBuilder {
             .end() // rjs模块需要导出给minipack 使用，蹩脚
             .optimization.runtimeChunk({ name: 'runtime-rjs' })
             .splitChunks({ cacheGroups });
+        cfg.output.delete('libraryExport');
         cfg.output.set('clean', false);
         const config = cfg.toConfig();
         config.entry = () => this.entries;

package/lib/plugins/app-entry.js

@@ -1,5 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const babel = __importStar(require("@babel/core"));
 // TODO 动态生成app.config.ts文件还是会造成二次编译，待优化
 // 原有实现方案会造成二次编译，导致编译性能下降
 // https://registry.code.tuya-inc.top/godzilla/ray-monorepo/-/blob/3bb0c0754881b4bc0ebdb4540f628c941bfb3be8/packages/builder-mp/src/webpack/plugins/AppFrameworkEntry/index.ts
@@ -13,11 +37,44 @@ function configWebpack(context) {
     if (thePlugin._staticModules) {
         const file = Object.keys(thePlugin._staticModules).find((name) => /\/?app\./.test(name));
         const source = thePlugin._staticModules[file];
-        const content = `import '@ray-js/ray/main';${source}`;
+        const content = `
+    import router from '@ray-js/ray/main';
+    ${updateCode(source, file)};
+    function reOverloadNativeAppConstructor(config) {
+      const app = overloadNativeAppConstructor(config);
+      return function(opts) {
+        const cfg = app(opts);
+        cfg.asSubPackageRuntimeOptions && router.setUrlPrefix(cfg.asSubPackageRuntimeOptions.subPackageRoot);
+        return cfg;
+      }
+    }
+    `;
         thePlugin._staticModules[file] = content;
         plugin.set('plugin', thePlugin);
     }
 }
+function updateCode(code, name) {
+    const opts = {
+        plugins: [
+            function () {
+                return {
+                    visitor: {
+                        Identifier(path) {
+                            if (path.parent.type === 'CallExpression' &&
+                                path.node.name === 'overloadNativeAppConstructor') {
+                                path.node.name = 'reOverloadNativeAppConstructor';
+                            }
+                        },
+                    },
+                };
+            },
+        ],
+        sourceFileName: name,
+        filename: name,
+    };
+    const res = babel.transformSync(code, opts);
+    return res === null || res === void 0 ? void 0 : res.code;
+}
 exports.default = {
     name: 'app-entry-wrapper',
     configWebpack,

package/lib/plugins/resolve-alias.js

@@ -26,7 +26,7 @@ exports.default = {
     configWebpack(context) {
         const { config } = context;
         const { target } = builder_1.builder.options;
-        // alias('ray', '@ray-js/ray', config)
+        alias('ray', '@ray-js/ray', config);
         // 修改 mini-css-extract-plugin 的配置
         config.plugin('mini-css-extract-plugin').tap(([options]) => [Object.assign(Object.assign({}, options), { ignoreOrder: true })]);
         // 收敛 babel.config 配置

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,39 +19,43 @@ 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 defaultTemplateDepth = {
-    swiper: 3,
-    text: 1,
-    ad: -1,
-    'match-media': -1,
-    'page-container': -1,
-    'share-element': -1,
-    'keyboard-accessory': -1,
-    'voip-room': -1,
-    'ad-custom': -1,
-    'page-meta': -1,
-    'navigation-bar': -1,
-};
-const innerPlugins = [resolve_legacy_1.default, app_entry_1.default, less_1.default, resolve_alias_1.default];
-function getRayCoreOptions(rjsBuilder) {
-    const { cwd, source, watch, target, mini, analyze, output } = builder_1.builder.options;
+const isThing = process.env.PLATFORM === 'thing';
+const defaultTemplateDepth = isThing
+    ? {
+        swiper: 3,
+        text: 1,
+        ad: -1,
+        'match-media': -1,
+        'page-container': -1,
+        'share-element': -1,
+        'keyboard-accessory': -1,
+        'voip-room': -1,
+        'ad-custom': -1,
+        'page-meta': -1,
+        'navigation-bar': -1,
+    }
+    : {};
+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 });
+        plugins,
+        blended });
     return remaxBuildConfig;
 }
 exports.getRayCoreOptions = getRayCoreOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "0.10.2",
+  "version": "0.20.0-beta.1",
   "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.1.3",
-    "@ray-core/build-store": "^0.1.3",
-    "@ray-core/cli": "^0.1.3",
-    "@ray-core/ray": "^0.1.3",
-    "@ray-js/adapter": "^0.10.2",
+    "@ray-core/babel-preset-remax": "^0.2.0-beta.6",
+    "@ray-core/build-store": "^0.2.0-beta.6",
+    "@ray-core/cli": "^0.2.0-beta.6",
+    "@ray-core/ray": "^0.2.0-beta.6",
+    "@ray-js/adapter": "^0.20.0-beta.1",
     "@ray-js/rjs-for-wechat": "^0.0.3",
-    "@ray-js/shared": "^0.10.2",
-    "@ray-js/types": "^0.10.2",
+    "@ray-js/shared": "^0.20.0-beta.1",
+    "@ray-js/types": "^0.20.0-beta.1",
     "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.1.3",
+    "@ray-core/types": "^0.2.0-beta.6",
     "@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": "05f65fee00b3174d78bd9201df6eb8cedfcfe03f",
+  "gitHead": "bbd6144c9594e4f18317127a74f4e5129aae1e6b",
   "repository": {}
 }