From 8f9ad93ec8c45618a1f3af167dfd019c3d80b2ff Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Wed, 9 Oct 2024 08:49:48 +0200 Subject: [PATCH 1/4] fix: remove duplicate enableGlobalCache in .yarnrc.yml --- .yarnrc.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index b90610417..5f9619a69 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,5 +1,4 @@ compressionLevel: mixed -enableGlobalCache: false nodeLinker: node-modules nmMode: hardlinks-local enableGlobalCache: true From e209af3510040b8cd7b8fb82ec6323dac5ac461d Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Wed, 9 Oct 2024 09:40:04 +0200 Subject: [PATCH 2/4] fix: add @maplibre/maplibre-react-native dependencies to all packages --- packages/examples/package.json | 1 + packages/react-native-app/package.json | 1 + yarn.lock | 2 ++ 3 files changed, 4 insertions(+) diff --git a/packages/examples/package.json b/packages/examples/package.json index ceeb29ecb..40caa82ed 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -12,6 +12,7 @@ ], "dependencies": { "@mapbox/geo-viewport": "^0.5.0", + "@maplibre/maplibre-react-native": "workspace:*", "@react-native-masked-view/masked-view": "^0.3.1", "@react-navigation/native": "^6.1.8", "@react-navigation/stack": "^6.3.25", diff --git a/packages/react-native-app/package.json b/packages/react-native-app/package.json index 419275eaf..1e32fe836 100644 --- a/packages/react-native-app/package.json +++ b/packages/react-native-app/package.json @@ -15,6 +15,7 @@ "dependencies": { "@mapbox/geo-viewport": "*", "@maplibre-react-native/examples": "*", + "@maplibre/maplibre-react-native": "workspace:*", "@react-native-masked-view/masked-view": "*", "@react-navigation/native": "*", "@react-navigation/stack": "*", diff --git a/yarn.lock b/yarn.lock index f84199dfe..e3c5b21f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2715,6 +2715,7 @@ __metadata: "@babel/preset-typescript": "npm:7.22.5" "@babel/runtime": "npm:^7.23.1" "@mapbox/geo-viewport": "npm:^0.5.0" + "@maplibre/maplibre-react-native": "workspace:*" "@react-native-masked-view/masked-view": "npm:^0.3.1" "@react-native/metro-config": "npm:^0.75.2" "@react-navigation/native": "npm:^6.1.8" @@ -2762,6 +2763,7 @@ __metadata: "@babel/runtime": "npm:*" "@mapbox/geo-viewport": "npm:*" "@maplibre-react-native/examples": "npm:*" + "@maplibre/maplibre-react-native": "workspace:*" "@react-native-masked-view/masked-view": "npm:*" "@react-native/metro-config": "npm:*" "@react-navigation/native": "npm:*" From 375dd78f933fa55b21bd51f6b267b31358824b22 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Wed, 9 Oct 2024 10:38:08 +0200 Subject: [PATCH 3/4] fix: use example also with workspace:* --- packages/expo-app/package.json | 2 +- packages/react-native-app/package.json | 2 +- yarn.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/expo-app/package.json b/packages/expo-app/package.json index 50dfcc7da..79667f5f9 100644 --- a/packages/expo-app/package.json +++ b/packages/expo-app/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@mapbox/geo-viewport": "*", - "@maplibre-react-native/examples": "*", + "@maplibre-react-native/examples": "workspace:*", "@maplibre/maplibre-react-native": "workspace:*", "@react-native-masked-view/masked-view": "*", "@react-navigation/native": "*", diff --git a/packages/react-native-app/package.json b/packages/react-native-app/package.json index 1e32fe836..b3c27f9d6 100644 --- a/packages/react-native-app/package.json +++ b/packages/react-native-app/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@mapbox/geo-viewport": "*", - "@maplibre-react-native/examples": "*", + "@maplibre-react-native/examples": "workspace:*", "@maplibre/maplibre-react-native": "workspace:*", "@react-native-masked-view/masked-view": "*", "@react-navigation/native": "*", diff --git a/yarn.lock b/yarn.lock index e3c5b21f3..37837bcf2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2706,7 +2706,7 @@ __metadata: languageName: node linkType: hard -"@maplibre-react-native/examples@npm:*, @maplibre-react-native/examples@workspace:packages/examples": +"@maplibre-react-native/examples@workspace:*, @maplibre-react-native/examples@workspace:packages/examples": version: 0.0.0-use.local resolution: "@maplibre-react-native/examples@workspace:packages/examples" dependencies: @@ -2762,7 +2762,7 @@ __metadata: "@babel/preset-typescript": "npm:*" "@babel/runtime": "npm:*" "@mapbox/geo-viewport": "npm:*" - "@maplibre-react-native/examples": "npm:*" + "@maplibre-react-native/examples": "workspace:*" "@maplibre/maplibre-react-native": "workspace:*" "@react-native-masked-view/masked-view": "npm:*" "@react-native/metro-config": "npm:*" @@ -8709,7 +8709,7 @@ __metadata: dependencies: "@babel/core": "npm:^7.20.0" "@mapbox/geo-viewport": "npm:*" - "@maplibre-react-native/examples": "npm:*" + "@maplibre-react-native/examples": "workspace:*" "@maplibre/maplibre-react-native": "workspace:*" "@react-native-masked-view/masked-view": "npm:*" "@react-navigation/native": "npm:*" From 0dbec212867939588b9e469b93943833ba2e4483 Mon Sep 17 00:00:00 2001 From: Kilian Finger Date: Wed, 9 Oct 2024 10:47:55 +0200 Subject: [PATCH 4/4] fix: remove @maplibre/maplibre-react-native from react-native-app --- packages/react-native-app/package.json | 1 - yarn.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/react-native-app/package.json b/packages/react-native-app/package.json index b3c27f9d6..e7507c18d 100644 --- a/packages/react-native-app/package.json +++ b/packages/react-native-app/package.json @@ -15,7 +15,6 @@ "dependencies": { "@mapbox/geo-viewport": "*", "@maplibre-react-native/examples": "workspace:*", - "@maplibre/maplibre-react-native": "workspace:*", "@react-native-masked-view/masked-view": "*", "@react-navigation/native": "*", "@react-navigation/stack": "*", diff --git a/yarn.lock b/yarn.lock index 37837bcf2..a11d58861 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2763,7 +2763,6 @@ __metadata: "@babel/runtime": "npm:*" "@mapbox/geo-viewport": "npm:*" "@maplibre-react-native/examples": "workspace:*" - "@maplibre/maplibre-react-native": "workspace:*" "@react-native-masked-view/masked-view": "npm:*" "@react-native/metro-config": "npm:*" "@react-navigation/native": "npm:*"