@react-native-oh/react-native-harmony-cli 0.77.73 → 0.77.75
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 +2 -2
- package/dist/assetResolver.js +1 -1
- package/dist/autolinking/Autolinking.js +4 -2
- package/dist/codegen/core/TypeAnnotationToTS.js +2 -0
- package/dist/commands/bundle-harmony.js +6 -1
- package/dist/commands/clean-harmony.js +5 -5
- package/dist/commands/init-harmony.js +2 -2
- package/dist/commands/init.js +2 -2
- package/dist/commands/verify-package-harmony.js +2 -0
- package/dist/core/OHPackageJSON5.js +2 -2
- package/dist/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +1 -1
- package/dist/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +2 -2
- package/dist/package-verifier/verify-package.js +1 -1
- package/dist/simulator/LaunchSimulator.js +12 -6
- package/harmony/rnoh-hvigor-plugin-0.77.75.tgz +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/00295336 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/008b46d2 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/00cd4dda +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/04cea04c +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/05456871 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/0ae32abb +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/0b48ad8e +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/0cae97fc +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/1480fa97 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/1605ee89 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/1e6ae961 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/240d2667 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/27934436 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/308da66a +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/3442f3cf +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/349f72a0 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/37767edf +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/37ce5add +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/385deae1 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/3cd62667 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/4387cd63 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/444b6d47 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/45ece0fb +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/47ccd396 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/496f7444 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/4d82696e +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/4eb25953 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/50c3e9bb +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/5926231b +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/59c354c2 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/5c74cb2d +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/5dcb9ab8 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/5e5aa298 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/5ebb4e14 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/608a0945 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/62001dcc +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/63177a89 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/690790d2 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/6948fdf0 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/6debf626 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/708bb39b +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/76f64b03 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/78ea606f +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/7b8ac24d +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/7d186843 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/7f12dc56 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/8313724a +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/84492c6c +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/8449f6fc +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/86506236 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/8b8ad1ff +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/8f473a16 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/8f91e6a2 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/9ef6c589 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a06f5312 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a25c6436 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a376585e +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a4e0b7a8 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a53962e8 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a576458a +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/a8bbebf8 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/af8536f0 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/b00cb392 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/b26b36fb +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/b3783e31 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/b41523d2 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/b45a94bb +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/bb2a0b08 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/bb563230 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/bd3da552 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/c3025482 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/c75a650e +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/c7dc8283 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/cbf6c034 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/cf9197ca +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/cffe922b +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/d49ea56c +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/d533a666 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/d948e745 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/d9f2d22b +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/dc1052ee +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/dde88fbf +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/dfa0a41b +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/edce8119 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/ee4cf060 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/f079d49d +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/f2452d07 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/fb134c38 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/fd1210c0 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/fe159876 +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/ff657ffe +0 -0
- package/node-compile-cache/v24.14.1-x64-cf738c9d-0/ff687756 +0 -0
- package/package.json +5 -5
- package/src/assetResolver.ts +1 -1
- package/src/autolinking/Autolinking.ts +5 -3
- package/src/codegen/core/TypeAnnotationToTS.ts +2 -0
- package/src/commands/bundle-harmony.ts +5 -0
- package/src/commands/clean-harmony.ts +6 -6
- package/src/commands/init-harmony.ts +2 -2
- package/src/commands/init.ts +6 -3
- package/src/commands/run-harmony.ts +1 -1
- package/src/commands/verify-package-harmony.ts +2 -0
- package/src/core/OHPackageJSON5.ts +2 -2
- package/src/init/templates/harmony/entry/src/main/ets/PackageProvider.ets +1 -1
- package/src/init/templates/harmony/entry/src/main/ets/workers/RNOHWorker.ets +2 -2
- package/src/package-verifier/verify-package.ts +1 -1
- package/src/simulator/LaunchSimulator.ts +12 -6
- package/harmony/rnoh-hvigor-plugin-0.77.73.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
|
@@ -223,12 +223,12 @@ export const commandInitHarmony: Command = {
|
|
|
223
223
|
fs.writeTextSync(path, content);
|
|
224
224
|
});
|
|
225
225
|
|
|
226
|
-
const buildProfileTemplateComment =
|
|
226
|
+
const buildProfileTemplateComment = 'build-profile.json5 can contain signingConfigs which are unique for each developer, therefore that file is ignored by Git. Create a build-profile.json5 based on this template after cloning this repository to be able to open this project in DevEco Studio.';
|
|
227
227
|
|
|
228
228
|
const buildProfilePath = harmonyDirPath.copyWithNewSegment('build-profile.json5');
|
|
229
229
|
const buildProfileContent = fs.readTextSync(buildProfilePath);
|
|
230
230
|
const contentLines = buildProfileContent.split('\n');
|
|
231
|
-
contentLines.splice(1, 0,
|
|
231
|
+
contentLines.splice(1, 0, ' // ' + buildProfileTemplateComment);
|
|
232
232
|
const buildProfileTemplateContent = contentLines.join('\n');
|
|
233
233
|
|
|
234
234
|
fs.writeTextSync(
|
package/src/commands/init.ts
CHANGED
|
@@ -153,7 +153,7 @@ class ValidationHelper {
|
|
|
153
153
|
}
|
|
154
154
|
return reactNativeVersion;
|
|
155
155
|
}
|
|
156
|
-
return
|
|
156
|
+
return '0.77';
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
159
|
|
|
@@ -580,7 +580,7 @@ async function cleanupTempDir(tempDir: string): Promise<void> {
|
|
|
580
580
|
async function getRNOHVersion(rnVersion: string): Promise<string> {
|
|
581
581
|
const versionParts = rnVersion.split('.');
|
|
582
582
|
const majorMinorVersion = `${versionParts[0]}.${versionParts[1]}`;
|
|
583
|
-
let versionInfos =
|
|
583
|
+
let versionInfos = '';
|
|
584
584
|
await runCliCommand(NPM_EXE, ['view', DEFAULT_TEMPLATE_PKG, 'versions', '--json'], process.cwd(), false,
|
|
585
585
|
(data) => {
|
|
586
586
|
versionInfos += data.toString();
|
|
@@ -597,7 +597,10 @@ async function getRNOHVersion(rnVersion: string): Promise<string> {
|
|
|
597
597
|
return matchingVersions.pop();
|
|
598
598
|
}
|
|
599
599
|
|
|
600
|
-
async function handleMissingHarmonyDir(
|
|
600
|
+
async function handleMissingHarmonyDir(
|
|
601
|
+
destDir: string,
|
|
602
|
+
rnVersion: string,
|
|
603
|
+
): Promise<{ rnohTemplateConfig: TemplateConfig, rnohVersion: string, rnohCliVersion: string }> {
|
|
601
604
|
const lastestVersion = await getRNOHVersion(rnVersion);
|
|
602
605
|
const defaultTempDir = await createTempDir();
|
|
603
606
|
try {
|
|
@@ -192,7 +192,7 @@ export const commandRunHarmony: Command = {
|
|
|
192
192
|
message: 'Please select a device:',
|
|
193
193
|
choices: connectedDevices.map((deviceOrSimulator, index) => `${index + 1}. ${deviceOrSimulator.name}`)
|
|
194
194
|
}
|
|
195
|
-
])
|
|
195
|
+
]);
|
|
196
196
|
return connectedDevices[parseInt(answers.selectedDeviceIndex) - 1].name;
|
|
197
197
|
}
|
|
198
198
|
|
|
@@ -21,10 +21,10 @@ export class OHPackageJSON5 {
|
|
|
21
21
|
private constructor(private rawData: Record<string, any>) {}
|
|
22
22
|
|
|
23
23
|
get name(): string {
|
|
24
|
-
return this.rawData
|
|
24
|
+
return this.rawData.name;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
get version(): string {
|
|
28
|
-
return this.rawData
|
|
28
|
+
return this.rawData.version;
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import type { RNPackageContext, RNOHPackage } from '@rnoh/react-native-openharmony';
|
|
9
|
-
import { createRNOHPackages as createRNOHPackagesAutolinking } from
|
|
9
|
+
import { createRNOHPackages as createRNOHPackagesAutolinking } from './RNOHPackagesFactory'
|
|
10
10
|
|
|
11
11
|
export function getRNOHPackages(ctx: RNPackageContext): RNOHPackage[] {
|
|
12
12
|
return [
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
* It looks like this is ArkTS problem and it may be fixed in the future.
|
|
13
13
|
* For the time being, use direct imports.
|
|
14
14
|
*/
|
|
15
|
-
import { setupRNOHWorker } from
|
|
16
|
-
import { getRNOHPackages } from
|
|
15
|
+
import { setupRNOHWorker } from '@rnoh/react-native-openharmony/src/main/ets/setupRNOHWorker'
|
|
16
|
+
import { getRNOHPackages } from '../PackageProvider'
|
|
17
17
|
|
|
18
18
|
setupRNOHWorker({
|
|
19
19
|
createWorkerRNInstanceConfig: (_rnInstanceName) => {
|
|
@@ -116,7 +116,7 @@ function findHarPath(packagePath: AbsolutePath): AbsolutePath | null {
|
|
|
116
116
|
const harFilenames = fileOrDirNames.filter((fileOrDirName) =>
|
|
117
117
|
fileOrDirName.endsWith('.har')
|
|
118
118
|
);
|
|
119
|
-
if (harFilenames.length
|
|
119
|
+
if (harFilenames.length !== 1) {
|
|
120
120
|
return null;
|
|
121
121
|
}
|
|
122
122
|
return packageHarmonyPath.copyWithNewSegment(harFilenames[0]);
|
|
@@ -25,13 +25,15 @@ 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) return av - bv;
|
|
28
|
+
if (av !== bv) { return av - bv;
|
|
29
|
+
}
|
|
29
30
|
}
|
|
30
31
|
return 0;
|
|
31
32
|
}
|
|
32
33
|
function isSupportedVersion(versionDir: string): boolean {
|
|
33
34
|
const m = versionDir.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)/);
|
|
34
|
-
if (!m) return false;
|
|
35
|
+
if (!m) { return false;
|
|
36
|
+
}
|
|
35
37
|
const current = m.slice(1).map(n => parseInt(n, 10));
|
|
36
38
|
return compareVersionTuple(current, MIN_SUPPORTED_VERSION) >= 0;
|
|
37
39
|
}
|
|
@@ -143,9 +145,11 @@ function parseDeviceManagerXml(xmlContent: string): DevicePathInfo {
|
|
|
143
145
|
while ((m = optionRegex.exec(xmlContent))) {
|
|
144
146
|
const tag = m[0];
|
|
145
147
|
const nameMatch = tag.match(/\bname=["']([^"']+)["']/i);
|
|
146
|
-
if (!nameMatch) continue;
|
|
148
|
+
if (!nameMatch) { continue;
|
|
149
|
+
}
|
|
147
150
|
const valueMatch = tag.match(/\bvalue=["']([^"']+)["']/i);
|
|
148
|
-
if (!valueMatch) continue;
|
|
151
|
+
if (!valueMatch) { continue;
|
|
152
|
+
}
|
|
149
153
|
const name = nameMatch[1];
|
|
150
154
|
const value = valueMatch[1];
|
|
151
155
|
if (name === 'imageDeployPath' && !info.imageRoot) {
|
|
@@ -153,7 +157,8 @@ function parseDeviceManagerXml(xmlContent: string): DevicePathInfo {
|
|
|
153
157
|
} else if (name === 'openharmonyDeployPath' && !info.instancePath) {
|
|
154
158
|
info.instancePath = value;
|
|
155
159
|
}
|
|
156
|
-
if (info.imageRoot && info.instancePath) break;
|
|
160
|
+
if (info.imageRoot && info.instancePath) { break;
|
|
161
|
+
}
|
|
157
162
|
}
|
|
158
163
|
return info;
|
|
159
164
|
}
|
|
@@ -221,7 +226,8 @@ async function resolveInstanceAndImageRoot(
|
|
|
221
226
|
try {
|
|
222
227
|
const content = await fs.readFile(xmlPath, 'utf-8');
|
|
223
228
|
xmlInfo = parseDeviceManagerXml(content);
|
|
224
|
-
if (xmlInfo.instancePath || xmlInfo.imageRoot) break;
|
|
229
|
+
if (xmlInfo.instancePath || xmlInfo.imageRoot) { break;
|
|
230
|
+
}
|
|
225
231
|
} catch (error) {
|
|
226
232
|
throw new DescriptiveError({
|
|
227
233
|
whatHappened: `Failed to read or parse device manager XML at ${xmlPath}: ${(error as any)?.message || error}`,
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|