From 7887f55dd0e8cd4e2f5d4e87f70fe8ce83f67054 Mon Sep 17 00:00:00 2001 From: daniel31x13 Date: Mon, 21 Apr 2025 20:04:16 -0400 Subject: [PATCH] bug fix --- apps/mobile/ios/Podfile.lock | 4 +- apps/mobile/package.json | 2 +- apps/web/package.json | 2 +- .../lib}/getFormatFromContentType.ts | 0 .../lib}/getLinkTypeFromFormat.ts | 0 packages/router/links.tsx | 4 +- packages/router/package.json | 14 ++++--- packages/router/user.tsx | 2 +- yarn.lock | 41 ++++++++----------- 9 files changed, 33 insertions(+), 36 deletions(-) rename {apps/web/lib/shared => packages/lib}/getFormatFromContentType.ts (100%) rename {apps/web/lib/shared => packages/lib}/getLinkTypeFromFormat.ts (100%) diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock index 1aa5be1f..f1edb8b9 100644 --- a/apps/mobile/ios/Podfile.lock +++ b/apps/mobile/ios/Podfile.lock @@ -230,7 +230,7 @@ PODS: - ExpoModulesCore - ExpoHaptics (14.0.1): - ExpoModulesCore - - ExpoHead (4.0.11): + - ExpoHead (4.0.20): - ExpoModulesCore - ExpoKeepAwake (14.0.3): - ExpoModulesCore @@ -2367,7 +2367,7 @@ SPEC CHECKSUMS: ExpoFileSystem: c8c19bf80d914c83dda3beb8569d7fb603be0970 ExpoFont: 773955186469acc5108ff569712a2d243857475f ExpoHaptics: e01cce0741d68c281853118eb0267f88d42c6b7a - ExpoHead: c2695f9e8d685d6fa76e7a42006b0b3420cf2d50 + ExpoHead: 15cd0b1168451650dafe3983b99beea3befb3590 ExpoKeepAwake: 2a5f15dd4964cba8002c9a36676319a3394c85c7 ExpoLinking: 0381341519ca7180a3a057d20edb1cf6a908aaf4 ExpoModulesCore: 0bcea8c26791a8f0aed1d4a961f1165e1fc657d4 diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 2e7f8967..bcf7802e 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -27,7 +27,7 @@ "expo-font": "~13.0.1", "expo-haptics": "~14.0.0", "expo-linking": "~7.0.3", - "expo-router": "4.0.11", + "expo-router": "4.0.20", "expo-secure-store": "~14.0.0", "expo-splash-screen": "~0.29.18", "expo-status-bar": "~2.0.0", diff --git a/apps/web/package.json b/apps/web/package.json index 3d034a85..d1cafc12 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -61,7 +61,7 @@ "node-fetch": "^2.7.0", "nodemailer": "^6.9.3", "playwright": "^1.45.0", - "react": "18.2.0", + "react": "18.3.1", "react-colorful": "^5.6.1", "react-dom": "18.2.0", "react-hot-toast": "^2.4.1", diff --git a/apps/web/lib/shared/getFormatFromContentType.ts b/packages/lib/getFormatFromContentType.ts similarity index 100% rename from apps/web/lib/shared/getFormatFromContentType.ts rename to packages/lib/getFormatFromContentType.ts diff --git a/apps/web/lib/shared/getLinkTypeFromFormat.ts b/packages/lib/getLinkTypeFromFormat.ts similarity index 100% rename from apps/web/lib/shared/getLinkTypeFromFormat.ts rename to packages/lib/getLinkTypeFromFormat.ts diff --git a/packages/router/links.tsx b/packages/router/links.tsx index 06bcb875..46f6da23 100644 --- a/packages/router/links.tsx +++ b/packages/router/links.tsx @@ -12,8 +12,8 @@ import { import { useRouter } from "next/router"; import { useSession } from "next-auth/react"; import { PostLinkSchemaType } from "@linkwarden/lib/schemaValidation"; -import getFormatFromContentType from "@/lib/shared/getFormatFromContentType"; -import getLinkTypeFromFormat from "@/lib/shared/getLinkTypeFromFormat"; +import getFormatFromContentType from "@linkwarden/lib/getFormatFromContentType"; +import getLinkTypeFromFormat from "@linkwarden/lib/getLinkTypeFromFormat"; const useLinks = (params: LinkRequestQuery = {}) => { const router = useRouter(); diff --git a/packages/router/package.json b/packages/router/package.json index 90bada20..d9d85588 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -4,13 +4,17 @@ "private": true, "main": "index.ts", "dependencies": { - "@tanstack/react-query": "^5.51.15", - "@tanstack/react-query-devtools": "^5.51.15", - "next-auth": "^4.22.1", - "next": "13.4.12", "@linkwarden/lib": "*", "@linkwarden/prisma": "*", "@linkwarden/types": "*", - "react": "18.2.0" + "@tanstack/react-query": "^5.51.15", + "react-hot-toast": "^2.4.1", + "@tanstack/react-query-devtools": "^5.51.15", + "next": "13.4.12", + "next-i18next": "^15.3.0", + "next-auth": "^4.22.1" + }, + "peerDependencies": { + "react": "18.3.1" } } diff --git a/packages/router/user.tsx b/packages/router/user.tsx index 200fd456..ca378ac2 100644 --- a/packages/router/user.tsx +++ b/packages/router/user.tsx @@ -4,7 +4,7 @@ import { useSession } from "next-auth/react"; const useUser = () => { const { data, status } = useSession(); - const userId = data?.user.id; + const userId = (data?.user as any)?.id; return useQuery({ queryKey: ["user"], diff --git a/yarn.lock b/yarn.lock index 3590f142..19056a8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2069,10 +2069,10 @@ postcss "~8.4.32" resolve-from "^5.0.0" -"@expo/metro-runtime@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@expo/metro-runtime/-/metro-runtime-4.0.0.tgz#fedccde1baebe97c02584331194f1f793492abbe" - integrity sha512-+zgCyuXqIzgZVN8h0g36sursGXBy3xqtJW9han7t/iR2HTTrrbEoep5ftW1a27bdSINU96ng+rSsPLbyHYeBvw== +"@expo/metro-runtime@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@expo/metro-runtime/-/metro-runtime-4.0.1.tgz#ccc74b32bd48eb64c34a4ff29690204cc11c6e7a" + integrity sha512-CRpbLvdJ1T42S+lrYa1iZp1KfDeBp4oeZOK3hdpiS5n0vR0nhD6sC1gGF0sTboCTp64tLteikz5Y3j53dvgOIw== "@expo/osascript@^2.1.6": version "2.1.6" @@ -2144,7 +2144,7 @@ resolved "https://registry.yarnpkg.com/@expo/sdk-runtime-versions/-/sdk-runtime-versions-1.0.0.tgz#d7ebd21b19f1c6b0395e50d78da4416941c57f7c" integrity sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ== -"@expo/server@^0.5.0": +"@expo/server@^0.5.3": version "0.5.3" resolved "https://registry.yarnpkg.com/@expo/server/-/server-0.5.3.tgz#7e2c268699aa962035bfb95c7e0d46515940709c" integrity sha512-WXsWzeBs5v/h0PUfHyNLLz07rwwO5myQ1A5DGYewyyGLmsyl61yVCe8AgAlp1wkiMsqhj2hZqI2u3K10QnCMrQ== @@ -3645,7 +3645,7 @@ invariant "^2.2.4" nullthrows "^1.1.1" -"@react-navigation/bottom-tabs@^7.0.0": +"@react-navigation/bottom-tabs@^7.0.0", "@react-navigation/bottom-tabs@^7.2.0": version "7.3.10" resolved "https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-7.3.10.tgz#19fa84d730d7040982edeba08542a37a50eb2a16" integrity sha512-qRCr7LHFpzEJFuG2Id9NNXT2GBgu+zZ7wK8UO0bRuaxXK1y6W09k6+fDcDUDR67tHIB4HvfHCj1VyeSEW8uorg== @@ -3673,7 +3673,7 @@ dependencies: color "^4.2.3" -"@react-navigation/native-stack@^7.0.0": +"@react-navigation/native-stack@^7.2.0": version "7.3.10" resolved "https://registry.yarnpkg.com/@react-navigation/native-stack/-/native-stack-7.3.10.tgz#80553b5ccaf27dcf1b67d3d93d7e73fdd985d29f" integrity sha512-bO/3bZiL/i2dbJQEeqfxIqp1CKzyx+RPdwaiLm6za8cUl877emnxFeAAOSUbN7r/AJgq+U/iCwc3K88mh+4oRQ== @@ -3681,7 +3681,7 @@ "@react-navigation/elements" "^2.3.8" warn-once "^0.1.1" -"@react-navigation/native@^7.0.0": +"@react-navigation/native@^7.0.0", "@react-navigation/native@^7.0.14": version "7.1.6" resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-7.1.6.tgz#0b51e543ad37348000f856959faf295aa129cd93" integrity sha512-XcfygfHDfAgf2iC4rNBc67Yy0M1aYRGNeNKqja5AJPFZoBQhAEAxKCwHsH4g3qU0zIbzLCthoSl5107dBjoeZw== @@ -6894,17 +6894,17 @@ expo-modules-core@2.2.3: dependencies: invariant "^2.2.4" -expo-router@4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/expo-router/-/expo-router-4.0.11.tgz#324364534fc7837a99a7894c611b3cd75e4470c5" - integrity sha512-2Qrd/fk98kC+CTg1umbuUaBaGkpdGStPpkSR99SoAjX6KWC1WhNMCv0hGFn7cRmSNOWQzgIfLGLERhRY1o4myw== +expo-router@4.0.20: + version "4.0.20" + resolved "https://registry.yarnpkg.com/expo-router/-/expo-router-4.0.20.tgz#1b4d7c9b9fd3c16a5bd145acab6281ae581efdc5" + integrity sha512-1+CtvohptOsG/Piejk8uQ9cmM+8ojadFkdeThCn4klZjc0dtFSSHenb8D/0RKuBdp4taBkNaqgEKwYvhVBJyEg== dependencies: - "@expo/metro-runtime" "4.0.0" - "@expo/server" "^0.5.0" + "@expo/metro-runtime" "4.0.1" + "@expo/server" "^0.5.3" "@radix-ui/react-slot" "1.0.1" - "@react-navigation/bottom-tabs" "^7.0.0" - "@react-navigation/native" "^7.0.0" - "@react-navigation/native-stack" "^7.0.0" + "@react-navigation/bottom-tabs" "^7.2.0" + "@react-navigation/native" "^7.0.14" + "@react-navigation/native-stack" "^7.2.0" client-only "^0.0.1" react-helmet-async "^1.3.0" react-native-helmet-async "2.0.4" @@ -11070,13 +11070,6 @@ react-window@^1.8.10: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" -react@18.2.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" - integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== - dependencies: - loose-envify "^1.1.0" - react@18.3.1: version "18.3.1" resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"