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

package/dist/components-harmony-ets/webView.ets

@@ -14,37 +14,42 @@ interface IError {
   error: WebResourceError
 }
 
-@Builder
-export default function TaroWebView (node: TaroWebViewElement) {
-  Web({ src: node._attrs.src, controller: node.controller })
-    .attributeModifier(commonStyleModify.setNode(node))
-    .onPageEnd((e: IPageLoad) => {
-      // 1. 创建消息端口
-      node.ports = node.controller.createWebMessagePorts(true)
-      // 2. 发送端口1到HTML5
-      node.controller.postMessage('init_web_messageport', [node.ports[1]], '*');
-      // 3. 保存端口0到本地
-      node.nativePort = node.ports[0]
-      // 4. 设置回调函数
-      node.nativePort.onMessageEventExt((result) => {
-        const message = node.handleMessageFromWeb(result)
-        const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, node)
-
-        eventHandler(messageEvent, 'message', node)
+@Component
+export default struct TaroWebView {
+  @ObjectLink node: TaroWebViewElement
+
+  build () {
+    Web({ src: this.node._attrs.src, controller: this.node.controller })
+      .attributeModifier(commonStyleModify.setNode(this.node))
+      .onPageEnd((e: IPageLoad) => {
+        // 1. 创建消息端口
+        this.node.ports = this.node.controller.createWebMessagePorts(true)
+        // 2. 发送端口1到HTML5
+        this.node.controller.postMessage('init_web_messageport', [this.node.ports[1]], '*');
+        // 3. 保存端口0到本地
+        this.node.nativePort = this.node.ports[0]
+        // 4. 设置回调函数
+        this.node.nativePort.onMessageEventExt((result) => {
+          const message = this.node.handleMessageFromWeb(result)
+          const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, this.node)
+
+          eventHandler(messageEvent, 'message', this.node)
+        })
+
+        const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: this.node._attrs.src } }, this.node)
+
+        eventHandler(onLoadEvent, 'load', this.node)
       })
-
-      const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: node._attrs.src } }, node)
-
-      eventHandler(onLoadEvent, 'load', node)
-    })
-    .onErrorReceive(shouldBindEvent((e: IError) => {
-      const event: TaroEvent = createTaroEvent('error', { detail: { url: node._attrs.src, fullUrl: e.request.getRequestUrl() } }, node)
-      
-      eventHandler(event, 'error', node)
-    }, node, ['error']))
-    .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
-    .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
-      node._nodeInfo.areaInfo = res[1]
-    }))
-    .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
+      .onErrorReceive(shouldBindEvent((e: IError) => {
+        const event: TaroEvent = createTaroEvent('error', { detail: { url: this.node._attrs.src, fullUrl: e.request.getRequestUrl() } }, this.node)
+        
+        eventHandler(event, 'error', this.node)
+      }, this.node, ['error']))
+      .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', this.node), this.node, ['click']))
+      .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
+        this.node._nodeInfo.areaInfo = res[1]
+      }))
+      .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
+  
+  }
 }

package/dist/index.js

@@ -158,7 +158,7 @@ export {
 const PLATFORM_NAME = 'harmony';
 const PACKAGE_NAME = '@tarojs/plugin-platform-harmony-ets';
 const PLUGIN_NAME = 'TaroHarmony';
-const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//];
+const HARMONY_SCOPES = [/^@system\./, /^@ohos\./, /^@hmscore\//, /^@jd-oh\//];
 
 function parseRelativePath(from, to) {
     const relativePath = path.relative(from, to).replace(/\\/g, '/');
@@ -372,8 +372,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;
@@ -479,6 +479,7 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                 code = apiLoader(code);
             }
             if (this.extensions.includes(path__namespace.extname(lib))) {
+                // 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);
@@ -502,8 +503,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
                     code = '// @ts-nocheck\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" />
@@ -523,14 +526,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()) {
@@ -552,7 +556,7 @@ 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/);
         }
@@ -568,7 +572,22 @@ declare global {
                 /^solid-js\/universal$/,
             ]);
         }
+        const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
         function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
+            if (externals.includes(source)) {
+                return {
+                    external: true,
+                    id: source,
+                    resolvedBy: name,
+                };
+            }
+            if (chorePackagePrefix && that.indexOfLibraries(source) > -1) {
+                return {
+                    external: true,
+                    id: path__namespace.join(chorePackagePrefix, source),
+                    resolvedBy: name,
+                };
+            }
             if (shared.isFunction(resolve)) {
                 if (source === that.runtimePath || that.runtimePath.includes(source)) {
                     return resolve('@tarojs/runtime', importer, options);
@@ -1151,7 +1170,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() {
@@ -1214,13 +1233,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;
@@ -1237,6 +1256,7 @@ class Harmony extends service.TaroPlatformBase {
             }
             packageJson = JSON.stringify(packageJson);
             yield helper.fs.writeFile(packageJsonFile, packageJson);
+            return packageJson;
         });
     }
     getChunkEntryModule(compilation, chunk, compiler = 'webpack4') {