diff --git a/Example/harmony_use_pushy/bun.lock b/Example/harmony_use_pushy/bun.lock index 52060e6..2045744 100644 --- a/Example/harmony_use_pushy/bun.lock +++ b/Example/harmony_use_pushy/bun.lock @@ -7,7 +7,7 @@ "@react-native-oh/react-native-harmony": "^0.72.59", "react": "18.2.0", "react-native": "0.72.5", - "react-native-update": "^10.34.9", + "react-native-update": "^10.35.0", }, "devDependencies": { "@babel/core": "^7.20.0", @@ -1399,7 +1399,7 @@ "react-native": ["react-native@0.72.5", "", { "dependencies": { "@jest/create-cache-key-function": "^29.2.1", "@react-native-community/cli": "11.3.7", "@react-native-community/cli-platform-android": "11.3.7", "@react-native-community/cli-platform-ios": "11.3.7", "@react-native/assets-registry": "^0.72.0", "@react-native/codegen": "^0.72.7", "@react-native/gradle-plugin": "^0.72.11", "@react-native/js-polyfills": "^0.72.1", "@react-native/normalize-colors": "^0.72.0", "@react-native/virtualized-lists": "^0.72.8", "abort-controller": "^3.0.0", "anser": "^1.4.9", "base64-js": "^1.1.2", "deprecated-react-native-prop-types": "4.1.0", "event-target-shim": "^5.0.1", "flow-enums-runtime": "^0.0.5", "invariant": "^2.2.4", "jest-environment-node": "^29.2.1", "jsc-android": "^250231.0.0", "memoize-one": "^5.0.0", "metro-runtime": "0.76.8", "metro-source-map": "0.76.8", "mkdirp": "^0.5.1", "nullthrows": "^1.1.1", "pretty-format": "^26.5.2", "promise": "^8.3.0", "react-devtools-core": "^4.27.2", "react-refresh": "^0.4.0", "react-shallow-renderer": "^16.15.0", "regenerator-runtime": "^0.13.2", "scheduler": "0.24.0-canary-efb381bbf-20230505", "stacktrace-parser": "^0.1.10", "use-sync-external-store": "^1.0.0", "whatwg-fetch": "^3.0.0", "ws": "^6.2.2", "yargs": "^17.6.2" }, "peerDependencies": { "react": "18.2.0" }, "bin": { "react-native": "cli.js" } }, "sha512-oIewslu5DBwOmo7x5rdzZlZXCqDIna0R4dUwVpfmVteORYLr4yaZo5wQnMeR+H7x54GaMhmgeqp0ZpULtulJFg=="], - "react-native-update": ["react-native-update@10.34.9", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-Bk9Wr6R3XTz4OwKnmcxm4S1heuZMFvdW+544Kcc5KMN/D8JHrf656yK35TYTNhRJPjq6oEsGfLDxgbQWSPtbIg=="], + "react-native-update": ["react-native-update@10.35.0", "", { "dependencies": { "nanoid": "^3.3.3", "react-native-url-polyfill": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-native": ">=0.59.0" } }, "sha512-jTFtTAmOec05Gf06ununz+bLFkLC7bu7GV2y5/VjEx3XDhk+/ohvpefIFYuaDub23+0Tbq85aIg9WlDa72tReQ=="], "react-native-url-polyfill": ["react-native-url-polyfill@2.0.0", "", { "dependencies": { "whatwg-url-without-unicode": "8.0.0-3" }, "peerDependencies": { "react-native": "*" } }, "sha512-My330Do7/DvKnEvwQc0WdcBnFPploYKp9CYlefDXzIdEaA+PAhDYllkvGeEroEzvc4Kzzj2O4yVdz8v6fjRvhA=="], diff --git a/Example/harmony_use_pushy/harmony/build-profile.json5 b/Example/harmony_use_pushy/harmony/build-profile.json5 index 0a204f5..dca14ff 100644 --- a/Example/harmony_use_pushy/harmony/build-profile.json5 +++ b/Example/harmony_use_pushy/harmony/build-profile.json5 @@ -10,8 +10,9 @@ buildOption: { strictMode: { caseSensitiveCheck: true, - useNormalizedOHMUrl: true, + useNormalizedOHMUrl: true }, + "nativeCompiler": "BiSheng" }, }, ], diff --git a/Example/harmony_use_pushy/harmony/entry/oh-package.json5 b/Example/harmony_use_pushy/harmony/entry/oh-package.json5 index 2be7216..da13056 100644 --- a/Example/harmony_use_pushy/harmony/entry/oh-package.json5 +++ b/Example/harmony_use_pushy/harmony/entry/oh-package.json5 @@ -6,7 +6,7 @@ author: '', license: '', dependencies: { - '@rnoh/react-native-openharmony': '0.72.38', + '@rnoh/react-native-openharmony': '0.72.96', pushy: 'file:../../node_modules/react-native-update/harmony/pushy', }, } diff --git a/Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets b/Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets index 76767d9..1319d60 100644 --- a/Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets +++ b/Example/harmony_use_pushy/harmony/entry/src/main/ets/pages/Index.ets @@ -54,7 +54,6 @@ struct Index { enableCAPIArchitecture: true, arkTsComponentNames: arkTsComponentNames, }, - initialProps: { "foo": "bar" } as Record, appKey: "harmony_use_pushy", wrappedCustomRNComponentBuilder: wrappedCustomRNComponentBuilder, onSetUp: (rnInstance) => { diff --git a/Example/harmony_use_pushy/harmony/oh-package.json5 b/Example/harmony_use_pushy/harmony/oh-package.json5 index b3a674f..9b8ccfe 100644 --- a/Example/harmony_use_pushy/harmony/oh-package.json5 +++ b/Example/harmony_use_pushy/harmony/oh-package.json5 @@ -13,6 +13,6 @@ }, }, overrides: { - '@rnoh/react-native-openharmony': '0.72.38', + '@rnoh/react-native-openharmony': '0.72.96', }, } diff --git a/Example/harmony_use_pushy/package.json b/Example/harmony_use_pushy/package.json index 833120c..b4bfd9f 100644 --- a/Example/harmony_use_pushy/package.json +++ b/Example/harmony_use_pushy/package.json @@ -18,7 +18,7 @@ "@react-native-oh/react-native-harmony": "^0.72.59", "react": "18.2.0", "react-native": "0.72.5", - "react-native-update": "^10.34.9" + "react-native-update": "^10.35.0" }, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/harmony/pushy/oh-package-lock.json5 b/harmony/pushy/oh-package-lock.json5 index 62bef8c..16f47c2 100644 --- a/harmony/pushy/oh-package-lock.json5 +++ b/harmony/pushy/oh-package-lock.json5 @@ -6,14 +6,14 @@ "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", "specifiers": { - "@rnoh/react-native-openharmony@0.72.38": "@rnoh/react-native-openharmony@0.72.38" + "@rnoh/react-native-openharmony@^0.72.96": "@rnoh/react-native-openharmony@0.72.96" }, "packages": { - "@rnoh/react-native-openharmony@0.72.38": { + "@rnoh/react-native-openharmony@0.72.96": { "name": "", - "version": "0.72.38", - "integrity": "sha512-br5SIrbB0OarSLirenleE7eTOX1lNccMJ7nb/G7qWTyJ7kW4DalmTXVKYpoT2qaOLls1uEE7McD1OjbZZM9jug==", - "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.38.har", + "version": "0.72.96", + "integrity": "sha512-gBbm8LLyqi5UE7qHWdZYeQnjyncfEpCczKZUP/9M2U1Z7exR0Kya8PMKMwr1ta5ujy7w/hZVC2LomEV4QvBeqA==", + "resolved": "https://ohpm.openharmony.cn/ohpm/@rnoh/react-native-openharmony/-/react-native-openharmony-0.72.96.har", "registryType": "ohpm" } } diff --git a/harmony/pushy/oh-package.json5 b/harmony/pushy/oh-package.json5 index 7e03489..96c1c33 100644 --- a/harmony/pushy/oh-package.json5 +++ b/harmony/pushy/oh-package.json5 @@ -1,13 +1,13 @@ { - "license": "MIT", - "types": "", - "devDependencies": {}, - "name": "pushy", - "description": "", - "main": "index.ets", - "version": "3.1.0-0.0.7", - "dependencies": { - "@rnoh/react-native-openharmony":"^0.72.38" + license: 'MIT', + types: '', + devDependencies: {}, + name: 'pushy', + description: '', + main: 'index.ets', + version: '10.35.1', + dependencies: { + '@rnoh/react-native-openharmony': '^0.72.96', }, - "modelVersion": "5.0.0" + modelVersion: '5.0.0', } diff --git a/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets b/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets index 19476da..9578366 100644 --- a/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets +++ b/harmony/pushy/src/main/ets/PushyFileJSBundleProvider.ets @@ -23,6 +23,11 @@ export class PushyFileJSBundleProvider extends JSBundleProvider { } async getBundle(): Promise { + if (!this.path) { + throw new JSBundleProviderError({ + whatHappened: 'No pushy bundle found. using default bundle', + }) + } try { const status = await fs.access(this.path, fs.OpenMode.READ_ONLY); if (status) { @@ -30,7 +35,6 @@ export class PushyFileJSBundleProvider extends JSBundleProvider { filePath: this.path } } - throw new Error('Update bundle not found'); } catch (error) { throw new JSBundleProviderError({ whatHappened: `Couldn't load JSBundle from ${this.path}`, diff --git a/harmony/pushy/src/main/ets/UpdateContext.ts b/harmony/pushy/src/main/ets/UpdateContext.ts index 3485703..cb4d058 100644 --- a/harmony/pushy/src/main/ets/UpdateContext.ts +++ b/harmony/pushy/src/main/ets/UpdateContext.ts @@ -189,18 +189,11 @@ export class UpdateContext { } } - public static getBundleUrl( - context: common.UIAbilityContext, - defaultAssetsUrl?: string, - ) { - return new UpdateContext(context).getBundleUrl(defaultAssetsUrl); - } - - public getBundleUrl(defaultAssetsUrl?: string) { + public getBundleUrl() { UpdateContext.isUsingBundleUrl = true; const currentVersion = this.getCurrentVersion(); if (!currentVersion) { - return defaultAssetsUrl; + return ''; } if (!this.isFirstTime()) { if (!this.preferences.getSync('firstTimeOk', true)) { @@ -222,7 +215,7 @@ export class UpdateContext { version = this.rollBack(); } } - return defaultAssetsUrl; + return ''; } getPackageVersion(): string { diff --git a/package.json b/package.json index dcebde6..dc36055 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-update", - "version": "10.35.0", + "version": "10.35.1", "description": "react-native hot update", "main": "src/index", "scripts": {