@react-native-oh/react-native-harmony-cli 0.82.32 → 0.82.34
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/autolinking/JSON5Writer.js +5 -1
- package/dist/codegen/core/TypeAnnotationToTS.js +2 -0
- package/dist/commands/bundle-harmony.js +7 -2
- 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/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 +14 -6
- package/harmony/rnoh-hvigor-plugin-0.82.34.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.test.ts +56 -0
- package/src/autolinking/Autolinking.ts +7 -3
- package/src/autolinking/JSON5Writer.ts +5 -1
- package/src/codegen/core/TypeAnnotationToTS.ts +2 -0
- package/src/commands/bundle-harmony.ts +7 -2
- package/src/commands/clean-harmony.ts +8 -6
- package/src/commands/init-harmony.ts +2 -2
- package/src/commands/init.ts +7 -3
- package/src/commands/run-harmony.ts +7 -1
- package/src/commands/verify-package-harmony.ts +2 -0
- 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 +6 -6
- package/harmony/rnoh-hvigor-plugin-0.82.32.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/README.md
CHANGED
|
@@ -4,8 +4,8 @@ Please refer to: [RNOH repo](https://gitcode.com/CPF-RN/ohos_react_native) for m
|
|
|
4
4
|
|
|
5
5
|
# Documentation
|
|
6
6
|
|
|
7
|
-
- [中文](https://gitcode.com/CPF-RN/ohos_react_native/
|
|
8
|
-
- [English](https://gitcode.com/CPF-RN/ohos_react_native/
|
|
7
|
+
- [中文](https://gitcode.com/CPF-RN/ohos_react_native/tree/main/docs/zh-cn)
|
|
8
|
+
- [English](https://gitcode.com/CPF-RN/ohos_react_native/tree/main/docs/en)
|
|
9
9
|
|
|
10
10
|
# License
|
|
11
11
|
|
package/dist/assetResolver.js
CHANGED
|
@@ -227,10 +227,12 @@ class Autolinking {
|
|
|
227
227
|
return Object.assign(Object.assign({}, lib), { etsRNOHPackageClassName: (_a = lib.etsRNOHPackageClassName) !== null && _a !== void 0 ? _a : this.npmPackageNameToRNOHPackageClassName(lib.npmPackageName), cppRNOHPackageClassName: (_b = lib.cppRNOHPackageClassName) !== null && _b !== void 0 ? _b : this.npmPackageNameToRNOHPackageClassName(lib.npmPackageName), cmakeLibraryTargetName: (_c = lib.cmakeLibraryTargetName) !== null && _c !== void 0 ? _c : this.npmPackageNameToCMakeLibraryTargetName(lib.npmPackageName), resolvedHars: lib.resolvedHars });
|
|
228
228
|
});
|
|
229
229
|
autolinkableLibraries.sort((a, b) => {
|
|
230
|
-
if (a.npmPackageName < b.npmPackageName)
|
|
230
|
+
if (a.npmPackageName < b.npmPackageName) {
|
|
231
231
|
return -1;
|
|
232
|
-
|
|
232
|
+
}
|
|
233
|
+
if (a.npmPackageName > b.npmPackageName) {
|
|
233
234
|
return 1;
|
|
235
|
+
}
|
|
234
236
|
return 0;
|
|
235
237
|
});
|
|
236
238
|
const ohPackage = json5_1.default.parse(input.ohPackagePathAndContent[1]);
|
|
@@ -36,7 +36,11 @@ class JSON5Writer {
|
|
|
36
36
|
// Return the modified source with JSON5-style formatting
|
|
37
37
|
// Use double quotes for both keys and values, and trailing commas
|
|
38
38
|
// quoteKeys: true ensures keys with special characters (like @, /, -) are properly quoted
|
|
39
|
-
|
|
39
|
+
// NOTE: toSource() preserves the original trailing newlines, so strip them
|
|
40
|
+
// before appending exactly one — otherwise every rewrite appends an extra
|
|
41
|
+
// blank line and they accumulate across builds (idempotency fix).
|
|
42
|
+
const source = writer.toSource({ quote: 'double', quoteKeys: true, trailingComma: true });
|
|
43
|
+
return source.replace(/(\r?\n)+$/, '') + '\n';
|
|
40
44
|
}
|
|
41
45
|
/**
|
|
42
46
|
* Updates dependencies with fallback to standard JSON5 stringify if preservation fails.
|
|
@@ -128,9 +128,10 @@ exports.commandBundleHarmony = {
|
|
|
128
128
|
},
|
|
129
129
|
],
|
|
130
130
|
func: (argv, config, args) => __awaiter(void 0, void 0, void 0, function* () {
|
|
131
|
-
var _a;
|
|
131
|
+
var _a, _b, _c;
|
|
132
132
|
const logger = new io_1.Logger();
|
|
133
133
|
try {
|
|
134
|
+
debugLog(`bundle-harmony entry: entry=${args.entryFile} dev=${args.dev} minify=${args.minify} jsEngine=${args.jsEngine} sourcemap=${args.sourcemapOutput} bundleOutput=${args.bundleOutput}`);
|
|
134
135
|
const defaultBundleName = args.jsEngine === 'hermes' ? 'hermes_bundle.hbc' : 'bundle.harmony.js';
|
|
135
136
|
const bundleOutput = (_a = args.bundleOutput) !== null && _a !== void 0 ? _a : `${HARMONY_RESOURCE_PATH}${path_1.default.sep}${defaultBundleName}`;
|
|
136
137
|
const shouldGenerateHbcBundle = bundleOutput
|
|
@@ -148,11 +149,15 @@ exports.commandBundleHarmony = {
|
|
|
148
149
|
sourceMap: args.sourcemapOutput,
|
|
149
150
|
sourceMapUrl: args.sourcemapOutput,
|
|
150
151
|
};
|
|
152
|
+
const configLoadStart = Date.now();
|
|
151
153
|
const metroConfig = yield loadMetroConfig({
|
|
152
154
|
config: args.config,
|
|
153
155
|
resetCache: args.resetCache,
|
|
154
156
|
});
|
|
155
|
-
|
|
157
|
+
debugLog(`Metro config loaded in ${Date.now() - configLoadStart}ms`);
|
|
158
|
+
const bundleStart = Date.now();
|
|
159
|
+
const _d = yield createBundle(metroConfig, buildOptions), { assets } = _d, bundle = __rest(_d, ["assets"]);
|
|
160
|
+
debugLog(`Bundle built in ${Date.now() - bundleStart}ms, codeSize=${(_c = (_b = bundle.code) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0}`);
|
|
156
161
|
if (shouldGenerateHbcBundle) {
|
|
157
162
|
debugLog('Starting Hermes bytecode compilation...');
|
|
158
163
|
yield saveHbcBundle(logger, bundle.code, bundleOutput, args.hermescDir, args.hermescOptions);
|
|
@@ -54,15 +54,15 @@ exports.commandCleanHarmony = {
|
|
|
54
54
|
description: 'Remove cached files in the OpenHarmony project.',
|
|
55
55
|
options: [
|
|
56
56
|
{
|
|
57
|
-
name:
|
|
58
|
-
description:
|
|
59
|
-
default:
|
|
57
|
+
name: '--harmony-project-path <path>',
|
|
58
|
+
description: 'Specifies the root of your OpenHarmony project.',
|
|
59
|
+
default: './harmony'
|
|
60
60
|
}
|
|
61
61
|
],
|
|
62
62
|
func: (_argv, _config, rawArgs) => __awaiter(void 0, void 0, void 0, function* () {
|
|
63
63
|
const harmonyProjectPath = new core_1.AbsolutePath(rawArgs.harmonyProjectPath);
|
|
64
|
-
const md5Path = crypto.createHash(
|
|
65
|
-
const hvigorCachePath = new core_1.AbsolutePath(node_path_1.default.join(node_os_1.default.homedir(),
|
|
64
|
+
const md5Path = crypto.createHash('md5').update(harmonyProjectPath.getValue()).digest('hex');
|
|
65
|
+
const hvigorCachePath = new core_1.AbsolutePath(node_path_1.default.join(node_os_1.default.homedir(), '.hvigor', 'project_caches', md5Path));
|
|
66
66
|
if (node_fs_1.default.existsSync(hvigorCachePath.getValue())) {
|
|
67
67
|
node_fs_1.default.rmSync(hvigorCachePath.getValue(), { recursive: true, force: true });
|
|
68
68
|
}
|
|
@@ -168,11 +168,11 @@ exports.commandInitHarmony = {
|
|
|
168
168
|
dynamicTemplateContentByPath.forEach((content, path) => {
|
|
169
169
|
fs.writeTextSync(path, content);
|
|
170
170
|
});
|
|
171
|
-
const buildProfileTemplateComment =
|
|
171
|
+
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.';
|
|
172
172
|
const buildProfilePath = harmonyDirPath.copyWithNewSegment('build-profile.json5');
|
|
173
173
|
const buildProfileContent = fs.readTextSync(buildProfilePath);
|
|
174
174
|
const contentLines = buildProfileContent.split('\n');
|
|
175
|
-
contentLines.splice(1, 0,
|
|
175
|
+
contentLines.splice(1, 0, ' // ' + buildProfileTemplateComment);
|
|
176
176
|
const buildProfileTemplateContent = contentLines.join('\n');
|
|
177
177
|
fs.writeTextSync(harmonyDirPath.copyWithNewSegment('build-profile.template.json5'), buildProfileTemplateContent);
|
|
178
178
|
logger.info((s) => [
|
package/dist/commands/init.js
CHANGED
|
@@ -141,7 +141,7 @@ class ValidationHelper {
|
|
|
141
141
|
}
|
|
142
142
|
return reactNativeVersion;
|
|
143
143
|
}
|
|
144
|
-
return
|
|
144
|
+
return '0.77';
|
|
145
145
|
});
|
|
146
146
|
}
|
|
147
147
|
}
|
|
@@ -553,7 +553,7 @@ function getRNOHVersion(rnVersion) {
|
|
|
553
553
|
return __awaiter(this, void 0, void 0, function* () {
|
|
554
554
|
const versionParts = rnVersion.split('.');
|
|
555
555
|
const majorMinorVersion = `${versionParts[0]}.${versionParts[1]}`;
|
|
556
|
-
let versionInfos =
|
|
556
|
+
let versionInfos = '';
|
|
557
557
|
yield runCliCommand(NPM_EXE, ['view', DEFAULT_TEMPLATE_PKG, 'versions', '--json'], process.cwd(), false, (data) => {
|
|
558
558
|
versionInfos += data.toString();
|
|
559
559
|
});
|
|
@@ -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) => {
|
|
@@ -97,7 +97,7 @@ function findHarPath(packagePath) {
|
|
|
97
97
|
const packageHarmonyPath = packagePath.copyWithNewSegment('harmony');
|
|
98
98
|
const fileOrDirNames = node_fs_1.default.readdirSync(packageHarmonyPath.getValue());
|
|
99
99
|
const harFilenames = fileOrDirNames.filter((fileOrDirName) => fileOrDirName.endsWith('.har'));
|
|
100
|
-
if (harFilenames.length
|
|
100
|
+
if (harFilenames.length !== 1) {
|
|
101
101
|
return null;
|
|
102
102
|
}
|
|
103
103
|
return packageHarmonyPath.copyWithNewSegment(harFilenames[0]);
|
|
@@ -29,15 +29,17 @@ function compareVersionTuple(a, b) {
|
|
|
29
29
|
for (let i = 0; i < Math.max(a.length, b.length); i++) {
|
|
30
30
|
const av = (_a = a[i]) !== null && _a !== void 0 ? _a : 0;
|
|
31
31
|
const bv = (_b = b[i]) !== null && _b !== void 0 ? _b : 0;
|
|
32
|
-
if (av !== bv)
|
|
32
|
+
if (av !== bv) {
|
|
33
33
|
return av - bv;
|
|
34
|
+
}
|
|
34
35
|
}
|
|
35
36
|
return 0;
|
|
36
37
|
}
|
|
37
38
|
function isSupportedVersion(versionDir) {
|
|
38
39
|
const m = versionDir.match(/^(\d+)\.(\d+)\.(\d+)\.(\d+)/);
|
|
39
|
-
if (!m)
|
|
40
|
+
if (!m) {
|
|
40
41
|
return false;
|
|
42
|
+
}
|
|
41
43
|
const current = m.slice(1).map(n => parseInt(n, 10));
|
|
42
44
|
return compareVersionTuple(current, MIN_SUPPORTED_VERSION) >= 0;
|
|
43
45
|
}
|
|
@@ -128,11 +130,15 @@ function parseDeviceManagerXml(xmlContent) {
|
|
|
128
130
|
while ((m = optionRegex.exec(xmlContent))) {
|
|
129
131
|
const tag = m[0];
|
|
130
132
|
const nameMatch = tag.match(/\bname=["']([^"']+)["']/i);
|
|
131
|
-
if (!nameMatch)
|
|
133
|
+
if (!nameMatch) {
|
|
132
134
|
continue;
|
|
135
|
+
}
|
|
136
|
+
;
|
|
133
137
|
const valueMatch = tag.match(/\bvalue=["']([^"']+)["']/i);
|
|
134
|
-
if (!valueMatch)
|
|
138
|
+
if (!valueMatch) {
|
|
135
139
|
continue;
|
|
140
|
+
}
|
|
141
|
+
;
|
|
136
142
|
const name = nameMatch[1];
|
|
137
143
|
const value = valueMatch[1];
|
|
138
144
|
if (name === 'imageDeployPath' && !info.imageRoot) {
|
|
@@ -141,8 +147,9 @@ function parseDeviceManagerXml(xmlContent) {
|
|
|
141
147
|
else if (name === 'openharmonyDeployPath' && !info.instancePath) {
|
|
142
148
|
info.instancePath = value;
|
|
143
149
|
}
|
|
144
|
-
if (info.imageRoot && info.instancePath)
|
|
150
|
+
if (info.imageRoot && info.instancePath) {
|
|
145
151
|
break;
|
|
152
|
+
}
|
|
146
153
|
}
|
|
147
154
|
return info;
|
|
148
155
|
}
|
|
@@ -186,8 +193,9 @@ function resolveInstanceAndImageRoot(env, devEcoVersion) {
|
|
|
186
193
|
try {
|
|
187
194
|
const content = yield fs_extra_1.default.readFile(xmlPath, 'utf-8');
|
|
188
195
|
xmlInfo = parseDeviceManagerXml(content);
|
|
189
|
-
if (xmlInfo.instancePath || xmlInfo.imageRoot)
|
|
196
|
+
if (xmlInfo.instancePath || xmlInfo.imageRoot) {
|
|
190
197
|
break;
|
|
198
|
+
}
|
|
191
199
|
}
|
|
192
200
|
catch (error) {
|
|
193
201
|
throw new core_1.DescriptiveError({
|
|
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
|
package/package.json
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-native-oh/react-native-harmony-cli",
|
|
3
|
-
"version": "0.82.
|
|
3
|
+
"version": "0.82.34",
|
|
4
4
|
"description": "",
|
|
5
|
-
"publishConfig": {
|
|
6
|
-
"registry": "https://registry.npmjs.org/",
|
|
7
|
-
"access": "public"
|
|
8
|
-
},
|
|
9
5
|
"scripts": {
|
|
10
6
|
"build": "tsc --outDir dist -p tsconfig.build.json && node ./scripts/copy-template.js",
|
|
11
7
|
"prepack": "npm run build && npm run _recreate-hvigor-plugin",
|
|
@@ -24,6 +20,10 @@
|
|
|
24
20
|
"keywords": [],
|
|
25
21
|
"author": "",
|
|
26
22
|
"license": "MIT",
|
|
23
|
+
"publishConfig": {
|
|
24
|
+
"registry": "https://registry.npmjs.org/",
|
|
25
|
+
"access": "public"
|
|
26
|
+
},
|
|
27
27
|
"peerDependencies": {
|
|
28
28
|
"metro": "^0.83.1"
|
|
29
29
|
},
|
package/src/assetResolver.ts
CHANGED
|
@@ -571,6 +571,62 @@ it('should preserve comments in oh-package.json5', async () => {
|
|
|
571
571
|
expect(ohPackageContent).toContain('@rnoh/test-package');
|
|
572
572
|
});
|
|
573
573
|
|
|
574
|
+
it('should rewrite oh-package.json5 idempotently without accumulating trailing blank lines', async () => {
|
|
575
|
+
const { runAutolinking, memFS } = createAutolinking({
|
|
576
|
+
fsStructure: {
|
|
577
|
+
...baseFileStructure,
|
|
578
|
+
node_modules: {
|
|
579
|
+
'test-package': {
|
|
580
|
+
harmony: {
|
|
581
|
+
'test_package.har': '',
|
|
582
|
+
},
|
|
583
|
+
'package.json': JSON.stringify({
|
|
584
|
+
name: 'test-package',
|
|
585
|
+
harmony: {
|
|
586
|
+
autolinking: true,
|
|
587
|
+
},
|
|
588
|
+
}),
|
|
589
|
+
},
|
|
590
|
+
},
|
|
591
|
+
harmony: {
|
|
592
|
+
...baseFileStructure.harmony,
|
|
593
|
+
// Simulates a file polluted by the old bug: trailing blank lines
|
|
594
|
+
// already accumulated across previous builds
|
|
595
|
+
'oh-package.json5': `{
|
|
596
|
+
// This is a top-level comment
|
|
597
|
+
"modelVersion": "5.0.0",
|
|
598
|
+
"dependencies": {
|
|
599
|
+
"@rnoh/react-native-openharmony/": "./react_native_openharmony",
|
|
600
|
+
},
|
|
601
|
+
}
|
|
602
|
+
|
|
603
|
+
|
|
604
|
+
`,
|
|
605
|
+
},
|
|
606
|
+
},
|
|
607
|
+
});
|
|
608
|
+
|
|
609
|
+
const ohPackagePath = new AbsolutePath('./harmony/oh-package.json5');
|
|
610
|
+
|
|
611
|
+
await runAutolinking();
|
|
612
|
+
const firstRunContent = memFS.readTextSync(ohPackagePath);
|
|
613
|
+
|
|
614
|
+
// Second run reads the file written by the first run and rewrites it,
|
|
615
|
+
// mimicking consecutive builds against the same project
|
|
616
|
+
await runAutolinking();
|
|
617
|
+
const secondRunContent = memFS.readTextSync(ohPackagePath);
|
|
618
|
+
|
|
619
|
+
// The rewrite must be idempotent: output must not change between runs
|
|
620
|
+
expect(secondRunContent).toBe(firstRunContent);
|
|
621
|
+
// The file must end with exactly one newline (LF or CRLF), no accumulated
|
|
622
|
+
// blank lines — count trailing newline units in a newline-style-agnostic way
|
|
623
|
+
// because toSource() emits CRLF on Windows
|
|
624
|
+
const trailingNewlines = (firstRunContent.match(/(\r?\n)+$/)?.[0] ?? '').replace(/\r/g, '');
|
|
625
|
+
expect(trailingNewlines).toBe('\n');
|
|
626
|
+
// Comments must still be preserved
|
|
627
|
+
expect(firstRunContent).toContain('// This is a top-level comment');
|
|
628
|
+
});
|
|
629
|
+
|
|
574
630
|
it('should support custom mainHarPath for HAR scanning', async () => {
|
|
575
631
|
const { runAutolinking, memFS } = createAutolinking({
|
|
576
632
|
fsStructure: {
|