@tarojs/plugin-platform-harmony-ets 4.0.0-beta.12 → 4.0.0-beta.121

package/dist/index.d.ts

@@ -0,0 +1,152 @@
+/* eslint-disable no-console */
+import { IFileType, TConfig, TaroPlatform, IPluginContext, TaroPlatformBase } from "@tarojs/service";
+import { PLATFORM_TYPE } from "@tarojs/shared";
+declare abstract class TaroPlatformHarmony<T extends TConfig = TConfig> extends TaroPlatform<T> {
+    platformType: PLATFORM_TYPE;
+    globalObject: string;
+    abstract fileType: IFileType;
+    abstract useETS: boolean;
+    abstract useJSON5: boolean;
+    taroComponentsPath: string;
+    /**
+     * 1. 清空 dist 文件夹
+     * 2. 输出编译提示
+     */
+    private setup;
+    private setupHarmonyApp;
+    protected printDevelopmentTip(): void;
+    /**
+     * 返回当前项目内的 runner 包
+     */
+    protected getRunner(): Promise<any>;
+    /**
+     * 准备 runner 参数
+     * @param extraOptions 需要额外合入 Options 的配置项
+     */
+    protected getOptions(extraOptions?: {}): any;
+    /**
+     * 调用 runner 开始编译
+     * @param extraOptions 需要额外传入 runner 的配置项
+     */
+    private build;
+    private buildHarmonyApp;
+    /**
+     * 调用 runner 开启编译
+     */
+    start(): Promise<void>;
+}
+declare class Harmony extends TaroPlatformHarmony {
+    #private;
+    platform: string;
+    globalObject: string;
+    fileType: {
+        templ: string;
+        style: string;
+        config: string;
+        script: string;
+    };
+    useETS: boolean;
+    useJSON5: boolean;
+    runtimePath: string[] | string;
+    taroComponentsPath: string;
+    apiEntryList: RegExp[];
+    constructor(ctx: IPluginContext, config: TConfig);
+    get framework(): "solid" | "vue3" | "react" | "preact";
+    get aliasFramework(): string;
+    get apiLibrary(): string;
+    get apiEntry(): RegExp[];
+    get componentLibrary(): string;
+    get runtimeLibrary(): string;
+    get runtimeFrameworkLibrary(): string;
+    get defineConstants(): Record<string, string>;
+    extensions: string[];
+    excludeLibraries: (string | RegExp)[];
+    externalDeps: [
+        string,
+        RegExp,
+        string?
+    ][];
+    harmonyScope: RegExp[];
+    indexOfLibraries(lib: string): number;
+    removeFromLibraries(lib: string): void;
+    moveLibraries(lib: string, target?: string, basedir?: string, sync?: boolean): void;
+    replaceDefineValue(code: string, define: Record<string, string>, ext?: string): string;
+    /**
+     * 修改 Vite 配置
+     */
+    modifyViteConfig(): void;
+    handleResourceEmit(outDir: string, basedir?: string): void;
+}
+declare module HarmonyWrapper {
+    export { Harmony };
+}
+import HarmonyOS_ArkTS = HarmonyWrapper.Harmony;
+declare class Harmony$0 extends TaroPlatformBase {
+    platform: string;
+    globalObject: string;
+    runtimePath: string;
+    taroComponentsPath: string;
+    fileType: {
+        templ: string;
+        style: string;
+        config: string;
+        script: string;
+    };
+    template: any;
+    /**
+     * 1. setupTransaction - init
+     * 2. setup
+     * 3. setupTransaction - close
+     * 4. buildTransaction - init
+     * 5. build
+     * 6. buildTransaction - close
+     */
+    constructor(ctx: any, config: any);
+    /**
+     * 增加组件或修改组件属性
+     */
+    modifyComponents(): void;
+    /**
+     * 不需要转 rpx
+     */
+    modifyPostcssConfigs(config: Record<string, any>): void;
+    /**
+     * 模板自定义组件 js
+     * 等鸿蒙支持 template 后需要重构
+     */
+    addEntry(): void;
+    /**
+     * 把 app、pages、自定义组件的 js 改造为鸿蒙的 export default 导出形式
+     */
+    modifyTaroExport(): void;
+    /**
+     * 修改最终的编译产物
+     * 1. 生成模板自定义组件的 xml、css 文件
+     * 2. 删除多余的文件
+     * 3. 把 components-harmony 中被使用到的组件移动到输出目录
+     */
+    modifyBuildAssets(ctx: any, config: any): void;
+    modifyWebpackConfig(): void;
+    modifyHarmonyConfig(pages: any, { projectPath, hapName, name }: {
+        projectPath: any;
+        hapName: any;
+        name: any;
+    }): void;
+    modifyHostPackage({ projectPath, hapName }: {
+        projectPath: any;
+        hapName?: string | undefined;
+    }): Promise<any>;
+    getChunkEntryModule(compilation: any, chunk: any, compiler?: string): any;
+    checkMetaType(entryModule: any): boolean;
+    isHarmonyRequest(request: string): boolean;
+}
+declare module HarmonyWrapper {
+    export { Harmony$0 as Harmony };
+}
+import HarmonyOS_JSUI = HarmonyWrapper.Harmony;
+interface IOptions {
+    disableArkTS?: boolean;
+    useConfigName?: string;
+}
+declare const _default: (ctx: IPluginContext, options?: IOptions) => void;
+export { _default as default, HarmonyOS_ArkTS, HarmonyOS_JSUI, IOptions };

package/dist/index.js

@@ -4,10 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var helper = require('@tarojs/helper');
 var path = require('node:path');
-var runnerUtils = require('@tarojs/runner-utils');
-var shared = require('@tarojs/shared');
 var service = require('@tarojs/service');
 var _package = require('@tarojs/service/dist/utils/package');
+var shared = require('@tarojs/shared');
 var webpackSources = require('webpack-sources');
 var template = require('@tarojs/shared/dist/template');
 
@@ -158,7 +157,7 @@ export {
 const PLATFORM_NAME = 'harmony';
 const PACKAGE_NAME = '@tarojs/plugin-platform-harmony-ets';
 const PLUGIN_NAME = 'TaroHarmony';
-const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//, /^@jd-oh\//];
+const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//];
 
 function parseRelativePath(from, to) {
     const relativePath = path.relative(from, to).replace(/\\/g, '/');
@@ -180,8 +179,8 @@ class TaroPlatformHarmony extends service.TaroPlatform {
      * 2. 输出编译提示
      */
     setup() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             yield this.setupTransaction.perform(this.setupHarmonyApp, this);
             (_b = (_a = this.ctx).onSetupClose) === null || _b === void 0 ? void 0 : _b.call(_a, this);
         });
@@ -237,6 +236,7 @@ class TaroPlatformHarmony extends service.TaroPlatform {
      * @param extraOptions 需要额外合入 Options 的配置项
      */
     getOptions(extraOptions = {}) {
+        var _a, _b, _c;
         const { ctx } = this;
         const { recursiveMerge } = ctx.helper;
         const config = recursiveMerge(Object.assign({}, this.config), {
@@ -248,21 +248,21 @@ class TaroPlatformHarmony extends service.TaroPlatform {
                 SUPPORT_TARO_POLYFILL: 'disabled',
             },
         });
-        return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useJSON5: this.useJSON5 }), extraOptions);
+        return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useJSON5: this.useJSON5, isPure: Boolean((_c = (_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.runOpts) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.args) === null || _c === void 0 ? void 0 : _c.pure) }), extraOptions);
     }
     /**
      * 调用 runner 开始编译
      * @param extraOptions 需要额外传入 runner 的配置项
      */
-    build(extraOptions = {}) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
+    build() {
+        return __awaiter(this, arguments, void 0, function* (extraOptions = {}) {
+            var _a, _b;
             (_b = (_a = this.ctx).onBuildInit) === null || _b === void 0 ? void 0 : _b.call(_a, this);
             yield this.buildTransaction.perform(this.buildHarmonyApp, this, extraOptions);
         });
     }
-    buildHarmonyApp(extraOptions = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
+    buildHarmonyApp() {
+        return __awaiter(this, arguments, void 0, function* (extraOptions = {}) {
             const runner = yield this.getRunner();
             const options = this.getOptions(Object.assign({
                 runtimePath: this.runtimePath,
@@ -285,7 +285,6 @@ class TaroPlatformHarmony extends service.TaroPlatform {
 var _Harmony_defineConstants;
 const frameworkAlias = {
     solid: 'solid',
-    vue: 'vue2',
     vue3: 'vue3',
 };
 let Harmony$1 = class Harmony extends TaroPlatformHarmony {
@@ -303,6 +302,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         this.useJSON5 = true;
         this.runtimePath = [];
         this.taroComponentsPath = `${PACKAGE_NAME}/dist/components-harmony-ets`;
+        this.apiEntryList = [
+            /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
+        ];
         _Harmony_defineConstants.set(this, {});
         this.extensions = ['.js', '.jsx', '.ts', '.tsx', '.cjs', '.mjs', '.mts', '.vue', '.ets', '.d.ts'];
         this.excludeLibraries = [];
@@ -317,14 +319,16 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             ['react', /^react$|react[\\/]cjs/],
             ['react/jsx-runtime', /^react[\\/]jsx-runtime$/], // Note: React 环境下自动注入，避免重复
         ];
+        this.harmonyScope = [...HARMONY_SCOPES];
+        const that = this;
         this.setupTransaction.addWrapper({
             close() {
-                this.modifyViteConfig();
+                that.modifyViteConfig();
             },
         });
         ctx.onBuildFinish(() => {
             const outDir = path__namespace.resolve(process.cwd(), config.outputRoot);
-            this.handleResourceEmit(outDir);
+            that.handleResourceEmit(outDir);
         });
     }
     get framework() {
@@ -336,6 +340,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
     get apiLibrary() {
         return path__namespace.resolve(__dirname, './apis');
     }
+    get apiEntry() {
+        return this.apiEntryList;
+    }
     get componentLibrary() {
         return path__namespace.resolve(__dirname, './components-harmony-ets');
     }
@@ -357,6 +364,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         env.forEach(([key, value]) => {
             __classPrivateFieldGet(this, _Harmony_defineConstants, "f")[`process.env.${key}`] = JSON.stringify(value);
         });
+        return __classPrivateFieldGet(this, _Harmony_defineConstants, "f");
     }
     indexOfLibraries(lib) {
         return this.externalDeps.findIndex(([_, rgx]) => rgx.test(lib));
@@ -421,9 +429,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             }
             if (ext) {
                 const code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
-                if ((/(?:import\s|from\s|require\()['"]([\\/.][^'"\s]+)['"]\)?/g.test(code)
-                    || /\/{3}\s<reference\spath=['"][^'"\s]+['"]\s\/>/g.test(code))
-                    && `${libName}${path__namespace.extname(libDir)}` !== libDir) {
+                if ((/(?:import\s|from\s|require\()['"]([\\/.][^'"\s]+)['"]\)?/g.test(code) ||
+                    /\/{3}\s<reference\spath=['"][^'"\s]+['"]\s\/>/g.test(code)) &&
+                    `${libName}${path__namespace.extname(libDir)}` !== libDir) {
+                    // Note: 文件包含包内引用的依赖
                     const pkgPath = path__namespace.relative(libName, libDir);
                     if (new RegExp(`^index(${this.extensions.map(e => e.replace('.', '\\.')).join('|')})$`).test(pkgPath)) {
                         // Note: 入口为 index 场景
@@ -474,17 +483,20 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         }
         else if (stat.isFile()) {
             let code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
-            // TODO: 后续这部分代码应该根据使用的框架抽离到对应的平台插件处
-            if ([/(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/].some(e => e.test(lib))) {
+            if (this.apiEntry.some(e => e.test(lib))) {
                 code = apiLoader(code);
             }
             if (this.extensions.includes(path__namespace.extname(lib))) {
+                // Note: 移除 onpm 不能装载的类型，新版本会导致 ets-loader 抛出 resolvedFileName 异常
+                code = code.replace(/\/{3}\s*<reference\s+types=['"]([^'"\s]+)['"]\s*\/>\n*/g, '');
                 // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中
-                code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
+                code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1 = '') => {
+                    if (p1.startsWith('node:') || p1.endsWith('.so'))
+                        return src;
                     const { outputRoot } = this.ctx.runOpts.config;
                     const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES, p1);
                     const relativePath = parseRelativePath(path__namespace.dirname(target), targetPath);
-                    if (HARMONY_SCOPES.every(e => !e.test(p1))) {
+                    if (this.harmonyScope.every(e => !e.test(p1))) {
                         if (this.indexOfLibraries(p1) === -1 && !/\.(d\.ts|flow\.js)$/.test(lib)) {
                             this.externalDeps.push([p1, new RegExp(`^${p1.replace(/([-\\/$])/g, '\\$1')}$`)]);
                             this.moveLibraries(p1, targetPath, path__namespace.dirname(lib), true);
@@ -493,15 +505,24 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     }
                     return src;
                 });
-                const define = Object.assign({}, this.defineConstants);
+                const define = Object.assign(Object.assign({}, this.defineConstants), { 
+                    // Note: React 开发环境可能调用 stack 可能导致 appWrapper 实例变更
+                    'ReactDebugCurrentFrame.getCurrentStack': 'ReactDebugCurrentFrame.getCurrentStack$' });
                 if ([/(@tarojs[\\/]runtime|taro-runtime)[\\/]dist/].some(e => e.test(lib))) {
                     define.global = 'globalThis';
                 }
-                code = this.replaceDefineValue(code, define);
                 const ext = path__namespace.extname(target);
+                if (![/d\.e?tsx?$/, /\.(json|map|md)$/].some(e => e.test(target))) {
+                    code = this.replaceDefineValue(code, define, ext);
+                }
                 if (['.ts'].includes(ext)) {
                     code = '// @ts-nocheck\n' + code;
                 }
+                // 处理嵌套样式的编译，需要针对ReactElement进行props操作，dev模式下会Object.freeze，所以需要在开发模式下注入Object.freeze来覆盖解锁
+                // 处理的方法再taro-platform-harmony/src/runtime-ets/dom/cssNesting: ele.props.style = declaration
+                if (/react\/jsx-runtime/.test(lib) && process.env.NODE_ENV === 'development') {
+                    code = 'Object.freeze = (obj) => obj \n' + code;
+                }
             }
             // Note: 传入 chorePackagePrefix 时，不生成核心依赖库
             if (!chorePackagePrefix) {
@@ -542,9 +563,13 @@ declare global {
             this.moveLibraries(realPath, target, basedir);
         }
     }
-    replaceDefineValue(code, define) {
+    replaceDefineValue(code, define, ext = '.js') {
         Object.keys(define).forEach(key => {
-            code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), define[key]);
+            let value = define[key];
+            if (/^['"`].*['"`]$/.test(value) && ['.ts', '.tsx', '.ets'].includes(ext)) {
+                value = `(${value} as string)`;
+            }
+            code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), value);
         });
         return code;
     }
@@ -563,8 +588,8 @@ declare global {
         // @ts-ignore
         if (that.framework === 'solid') {
             that.externalDeps.push([
-                '@tarojs/plugin-framework-react/dist/runtime/reconciler',
-                /^@tarojs\/plugin-framework-react\/dist\/runtime\/reconciler$/,
+                '@tarojs/plugin-framework-solid/dist/reconciler',
+                /^@tarojs\/plugin-framework-solid\/dist\/reconciler$/,
                 path__namespace.join(this.runtimeFrameworkLibrary, 'reconciler')
             ]);
             that.externalDeps.push([
@@ -572,15 +597,24 @@ declare global {
                 /^solid-js\/universal$/,
             ]);
         }
+        const chorePkgRgx = new RegExp(`^${(chorePackagePrefix || '').replace(/[\\/]+/g, '[\\\\/]+').replace(/[-^$*?.|]/g, '\\$&')}`);
         const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
-        function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
-            if (externals.includes(source)) {
+        function modifyResolveId({ source = '', name = 'modifyResolveId' }) {
+            if (externals.includes(source) || (chorePackagePrefix && chorePkgRgx.test(source))) {
                 return {
                     external: true,
                     id: source,
                     resolvedBy: name,
                 };
             }
+            else if (source.includes('css_variables')) {
+                return {
+                    external: true,
+                    id: path__namespace.join(outputRoot, 'css_variables'),
+                    moduleSideEffects: 'no-treeshake',
+                    resolvedBy: name,
+                };
+            }
             if (chorePackagePrefix && that.indexOfLibraries(source) > -1) {
                 return {
                     external: true,
@@ -588,11 +622,6 @@ declare global {
                     resolvedBy: name,
                 };
             }
-            if (shared.isFunction(resolve)) {
-                if (source === that.runtimePath || that.runtimePath.includes(source)) {
-                    return resolve('@tarojs/runtime', importer, options);
-                }
-            }
             // Note: 映射 Taro 相关依赖到注入 taro 目录
             if (that.indexOfLibraries(source) > -1) {
                 return {
@@ -622,19 +651,18 @@ declare global {
             }
             function injectLoaderMeta() {
                 return {
-                    name: 'taro:vite-h5-loader-meta',
+                    name: 'taro:vite-loader-meta',
                     buildStart() {
                         return __awaiter(this, void 0, void 0, function* () {
-                            yield this.load({ id: runnerUtils.VITE_COMPILER_LABEL });
-                            const info = this.getModuleInfo(runnerUtils.VITE_COMPILER_LABEL);
-                            const compiler = info === null || info === void 0 ? void 0 : info.meta.viteCompilerContext;
+                            const { getViteHarmonyCompilerContext } = that.ctx.runnerUtils;
+                            const compiler = getViteHarmonyCompilerContext(this);
                             if (compiler) {
                                 switch (that.framework) {
                                     // @ts-ignore
                                     case 'solid':
                                         compiler.loaderMeta || (compiler.loaderMeta = {});
                                         compiler.loaderMeta.importFrameworkStatement = ``;
-                                        compiler.mockAppStatement = `
+                                        compiler.loaderMeta.mockAppStatement = `
 function App(props) {
   return null
 }
@@ -1030,7 +1058,7 @@ class Harmony extends service.TaroPlatformBase {
      * 等鸿蒙支持 template 后需要重构
      */
     addEntry() {
-        this.ctx.onCompilerMake(({ compilation, plugin }) => __awaiter(this, void 0, void 0, function* () {
+        this.ctx.onCompilerMake((_a) => __awaiter(this, [_a], void 0, function* ({ compilation, plugin }) {
             // container/index.hml
             const filePath = path.resolve(__dirname, 'template/container');
             plugin.addEntry(filePath, 'container/index', helper.META_TYPE.STATIC);
@@ -1233,8 +1261,8 @@ class Harmony extends service.TaroPlatformBase {
             console.warn(helper.chalk.red('设置鸿蒙 Hap 配置失败：', err));
         });
     }
-    modifyHostPackage({ projectPath, hapName = 'entry' }) {
-        return __awaiter(this, void 0, void 0, function* () {
+    modifyHostPackage(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ projectPath, hapName = 'entry' }) {
             const packageJsonFile = path.join(projectPath, hapName, 'package.json');
             const hmsDeps = {
                 '@hmscore/hms-js-base': '^6.1.0-300',
@@ -1259,7 +1287,7 @@ class Harmony extends service.TaroPlatformBase {
             return packageJson;
         });
     }
-    getChunkEntryModule(compilation, chunk, compiler = 'webpack4') {
+    getChunkEntryModule(compilation, chunk, compiler = 'webpack5') {
         if (compiler === 'webpack5') {
             const chunkGraph = compilation.chunkGraph;
             const entryModules = Array.from(chunkGraph.getChunkEntryModulesIterable(chunk));
@@ -1300,8 +1328,8 @@ var index = (ctx, options = {}) => {
     ctx.registerPlatform({
         name: PLATFORM_NAME,
         useConfigName: options.useConfigName || PLATFORM_NAME,
-        fn({ config }) {
-            return __awaiter(this, void 0, void 0, function* () {
+        fn(_a) {
+            return __awaiter(this, arguments, void 0, function* ({ config }) {
                 const program = new Harmony$2(ctx, config);
                 yield program.start();
             });
@@ -1325,6 +1353,7 @@ function assertHarmonyConfig(ctx, config) {
     }
 }
 
+exports.HarmonyOS_ArkTS = Harmony$1;
 exports.HarmonyOS_JSUI = Harmony;
 exports.default = index;
 //# sourceMappingURL=index.js.map