@react-native-oh/react-native-harmony-cli 0.84.1 → 0.84.3
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.
- package/README.md +4 -4
- package/dist/assetResolver.js +1 -1
- package/dist/autolinking/Autolinking.js +4 -2
- package/dist/codegen/generators/LibGlueCodeGenerator.js +16 -6
- package/dist/commands/clean-harmony.js +5 -5
- package/dist/commands/codegen-lib-harmony.js +78 -40
- package/dist/commands/init-harmony.js +2 -2
- package/dist/commands/init.js +2 -2
- package/dist/commands/verify-package-harmony.js +1 -0
- package/dist/core/OHPackageJSON5.js +2 -2
- package/dist/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +2 -2
- package/dist/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +3 -3
- package/dist/package-verifier/verify-package.js +1 -1
- package/dist/simulator/LaunchSimulator.js +12 -6
- package/harmony/rnoh-hvigor-plugin-0.84.3.tgz +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/00a68392 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/0544a6cc +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/0f36b2db +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/12f23f1e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/13d95d98 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1629e86b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/180c8379 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1a697147 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1a8271b1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/1b7fa689 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/255a9f13 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/268d155b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/27db9aa4 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/28db79ed +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2dc2bbcb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2df5f8c5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/2f88aedb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/31b3a7ea +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/36335b1c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/38fca641 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/397722eb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/397b6432 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/3b17421f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/454f5e18 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/45ec6cce +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/482d51b1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4ac5cd67 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4d40499a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4dcad919 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/4fc31929 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/54edc8f5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/558a5405 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/58d2b670 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/5ec7feca +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/62180f3e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/63981360 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/64096c89 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/64af560b +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6585e783 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6954304f +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/69fd6235 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6d3a0478 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/6e131db7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/778cd8f1 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/788206b6 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7882dc26 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7b3c14f7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/7cdfe667 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/8048c487 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/8332d9a3 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/84e5b603 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/854d8127 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/88c97376 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/90d5f644 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/967e25ac +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/969896c2 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/9790193e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/97ae40c5 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/9a5bf482 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a07adeb9 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a427f355 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a9dd7eb7 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/a9e9d79e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ab920855 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ab9e3038 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/af054988 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/afe03e51 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b3b83913 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b4db7b4d +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b5225355 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b8c00f06 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b917a081 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/b9e2f3bd +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/bd70db0e +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/bdbda648 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/be1e5469 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/c9462295 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ca6e5efa +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/caf52beb +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cb268960 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cca16b15 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/cfc1c937 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d10e6e05 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d172fc04 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d4e94e50 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/d59f8d2c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/da964053 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e0bb712a +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e3e6ca34 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/e50f7385 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f1a1d282 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f2514c3c +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f66207cf +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/f8d129ce +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/fb1e9558 +0 -0
- package/node-compile-cache/v22.14.0-x64-efe9a9df-0/ff7e3608 +0 -0
- package/package.json +5 -5
- package/src/assetResolver.ts +1 -1
- package/src/autolinking/Autolinking.ts +7 -3
- package/src/codegen/generators/LibGlueCodeGenerator.ts +23 -12
- package/src/commands/bundle-harmony.ts +4 -4
- package/src/commands/clean-harmony.ts +6 -6
- package/src/commands/codegen-lib-harmony.ts +110 -56
- package/src/commands/init-harmony.ts +2 -2
- package/src/commands/init.ts +4 -3
- package/src/commands/run-harmony.ts +1 -1
- package/src/commands/verify-package-harmony.ts +1 -0
- package/src/core/OHPackageJSON5.ts +2 -2
- package/src/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +2 -2
- package/src/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +3 -3
- package/src/package-verifier/verify-package.ts +1 -1
- package/src/simulator/LaunchSimulator.ts +18 -6
- package/harmony/rnoh-hvigor-plugin-0.84.1.tgz +0 -0
|
@@ -25,13 +25,17 @@ function compareVersionTuple(a: number[], b: number[]): number {
|
|
|
25
25
|
for (let i = 0; i < Math.max(a.length, b.length); i++) {
|
|
26
26
|
const av = a[i] ?? 0;
|
|
27
27
|
const bv = b[i] ?? 0;
|
|
28
|
-
if (av !== bv)
|
|
28
|
+
if (av !== bv) {
|
|
29
|
+
return av - bv;
|
|
30
|
+
}
|
|
29
31
|
}
|
|
30
32
|
return 0;
|
|
31
33
|
}
|
|
32
34
|
function isSupportedVersion(versionDir: string): boolean {
|
|
33
35
|
const m = versionDir.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)/);
|
|
34
|
-
if (!m)
|
|
36
|
+
if (!m) {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
35
39
|
const current = m.slice(1).map(n => parseInt(n, 10));
|
|
36
40
|
return compareVersionTuple(current, MIN_SUPPORTED_VERSION) >= 0;
|
|
37
41
|
}
|
|
@@ -143,9 +147,13 @@ function parseDeviceManagerXml(xmlContent: string): DevicePathInfo {
|
|
|
143
147
|
while ((m = optionRegex.exec(xmlContent))) {
|
|
144
148
|
const tag = m[0];
|
|
145
149
|
const nameMatch = tag.match(/\bname=["']([^"']+)["']/i);
|
|
146
|
-
if (!nameMatch)
|
|
150
|
+
if (!nameMatch) {
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
147
153
|
const valueMatch = tag.match(/\bvalue=["']([^"']+)["']/i);
|
|
148
|
-
if (!valueMatch)
|
|
154
|
+
if (!valueMatch) {
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
149
157
|
const name = nameMatch[1];
|
|
150
158
|
const value = valueMatch[1];
|
|
151
159
|
if (name === 'imageDeployPath' && !info.imageRoot) {
|
|
@@ -153,7 +161,9 @@ function parseDeviceManagerXml(xmlContent: string): DevicePathInfo {
|
|
|
153
161
|
} else if (name === 'openharmonyDeployPath' && !info.instancePath) {
|
|
154
162
|
info.instancePath = value;
|
|
155
163
|
}
|
|
156
|
-
if (info.imageRoot && info.instancePath)
|
|
164
|
+
if (info.imageRoot && info.instancePath) {
|
|
165
|
+
break;
|
|
166
|
+
}
|
|
157
167
|
}
|
|
158
168
|
return info;
|
|
159
169
|
}
|
|
@@ -221,7 +231,9 @@ async function resolveInstanceAndImageRoot(
|
|
|
221
231
|
try {
|
|
222
232
|
const content = await fs.readFile(xmlPath, 'utf-8');
|
|
223
233
|
xmlInfo = parseDeviceManagerXml(content);
|
|
224
|
-
if (xmlInfo.instancePath || xmlInfo.imageRoot)
|
|
234
|
+
if (xmlInfo.instancePath || xmlInfo.imageRoot) {
|
|
235
|
+
break;
|
|
236
|
+
}
|
|
225
237
|
} catch (error) {
|
|
226
238
|
throw new DescriptiveError({
|
|
227
239
|
whatHappened: `Failed to read or parse device manager XML at ${xmlPath}: ${(error as any)?.message || error}`,
|
|
Binary file
|