@tarojs/plugin-platform-harmony-ets 4.0.0-alpha.0 → 4.0.0-alpha.11

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');
 
@@ -44,7 +43,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -68,6 +67,91 @@ function __classPrivateFieldSet(receiver, state, value, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+function apiLoader(str) {
+    return `import {
+  useAddToFavorites,
+  useDidHide,
+  useDidShow,
+  useError,
+  useLaunch,
+  useLoad,
+  useOptionMenuClick,
+  usePageNotFound,
+  usePageScroll,
+  usePullDownRefresh,
+  usePullIntercept,
+  useReachBottom,
+  useReady,
+  useResize,
+  useRouter,
+  useSaveExitState,
+  useShareAppMessage,
+  useShareTimeline,
+  useTabItemTap,
+  useTitleClick,
+  useScope,
+  useUnhandledRejection,
+  useUnload
+} from '@tarojs/plugin-framework-react/dist/runtime'
+${str}
+
+taro.useAddToFavorites = useAddToFavorites
+taro.useDidHide = useDidHide
+taro.useDidShow = useDidShow
+taro.useError = useError
+taro.useLaunch = useLaunch
+taro.useLoad = useLoad
+taro.useOptionMenuClick = useOptionMenuClick
+taro.usePageNotFound = usePageNotFound
+taro.usePageScroll = usePageScroll
+taro.usePullDownRefresh = usePullDownRefresh
+taro.usePullIntercept = usePullIntercept
+taro.useReachBottom = useReachBottom
+taro.useReady = useReady
+taro.useResize = useResize
+taro.useRouter = useRouter
+taro.useSaveExitState = useSaveExitState
+taro.useShareAppMessage = useShareAppMessage
+taro.useShareTimeline = useShareTimeline
+taro.useTabItemTap = useTabItemTap
+taro.useTitleClick = useTitleClick
+taro.useScope = useScope
+taro.useUnhandledRejection = useUnhandledRejection
+taro.useUnload = useUnload
+
+export {
+  useAddToFavorites,
+  useDidHide,
+  useDidShow,
+  useError,
+  useLaunch,
+  useLoad,
+  useOptionMenuClick,
+  usePageNotFound,
+  usePageScroll,
+  usePullDownRefresh,
+  usePullIntercept,
+  useReachBottom,
+  useReady,
+  useResize,
+  useRouter,
+  useSaveExitState,
+  useShareAppMessage,
+  useShareTimeline,
+  useTabItemTap,
+  useTitleClick,
+  useScope,
+  useUnhandledRejection,
+  useUnload
+}
+`;
 }
 
 const PLATFORM_NAME = 'harmony';
@@ -95,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);
         });
@@ -152,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), {
@@ -159,24 +244,25 @@ class TaroPlatformHarmony extends service.TaroPlatform {
                 FRAMEWORK: JSON.stringify(this.config.framework),
                 TARO_ENV: JSON.stringify(this.platform),
                 TARO_PLATFORM: JSON.stringify(this.platformType),
-                TARO_VERSION: JSON.stringify(_package.getPkgVersion())
+                TARO_VERSION: JSON.stringify(_package.getPkgVersion()),
+                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,
@@ -199,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 {
@@ -217,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 = [];
@@ -231,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() {
@@ -250,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');
     }
@@ -286,8 +379,8 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
             return;
         if (this.excludeLibraries.some(e => typeof e === 'string' ? e === lib : e.test(lib)))
             return;
+        const { outputRoot, chorePackagePrefix } = this.ctx.runOpts.config;
         if (sync) {
-            const { outputRoot } = this.ctx.runOpts.config;
             const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES);
             // FIXME 不支持 alias 配置
             const libName = lib;
@@ -335,9 +428,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 场景
@@ -364,8 +458,16 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                         ? path__namespace.join(path__namespace.dirname(target), `${basename}${ext}`)
                         : path__namespace.join(target, `index${isDTS ? '.d.ts' : ext}`);
                 }
-                else if (libDir !== path__namespace.relative(targetPath, target)) {
-                    target = path__namespace.join(targetPath, libDir);
+                else {
+                    const libPath = path__namespace.relative(targetPath, target);
+                    if (libDir !== libPath) {
+                        if (path__namespace.relative(libPath, libDir).startsWith('.')) {
+                            target = path__namespace.join(targetPath, libDir);
+                        }
+                        else {
+                            target = path__namespace.join(targetPath, libName, `index${ext}`);
+                        }
+                    }
                 }
             }
         }
@@ -380,12 +482,16 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
         }
         else if (stat.isFile()) {
             let code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
+            if (this.apiEntry.some(e => e.test(lib))) {
+                code = apiLoader(code);
+            }
             if (this.extensions.includes(path__namespace.extname(lib))) {
-                code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
+                // Note: 查询 externals 内的依赖，并将它们添加到 externalDeps 中
+                code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1) => {
                     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);
@@ -394,18 +500,29 @@ 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;
+                }
             }
-            if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
-                code = `/// <reference path="global.d.ts" />
+            // Note: 传入 chorePackagePrefix 时，不生成核心依赖库
+            if (!chorePackagePrefix) {
+                if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
+                    code = `/// <reference path="global.d.ts" />
 
 /// <reference path="taro.api.d.ts" />
 /// <reference path="taro.component.d.ts" />
@@ -425,14 +542,15 @@ declare global {
   const defineAppConfig: (config: Taro.Config) => Taro.Config
   const definePageConfig: (config: Taro.Config) => Taro.Config
 }`;
-            }
-            try {
-                const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
-                helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
-                helper.fs.writeFileSync(targetPath, code);
-            }
-            catch (e) {
-                console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
+                }
+                try {
+                    const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
+                    helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
+                    helper.fs.writeFileSync(targetPath, code);
+                }
+                catch (e) {
+                    console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
+                }
             }
         }
         else if (stat.isSymbolicLink()) {
@@ -440,9 +558,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;
     }
@@ -454,15 +576,15 @@ declare global {
         const that = this;
         const { appPath } = that.ctx.paths;
         const { config } = that.ctx.runOpts;
-        const { outputRoot } = config;
+        const { outputRoot, ohPackage = {}, chorePackagePrefix } = config;
         if (!that.framework.includes('vue')) {
             that.excludeLibraries.push(/\bvue\b/);
         }
         // @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-react/dist/reconciler',
+                /^@tarojs\/plugin-framework-react\/dist\/reconciler$/,
                 path__namespace.join(this.runtimeFrameworkLibrary, 'reconciler')
             ]);
             that.externalDeps.push([
@@ -470,11 +592,29 @@ declare global {
                 /^solid-js\/universal$/,
             ]);
         }
-        function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
-            if (shared.isFunction(resolve)) {
-                if (source === that.runtimePath || that.runtimePath.includes(source)) {
-                    return resolve('@tarojs/runtime', importer, options);
-                }
+        const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
+        function modifyResolveId({ source = '', name = 'modifyResolveId' }) {
+            if (externals.includes(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,
+                    id: path__namespace.join(chorePackagePrefix, source),
+                    resolvedBy: name,
+                };
             }
             // Note: 映射 Taro 相关依赖到注入 taro 目录
             if (that.indexOfLibraries(source) > -1) {
@@ -505,19 +645,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
 }
@@ -552,7 +691,7 @@ function App(props) {
             isFile: (file) => {
                 try {
                     const stat = helper.fs.lstatSync(file);
-                    return stat.isFile() || (file.endsWith(mediaPath) && stat.isDirectory());
+                    return stat.isFile() || (file.endsWith(mediaPath.replace('/', path__namespace.sep)) && stat.isDirectory());
                 }
                 catch (_) { } // eslint-disable-line no-empty
                 return false;
@@ -913,7 +1052,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);
@@ -1053,7 +1192,7 @@ class Harmony extends service.TaroPlatformBase {
                 const outDir = path.join(compsOutDir, name);
                 helper.fs.copy(src, outDir);
             });
-            this.modifyHostPackageDep(outDir);
+            this.modifyHostPackage(config.harmony);
         });
     }
     modifyWebpackConfig() {
@@ -1116,13 +1255,13 @@ class Harmony extends service.TaroPlatformBase {
             console.warn(helper.chalk.red('设置鸿蒙 Hap 配置失败：', err));
         });
     }
-    modifyHostPackageDep(dest) {
-        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',
                 '@hmscore/hms-jsb-account': '^1.0.300'
             };
-            const packageJsonFile = path.resolve(dest, '../../../../../package.json');
             const isExists = yield helper.fs.pathExists(packageJsonFile);
             if (!isExists)
                 return;
@@ -1139,9 +1278,10 @@ class Harmony extends service.TaroPlatformBase {
             }
             packageJson = JSON.stringify(packageJson);
             yield helper.fs.writeFile(packageJsonFile, packageJson);
+            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));
@@ -1182,8 +1322,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();
             });
@@ -1207,6 +1347,7 @@ function assertHarmonyConfig(ctx, config) {
     }
 }
 
+exports.HarmonyOS_ArkTS = Harmony$1;
 exports.HarmonyOS_JSUI = Harmony;
 exports.default = index;
 //# sourceMappingURL=index.js.map