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

package/lib/build.js

@@ -17,8 +17,9 @@ 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 builder_rjs_1 = __importDefault(require("./builder.rjs"));
 const ray_core_1 = require("./ray-core");
+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 = {
@@ -57,9 +58,15 @@ function build(options, context) {
         }
         const rayCoreOpts = (0, ray_core_1.getRayCoreOptions)();
         const rayApi = new ray_core_1.RayAPI(rayCoreOpts);
-        // 编译除rjs模块外的小程序模块
         const compiler = (0, legacyExport_1.buildMini)(rayApi, rayCoreOpts);
-        builder_rjs_1.default.init(compiler, compileOptions); // TODO rjs 可用动态虚拟模块实现单webpack编译
+        const workerBuild = new build_worker_1.default(compileOptions, compiler);
+        workerBuild.run();
+        if (target === 'thing') {
+            const rjsBuild = new build_rjs_1.default(compileOptions, compiler);
+            compiler.hooks.afterCompile.tap(LOG_PREFIX, () => {
+                rjsBuild.run();
+            });
+        }
         return compiler;
     });
 }

package/lib/build.rjs.d.ts

@@ -0,0 +1,14 @@
+import { CliOptions } from '@ray-js/types';
+import { customWebpack as webpack } from '@ray-core/cli/lib/legacyExport';
+declare class RjsBuild {
+    private options;
+    private compiler;
+    private parent;
+    private watcher;
+    constructor(options: CliOptions, parent: webpack.Compiler);
+    private createWebpackConfig;
+    private initRjsBuilder;
+    private runOrWatch;
+    run(): webpack.Compiler;
+}
+export default RjsBuild;

package/lib/build.rjs.js

@@ -0,0 +1,140 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const webpack_chain_1 = __importDefault(require("webpack-chain"));
+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 builder_1 = require("./builder");
+const onBuildEnd_1 = __importDefault(require("./plugins/onBuildEnd"));
+const optimizeRjsEntries_1 = __importDefault(require("./plugins/optimizeRjsEntries"));
+colors_1.default.enable();
+const extensions = ['.mjs', '.js', '.jsx', '.ts', '.tsx'];
+const moduleMatcher = new RegExp(`(${extensions.join('|')})$`);
+const LOG_PREFIX_RJS = 'build-rjs';
+const innerPlugins = [(0, optimizeRjsEntries_1.default)(), (0, onBuildEnd_1.default)(LOG_PREFIX_RJS)];
+class RjsBuild {
+    constructor(options, parent) {
+        this.options = options;
+        this.parent = parent;
+        this.initRjsBuilder();
+    }
+    createWebpackConfig() {
+        const { cwd, output, mini, target } = this.options;
+        let nodeEnv = process.env.NODE_ENV;
+        if (nodeEnv !== 'development' && nodeEnv !== 'production') {
+            nodeEnv = 'development';
+        }
+        const config = new webpack_chain_1.default();
+        config
+            .context(cwd)
+            .cache({
+            type: 'filesystem',
+            cacheDirectory: path_1.default.join(cwd, 'node_modules', '.rjs_cache'),
+        })
+            .devtool('cheap-module-source-map')
+            .mode(nodeEnv)
+            .module.rule('js')
+            .test(moduleMatcher)
+            .exclude.add(/node_modules/)
+            .end()
+            .use('babel-loader')
+            .loader('babel-loader')
+            .options({
+            configFile: path_1.default.resolve(__dirname, './babel/configs/babel.config.js'),
+        });
+        config.output
+            .set('filename', '[name].rjs')
+            .set('libraryTarget', 'commonjs2')
+            .set('clean', false)
+            .set('globalObject', 'Render')
+            .set('path', output)
+            .set('publicPath', '/')
+            .end()
+            .optimization.set('runtimeChunk', { name: 'runtime-rjs' })
+            .set('splitChunks', {
+            cacheGroups: {
+                vendors: {
+                    name: 'ray-vendors-rjs',
+                    test: moduleMatcher,
+                    chunks: 'initial',
+                    minChunks: 2,
+                    minSize: 0,
+                    priority: 2,
+                },
+            },
+        })
+            .set('minimize', mini !== null && mini !== void 0 ? mini : false)
+            .end()
+            .plugin('defined')
+            .use(legacyExport_1.customWebpack.DefinePlugin, [
+            {
+                'process.env.NODE_ENV': JSON.stringify(nodeEnv),
+                'process.env.PLATFORM': JSON.stringify(target),
+            },
+        ])
+            .end()
+            .watchOptions({ aggregateTimeout: 1000 });
+        innerPlugins.forEach((p) => p.configWebpack({ config }));
+        config.resolve.merge(this.parent.options.resolve);
+        return config.toConfig();
+    }
+    initRjsBuilder() {
+        const cfg = this.createWebpackConfig();
+        cfg.entry = () => {
+            shared_1.log.verbose(LOG_PREFIX_RJS, 'rjs entries', builder_1.builder.rjsEntry);
+            return builder_1.builder.rjsEntry;
+        };
+        const compiler = (0, legacyExport_1.customWebpack)(cfg);
+        this.compiler = compiler;
+    }
+    runOrWatch() {
+        return (error, stats) => {
+            setTimeout(() => {
+                var _a, _b;
+                if (error) {
+                    shared_1.log.error(LOG_PREFIX_RJS, error.message);
+                    throw error;
+                }
+                const info = stats.toJson();
+                if (stats.hasErrors()) {
+                    (_a = info === null || info === void 0 ? void 0 : info.errors) === null || _a === void 0 ? void 0 : _a.forEach((error) => {
+                        shared_1.log.error(LOG_PREFIX_RJS, error.message);
+                    });
+                    if (!this.options.watch) {
+                        process.exit(1);
+                    }
+                }
+                if (stats.hasWarnings()) {
+                    (_b = info === null || info === void 0 ? void 0 : info.warnings) === null || _b === void 0 ? void 0 : _b.forEach((warning) => {
+                        shared_1.log.warn(LOG_PREFIX_RJS, warning.message);
+                    });
+                }
+                if (this.options.watch) {
+                    shared_1.log.info('', 'Watching for changes...'.green);
+                }
+            });
+        };
+    }
+    run() {
+        const cb = this.runOrWatch();
+        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.compiler.run(cb);
+        }
+        return this.compiler;
+    }
+}
+exports.default = RjsBuild;

package/lib/build.worker.d.ts

@@ -0,0 +1,15 @@
+import { CliOptions } from '@ray-js/types';
+import { customWebpack as webpack } from '@ray-core/cli/lib/legacyExport';
+declare class WorkerBuild {
+    private options;
+    private compiler;
+    private parent;
+    private watcher;
+    private routesConfigFile;
+    constructor(options: CliOptions, parent: webpack.Compiler);
+    private createWebpackConfig;
+    private initWorkerBuilder;
+    private runOrWatch;
+    run(): webpack.Compiler;
+}
+export default WorkerBuild;

package/lib/build.worker.js

@@ -0,0 +1,174 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const webpack_chain_1 = __importDefault(require("webpack-chain"));
+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 builder_1 = require("./builder");
+const onBuildEnd_1 = __importDefault(require("./plugins/onBuildEnd"));
+const utils_1 = require("./utils");
+colors_1.default.enable();
+const extensions = ['.mjs', '.js', '.jsx', '.ts', '.tsx'];
+const moduleMatcher = new RegExp(`(${extensions.join('|')})$`);
+const LOG_PREFIX_WORKER = 'build-worker';
+const innerPlugins = [(0, onBuildEnd_1.default)(LOG_PREFIX_WORKER)];
+class WorkerBuild {
+    constructor(options, parent) {
+        this.options = options;
+        this.parent = parent;
+        this.initWorkerBuilder();
+    }
+    createWebpackConfig() {
+        const { cwd, output, mini, target } = this.options;
+        let nodeEnv = process.env.NODE_ENV;
+        if (nodeEnv !== 'development' && nodeEnv !== 'production') {
+            nodeEnv = 'development';
+        }
+        const config = new webpack_chain_1.default();
+        config
+            .context(cwd)
+            .cache({
+            type: 'filesystem',
+            cacheDirectory: path_1.default.join(cwd, 'node_modules', '.workers_cache'),
+        })
+            .devtool('cheap-module-source-map')
+            .mode(nodeEnv)
+            .module.rule('js')
+            .test(moduleMatcher)
+            .exclude.add(/node_modules/)
+            .end()
+            .use('babel-loader')
+            .loader('babel-loader')
+            .options({
+            configFile: path_1.default.resolve(__dirname, './babel/configs/babel.config.js'),
+        });
+        config.output
+            .set('filename', '[name].js')
+            .set('libraryTarget', 'commonjs2')
+            .set('clean', false)
+            .set('globalObject', 'worker')
+            .set('path', output)
+            .set('publicPath', '/')
+            .end()
+            .optimization.set('runtimeChunk', { name: 'runtime-worker' })
+            .set('splitChunks', {
+            cacheGroups: {
+                vendors: {
+                    name: 'ray-vendors-worker',
+                    test: moduleMatcher,
+                    chunks: 'initial',
+                    minChunks: 2,
+                    minSize: 0,
+                    priority: 2,
+                },
+            },
+        })
+            .set('minimize', mini !== null && mini !== void 0 ? mini : false)
+            .end()
+            .plugin('defined')
+            .use(legacyExport_1.customWebpack.DefinePlugin, [
+            {
+                'process.env.NODE_ENV': JSON.stringify(nodeEnv),
+                'process.env.PLATFORM': JSON.stringify(target),
+            },
+        ])
+            .end()
+            .watchOptions({ aggregateTimeout: 1000 });
+        innerPlugins.forEach((p) => p.configWebpack({ config }));
+        config.resolve.merge(this.parent.options.resolve);
+        return config.toConfig();
+    }
+    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 entries = workers.reduce((o, k) => {
+                const { source: rootDir, target, cwd } = this.options;
+                const name = path_1.default.join(root, k);
+                const f = path_1.default.join(cwd, rootDir, name);
+                const m = (0, utils_1.getModuleOfPlatform)(f, {
+                    rootDir,
+                    target,
+                    cwd,
+                    extensions: ['ts', 'js', 'tsx', 'jsx'],
+                });
+                if (m) {
+                    o[name] = m[1];
+                }
+                else {
+                    shared_1.log.warn(LOG_PREFIX_WORKER, `Can't resolve module ${k} in ${root}`);
+                }
+                return o;
+            }, {});
+            shared_1.log.verbose(LOG_PREFIX_WORKER, 'worker entries', entries);
+            return entries;
+        };
+        const compiler = (0, legacyExport_1.customWebpack)(cfg);
+        this.compiler = compiler;
+    }
+    runOrWatch() {
+        return (error, stats) => {
+            setTimeout(() => {
+                var _a, _b;
+                if (error) {
+                    shared_1.log.error(LOG_PREFIX_WORKER, error.message);
+                    throw error;
+                }
+                const info = stats.toJson();
+                if (stats.hasErrors()) {
+                    (_a = info === null || info === void 0 ? void 0 : info.errors) === null || _a === void 0 ? void 0 : _a.forEach((error) => {
+                        shared_1.log.error(LOG_PREFIX_WORKER, error.message);
+                    });
+                    if (!this.options.watch) {
+                        process.exit(1);
+                    }
+                }
+                if (stats.hasWarnings()) {
+                    (_b = info === null || info === void 0 ? void 0 : info.warnings) === null || _b === void 0 ? void 0 : _b.forEach((warning) => {
+                        shared_1.log.warn(LOG_PREFIX_WORKER, warning.message);
+                    });
+                }
+                if (this.options.watch) {
+                    shared_1.log.info('', 'Watching for changes...'.green);
+                }
+            });
+        };
+    }
+    run() {
+        const cb = this.runOrWatch();
+        if (this.options.watch) {
+            if (!this.watcher) {
+                this.watcher = this.compiler.watch({}, cb);
+            }
+            else {
+                this.watcher.close(() => {
+                    this.watcher = this.compiler.watch({}, cb);
+                });
+            }
+            this.compiler.hooks.afterCompile.tap(LOG_PREFIX_WORKER, (compilation) => {
+                if (!compilation.fileDependencies.has(this.routesConfigFile)) {
+                    compilation.fileDependencies.add(this.routesConfigFile);
+                }
+            });
+        }
+        else {
+            this.compiler.run(cb);
+        }
+        return this.compiler;
+    }
+}
+exports.default = WorkerBuild;

package/lib/builder.d.ts

@@ -4,11 +4,13 @@ export default class Builder {
     private cliOptions;
     private entryValue;
     private _api;
+    rjsEntries: Map<string, string>;
     get options(): CliOptions;
     set options(v: CliOptions);
     get entry(): Entry;
     set entry(v: Entry);
     get api(): API;
     set api(api: API);
+    get rjsEntry(): {};
 }
 export declare const builder: Builder;

package/lib/builder.js

@@ -4,6 +4,7 @@ exports.builder = void 0;
 class Builder {
     constructor() {
         this.entryValue = {};
+        this.rjsEntries = new Map();
     }
     get options() {
         return this.cliOptions;
@@ -23,6 +24,12 @@ class Builder {
     set api(api) {
         this._api = api;
     }
+    get rjsEntry() {
+        return Array.from(this.rjsEntries).reduce((o, [k, v]) => {
+            o[k] = v;
+            return o;
+        }, {});
+    }
 }
 exports.default = Builder;
 exports.builder = new Builder();

package/lib/loaders/rjs/index.js

@@ -5,12 +5,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const slash_1 = __importDefault(require("slash"));
 const shared_1 = require("@ray-js/shared");
+const path_1 = __importDefault(require("path"));
+const utils_1 = require("../../utils");
 const rjs = '@ray-js/rjs-for-wechat';
 const RjsLoader = function RjsLoader(source, map) {
-    let content = `module.exports = __minipack_require__("${(0, slash_1.default)(this._module.resource)}")`;
     const { builder } = this.getOptions();
-    const cwd = builder.options.cwd;
-    if (process.env.PLATFORM !== 'thing') {
+    const { cwd, source: rootDir, target } = builder.options;
+    let content;
+    if (target === 'thing') {
+        const rjsModule = getRjsModule(this._compilation, this.resourcePath);
+        if (!rjsModule) {
+            shared_1.log.error('rjs loader', `Can't resolve rjs module`);
+            this.callback(null, `"Can't resolve rjs module"`, map);
+            return;
+        }
+        let resource = rjsModule[1];
+        const m = (0, utils_1.getModuleOfPlatform)(resource, { target, cwd, rootDir, extensions: ['rjs'] });
+        if (!m) {
+            shared_1.log.error('rjs loader', `Can't resolve rjs module: current platform is ${target}, but got ${resource}`);
+            this.callback(null, `"Can't resolve rjs module: current platform is ${target}, but got ${resource}"`, map);
+            return;
+        }
+        builder.rjsEntries.set(m[0], m[1]);
+        content = `module.exports = __non_webpack_require__("${(0, slash_1.default)(m[2])}")`;
+    }
+    else {
         try {
             const obj = require(rjs);
             const rjsMethods = Object.keys(obj).join(', ');
@@ -24,3 +43,20 @@ const RjsLoader = function RjsLoader(source, map) {
     this.callback(null, content, map);
 };
 exports.default = RjsLoader;
+function getRjsModule(compilation, p) {
+    const { moduleGraph } = compilation;
+    const moduleMap = moduleGraph._moduleMap;
+    for (const [m, mgm] of moduleMap) {
+        const out = mgm.outgoingConnections || [];
+        for (const mc of out) {
+            const { resource, rawRequest } = mc.module || {};
+            if (resource === p) {
+                return [
+                    m.resource,
+                    path_1.default.join(path_1.default.dirname(resource), rawRequest),
+                    rawRequest, // 引用rjs的模块中，import 的具体模块名
+                ];
+            }
+        }
+    }
+}

package/lib/plugins/onBuildEnd.d.ts

@@ -0,0 +1,8 @@
+import Config from 'webpack-chain';
+declare const _default: (name: any) => {
+    name: string;
+    configWebpack({ config }: {
+        config: Config;
+    }): void;
+};
+export default _default;

package/lib/plugins/onBuildEnd.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_1 = require("@ray-js/shared");
+const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
+class OnBuildEnd {
+    constructor(opts) {
+        this.options = opts;
+    }
+    apply(compiler) {
+        const { name } = this.options;
+        compiler.hooks.done.tap(name, (stats) => {
+            setTimeout(() => {
+                var _a;
+                const assets = ((_a = stats.toJson()) === null || _a === void 0 ? void 0 : _a.assets) || [];
+                const size = assets.reduce((acc, asset) => acc + asset.size, 0);
+                console.log(name);
+                console.log(stats.toString({
+                    colors: true,
+                    entrypoints: false,
+                    assets: false,
+                    children: false,
+                    modules: false,
+                }));
+                console.log('');
+                shared_1.log.info(name, `Output size ${size} bytes`.yellow, (0, pretty_bytes_1.default)(size).bgMagenta.white);
+                console.log('');
+            });
+        });
+    }
+}
+exports.default = (name) => {
+    const n = `${name}-on-build-end-plugin`;
+    return {
+        name: n,
+        configWebpack({ config }) {
+            config.plugin(n).use(OnBuildEnd, [{ name: n }]);
+        },
+    };
+};

package/lib/plugins/optimizeRjsEntries.d.ts

@@ -0,0 +1,8 @@
+import Config from 'webpack-chain';
+declare const _default: () => {
+    name: string;
+    configWebpack({ config }: {
+        config: Config;
+    }): void;
+};
+export default _default;

package/lib/plugins/optimizeRjsEntries.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const webpack_1 = require("webpack");
+const path_1 = __importDefault(require("path"));
+const slash_1 = __importDefault(require("slash"));
+const { ConcatSource } = webpack_1.sources;
+class RjsBuildPlugin {
+    constructor(opts) {
+        this.options = opts;
+    }
+    apply(compiler) {
+        const { name } = this.options;
+        compiler.hooks.thisCompilation.tap(name, (compilation) => {
+            compilation.hooks.processAssets.tapAsync({
+                name,
+                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+            }, (_, callback) => {
+                compilation.chunkGroups.forEach((group) => {
+                    group.chunks.reverse().forEach((chunk) => {
+                        var _a;
+                        if (chunk.name !== group.name) {
+                            const requires = [];
+                            const files = Array.from(chunk.files);
+                            files.forEach((file) => {
+                                if (file.endsWith('.rjs')) {
+                                    const relativePath = (0, slash_1.default)(path_1.default.relative(path_1.default.dirname(group.name), file)).replace(/\.rjs$/i, '.js');
+                                    requires.push(`require('./${relativePath}');\n`);
+                                    const newFilename = file.replace(/\.rjs$/i, '.js');
+                                    if (!compilation.assets[newFilename]) {
+                                        compilation.assets[newFilename] = compilation.assets[file];
+                                        delete compilation.assets[file];
+                                    }
+                                }
+                            });
+                            const assetPath = group.name + '.rjs';
+                            const source = (_a = compilation.assets[assetPath]) !== null && _a !== void 0 ? _a : '';
+                            compilation.assets[assetPath] = new ConcatSource(...requires, source);
+                        }
+                    });
+                });
+                callback();
+            });
+        });
+    }
+}
+exports.default = () => {
+    const name = `rjs-build-optimize-plugin`;
+    return {
+        name,
+        configWebpack({ config }) {
+            config.plugin(name).use(RjsBuildPlugin, [{ name }]);
+        },
+    };
+};

package/lib/plugins/resolve-alias.js

@@ -25,6 +25,11 @@ exports.default = {
     name: 'mini-app-module-resolve',
     configWebpack(context) {
         const { config } = context;
+        config.watch(true);
+        config.watchOptions({
+            ignored: /\.rjs$/i,
+            aggregateTimeout: 1000,
+        });
         const { target } = builder_1.builder.options;
         alias('ray', '@ray-js/ray', config);
         // 修改 mini-css-extract-plugin 的配置
@@ -33,8 +38,6 @@ exports.default = {
         // 调整 ray-core 的 babel 配置
         config.module
             .rule('js')
-            .exclude.add((m) => /\.rjs$/i.test(m))
-            .end()
             .use('babel')
             .tap((options) => {
             // 修复 babel alias 错误问题

package/lib/ray-core.js

@@ -20,12 +20,12 @@ 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 builder_1 = require("./builder");
 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 onBuildEnd_1 = __importDefault(require("./plugins/onBuildEnd"));
 const _a = (0, legacyExport_1.getDefaultOptions)(), { UNSAFE_wechatTemplateDepth } = _a, remaxDefaultOptions = __rest(_a, ["UNSAFE_wechatTemplateDepth"]);
 const isThing = process.env.PLATFORM === 'thing';
 const defaultTemplateDepth = isThing
@@ -43,11 +43,11 @@ const defaultTemplateDepth = isThing
         'navigation-bar': -1,
     }
     : {};
-const innerPlugins = [resolve_legacy_1.default, app_entry_1.default, less_1.default, resolve_alias_1.default, rjs_1.default];
+const innerPlugins = [resolve_legacy_1.default, app_entry_1.default, less_1.default, resolve_alias_1.default, (0, onBuildEnd_1.default)('ray')];
 function getRayCoreOptions() {
     const { cwd, source, watch, target, mini, analyze, output, blended } = builder_1.builder.options;
     if (blended) {
-        innerPlugins.push(BlendedApp_1.default);
+        innerPlugins.push(Object.assign(Object.assign({}, BlendedApp_1.default), { name: 'blended-app-plugin' }));
     }
     const api = builder_1.builder.api;
     // @ts-ignore

package/lib/utils.d.ts

@@ -0,0 +1,6 @@
+export declare function getModuleOfPlatform(file: string, opts: {
+    target: string;
+    cwd: string;
+    rootDir: string;
+    extensions: string[];
+}): string[];

package/lib/utils.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getModuleOfPlatform = void 0;
+const paths_1 = require("@ray-core/cli/lib/build/utils/paths");
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+function getModuleOfPlatform(file, opts) {
+    const outputName = (0, paths_1.getNativeAssetOutputPath)((0, paths_1.replaceExtension)(file, ''), opts).replace(/(?:\.mini|\.wechat|\.thing|\.tuya|\.web)$/, '');
+    const target = opts.target;
+    for (const ext of opts.extensions) {
+        const exts = [`.${target}.${ext}`];
+        if (target !== 'web') {
+            if (target === 'thing') {
+                exts.push(`.tuya.${ext}`);
+            }
+            exts.push(`.mini.${ext}`);
+        }
+        exts.push(`.${ext}`);
+        const dirname = path_1.default.dirname(file);
+        const reg = RegExp(`\\.${ext}$`);
+        const name = path_1.default
+            .basename(file)
+            .replace(reg, '')
+            .replace(/(?:\.mini|\.wechat|\.thing|\.tuya|\.web)$/, '');
+        for (const p of exts) {
+            const f = path_1.default.join(dirname, `${name}${p}`);
+            if (fs_extra_1.default.existsSync(f)) {
+                return [outputName, f, `${name}.${ext}`];
+            }
+        }
+    }
+}
+exports.getModuleOfPlatform = getModuleOfPlatform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/builder-mp",
-  "version": "0.20.0-beta.2",
+  "version": "0.20.0-beta.4",
   "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.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-core/babel-preset-remax": "^0.2.0-beta.9",
+    "@ray-core/build-store": "^0.2.0-beta.9",
+    "@ray-core/cli": "^0.2.0-beta.9",
+    "@ray-core/ray": "^0.2.0-beta.9",
+    "@ray-js/adapter": "^0.20.0-beta.4",
     "@ray-js/rjs-for-wechat": "^0.0.3",
-    "@ray-js/shared": "^0.20.0-beta.2",
-    "@ray-js/types": "^0.20.0-beta.2",
+    "@ray-js/shared": "^0.20.0-beta.4",
+    "@ray-js/types": "^0.20.0-beta.4",
     "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.7",
+    "@ray-core/types": "^0.2.0-beta.9",
     "@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": "67aa3b9aa0a8113c3965772893bdd76ed3a243bf",
+  "gitHead": "826b1049dc292e04661531c7de47cfa38dc45345",
   "repository": {}
 }

package/lib/builder.rjs.d.ts

@@ -1,20 +0,0 @@
-import Config from 'webpack-chain';
-import { Compiler, Stats } from 'webpack';
-export declare class RjsBuilder {
-    private compiler;
-    private parentCompiler;
-    private entries;
-    private webpackConfig;
-    private compileOptions;
-    init: (parentCompiler: Compiler, compileOptions: any) => void;
-    initWebpack(cfg: Config): Compiler;
-    run(entries: any): void;
-    config(config: Config): void;
-    print: (prefix: string, stats: Stats[]) => void;
-    parentDoneHook(): void;
-    rjsDoneHook(): void;
-    recomposeAssets(): void;
-    extractRjsModuleHook(): void;
-}
-declare const rjsBuilder: RjsBuilder;
-export default rjsBuilder;

package/lib/builder.rjs.js

@@ -1,218 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RjsBuilder = void 0;
-const pretty_bytes_1 = __importDefault(require("pretty-bytes"));
-const webpack_1 = require("webpack");
-const path_1 = __importDefault(require("path"));
-const slash_1 = __importDefault(require("slash"));
-const colors_1 = __importDefault(require("colors"));
-const shared_1 = require("@ray-js/shared");
-const legacyExport_1 = require("@ray-core/cli/lib/legacyExport");
-const { ConcatSource } = webpack_1.sources;
-colors_1.default.enable();
-// 需保留
-const plugins = [
-    'webpack-define-plugin',
-    'provide-regeneratorRuntime',
-    // 'webpackbar',
-    'defined',
-    'mini-css-extract-plugin',
-    'remax-coverage-ignore-plugin',
-];
-// 需删除
-const rules = ['ray-hooks', 'ray-context', 'rjs'];
-const getRjsModules = (content) => {
-    const reg = /__minipack_require__\((?:"|')([^\)]+)(?:"|')\)/g;
-    const deps = [];
-    let res;
-    while ((res = reg.exec(content))) {
-        let [, dep] = res;
-        dep = (0, slash_1.default)(dep);
-        if (dep && !deps.includes(dep)) {
-            deps.push(dep);
-        }
-    }
-    return deps;
-};
-const replaceModeContent = (content) => content.replace(/__minipack_require__/g, 'require');
-const isSupportMultiRjs = false;
-const LOG_PREFIX = 'builder-mp';
-const LOG_PREFIX_RJS = 'builder-rjs';
-class RjsBuilder {
-    constructor() {
-        this.init = (parentCompiler, compileOptions) => {
-            this.parentCompiler = parentCompiler;
-            this.compileOptions = compileOptions;
-            this.parentDoneHook();
-            if (process.env.PLATFORM === 'thing') {
-                this.initWebpack(this.webpackConfig);
-                this.rjsDoneHook();
-                this.recomposeAssets();
-                this.extractRjsModuleHook();
-            }
-        };
-        this.print = (prefix, stats) => {
-            setTimeout(() => {
-                const assets = stats.reduce((a, s) => { var _a; return ((a = a.concat(((_a = s.toJson()) === null || _a === void 0 ? void 0 : _a.assets) || [])), a); }, []);
-                const size = assets.reduce((acc, asset) => acc + asset.size, 0);
-                stats.forEach((s) => {
-                    console.log(s.toString({
-                        colors: true,
-                        entrypoints: false,
-                        assets: this.compileOptions.watch ? false : true,
-                        children: false,
-                        modules: false,
-                    }));
-                });
-                console.log('');
-                shared_1.log.info(prefix, `Output size ${size} bytes`.yellow, (0, pretty_bytes_1.default)(size).bgMagenta.white);
-                console.log('');
-            });
-        };
-    }
-    initWebpack(cfg) {
-        var _a, _b;
-        cfg.cache({
-            type: 'filesystem',
-            cacheDirectory: path_1.default.join(this.compileOptions.cwd, 'node_modules', '.rjs_cache'),
-        });
-        shared_1.log.verbose(LOG_PREFIX_RJS, '初始化rjs webpack');
-        // 部分plugin不需要
-        (_a = cfg.plugins) === null || _a === void 0 ? void 0 : _a.values().forEach((plugin) => {
-            if (!plugins.includes(plugin.name)) {
-                cfg.plugins.delete(plugin.name);
-            }
-        });
-        // 部分rule不需要
-        (_b = cfg.module) === null || _b === void 0 ? void 0 : _b.rules.values().forEach((rule) => {
-            if (rules.includes(rule.name)) {
-                cfg.module.rules.delete(rule.name);
-            }
-        });
-        const cacheGroups = cfg.optimization.get('splitChunks').cacheGroups;
-        Object.keys(cacheGroups).forEach((k) => {
-            const v = cacheGroups[k];
-            v.name += '-rjs';
-            cacheGroups[k] = v;
-        });
-        cfg.output
-            .filename('[name].rjs')
-            .globalObject('Render') // 哪来的Render？因视图层没有window等全局对象，但暴露了Render全局函数
-            .libraryTarget('commonjs2')
-            .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;
-        if (this.compiler) {
-            return;
-        }
-        this.compiler = (0, legacyExport_1.customWebpack)(config);
-        return this.compiler;
-    }
-    run(entries) {
-        shared_1.log.verbose(LOG_PREFIX_RJS, '运行rjs编译');
-        this.entries = entries;
-        this.compiler.run(() => { });
-    }
-    config(config) {
-        shared_1.log.verbose(LOG_PREFIX_RJS, '注册rjs编译配置');
-        this.webpackConfig = config;
-    }
-    parentDoneHook() {
-        this.parentCompiler.hooks.done.tap('tuya-scripts', (stats) => {
-            this.print(LOG_PREFIX, [stats]);
-        });
-    }
-    rjsDoneHook() {
-        this.compiler.hooks.done.tap('rjs-builder-done', (stats) => {
-            this.print(LOG_PREFIX_RJS, [stats]);
-        });
-    }
-    recomposeAssets() {
-        const PLUGIN_NAME = 'rjs-building';
-        this.compiler.hooks.thisCompilation.tap('rjs-building', (compilation) => {
-            compilation.hooks.processAssets.tapAsync({
-                name: PLUGIN_NAME,
-                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
-            }, (_, callback) => {
-                compilation.chunkGroups.forEach((group) => {
-                    group.chunks.reverse().forEach((chunk) => {
-                        var _a;
-                        if (chunk.name !== group.name) {
-                            const requires = [];
-                            const files = Array.from(chunk.files);
-                            files.forEach((file) => {
-                                if (file.endsWith('.rjs')) {
-                                    const relativePath = (0, slash_1.default)(path_1.default.relative(path_1.default.dirname(group.name), file)).replace(/\.rjs$/i, '.js');
-                                    requires.push(`require('./${relativePath}');\n`);
-                                    const newFilename = file.replace(/\.rjs$/i, '.js');
-                                    if (!compilation.assets[newFilename]) {
-                                        compilation.assets[newFilename] = compilation.assets[file];
-                                        delete compilation.assets[file];
-                                    }
-                                }
-                            });
-                            const assetPath = group.name + '.rjs';
-                            const source = (_a = compilation.assets[assetPath]) !== null && _a !== void 0 ? _a : '';
-                            compilation.assets[assetPath] = new ConcatSource(...requires, source);
-                        }
-                    });
-                });
-                callback();
-            });
-        });
-    }
-    extractRjsModuleHook() {
-        this.parentCompiler.hooks.emit.tap('rjs-build-plugin', (compilation) => {
-            shared_1.log.verbose(LOG_PREFIX_RJS, '提取rjs编译入口文件');
-            const rjsEntry = {};
-            const entries = compilation.entrypoints;
-            const assets = compilation.assets;
-            for (const p of entries.keys()) {
-                let content = assets[`${p}.js`].source();
-                if (Buffer.isBuffer(content))
-                    content = content.toString();
-                const rjsModules = getRjsModules(content);
-                content = replaceModeContent(content);
-                rjsModules.forEach((rjs, index) => {
-                    /**
-                     * TODO 支持多页面引用多rjs文件？
-                     * 当前minipack支持一个页面仅能引入单个rjs模块文件，且文件名同页面文件名
-                     **/
-                    // 啥时候支持多rjs？
-                    const sep = (0, slash_1.default)(path_1.default.sep);
-                    if (isSupportMultiRjs) {
-                        const newModName = `${index}.${rjs.slice(rjs.lastIndexOf(sep) + 1)}`;
-                        const chunkName = `${path_1.default.dirname(p)}${sep}${newModName.replace(/\.rjs/i, '')}`;
-                        const filename = `.${sep}${newModName}`;
-                        rjsEntry[chunkName] = rjs;
-                        content = content.replace(rjs, filename);
-                    }
-                    else {
-                        // 当前一个页面仅支持引入一个rjs模块文件
-                        if (rjsEntry[p]) {
-                            rjsEntry[p] = rjs;
-                            shared_1.log.warn('RJS-BUILD-RAY', '一个页面(%s)仅支持引入一个rjs模块: %s', p, rjs);
-                        }
-                        rjsEntry[p] = rjs;
-                        content = content.replace(rjs, (0, slash_1.default)(`.${sep}${p.slice(p.lastIndexOf(sep) + 1)}.rjs`));
-                    }
-                });
-                assets[`${p}.js`] = {
-                    source: () => content,
-                    size: () => Buffer.byteLength(content),
-                };
-            }
-            this.run(rjsEntry);
-        });
-    }
-}
-exports.RjsBuilder = RjsBuilder;
-const rjsBuilder = new RjsBuilder();
-exports.default = rjsBuilder;

package/lib/plugins/rjs.d.ts

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

package/lib/plugins/rjs.js

@@ -1,11 +0,0 @@
-"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);
-    },
-};