@tarojs/plugin-platform-harmony-ets 4.0.0-beta.3 → 4.0.0-beta.31

package/dist/index.js

@@ -5,9 +5,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');
 
@@ -244,10 +244,11 @@ 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, useNesting: config.useNesting, useJSON5: this.useJSON5 }), extraOptions);
     }
     /**
      * 调用 runner 开始编译
@@ -316,14 +317,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() {
@@ -335,6 +338,11 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
     get apiLibrary() {
         return path__namespace.resolve(__dirname, './apis');
     }
+    get apiEntry() {
+        return [
+            /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
+        ];
+    }
     get componentLibrary() {
         return path__namespace.resolve(__dirname, './components-harmony-ets');
     }
@@ -371,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;
@@ -423,6 +431,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 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 场景
@@ -473,16 +482,16 @@ 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))) {
-                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);
@@ -500,9 +509,16 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 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" />
@@ -522,14 +538,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()) {
@@ -551,15 +568,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([
@@ -567,11 +584,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) {
@@ -614,7 +649,7 @@ declare global {
                                     case 'solid':
                                         compiler.loaderMeta || (compiler.loaderMeta = {});
                                         compiler.loaderMeta.importFrameworkStatement = ``;
-                                        compiler.mockAppStatement = `
+                                        compiler.loaderMeta.mockAppStatement = `
 function App(props) {
   return null
 }
@@ -1150,7 +1185,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() {
@@ -1213,13 +1248,13 @@ class Harmony extends service.TaroPlatformBase {
             console.warn(helper.chalk.red('设置鸿蒙 Hap 配置失败：', err));
         });
     }
-    modifyHostPackageDep(dest) {
+    modifyHostPackage({ projectPath, hapName = 'entry' }) {
         return __awaiter(this, void 0, void 0, function* () {
+            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;
@@ -1236,6 +1271,7 @@ class Harmony extends service.TaroPlatformBase {
             }
             packageJson = JSON.stringify(packageJson);
             yield helper.fs.writeFile(packageJsonFile, packageJson);
+            return packageJson;
         });
     }
     getChunkEntryModule(compilation, chunk, compiler = 'webpack4') {
@@ -1304,6 +1340,7 @@ function assertHarmonyConfig(ctx, config) {
     }
 }
 
+exports.HarmonyOS_ArkTS = Harmony$1;
 exports.HarmonyOS_JSUI = Harmony;
 exports.default = index;
 //# sourceMappingURL=index.js.map