diff --git a/package.json b/package.json index f45ae56a..0db1ba23 100644 --- a/package.json +++ b/package.json @@ -84,10 +84,9 @@ "native-run": "^1.7.2", "nativescript": "^8.5.3", "nativescript-theme-core": "^1.0.6", - "nativescript-wear-os": "link:customized-node-modules/nativescript-wear-os", "orbit-db": "^0.29.0", "pnpm": "^8.5.0", - "webnative-elm": "link:../webnative-elm" + "webnative-elm": "^8.1.0" }, "devDependencies": { "@capacitor/assets": "^2.0.4", @@ -115,7 +114,8 @@ "pnpm": { "patchedDependencies": { "orbit-db-storage-adapter@0.9.0": "patches/orbit-db-storage-adapter@0.9.0.patch", - "@ionic/pwa-elements@3.1.1": "patches/@ionic__pwa-elements@3.1.1.patch" + "@ionic/pwa-elements@3.1.1": "patches/@ionic__pwa-elements@3.1.1.patch", + "webnative-elm@8.1.0": "patches/webnative-elm@8.1.0.patch" } } } \ No newline at end of file diff --git a/patches/webnative-elm@8.1.0.patch b/patches/webnative-elm@8.1.0.patch new file mode 100644 index 00000000..c897c846 --- /dev/null +++ b/patches/webnative-elm@8.1.0.patch @@ -0,0 +1,46 @@ +diff --git a/lib/index.d.ts b/lib/index.d.ts +index 6691cdaa3e18e502a1f9f35db9adcc3a58ff8eb5..1255d8f1790278becdc47e73e6de1e7d9a0aa71c 100644 +--- a/lib/index.d.ts ++++ b/lib/index.d.ts +@@ -1,5 +1,5 @@ +-import * as Webnative from "webnative"; +-import { Maybe } from "webnative"; ++import * as Webnative from "@oddjs/odd"; ++import { Maybe } from "@oddjs/odd"; + export type Reference = string; + /** + * Create TaskPort namespace. +diff --git a/lib/index.js b/lib/index.js +index 67e7a059c37c2a2e7f332b47c7ed765c10c72fe1..84967fd2b3ef012e283f97e3ffbbc84ecf339c8a 100644 +--- a/lib/index.js ++++ b/lib/index.js +@@ -1,5 +1,5 @@ +-import * as Webnative from "webnative"; +-import { hasProp } from "webnative/common/index"; ++import * as Webnative from "@oddjs/odd"; ++import { hasProp } from "@oddjs/odd/common/index"; + /** + * Create TaskPort namespace. + */ +diff --git a/package.json b/package.json +index 4402b9d7341251fc8a987d3026f2141f3ae94438..36f4081c58f2b214d75eb7bc7da7a0cfd979740d 100644 +--- a/package.json ++++ b/package.json +@@ -40,7 +40,7 @@ + }, + "peerDependencies": { + "elm-taskport": ">=0.2.0", +- "webnative": ">0.35.0" ++ "@oddjs/odd": "^0.37.2" + }, + "devDependencies": { + "elm-taskport": "^2.0.1", +@@ -48,7 +48,7 @@ + "events": "^3.3.0", + "rimraf": "^3.0.2", + "typescript": "^4.9.3", +- "webnative": "^0.36.0-alpha-3" ++ "@oddjs/odd": "^0.37.2" + }, + "files": [ + "dist", \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4391e11b..9dffd786 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,9 @@ patchedDependencies: orbit-db-storage-adapter@0.9.0: hash: tx7rl4nryxk7u4geoy4mwey7fa path: patches/orbit-db-storage-adapter@0.9.0.patch + webnative-elm@8.1.0: + hash: fa6l2pklum3ztjcjm3yizcndpi + path: patches/webnative-elm@8.1.0.patch dependencies: '@capacitor/action-sheet': @@ -150,9 +153,6 @@ dependencies: nativescript-theme-core: specifier: ^1.0.6 version: 1.0.6 - nativescript-wear-os: - specifier: link:customized-node-modules/nativescript-wear-os - version: link:customized-node-modules/nativescript-wear-os orbit-db: specifier: ^0.29.0 version: 0.29.0(go-ipfs@0.22.0)(ipfs@0.66.0)(ipfsd-ctl@13.0.0) @@ -160,8 +160,8 @@ dependencies: specifier: ^8.5.0 version: 8.5.0 webnative-elm: - specifier: link:../webnative-elm - version: link:../webnative-elm + specifier: ^8.1.0 + version: 8.1.0(patch_hash=fa6l2pklum3ztjcjm3yizcndpi)(elm-taskport@2.0.1)(webnative@0.36.3) devDependencies: '@capacitor/assets': @@ -19393,6 +19393,47 @@ packages: engines: {node: '>=12'} dev: false + /webnative-elm@8.1.0(patch_hash=fa6l2pklum3ztjcjm3yizcndpi)(elm-taskport@2.0.1)(webnative@0.36.3): + resolution: {integrity: sha512-E8sgEWHXOxxXJSCIKwR3GuRCe8N4+gnZN/1lv9W8E+KMdMAonB7vDjmEKhbATYQKClsGl6GjXwhAmslmqmNi6w==} + peerDependencies: + elm-taskport: '>=0.2.0' + webnative: '>0.35.0' + dependencies: + elm-taskport: 2.0.1 + webnative: 0.36.3 + dev: false + patched: true + + /webnative@0.36.3: + resolution: {integrity: sha512-MucN6ydnyY5E8GczuARAWXSOn3+yjXKSLNTIPeJhcFmZpxPBDRfpZ0SpKJjKWtVLNiEaUQibeiKsIYDfij/wIQ==} + engines: {node: '>=16'} + deprecated: webnative has been renamed to @oddjs/odd. Upgrade to @oddjs/odd. + dependencies: + '@ipld/dag-cbor': 8.0.1 + '@ipld/dag-pb': 3.0.2 + '@libp2p/interface-keys': 1.0.8 + '@libp2p/peer-id': 1.1.18 + '@multiformats/multiaddr': 11.6.1 + blockstore-core: 2.0.2 + blockstore-datastore-adapter: 4.0.0 + datastore-core: 8.0.4 + datastore-level: 9.0.4 + events: 3.3.0 + fission-bloom-filters: 1.7.1 + ipfs-core-types: 0.13.0 + ipfs-repo: 16.0.0 + keystore-idb: 0.15.5 + localforage: 1.10.0 + multiformats: 10.0.3 + one-webcrypto: 1.0.3 + throttle-debounce: 3.0.1 + tweetnacl: 1.0.3 + uint8arrays: 3.1.1 + wnfs: 0.1.7 + transitivePeerDependencies: + - supports-color + dev: false + /webpack-bundle-analyzer@4.8.0: resolution: {integrity: sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==} engines: {node: '>= 10.13.0'}