@react-native-oh/react-native-harmony-cli 0.84.2 → 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/dist/assetResolver.js +1 -1
- package/dist/autolinking/Autolinking.js +4 -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 +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/commands/bundle-harmony.ts +4 -4
- package/src/commands/clean-harmony.ts +6 -6
- 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.2.tgz +0 -0
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]);
|
|
@@ -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
|
});
|
|
@@ -123,6 +123,7 @@ function logCheckResult(loader, checkResult) {
|
|
|
123
123
|
case 'skip':
|
|
124
124
|
return `${chalk_1.default.yellow('SKIP')}`;
|
|
125
125
|
}
|
|
126
|
+
return undefined;
|
|
126
127
|
})();
|
|
127
128
|
loader.info(checkResult.message
|
|
128
129
|
? `[${chalk_1.default.bold(prefix)}] ${chalk_1.default.bold(checkResult.name)}\n${checkResult.message}`
|
|
@@ -20,10 +20,10 @@ class OHPackageJSON5 {
|
|
|
20
20
|
this.rawData = rawData;
|
|
21
21
|
}
|
|
22
22
|
get name() {
|
|
23
|
-
return this.rawData
|
|
23
|
+
return this.rawData.name;
|
|
24
24
|
}
|
|
25
25
|
get version() {
|
|
26
|
-
return this.rawData
|
|
26
|
+
return this.rawData.version;
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
exports.OHPackageJSON5 = OHPackageJSON5;
|
|
@@ -6,10 +6,10 @@
|
|
|
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 [
|
|
13
13
|
...createRNOHPackagesAutolinking(ctx)
|
|
14
|
-
]
|
|
14
|
+
];
|
|
15
15
|
}
|
|
@@ -12,12 +12,12 @@
|
|
|
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) => {
|
|
20
20
|
return { thirdPartyPackagesFactory: getRNOHPackages }
|
|
21
21
|
}
|
|
22
|
-
})
|
|
22
|
+
});
|
|
23
23
|
|
|
@@ -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,13 @@ 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
|
+
}
|
|
133
136
|
const valueMatch = tag.match(/\bvalue=["']([^"']+)["']/i);
|
|
134
|
-
if (!valueMatch)
|
|
137
|
+
if (!valueMatch) {
|
|
135
138
|
continue;
|
|
139
|
+
}
|
|
136
140
|
const name = nameMatch[1];
|
|
137
141
|
const value = valueMatch[1];
|
|
138
142
|
if (name === 'imageDeployPath' && !info.imageRoot) {
|
|
@@ -141,8 +145,9 @@ function parseDeviceManagerXml(xmlContent) {
|
|
|
141
145
|
else if (name === 'openharmonyDeployPath' && !info.instancePath) {
|
|
142
146
|
info.instancePath = value;
|
|
143
147
|
}
|
|
144
|
-
if (info.imageRoot && info.instancePath)
|
|
148
|
+
if (info.imageRoot && info.instancePath) {
|
|
145
149
|
break;
|
|
150
|
+
}
|
|
146
151
|
}
|
|
147
152
|
return info;
|
|
148
153
|
}
|
|
@@ -186,8 +191,9 @@ function resolveInstanceAndImageRoot(env, devEcoVersion) {
|
|
|
186
191
|
try {
|
|
187
192
|
const content = yield fs_extra_1.default.readFile(xmlPath, 'utf-8');
|
|
188
193
|
xmlInfo = parseDeviceManagerXml(content);
|
|
189
|
-
if (xmlInfo.instancePath || xmlInfo.imageRoot)
|
|
194
|
+
if (xmlInfo.instancePath || xmlInfo.imageRoot) {
|
|
190
195
|
break;
|
|
196
|
+
}
|
|
191
197
|
}
|
|
192
198
|
catch (error) {
|
|
193
199
|
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
|
|
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.84.
|
|
3
|
+
"version": "0.84.3",
|
|
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",
|
|
@@ -59,5 +55,9 @@
|
|
|
59
55
|
"mustache": "^4.2.0",
|
|
60
56
|
"tar": "^6.1.15",
|
|
61
57
|
"tmp": "^0.2.1"
|
|
58
|
+
},
|
|
59
|
+
"publishConfig": {
|
|
60
|
+
"registry": "https://registry.npmjs.org/",
|
|
61
|
+
"access": "public"
|
|
62
62
|
}
|
|
63
63
|
}
|
package/src/assetResolver.ts
CHANGED
|
@@ -359,8 +359,12 @@ export class Autolinking {
|
|
|
359
359
|
};
|
|
360
360
|
});
|
|
361
361
|
autolinkableLibraries.sort((a, b) => {
|
|
362
|
-
if (a.npmPackageName < b.npmPackageName)
|
|
363
|
-
|
|
362
|
+
if (a.npmPackageName < b.npmPackageName) {
|
|
363
|
+
return -1;
|
|
364
|
+
}
|
|
365
|
+
if (a.npmPackageName > b.npmPackageName) {
|
|
366
|
+
return 1;
|
|
367
|
+
}
|
|
364
368
|
return 0;
|
|
365
369
|
});
|
|
366
370
|
|
|
@@ -518,7 +522,7 @@ export class Autolinking {
|
|
|
518
522
|
if (afterNodeModules.startsWith('@')) {
|
|
519
523
|
const parts = afterNodeModules.split('/');
|
|
520
524
|
if (parts.length >= 2) {
|
|
521
|
-
return `${parts[0]}/${parts[1]}`;
|
|
525
|
+
return `${parts[0]}/${parts[1]}`; // @scope/package
|
|
522
526
|
}
|
|
523
527
|
} else {
|
|
524
528
|
// 非 scoped package
|
|
@@ -48,10 +48,10 @@ const ASSETS_DEFAULT_DEST_PATH = pathUtils.normalize(
|
|
|
48
48
|
type Bundle = {
|
|
49
49
|
code: string;
|
|
50
50
|
map: string;
|
|
51
|
-
}
|
|
51
|
+
};
|
|
52
52
|
type RunBuildResult = Bundle & {
|
|
53
53
|
assets?: ReadonlyArray<AssetData>;
|
|
54
|
-
}
|
|
54
|
+
};
|
|
55
55
|
type RunBuildOptions = BuildOptions & {assets?: boolean};
|
|
56
56
|
type Path = string;
|
|
57
57
|
type OSType = 'darwin' | 'linux' | 'win32';
|
|
@@ -163,7 +163,7 @@ export const commandBundleHarmony: Command = {
|
|
|
163
163
|
resetCache: args.resetCache,
|
|
164
164
|
});
|
|
165
165
|
|
|
166
|
-
const {assets, ...bundle}= await createBundle(metroConfig, buildOptions);
|
|
166
|
+
const {assets, ...bundle} = await createBundle(metroConfig, buildOptions);
|
|
167
167
|
|
|
168
168
|
if (shouldGenerateHbcBundle) {
|
|
169
169
|
debugLog('Starting Hermes bytecode compilation...');
|
|
@@ -179,7 +179,7 @@ export const commandBundleHarmony: Command = {
|
|
|
179
179
|
await saveJSBundle(logger, bundle, bundleOutput);
|
|
180
180
|
}
|
|
181
181
|
maybeSaveSourceMap(logger, bundle, args.sourcemapOutput);
|
|
182
|
-
if(assets){
|
|
182
|
+
if (assets) {
|
|
183
183
|
await copyAssets(logger, assets, assetsDest);
|
|
184
184
|
debugLog('Assets copy completed, cleaning up...');
|
|
185
185
|
}
|
|
@@ -19,15 +19,15 @@ export const commandCleanHarmony: Command = {
|
|
|
19
19
|
description: 'Remove cached files in the OpenHarmony project.',
|
|
20
20
|
options: [
|
|
21
21
|
{
|
|
22
|
-
name:
|
|
23
|
-
description:
|
|
24
|
-
default:
|
|
22
|
+
name: '--harmony-project-path <path>',
|
|
23
|
+
description: 'Specifies the root of your OpenHarmony project.',
|
|
24
|
+
default: './harmony'
|
|
25
25
|
}
|
|
26
26
|
],
|
|
27
27
|
func: async (_argv, _config, rawArgs: any) => {
|
|
28
28
|
const harmonyProjectPath = new AbsolutePath(rawArgs.harmonyProjectPath);
|
|
29
|
-
const md5Path = crypto.createHash(
|
|
30
|
-
const hvigorCachePath = new AbsolutePath(path.join(os.homedir(),
|
|
29
|
+
const md5Path = crypto.createHash('md5').update(harmonyProjectPath.getValue()).digest('hex');
|
|
30
|
+
const hvigorCachePath = new AbsolutePath(path.join(os.homedir(), '.hvigor', 'project_caches', md5Path));
|
|
31
31
|
|
|
32
32
|
if (fs.existsSync(hvigorCachePath.getValue())) {
|
|
33
33
|
fs.rmSync(hvigorCachePath.getValue(), { recursive: true, force: true });
|
|
@@ -42,7 +42,7 @@ export const commandCleanHarmony: Command = {
|
|
|
42
42
|
if (Array.isArray(buildProfile.modules)) {
|
|
43
43
|
buildProfile.modules.forEach((module: any) => {
|
|
44
44
|
if (module && module.srcPath) {
|
|
45
|
-
const modulePath =
|
|
45
|
+
const modulePath = harmonyProjectPath.copyWithNewSegment(module.srcPath);
|
|
46
46
|
const cxxPath = modulePath.copyWithNewSegment('.cxx');
|
|
47
47
|
const buildPath = modulePath.copyWithNewSegment('build');
|
|
48
48
|
|
|
@@ -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,8 @@ async function getRNOHVersion(rnVersion: string): Promise<string> {
|
|
|
597
597
|
return matchingVersions.pop();
|
|
598
598
|
}
|
|
599
599
|
|
|
600
|
-
async function handleMissingHarmonyDir(destDir: string, rnVersion: string):
|
|
600
|
+
async function handleMissingHarmonyDir(destDir: string, rnVersion: string):
|
|
601
|
+
Promise<{ rnohTemplateConfig: TemplateConfig, rnohVersion: string, rnohCliVersion: string }> {
|
|
601
602
|
const lastestVersion = await getRNOHVersion(rnVersion);
|
|
602
603
|
const defaultTempDir = await createTempDir();
|
|
603
604
|
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,10 +6,10 @@
|
|
|
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 [
|
|
13
13
|
...createRNOHPackagesAutolinking(ctx)
|
|
14
|
-
]
|
|
14
|
+
];
|
|
15
15
|
}
|
|
@@ -12,12 +12,12 @@
|
|
|
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) => {
|
|
20
20
|
return { thirdPartyPackagesFactory: getRNOHPackages }
|
|
21
21
|
}
|
|
22
|
-
})
|
|
22
|
+
});
|
|
23
23
|
|
|
@@ -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,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
|