From 1ef5dd58bcec89cb16249459d30502a5b8a14681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Edenstr=C3=B6m?= Date: Tue, 26 Oct 2021 09:59:14 +0200 Subject: [PATCH] remove duplicate cookies packages --- apps/skolplattformen-sthlm/App.js | 2 +- .../skolplattformen-sthlm/android/gradlew.bat | 0 apps/skolplattformen-sthlm/ios/Podfile.lock | 12 ++-- apps/skolplattformen-sthlm/package.json | 61 +++++++++---------- libs/api-skolplattformen/README.md | 2 +- libs/hooks/README.md | 2 +- package.json | 1 - yarn.lock | 7 --- 8 files changed, 39 insertions(+), 48 deletions(-) mode change 100644 => 100755 apps/skolplattformen-sthlm/android/gradlew.bat diff --git a/apps/skolplattformen-sthlm/App.js b/apps/skolplattformen-sthlm/App.js index 0d64f37c..9ff52f8b 100644 --- a/apps/skolplattformen-sthlm/App.js +++ b/apps/skolplattformen-sthlm/App.js @@ -1,6 +1,6 @@ import * as eva from '@eva-design/eva' import AsyncStorage from '@react-native-async-storage/async-storage' -import CookieManager from '@react-native-community/cookies' +import CookieManager from '@react-native-cookies/cookies' import init from '@skolplattformen/api-skolplattformen' import { ApiProvider } from '@skolplattformen/hooks' import { ApplicationProvider, IconRegistry } from '@ui-kitten/components' diff --git a/apps/skolplattformen-sthlm/android/gradlew.bat b/apps/skolplattformen-sthlm/android/gradlew.bat old mode 100644 new mode 100755 diff --git a/apps/skolplattformen-sthlm/ios/Podfile.lock b/apps/skolplattformen-sthlm/ios/Podfile.lock index 7c4e70a3..648d9ec7 100644 --- a/apps/skolplattformen-sthlm/ios/Podfile.lock +++ b/apps/skolplattformen-sthlm/ios/Podfile.lock @@ -287,7 +287,7 @@ PODS: - React-jsi (= 0.65.1) - React-perflogger (= 0.65.1) - React-jsinspector (0.65.1) - - react-native-cookies (5.0.1): + - react-native-cookies (6.0.11): - React-Core - react-native-restart (0.0.22): - React-Core @@ -364,7 +364,7 @@ PODS: - React-perflogger (= 0.65.1) - RNCalendarEvents (2.2.0): - React - - RNCAsyncStorage (1.15.2): + - RNCAsyncStorage (1.15.9): - React-Core - RNCMaskedView (0.1.11): - React @@ -461,7 +461,7 @@ DEPENDENCIES: - React-jsi (from `../../../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../../../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../../../node_modules/react-native/ReactCommon/jsinspector`) - - "react-native-cookies (from `../../../node_modules/@react-native-community/cookies`)" + - "react-native-cookies (from `../../../node_modules/@react-native-cookies/cookies`)" - react-native-restart (from `../../../node_modules/react-native-restart`) - react-native-safe-area-context (from `../../../node_modules/react-native-safe-area-context`) - react-native-simple-toast (from `../../../node_modules/react-native-simple-toast`) @@ -545,7 +545,7 @@ EXTERNAL SOURCES: React-jsinspector: :path: "../../../node_modules/react-native/ReactCommon/jsinspector" react-native-cookies: - :path: "../../../node_modules/@react-native-community/cookies" + :path: "../../../node_modules/@react-native-cookies/cookies" react-native-restart: :path: "../../../node_modules/react-native-restart" react-native-safe-area-context: @@ -635,7 +635,7 @@ SPEC CHECKSUMS: React-jsi: 12913c841713a15f64eabf5c9ad98592c0ec5940 React-jsiexecutor: 43f2542aed3c26e42175b339f8d37fe3dd683765 React-jsinspector: 41e58e5b8e3e0bf061fdf725b03f2144014a8fb0 - react-native-cookies: ce50e42ace7cf0dd47769260ca5bbe8eee607e4e + react-native-cookies: cd92f3824ed1e32a20802e8185101e14bb5b76da react-native-restart: 733a51ad137f15b0f8dc34c4082e55af7da00979 react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057 react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f @@ -653,7 +653,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de ReactCommon: eafed38eec7b591c31751bfa7494801618460459 RNCalendarEvents: 7e65eb4a94f53c1744d1e275f7fafcfaa619f7a3 - RNCAsyncStorage: 9b7605e899f9acb2fba33e87952c529731265453 + RNCAsyncStorage: 26f25150da507524a7815f2ada06ca0967f65633 RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 RNDateTimePicker: d943800c936fb01c352fcfb70439550d2cb57092 RNDeviceInfo: 8a06046616c6b5c03787b04f265fa3b52b37c80b diff --git a/apps/skolplattformen-sthlm/package.json b/apps/skolplattformen-sthlm/package.json index e02257b2..fb0ad2d7 100644 --- a/apps/skolplattformen-sthlm/package.json +++ b/apps/skolplattformen-sthlm/package.json @@ -15,23 +15,42 @@ "check-i18n": "npm run i18n -- --check" }, "dependencies": { - "react": "*", - "react-native": "*", - "@testing-library/react-native": "*", - "@testing-library/jest-native": "*", "@eva-design/eva": "*", "@eva-design/material": "*", "@react-native-async-storage/async-storage": "*", - "@react-native-community/cookies": "*", "@react-native-community/datetimepicker": "*", "@react-native-community/masked-view": "*", + "@react-native-cookies/cookies": "*", "@react-navigation/bottom-tabs": "*", "@react-navigation/native": "*", "@react-navigation/stack": "*", + "@testing-library/jest-native": "*", + "@testing-library/react-hooks": "*", + "@testing-library/react-native": "*", + "@testing-library/react": "*", "@ui-kitten/components": "*", "@ui-kitten/eva-icons": "*", "@ui-kitten/metro-config": "*", + "buffer": "*", + "camelcase-keys": "*", + "change-case": "*", + "deepmerge": "*", + "events": "*", + "fast-fuzzy": "*", + "fetch-cookie": "*", + "formik": "*", + "h2m": "*", + "he": "*", "hermes-engine": "*", + "https-proxy-agent": "*", + "i18n-js": "*", + "js-htmlencode": "*", + "luxon": "*", + "moment": "*", + "node-blob": "*", + "node-fetch": "*", + "node-html-parser": "*", + "personnummer": "*", "react-native-animatable": "*", "react-native-calendar-events": "*", "react-native-dev-menu": "*", @@ -49,34 +68,14 @@ "react-native-svg": "*", "react-native-typography": "*", "react-native-webview": "*", - "formik": "*", - "moment": "*", - "personnummer": "*", - "yup": "*", - "@testing-library/react-hooks": "*", - "valtio": "*", - "i18n-js": "*", - "deepmerge": "*", - "buffer": "*", - "fast-fuzzy": "*", - "luxon": "*", - "node-fetch": "*", - "tough-cookie": "*", - "fetch-cookie": "*", - "https-proxy-agent": "*", - "@react-native-cookies/cookies": "*", - "events": "*", - "he": "*", - "node-html-parser": "*", - "change-case": "*", - "node-blob": "*", - "camelcase-keys": "*", - "h2m": "*", - "js-htmlencode": "*", - "regenerator-runtime": "*", + "react-native": "*", "react-redux": "*", + "react": "*", "redux": "*", - "@testing-library/react": "*" + "regenerator-runtime": "*", + "tough-cookie": "*", + "valtio": "*", + "yup": "*" }, "devDependencies": {}, "private": true diff --git a/libs/api-skolplattformen/README.md b/libs/api-skolplattformen/README.md index 1ddfe61a..85053458 100644 --- a/libs/api-skolplattformen/README.md +++ b/libs/api-skolplattformen/README.md @@ -17,7 +17,7 @@ the concrete implementation of fetch and cookie handler must be injected. ```javascript import init from '@skolplattformen/api-skolplattformen' -import CookieManager from '@react-native-community/cookies' +import CookieManager from '@react-native-cookies/cookies' const api = init(fetch, () => CookieManager.clearAll()) ``` diff --git a/libs/hooks/README.md b/libs/hooks/README.md index 5e0bcb36..16f570fc 100644 --- a/libs/hooks/README.md +++ b/libs/hooks/README.md @@ -19,7 +19,7 @@ In order to use api hooks, you must wrap your app in an ApiProvider import React from 'react' import { ApiProvider } from '@skolplattformen/hooks' import init from '@skolplattformen/api-skolplattformen' -import { CookieManager } from '@react-native-community/cookies' +import { CookieManager } from '@react-native-cookies/cookies' import AsyncStorage from '@react-native-async-storage/async-storage' import { RootComponent } from './components/root' import crashlytics from '@react-native-firebase/crashlytics' diff --git a/package.json b/package.json index 98bad385..8d617f06 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "@eva-design/eva": "2.0.0", "@eva-design/material": "2.0.0", "@react-native-async-storage/async-storage": "1.15.9", - "@react-native-community/cookies": "5.0.1", "@react-native-community/datetimepicker": "3.4.3", "@react-native-community/masked-view": "^0.1.11", "@react-native-cookies/cookies": "^6.0.7", diff --git a/yarn.lock b/yarn.lock index dbd28b93..f181f32d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2015,13 +2015,6 @@ sudo-prompt "^9.0.0" wcwidth "^1.0.1" -"@react-native-community/cookies@5.0.1": - version "5.0.1" - resolved "https://registry.npmjs.org/@react-native-community/cookies/-/cookies-5.0.1.tgz" - integrity sha512-Is/kWBmYBFtX4DOImfglK5Bz2w3PdpgMGTqdVQSbZlFdSDw32lwFMk1mLSAzL5EcUEDwJJbcEATbU3JGSZSVXw== - dependencies: - invariant "^2.2.4" - "@react-native-community/datetimepicker@3.4.3": version "3.4.3" resolved "https://registry.npmjs.org/@react-native-community/datetimepicker/-/datetimepicker-3.4.3.tgz"