@tarojs/plugin-platform-harmony-ets 4.0.0-canary.9 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (135) hide show
  1. package/dist/apis/base/system.ts +73 -20
  2. package/dist/apis/canvas/index.ts +10 -1
  3. package/dist/apis/device/clipboard.ts +23 -8
  4. package/dist/apis/framework/index.ts +1 -5
  5. package/dist/apis/index.ts +27 -17
  6. package/dist/apis/media/image/index.ts +169 -17
  7. package/dist/apis/network/request.ts +5 -5
  8. package/dist/apis/route/index.ts +15 -0
  9. package/dist/apis/storage/index.ts +146 -78
  10. package/dist/apis/ui/animation/animation.ts +71 -29
  11. package/dist/apis/ui/background.ts +2 -1
  12. package/dist/apis/ui/interaction/index.ts +58 -59
  13. package/dist/apis/ui/navigation-bar/index.ts +1 -1
  14. package/dist/apis/ui/pull-down-refresh.ts +9 -3
  15. package/dist/apis/ui/scroll/index.ts +5 -5
  16. package/dist/apis/ui/tab-bar.ts +3 -3
  17. package/dist/apis/utils/index.ts +21 -2
  18. package/dist/apis/utils/permissions.ts +6 -0
  19. package/dist/apis/wxml/IntersectionObserver.ts +18 -10
  20. package/dist/apis/wxml/index.ts +2 -0
  21. package/dist/apis/wxml/selectorQuery.ts +26 -13
  22. package/dist/components-harmony-ets/button.ets +64 -34
  23. package/dist/components-harmony-ets/canvas.ets +51 -0
  24. package/dist/components-harmony-ets/checkbox.ets +73 -62
  25. package/dist/components-harmony-ets/form.ets +51 -29
  26. package/dist/components-harmony-ets/icon.ets +31 -19
  27. package/dist/components-harmony-ets/image.ets +34 -14
  28. package/dist/components-harmony-ets/index.ets +92 -0
  29. package/dist/components-harmony-ets/innerHtml.ets +11 -6
  30. package/dist/components-harmony-ets/input.ets +63 -41
  31. package/dist/components-harmony-ets/label.ets +71 -44
  32. package/dist/components-harmony-ets/listView.ets +31 -0
  33. package/dist/components-harmony-ets/movableArea.ets +126 -0
  34. package/dist/components-harmony-ets/movableView.ets +93 -0
  35. package/dist/components-harmony-ets/navigationBar.ets +65 -0
  36. package/dist/components-harmony-ets/pageMeta.ets +94 -0
  37. package/dist/components-harmony-ets/picker.ets +43 -39
  38. package/dist/components-harmony-ets/progress.ets +52 -0
  39. package/dist/components-harmony-ets/pseudo.ets +80 -0
  40. package/dist/components-harmony-ets/radio.ets +78 -68
  41. package/dist/components-harmony-ets/richText.ets +14 -30
  42. package/dist/components-harmony-ets/scrollList.ets +108 -0
  43. package/dist/components-harmony-ets/scrollView.ets +69 -30
  44. package/dist/components-harmony-ets/slider.ets +19 -15
  45. package/dist/components-harmony-ets/stickySection.ets +42 -0
  46. package/dist/components-harmony-ets/style.ets +386 -130
  47. package/dist/components-harmony-ets/swiper.ets +61 -20
  48. package/dist/components-harmony-ets/switch.ets +36 -32
  49. package/dist/components-harmony-ets/{index.ts → tag.ts} +6 -0
  50. package/dist/components-harmony-ets/text.ets +112 -50
  51. package/dist/components-harmony-ets/textArea.ets +50 -35
  52. package/dist/components-harmony-ets/utils/AttributeManager.ets +2 -2
  53. package/dist/components-harmony-ets/utils/DynamicCenter.ts +2 -2
  54. package/dist/components-harmony-ets/utils/flexManager.ets +50 -19
  55. package/dist/components-harmony-ets/utils/helper.ets +20 -8
  56. package/dist/components-harmony-ets/utils/htmlParser/HarmonyHTMLParser.ts +1 -2
  57. package/dist/components-harmony-ets/utils/htmlParser/index.ts +1 -1
  58. package/dist/components-harmony-ets/utils/index.ts +54 -50
  59. package/dist/components-harmony-ets/utils/styles.ets +172 -92
  60. package/dist/components-harmony-ets/video.ets +34 -21
  61. package/dist/components-harmony-ets/view.ets +62 -29
  62. package/dist/components-harmony-ets/webView.ets +40 -34
  63. package/dist/index.d.ts +152 -0
  64. package/dist/index.js +102 -56
  65. package/dist/index.js.map +1 -1
  66. package/dist/runtime-ets/bom/document.ts +6 -4
  67. package/dist/runtime-ets/bom/getComputedStyle.ts +2 -2
  68. package/dist/runtime-ets/bom/window.ts +7 -0
  69. package/dist/runtime-ets/current.ts +5 -1
  70. package/dist/runtime-ets/dom/bind.ts +28 -12
  71. package/dist/runtime-ets/dom/class-list.ts +2 -2
  72. package/dist/runtime-ets/dom/cssNesting.ts +419 -0
  73. package/dist/runtime-ets/dom/cssStyleDeclaration.ts +28 -42
  74. package/dist/runtime-ets/dom/document.ts +22 -8
  75. package/dist/runtime-ets/dom/element/canvas.ts +136 -0
  76. package/dist/runtime-ets/dom/element/element.ts +376 -57
  77. package/dist/runtime-ets/dom/element/form.ts +31 -26
  78. package/dist/runtime-ets/dom/element/index.ts +30 -2
  79. package/dist/runtime-ets/dom/element/movableArea.ts +11 -0
  80. package/dist/runtime-ets/dom/element/movableView.ts +248 -0
  81. package/dist/runtime-ets/dom/element/normal.ts +35 -8
  82. package/dist/runtime-ets/dom/element/progress.ts +11 -0
  83. package/dist/runtime-ets/dom/element/scrollView.ts +1 -0
  84. package/dist/runtime-ets/dom/element/text.ts +1 -8
  85. package/dist/runtime-ets/dom/element/video.ts +5 -4
  86. package/dist/runtime-ets/dom/element/webView.ts +12 -5
  87. package/dist/runtime-ets/dom/event.ts +3 -5
  88. package/dist/runtime-ets/dom/eventTarget.ts +2 -3
  89. package/dist/runtime-ets/dom/node.ts +65 -32
  90. package/dist/runtime-ets/dom/stylesheet/covertWeb2Hm.ts +418 -237
  91. package/dist/runtime-ets/dom/stylesheet/index.ts +29 -311
  92. package/dist/runtime-ets/dom/stylesheet/type.ts +53 -11
  93. package/dist/runtime-ets/dom/stylesheet/util.ts +33 -27
  94. package/dist/runtime-ets/index.ts +2 -2
  95. package/dist/runtime-ets/interface/event.ts +1 -1
  96. package/dist/runtime-ets/utils/index.ts +74 -13
  97. package/dist/runtime-ets/utils/info.ts +2 -2
  98. package/dist/runtime-framework/react/app.ts +15 -10
  99. package/dist/runtime-framework/react/hooks.ts +0 -1
  100. package/dist/runtime-framework/react/index.ts +0 -2
  101. package/dist/runtime-framework/react/native-page.ts +217 -80
  102. package/dist/runtime-framework/react/page.ts +4 -9
  103. package/dist/runtime-framework/react/utils/index.ts +3 -3
  104. package/dist/runtime-framework/solid/app.ts +30 -46
  105. package/dist/runtime-framework/solid/connect.ts +21 -3
  106. package/dist/runtime-framework/solid/hooks.ts +16 -11
  107. package/dist/runtime-framework/solid/index.ts +6 -2
  108. package/dist/runtime-framework/solid/page.ts +85 -31
  109. package/dist/runtime-framework/solid/reconciler/props.ts +70 -25
  110. package/dist/runtime-framework/solid/reconciler/render.ts +16 -6
  111. package/dist/runtime-framework/solid/reconciler/use.ts +0 -1
  112. package/dist/runtime-framework/solid/utils/index.ts +3 -5
  113. package/dist/runtime-utils.d.ts +827 -0
  114. package/dist/runtime-utils.js +618 -245
  115. package/dist/runtime-utils.js.map +1 -1
  116. package/dist/runtime.d.ts +1 -0
  117. package/dist/runtime.js +618 -245
  118. package/dist/runtime.js.map +1 -1
  119. package/index.js +3 -1
  120. package/package.json +14 -15
  121. package/static/media/cancel.svg +1 -1
  122. package/static/media/circle.svg +1 -1
  123. package/static/media/clear.svg +1 -1
  124. package/static/media/download.svg +1 -1
  125. package/static/media/info.svg +1 -1
  126. package/static/media/info_circle.svg +1 -1
  127. package/static/media/search.svg +1 -1
  128. package/static/media/success.svg +1 -1
  129. package/static/media/success_no_circle.svg +1 -1
  130. package/static/media/warn.svg +1 -1
  131. package/types/harmony.d.ts +5 -0
  132. package/types/index.d.ts +4 -0
  133. package/types/runtime.d.ts +1 -1
  134. package/dist/runtime-ets/utils/bind.ts +0 -24
  135. /package/dist/runtime-framework/solid/{contant.ts → constant.ts} +0 -0
@@ -1,9 +1,9 @@
1
1
  import { AREA_CHANGE_EVENT_NAME, eventHandler, getComponentEventCallback, VISIBLE_CHANGE_EVENT_NAME, createTaroEvent } from '@tarojs/runtime'
2
2
 
3
3
  import commonStyleModify from './style'
4
- import { getNormalAttributes, shouldBindEvent, getNodeThresholds } from './utils/helper'
4
+ import { shouldBindEvent, getNodeThresholds } from './utils/helper'
5
5
 
6
- import type { TaroAny, TaroWebViewElement, TaroStyleType, TaroEvent } from '@tarojs/runtime'
6
+ import type { TaroAny, TaroWebViewElement, TaroEvent } from '@tarojs/runtime'
7
7
 
8
8
  interface IPageLoad {
9
9
  url: string
@@ -14,37 +14,43 @@ interface IError {
14
14
  error: WebResourceError
15
15
  }
16
16
 
17
- @Builder
18
- export default function TaroWebView (node: TaroWebViewElement) {
19
- Web({ src: node._attrs.src, controller: node.controller })
20
- .attributeModifier(commonStyleModify.setNode(node))
21
- .onPageEnd((e: IPageLoad) => {
22
- // 1. 创建消息端口
23
- node.ports = node.controller.createWebMessagePorts(true)
24
- // 2. 发送端口1到HTML5
25
- node.controller.postMessage('init_web_messageport', [node.ports[1]], '*');
26
- // 3. 保存端口0到本地
27
- node.nativePort = node.ports[0]
28
- // 4. 设置回调函数
29
- node.nativePort.onMessageEventExt((result) => {
30
- const message = node.handleMessageFromWeb(result)
31
- const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, node)
32
-
33
- eventHandler(messageEvent, 'message', node)
17
+ @Component
18
+ export default struct TaroWebView {
19
+ @Builder customBuilder() {}
20
+ @BuilderParam createLazyChildren: (node: TaroWebViewElement, layer?: number) => void = this.customBuilder
21
+ @ObjectLink node: TaroWebViewElement
22
+
23
+ build () {
24
+ Web({ src: this.node._attrs.src, controller: this.node.controller })
25
+ .attributeModifier(commonStyleModify.setNode(this.node))
26
+ .onPageEnd((e: IPageLoad) => {
27
+ // 1. 创建消息端口
28
+ this.node.ports = this.node.controller.createWebMessagePorts(true)
29
+ // 2. 发送端口1到HTML5
30
+ this.node.controller.postMessage('init_web_messageport', [this.node.ports[1]], '*');
31
+ // 3. 保存端口0到本地
32
+ this.node.nativePort = this.node.ports[0]
33
+ // 4. 设置回调函数
34
+ this.node.nativePort.onMessageEventExt((result) => {
35
+ const message = this.node.handleMessageFromWeb(result)
36
+ const messageEvent: TaroEvent = createTaroEvent('message', { detail: { data: message } }, this.node)
37
+
38
+ eventHandler(messageEvent, 'message', this.node)
39
+ })
40
+
41
+ const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: this.node._attrs.src } }, this.node)
42
+
43
+ eventHandler(onLoadEvent, 'load', this.node)
34
44
  })
35
-
36
- const onLoadEvent: TaroEvent = createTaroEvent('load', { detail: { src: node._attrs.src } }, node)
37
-
38
- eventHandler(onLoadEvent, 'load', node)
39
- })
40
- .onErrorReceive(shouldBindEvent((e: IError) => {
41
- const event: TaroEvent = createTaroEvent('error', { detail: { url: node._attrs.src, fullUrl: e.request.getRequestUrl() } }, node)
42
-
43
- eventHandler(event, 'error', node)
44
- }, node, ['error']))
45
- .onClick(shouldBindEvent((e: ClickEvent) => eventHandler(e, 'click', node), node, ['click']))
46
- .onAreaChange(getComponentEventCallback(node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
47
- node._nodeInfo.areaInfo = res[1]
48
- }))
49
- .onVisibleAreaChange(getNodeThresholds(node) || [0.0, 1.0], getComponentEventCallback(node, VISIBLE_CHANGE_EVENT_NAME))
45
+ .onErrorReceive(shouldBindEvent((e: IError) => {
46
+ const event: TaroEvent = createTaroEvent('error', { detail: { url: this.node._attrs.src, fullUrl: e.request.getRequestUrl() } }, this.node)
47
+
48
+ eventHandler(event, 'error', this.node)
49
+ }, this.node, ['error']))
50
+ .onClick(shouldBindEvent((e: ClickEvent) => { eventHandler(e, 'click', this.node) }, this.node, ['click']))
51
+ .onAreaChange(getComponentEventCallback(this.node, AREA_CHANGE_EVENT_NAME, (res: TaroAny) => {
52
+ this.node._nodeInfo.areaInfo = res[1]
53
+ }))
54
+ .onVisibleAreaChange(getNodeThresholds(this.node) || [0.0, 1.0], getComponentEventCallback(this.node, VISIBLE_CHANGE_EVENT_NAME))
55
+ }
50
56
  }
@@ -0,0 +1,152 @@
1
+ /* eslint-disable no-console */
2
+ import { IFileType, TConfig, TaroPlatform, IPluginContext, TaroPlatformBase } from "@tarojs/service";
3
+ import { PLATFORM_TYPE } from "@tarojs/shared";
4
+ declare abstract class TaroPlatformHarmony<T extends TConfig = TConfig> extends TaroPlatform<T> {
5
+ platformType: PLATFORM_TYPE;
6
+ globalObject: string;
7
+ abstract fileType: IFileType;
8
+ abstract useETS: boolean;
9
+ abstract useJSON5: boolean;
10
+ taroComponentsPath: string;
11
+ /**
12
+ * 1. 清空 dist 文件夹
13
+ * 2. 输出编译提示
14
+ */
15
+ private setup;
16
+ private setupHarmonyApp;
17
+ protected printDevelopmentTip(): void;
18
+ /**
19
+ * 返回当前项目内的 runner 包
20
+ */
21
+ protected getRunner(): Promise<any>;
22
+ /**
23
+ * 准备 runner 参数
24
+ * @param extraOptions 需要额外合入 Options 的配置项
25
+ */
26
+ protected getOptions(extraOptions?: {}): any;
27
+ /**
28
+ * 调用 runner 开始编译
29
+ * @param extraOptions 需要额外传入 runner 的配置项
30
+ */
31
+ private build;
32
+ private buildHarmonyApp;
33
+ /**
34
+ * 调用 runner 开启编译
35
+ */
36
+ start(): Promise<void>;
37
+ }
38
+ declare class Harmony extends TaroPlatformHarmony {
39
+ #private;
40
+ platform: string;
41
+ globalObject: string;
42
+ fileType: {
43
+ templ: string;
44
+ style: string;
45
+ config: string;
46
+ script: string;
47
+ };
48
+ useETS: boolean;
49
+ useJSON5: boolean;
50
+ runtimePath: string[] | string;
51
+ taroComponentsPath: string;
52
+ apiEntryList: RegExp[];
53
+ constructor(ctx: IPluginContext, config: TConfig);
54
+ get framework(): "solid" | "vue3" | "react" | "preact" | "none";
55
+ get aliasFramework(): string;
56
+ get apiLibrary(): string;
57
+ get apiEntry(): RegExp[];
58
+ get componentLibrary(): string;
59
+ get runtimeLibrary(): string;
60
+ get runtimeFrameworkLibrary(): string;
61
+ get defineConstants(): Record<string, string> | undefined;
62
+ extensions: string[];
63
+ excludeLibraries: (string | RegExp)[];
64
+ externalDeps: [
65
+ string,
66
+ RegExp,
67
+ string?
68
+ ][];
69
+ harmonyScope: RegExp[];
70
+ indexOfLibraries(lib: string): number;
71
+ removeFromLibraries(lib: string): void;
72
+ moveLibraries(lib: string, target?: string, basedir?: string, sync?: boolean): void;
73
+ replaceDefineValue(code: string, define: Record<string, string>, ext?: string): string;
74
+ /**
75
+ * 修改 Vite 配置
76
+ */
77
+ modifyViteConfig(): void;
78
+ handleResourceEmit(outDir: string, basedir?: string): void;
79
+ }
80
+ declare module HarmonyWrapper {
81
+ export { Harmony };
82
+ }
83
+ import HarmonyOS_ArkTS = HarmonyWrapper.Harmony;
84
+ declare class Harmony$0 extends TaroPlatformBase {
85
+ platform: string;
86
+ globalObject: string;
87
+ runtimePath: string;
88
+ taroComponentsPath: string;
89
+ fileType: {
90
+ templ: string;
91
+ style: string;
92
+ config: string;
93
+ script: string;
94
+ };
95
+ template: any;
96
+ /**
97
+ * 1. setupTransaction - init
98
+ * 2. setup
99
+ * 3. setupTransaction - close
100
+ * 4. buildTransaction - init
101
+ * 5. build
102
+ * 6. buildTransaction - close
103
+ */
104
+ constructor(ctx: any, config: any);
105
+ /**
106
+ * 增加组件或修改组件属性
107
+ */
108
+ modifyComponents(): void;
109
+ /**
110
+ * 不需要转 rpx
111
+ */
112
+ modifyPostcssConfigs(config: Record<string, any>): void;
113
+ /**
114
+ * 模板自定义组件 js
115
+ * 等鸿蒙支持 template 后需要重构
116
+ */
117
+ addEntry(): void;
118
+ /**
119
+ * 把 app、pages、自定义组件的 js 改造为鸿蒙的 export default 导出形式
120
+ */
121
+ modifyTaroExport(): void;
122
+ /**
123
+ * 修改最终的编译产物
124
+ * 1. 生成模板自定义组件的 xml、css 文件
125
+ * 2. 删除多余的文件
126
+ * 3. 把 components-harmony 中被使用到的组件移动到输出目录
127
+ */
128
+ modifyBuildAssets(ctx: any, config: any): void;
129
+ modifyWebpackConfig(): void;
130
+ modifyHarmonyConfig(pages: any, { projectPath, hapName, name }: {
131
+ projectPath: any;
132
+ hapName: any;
133
+ name: any;
134
+ }): void;
135
+ modifyHostPackage({ projectPath, hapName }: {
136
+ projectPath: any;
137
+ hapName?: string | undefined;
138
+ }): Promise<any>;
139
+ getChunkEntryModule(compilation: any, chunk: any, compiler?: string): any;
140
+ checkMetaType(entryModule: any): boolean;
141
+ isHarmonyRequest(request: string): boolean;
142
+ }
143
+ declare module HarmonyWrapper {
144
+ export { Harmony$0 as Harmony };
145
+ }
146
+ import HarmonyOS_JSUI = HarmonyWrapper.Harmony;
147
+ interface IOptions {
148
+ disableArkTS?: boolean;
149
+ useConfigName?: string;
150
+ }
151
+ declare const _default: (ctx: IPluginContext, options?: IOptions) => void;
152
+ export { _default as default, HarmonyOS_ArkTS, HarmonyOS_JSUI, IOptions };
package/dist/index.js CHANGED
@@ -2,12 +2,11 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var helper = require('@tarojs/helper');
6
5
  var path = require('node:path');
7
- var runnerUtils = require('@tarojs/runner-utils');
8
- var shared = require('@tarojs/shared');
6
+ var helper = require('@tarojs/helper');
9
7
  var service = require('@tarojs/service');
10
8
  var _package = require('@tarojs/service/dist/utils/package');
9
+ var shared = require('@tarojs/shared');
11
10
  var webpackSources = require('webpack-sources');
12
11
  var template = require('@tarojs/shared/dist/template');
13
12
 
@@ -180,8 +179,8 @@ class TaroPlatformHarmony extends service.TaroPlatform {
180
179
  * 2. 输出编译提示
181
180
  */
182
181
  setup() {
183
- var _a, _b;
184
182
  return __awaiter(this, void 0, void 0, function* () {
183
+ var _a, _b;
185
184
  yield this.setupTransaction.perform(this.setupHarmonyApp, this);
186
185
  (_b = (_a = this.ctx).onSetupClose) === null || _b === void 0 ? void 0 : _b.call(_a, this);
187
186
  });
@@ -237,6 +236,7 @@ class TaroPlatformHarmony extends service.TaroPlatform {
237
236
  * @param extraOptions 需要额外合入 Options 的配置项
238
237
  */
239
238
  getOptions(extraOptions = {}) {
239
+ var _a, _b, _c;
240
240
  const { ctx } = this;
241
241
  const { recursiveMerge } = ctx.helper;
242
242
  const config = recursiveMerge(Object.assign({}, this.config), {
@@ -248,21 +248,21 @@ class TaroPlatformHarmony extends service.TaroPlatform {
248
248
  SUPPORT_TARO_POLYFILL: 'disabled',
249
249
  },
250
250
  });
251
- return Object.assign(Object.assign(Object.assign({}, config), { buildAdapter: config.platform, fileType: this.fileType, platformType: this.platformType, useETS: this.useETS, useJSON5: this.useJSON5 }), extraOptions);
251
+ 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);
252
252
  }
253
253
  /**
254
254
  * 调用 runner 开始编译
255
255
  * @param extraOptions 需要额外传入 runner 的配置项
256
256
  */
257
- build(extraOptions = {}) {
258
- var _a, _b;
259
- return __awaiter(this, void 0, void 0, function* () {
257
+ build() {
258
+ return __awaiter(this, arguments, void 0, function* (extraOptions = {}) {
259
+ var _a, _b;
260
260
  (_b = (_a = this.ctx).onBuildInit) === null || _b === void 0 ? void 0 : _b.call(_a, this);
261
261
  yield this.buildTransaction.perform(this.buildHarmonyApp, this, extraOptions);
262
262
  });
263
263
  }
264
- buildHarmonyApp(extraOptions = {}) {
265
- return __awaiter(this, void 0, void 0, function* () {
264
+ buildHarmonyApp() {
265
+ return __awaiter(this, arguments, void 0, function* (extraOptions = {}) {
266
266
  const runner = yield this.getRunner();
267
267
  const options = this.getOptions(Object.assign({
268
268
  runtimePath: this.runtimePath,
@@ -285,7 +285,6 @@ class TaroPlatformHarmony extends service.TaroPlatform {
285
285
  var _Harmony_defineConstants;
286
286
  const frameworkAlias = {
287
287
  solid: 'solid',
288
- vue: 'vue2',
289
288
  vue3: 'vue3',
290
289
  };
291
290
  let Harmony$1 = class Harmony extends TaroPlatformHarmony {
@@ -303,6 +302,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
303
302
  this.useJSON5 = true;
304
303
  this.runtimePath = [];
305
304
  this.taroComponentsPath = `${PACKAGE_NAME}/dist/components-harmony-ets`;
305
+ this.apiEntryList = [
306
+ /(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/,
307
+ ];
306
308
  _Harmony_defineConstants.set(this, {});
307
309
  this.extensions = ['.js', '.jsx', '.ts', '.tsx', '.cjs', '.mjs', '.mts', '.vue', '.ets', '.d.ts'];
308
310
  this.excludeLibraries = [];
@@ -317,14 +319,16 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
317
319
  ['react', /^react$|react[\\/]cjs/],
318
320
  ['react/jsx-runtime', /^react[\\/]jsx-runtime$/], // Note: React 环境下自动注入,避免重复
319
321
  ];
322
+ this.harmonyScope = [...HARMONY_SCOPES];
323
+ const that = this;
320
324
  this.setupTransaction.addWrapper({
321
325
  close() {
322
- this.modifyViteConfig();
326
+ that.modifyViteConfig();
323
327
  },
324
328
  });
325
329
  ctx.onBuildFinish(() => {
326
330
  const outDir = path__namespace.resolve(process.cwd(), config.outputRoot);
327
- this.handleResourceEmit(outDir);
331
+ that.handleResourceEmit(outDir);
328
332
  });
329
333
  }
330
334
  get framework() {
@@ -336,6 +340,9 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
336
340
  get apiLibrary() {
337
341
  return path__namespace.resolve(__dirname, './apis');
338
342
  }
343
+ get apiEntry() {
344
+ return this.apiEntryList;
345
+ }
339
346
  get componentLibrary() {
340
347
  return path__namespace.resolve(__dirname, './components-harmony-ets');
341
348
  }
@@ -372,8 +379,8 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
372
379
  return;
373
380
  if (this.excludeLibraries.some(e => typeof e === 'string' ? e === lib : e.test(lib)))
374
381
  return;
382
+ const { outputRoot, chorePackagePrefix } = this.ctx.runOpts.config;
375
383
  if (sync) {
376
- const { outputRoot } = this.ctx.runOpts.config;
377
384
  const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES);
378
385
  // FIXME 不支持 alias 配置
379
386
  const libName = lib;
@@ -421,9 +428,10 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
421
428
  }
422
429
  if (ext) {
423
430
  const code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
424
- if ((/(?:import\s|from\s|require\()['"]([\\/.][^'"\s]+)['"]\)?/g.test(code)
425
- || /\/{3}\s<reference\spath=['"][^'"\s]+['"]\s\/>/g.test(code))
426
- && `${libName}${path__namespace.extname(libDir)}` !== libDir) {
431
+ if ((/(?:import\s|from\s|require\()['"]([\\/.][^'"\s]+)['"]\)?/g.test(code) ||
432
+ /\/{3}\s<reference\spath=['"][^'"\s]+['"]\s\/>/g.test(code)) &&
433
+ `${libName}${path__namespace.extname(libDir)}` !== libDir) {
434
+ // Note: 文件包含包内引用的依赖
427
435
  const pkgPath = path__namespace.relative(libName, libDir);
428
436
  if (new RegExp(`^index(${this.extensions.map(e => e.replace('.', '\\.')).join('|')})$`).test(pkgPath)) {
429
437
  // Note: 入口为 index 场景
@@ -474,16 +482,18 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
474
482
  }
475
483
  else if (stat.isFile()) {
476
484
  let code = helper.fs.readFileSync(lib, { encoding: 'utf8' });
477
- // TODO: 后续这部分代码应该根据使用的框架抽离到对应的平台插件处
478
- if ([/(@tarojs[\\/]plugin-platform-harmony-ets|taro-platform-harmony)[\\/]dist[\\/]apis[\\/]index\.ts/].some(e => e.test(lib))) {
485
+ if (this.apiEntry.some(e => e.test(lib))) {
479
486
  code = apiLoader(code);
480
487
  }
481
488
  if (this.extensions.includes(path__namespace.extname(lib))) {
482
- code = code.replace(/(?:import\s|from\s|require\()['"]([^.][^'"\s]+)['"]\)?/g, (src, p1) => {
489
+ // Note: 查询 externals 内的依赖,并将它们添加到 externalDeps
490
+ code = code.replace(/(?:import\s|from\s|require\()['"]([^\\/.][^'"\s]+)['"]\)?/g, (src, p1 = '') => {
491
+ if (p1.startsWith('node:') || p1.endsWith('.so'))
492
+ return src;
483
493
  const { outputRoot } = this.ctx.runOpts.config;
484
494
  const targetPath = path__namespace.join(outputRoot, helper.NODE_MODULES, p1);
485
495
  const relativePath = parseRelativePath(path__namespace.dirname(target), targetPath);
486
- if (HARMONY_SCOPES.every(e => !e.test(p1))) {
496
+ if (this.harmonyScope.every(e => !e.test(p1))) {
487
497
  if (this.indexOfLibraries(p1) === -1 && !/\.(d\.ts|flow\.js)$/.test(lib)) {
488
498
  this.externalDeps.push([p1, new RegExp(`^${p1.replace(/([-\\/$])/g, '\\$1')}$`)]);
489
499
  this.moveLibraries(p1, targetPath, path__namespace.dirname(lib), true);
@@ -492,18 +502,29 @@ let Harmony$1 = class Harmony extends TaroPlatformHarmony {
492
502
  }
493
503
  return src;
494
504
  });
495
- const define = Object.assign({}, this.defineConstants);
505
+ const define = Object.assign(Object.assign({}, this.defineConstants), {
506
+ // Note: React 开发环境可能调用 stack 可能导致 appWrapper 实例变更
507
+ 'ReactDebugCurrentFrame.getCurrentStack': 'ReactDebugCurrentFrame.getCurrentStack$' });
496
508
  if ([/(@tarojs[\\/]runtime|taro-runtime)[\\/]dist/].some(e => e.test(lib))) {
497
509
  define.global = 'globalThis';
498
510
  }
499
- code = this.replaceDefineValue(code, define);
500
511
  const ext = path__namespace.extname(target);
512
+ if (![/d\.e?tsx?$/, /\.(json|map|md)$/].some(e => e.test(target))) {
513
+ code = this.replaceDefineValue(code, define, ext);
514
+ }
501
515
  if (['.ts'].includes(ext)) {
502
516
  code = '// @ts-nocheck\n' + code;
503
517
  }
518
+ // 处理嵌套样式的编译,需要针对ReactElement进行props操作,dev模式下会Object.freeze,所以需要在开发模式下注入Object.freeze来覆盖解锁
519
+ // 处理的方法再taro-platform-harmony/src/runtime-ets/dom/cssNesting: ele.props.style = declaration
520
+ if (/react\/jsx-runtime/.test(lib) && process.env.NODE_ENV === 'development') {
521
+ code = 'Object.freeze = (obj) => obj \n' + code;
522
+ }
504
523
  }
505
- if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
506
- code = `/// <reference path="global.d.ts" />
524
+ // Note: 传入 chorePackagePrefix 时,不生成核心依赖库
525
+ if (!chorePackagePrefix) {
526
+ if (/tarojs[\\/]taro[\\/]types[\\/]index.d.ts/.test(target)) {
527
+ code = `/// <reference path="global.d.ts" />
507
528
 
508
529
  /// <reference path="taro.api.d.ts" />
509
530
  /// <reference path="taro.component.d.ts" />
@@ -523,14 +544,15 @@ declare global {
523
544
  const defineAppConfig: (config: Taro.Config) => Taro.Config
524
545
  const definePageConfig: (config: Taro.Config) => Taro.Config
525
546
  }`;
526
- }
527
- try {
528
- const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
529
- helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
530
- helper.fs.writeFileSync(targetPath, code);
531
- }
532
- catch (e) {
533
- console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
547
+ }
548
+ try {
549
+ const targetPath = target.replace(new RegExp(`\\b${helper.NODE_MODULES}\\b`), 'npm');
550
+ helper.fs.ensureDirSync(path__namespace.dirname(targetPath));
551
+ helper.fs.writeFileSync(targetPath, code);
552
+ }
553
+ catch (e) {
554
+ console.error(`[taro-arkts] inject ${lib} to ${target} failed`, e);
555
+ }
534
556
  }
535
557
  }
536
558
  else if (stat.isSymbolicLink()) {
@@ -538,9 +560,13 @@ declare global {
538
560
  this.moveLibraries(realPath, target, basedir);
539
561
  }
540
562
  }
541
- replaceDefineValue(code, define) {
563
+ replaceDefineValue(code, define, ext = '.js') {
542
564
  Object.keys(define).forEach(key => {
543
- code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), define[key]);
565
+ let value = define[key];
566
+ if (/^['"`].*['"`]$/.test(value) && ['.ts', '.tsx', '.ets'].includes(ext)) {
567
+ value = `(${value} as string)`;
568
+ }
569
+ code = code.replace(new RegExp(`\\b${key}\\b`, 'g'), value);
544
570
  });
545
571
  return code;
546
572
  }
@@ -552,15 +578,15 @@ declare global {
552
578
  const that = this;
553
579
  const { appPath } = that.ctx.paths;
554
580
  const { config } = that.ctx.runOpts;
555
- const { outputRoot } = config;
581
+ const { outputRoot, ohPackage = {}, chorePackagePrefix } = config;
556
582
  if (!that.framework.includes('vue')) {
557
583
  that.excludeLibraries.push(/\bvue\b/);
558
584
  }
559
585
  // @ts-ignore
560
586
  if (that.framework === 'solid') {
561
587
  that.externalDeps.push([
562
- '@tarojs/plugin-framework-react/dist/runtime/reconciler',
563
- /^@tarojs\/plugin-framework-react\/dist\/runtime\/reconciler$/,
588
+ '@tarojs/plugin-framework-solid/dist/reconciler',
589
+ /^@tarojs\/plugin-framework-solid\/dist\/reconciler$/,
564
590
  path__namespace.join(this.runtimeFrameworkLibrary, 'reconciler')
565
591
  ]);
566
592
  that.externalDeps.push([
@@ -568,11 +594,30 @@ declare global {
568
594
  /^solid-js\/universal$/,
569
595
  ]);
570
596
  }
571
- function modifyResolveId({ source = '', importer = '', options = {}, name = 'modifyResolveId', resolve }) {
572
- if (shared.isFunction(resolve)) {
573
- if (source === that.runtimePath || that.runtimePath.includes(source)) {
574
- return resolve('@tarojs/runtime', importer, options);
575
- }
597
+ const chorePkgRgx = new RegExp(`^${(chorePackagePrefix || '').replace(/[\\/]+/g, '[\\\\/]+').replace(/[-^$*?.|]/g, '\\$&')}`);
598
+ const externals = Object.keys(ohPackage.dependencies || []).concat(Object.keys(ohPackage.devDependencies || []));
599
+ function modifyResolveId({ source = '', name = 'modifyResolveId' }) {
600
+ if (externals.includes(source) || (chorePackagePrefix && chorePkgRgx.test(source))) {
601
+ return {
602
+ external: true,
603
+ id: source,
604
+ resolvedBy: name,
605
+ };
606
+ }
607
+ else if (source.includes('css_variables')) {
608
+ return {
609
+ external: true,
610
+ id: path__namespace.join(outputRoot, 'css_variables'),
611
+ moduleSideEffects: 'no-treeshake',
612
+ resolvedBy: name,
613
+ };
614
+ }
615
+ if (chorePackagePrefix && that.indexOfLibraries(source) > -1) {
616
+ return {
617
+ external: true,
618
+ id: path__namespace.join(chorePackagePrefix, source),
619
+ resolvedBy: name,
620
+ };
576
621
  }
577
622
  // Note: 映射 Taro 相关依赖到注入 taro 目录
578
623
  if (that.indexOfLibraries(source) > -1) {
@@ -603,19 +648,18 @@ declare global {
603
648
  }
604
649
  function injectLoaderMeta() {
605
650
  return {
606
- name: 'taro:vite-h5-loader-meta',
651
+ name: 'taro:vite-loader-meta',
607
652
  buildStart() {
608
653
  return __awaiter(this, void 0, void 0, function* () {
609
- yield this.load({ id: runnerUtils.VITE_COMPILER_LABEL });
610
- const info = this.getModuleInfo(runnerUtils.VITE_COMPILER_LABEL);
611
- const compiler = info === null || info === void 0 ? void 0 : info.meta.viteCompilerContext;
654
+ const { getViteHarmonyCompilerContext } = that.ctx.runnerUtils;
655
+ const compiler = getViteHarmonyCompilerContext(this);
612
656
  if (compiler) {
613
657
  switch (that.framework) {
614
658
  // @ts-ignore
615
659
  case 'solid':
616
660
  compiler.loaderMeta || (compiler.loaderMeta = {});
617
661
  compiler.loaderMeta.importFrameworkStatement = ``;
618
- compiler.mockAppStatement = `
662
+ compiler.loaderMeta.mockAppStatement = `
619
663
  function App(props) {
620
664
  return null
621
665
  }
@@ -1011,7 +1055,7 @@ class Harmony extends service.TaroPlatformBase {
1011
1055
  * 等鸿蒙支持 template 后需要重构
1012
1056
  */
1013
1057
  addEntry() {
1014
- this.ctx.onCompilerMake(({ compilation, plugin }) => __awaiter(this, void 0, void 0, function* () {
1058
+ this.ctx.onCompilerMake((_a) => __awaiter(this, [_a], void 0, function* ({ compilation, plugin }) {
1015
1059
  // container/index.hml
1016
1060
  const filePath = path.resolve(__dirname, 'template/container');
1017
1061
  plugin.addEntry(filePath, 'container/index', helper.META_TYPE.STATIC);
@@ -1151,7 +1195,7 @@ class Harmony extends service.TaroPlatformBase {
1151
1195
  const outDir = path.join(compsOutDir, name);
1152
1196
  helper.fs.copy(src, outDir);
1153
1197
  });
1154
- this.modifyHostPackageDep(outDir);
1198
+ this.modifyHostPackage(config.harmony);
1155
1199
  });
1156
1200
  }
1157
1201
  modifyWebpackConfig() {
@@ -1214,13 +1258,13 @@ class Harmony extends service.TaroPlatformBase {
1214
1258
  console.warn(helper.chalk.red('设置鸿蒙 Hap 配置失败:', err));
1215
1259
  });
1216
1260
  }
1217
- modifyHostPackageDep(dest) {
1218
- return __awaiter(this, void 0, void 0, function* () {
1261
+ modifyHostPackage(_a) {
1262
+ return __awaiter(this, arguments, void 0, function* ({ projectPath, hapName = 'entry' }) {
1263
+ const packageJsonFile = path.join(projectPath, hapName, 'package.json');
1219
1264
  const hmsDeps = {
1220
1265
  '@hmscore/hms-js-base': '^6.1.0-300',
1221
1266
  '@hmscore/hms-jsb-account': '^1.0.300'
1222
1267
  };
1223
- const packageJsonFile = path.resolve(dest, '../../../../../package.json');
1224
1268
  const isExists = yield helper.fs.pathExists(packageJsonFile);
1225
1269
  if (!isExists)
1226
1270
  return;
@@ -1237,9 +1281,10 @@ class Harmony extends service.TaroPlatformBase {
1237
1281
  }
1238
1282
  packageJson = JSON.stringify(packageJson);
1239
1283
  yield helper.fs.writeFile(packageJsonFile, packageJson);
1284
+ return packageJson;
1240
1285
  });
1241
1286
  }
1242
- getChunkEntryModule(compilation, chunk, compiler = 'webpack4') {
1287
+ getChunkEntryModule(compilation, chunk, compiler = 'webpack5') {
1243
1288
  if (compiler === 'webpack5') {
1244
1289
  const chunkGraph = compilation.chunkGraph;
1245
1290
  const entryModules = Array.from(chunkGraph.getChunkEntryModulesIterable(chunk));
@@ -1280,8 +1325,8 @@ var index = (ctx, options = {}) => {
1280
1325
  ctx.registerPlatform({
1281
1326
  name: PLATFORM_NAME,
1282
1327
  useConfigName: options.useConfigName || PLATFORM_NAME,
1283
- fn({ config }) {
1284
- return __awaiter(this, void 0, void 0, function* () {
1328
+ fn(_a) {
1329
+ return __awaiter(this, arguments, void 0, function* ({ config }) {
1285
1330
  const program = new Harmony$2(ctx, config);
1286
1331
  yield program.start();
1287
1332
  });
@@ -1305,6 +1350,7 @@ function assertHarmonyConfig(ctx, config) {
1305
1350
  }
1306
1351
  }
1307
1352
 
1353
+ exports.HarmonyOS_ArkTS = Harmony$1;
1308
1354
  exports.HarmonyOS_JSUI = Harmony;
1309
1355
  exports.default = index;
1310
1356
  //# sourceMappingURL=index.js.map