Skip to content

Commit de35d93

Browse files
committed
fix FileJSBundleProvider conflics issue
1 parent 83ca3a6 commit de35d93

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

Example/harmony_use_pushy/bun.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"": {
55
"name": "harmony_use_pushy",
66
"dependencies": {
7-
"@react-native-oh/react-native-harmony": "^0.72.43",
7+
"@react-native-oh/react-native-harmony": "^0.72.59",
88
"react": "18.2.0",
99
"react-native": "0.72.5",
1010
"react-native-update": "^10.26.4",

Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { FileJSBundleProvider } from 'pushy/src/main/ets/FileJSBundleProvider';
1+
import { PushyFileJSBundleProvider } from 'pushy/src/main/ets/PushyFileJSBundleProvider';
22
import { ComponentBuilderContext, RNOHCoreContext,RNAbility,
33
MetroJSBundleProvider } from '@rnoh/react-native-openharmony';
44
import {
55
RNApp,
66
AnyJSBundleProvider,
77
ResourceJSBundleProvider,
88
TraceJSBundleProviderDecorator,
9+
FileJSBundleProvider
910
} from '@rnoh/react-native-openharmony'
1011
import { createRNPackages } from '../RNPackagesFactory'
1112
import preferences from '@ohos.data.preferences';
@@ -65,7 +66,7 @@ struct Index {
6566
// local debug mode
6667
new MetroJSBundleProvider(),
6768
// release mode
68-
new FileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
69+
new PushyFileJSBundleProvider(this.rnohCoreContext.uiAbilityContext),
6970
new ResourceJSBundleProvider(this.rnohCoreContext.uiAbilityContext.resourceManager, 'bundle.harmony.js')
7071
]),
7172
this.rnohCoreContext.logger),
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"pushy_build_time": "2025-04-12T11:12:43.423Z",
2+
"pushy_build_time": "2025-04-30T02:46:33.340Z",
33
"versionName": "1.0.0"
44
}

Example/harmony_use_pushy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"hash": "pushy hash /Users/yanbo.he/Desktop/HarmonyOS/react-native-pushy/Example/harmony_use_pushy/.pushy/output/harmony.1735048297258.ppk"
1616
},
1717
"dependencies": {
18-
"@react-native-oh/react-native-harmony": "^0.72.43",
18+
"@react-native-oh/react-native-harmony": "^0.72.59",
1919
"react": "18.2.0",
2020
"react-native": "0.72.5",
2121
"react-native-update": "^10.26.4"

harmony/src/main/ets/FileJSBundleProvider.ets renamed to harmony/src/main/ets/PushyFileJSBundleProvider.ets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import fileIo from '@ohos.file.fs';
33
import common from '@ohos.app.ability.common';
44
import { UpdateContext } from './UpdateContext';
55

6-
export class FileJSBundleProvider extends JSBundleProvider {
6+
export class PushyFileJSBundleProvider extends JSBundleProvider {
77
private updateContext: UpdateContext;
88
private filePath: string = ''
99

0 commit comments

Comments
 (0)