Skip to content

adapter for harmony #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 12, 2025
Merged

adapter for harmony #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71f4d9c
update hvigorfile.ts file
bozaigao Jan 7, 2025
c3306b4
Merge branch 'reactnativecn:master' into master
bozaigao Jan 11, 2025
db0a4fb
change versionName get logic
bozaigao Jan 11, 2025
4726f68
change post logic for harmony
bozaigao Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Example/harmony_use_pushy/harmony/entry/hvigorfile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ export function generatePushyBuildTime(str?: string) {
if (!fs.existsSync(dirPath)) {
fs.mkdirSync(dirPath, { recursive: true });
}
const moduleJsonPath = path.resolve(__dirname, './oh-package.json5');
const moduleJsonPath = path.resolve(__dirname, '../AppScope/app.json5');
let versionName = '';
if (fs.existsSync(moduleJsonPath)) {
const moduleContent = fs.readFileSync(moduleJsonPath, 'utf-8');
const versionMatch = moduleContent.match(/"version":\s*"([^"]+)"/);
const versionMatch = moduleContent.match(/"versionName":\s*"([^"]+)"/);
if (versionMatch && versionMatch[1]) {
versionName = versionMatch[1];
}
Expand Down
5 changes: 4 additions & 1 deletion src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,10 @@
// @ts-ignore
delete fetchBody.buildTime;
}
const body = JSON.stringify(fetchBody);
let body = JSON.stringify(fetchBody);
if (Platform.OS === 'harmony') {

Check failure on line 209 in src/client.ts

View workflow job for this annotation

GitHub Actions / lint (20.x) 

This comparison appears to be unintentional because the types '"ios" | "android" | "windows" | "macos"' and '"harmony"' have no overlap.
body = fetchBody;

Check failure on line 210 in src/client.ts

View workflow job for this annotation

GitHub Actions / lint (20.x) 

Type '{ packageVersion: string; hash: string; buildTime: string; cInfo: { pushy: any; rn: string; os: string; uuid: any; }; }' is not assignable to type 'string'.
}
const fetchPayload = {
method: 'POST',
headers: {
Expand Down
Loading