upgrade testflight demo with bottom-tabs and move to apps folder

onejs · Oct 24, 2024 · e7f2113 · e7f2113
1 parent c7d3bf6
commit e7f2113
Show file tree

Hide file tree

Showing 56 changed files with 118 additions and 81 deletions.
diff --git a/examples/testflight/.env.default → apps/testflight/.env.default b/examples/testflight/.env.default → apps/testflight/.env.default
diff --git a/examples/testflight/.gitignore → apps/testflight/.gitignore b/examples/testflight/.gitignore → apps/testflight/.gitignore
diff --git a/examples/testflight/README.md → apps/testflight/README.md b/examples/testflight/README.md → apps/testflight/README.md
diff --git a/examples/testflight/app.json → apps/testflight/app.json b/examples/testflight/app.json → apps/testflight/app.json
diff --git a/examples/testflight/app/_layout.css → apps/testflight/app/_layout.css b/examples/testflight/app/_layout.css → apps/testflight/app/_layout.css
diff --git a/examples/testflight/app/_layout.tsx → apps/testflight/app/_layout.tsx b/examples/testflight/app/_layout.tsx → apps/testflight/app/_layout.tsx
diff --git a/...testflight/app/api/authentication+api.tsx → ...testflight/app/api/authentication+api.tsx b/...testflight/app/api/authentication+api.tsx → ...testflight/app/api/authentication+api.tsx
diff --git a/...p/index,notifications,profile/_layout.tsx → ...p/index,notifications,profile/_layout.tsx b/...p/index,notifications,profile/_layout.tsx → ...p/index,notifications,profile/_layout.tsx
diff --git a/...x,notifications,profile/post/[id]+ssr.tsx → ...x,notifications,profile/post/[id]+ssr.tsx b/...x,notifications,profile/post/[id]+ssr.tsx → ...x,notifications,profile/post/[id]+ssr.tsx
diff --git a/examples/testflight/app/index/index.tsx → apps/testflight/app/index/index.tsx b/examples/testflight/app/index/index.tsx → apps/testflight/app/index/index.tsx
diff --git a/...estflight/app/notifications/index+spa.tsx → ...estflight/app/notifications/index+spa.tsx b/...estflight/app/notifications/index+spa.tsx → ...estflight/app/notifications/index+spa.tsx
diff --git a/examples/testflight/app/profile/index.tsx → apps/testflight/app/profile/index.tsx b/examples/testflight/app/profile/index.tsx → apps/testflight/app/profile/index.tsx
diff --git a/examples/testflight/assets/app-icon.png → apps/testflight/assets/app-icon.png b/examples/testflight/assets/app-icon.png → apps/testflight/assets/app-icon.png
diff --git a/examples/testflight/assets/splash.png → apps/testflight/assets/splash.png b/examples/testflight/assets/splash.png → apps/testflight/assets/splash.png
diff --git a/examples/testflight/biome.json → apps/testflight/biome.json b/examples/testflight/biome.json → apps/testflight/biome.json
diff --git a/examples/testflight/code/brand/Logo.tsx → apps/testflight/code/brand/Logo.tsx b/examples/testflight/code/brand/Logo.tsx → apps/testflight/code/brand/Logo.tsx
diff --git a/examples/testflight/code/brand/one-ball.png → apps/testflight/code/brand/one-ball.png b/examples/testflight/code/brand/one-ball.png → apps/testflight/code/brand/one-ball.png
diff --git a/examples/testflight/code/data.ts → apps/testflight/code/data.ts b/examples/testflight/code/data.ts → apps/testflight/code/data.ts
diff --git a/examples/testflight/code/db/connection.ts → apps/testflight/code/db/connection.ts b/examples/testflight/code/db/connection.ts → apps/testflight/code/db/connection.ts
diff --git a/...ples/testflight/code/db/drizzle.config.ts → apps/testflight/code/db/drizzle.config.ts b/...ples/testflight/code/db/drizzle.config.ts → apps/testflight/code/db/drizzle.config.ts
diff --git a/...b/migrations/0000_clean_justin_hammer.sql → ...b/migrations/0000_clean_justin_hammer.sql b/...b/migrations/0000_clean_justin_hammer.sql → ...b/migrations/0000_clean_justin_hammer.sql
diff --git a/...t/code/db/migrations/0000_tiny_joseph.sql → ...t/code/db/migrations/0000_tiny_joseph.sql b/...t/code/db/migrations/0000_tiny_joseph.sql → ...t/code/db/migrations/0000_tiny_joseph.sql
diff --git a/...ode/db/migrations/meta/0000_snapshot.json → ...ode/db/migrations/meta/0000_snapshot.json b/...ode/db/migrations/meta/0000_snapshot.json → ...ode/db/migrations/meta/0000_snapshot.json
diff --git a/...ght/code/db/migrations/meta/_journal.json → ...ght/code/db/migrations/meta/_journal.json b/...ght/code/db/migrations/meta/_journal.json → ...ght/code/db/migrations/meta/_journal.json
diff --git a/...ples/testflight/code/db/run-migrations.ts → apps/testflight/code/db/run-migrations.ts b/...ples/testflight/code/db/run-migrations.ts → apps/testflight/code/db/run-migrations.ts
diff --git a/examples/testflight/code/db/schema.ts → apps/testflight/code/db/schema.ts b/examples/testflight/code/db/schema.ts → apps/testflight/code/db/schema.ts
diff --git a/examples/testflight/code/db/seed.ts → apps/testflight/code/db/seed.ts b/examples/testflight/code/db/seed.ts → apps/testflight/code/db/seed.ts
diff --git a/examples/testflight/code/feed/FeedCard.tsx → apps/testflight/code/feed/FeedCard.tsx b/examples/testflight/code/feed/FeedCard.tsx → apps/testflight/code/feed/FeedCard.tsx
diff --git a/examples/testflight/code/home/HomeIcons.tsx → apps/testflight/code/home/HomeIcons.tsx b/examples/testflight/code/home/HomeIcons.tsx → apps/testflight/code/home/HomeIcons.tsx
diff --git a/...estflight/code/home/HomeLayout.native.tsx → ...estflight/code/home/HomeLayout.native.tsx b/...estflight/code/home/HomeLayout.native.tsx → ...estflight/code/home/HomeLayout.native.tsx
@@ -1,41 +1,32 @@
-import { Tabs } from 'one'
+import { NativeTabs } from '../layouts/BottomTabs'
 import { HomeIcons } from './HomeIcons'
-import { useTheme } from 'tamagui'
 
 export function HomeLayout() {
-  const theme = useTheme()
-
   return (
-    <Tabs
-      screenOptions={{
-        headerShown: false,
-        tabBarActiveTintColor: theme.accentColor.val,
-        tabBarInactiveTintColor: theme.gray9.val,
-      }}
-    >
-      <Tabs.Screen
+    <NativeTabs>
+      <NativeTabs.Screen
         name="index"
         options={{
           title: 'Feed',
           tabBarIcon: ({ color }) => <HomeIcons.Home size={20} color={color} />,
         }}
       />
 
-      <Tabs.Screen
+      <NativeTabs.Screen
         name="notifications"
         options={{
           title: 'Notifications',
           tabBarIcon: ({ color }) => <HomeIcons.Notifications size={20} color={color} />,
         }}
       />
 
-      <Tabs.Screen
+      <NativeTabs.Screen
         name="profile"
         options={{
           title: 'Profile',
           tabBarIcon: ({ color }) => <HomeIcons.User size={20} color={color} />,
         }}
       />
-    </Tabs>
+    </NativeTabs>
   )
 }
diff --git a/examples/testflight/code/home/HomeLayout.tsx → apps/testflight/code/home/HomeLayout.tsx b/examples/testflight/code/home/HomeLayout.tsx → apps/testflight/code/home/HomeLayout.tsx
diff --git a/apps/testflight/code/layouts/BottomTabs.tsx b/apps/testflight/code/layouts/BottomTabs.tsx
@@ -0,0 +1,18 @@
+import { withLayoutContext } from 'one'
+import {
+  createNativeBottomTabNavigator,
+  type NativeBottomTabNavigationEventMap,
+} from 'react-native-bottom-tabs/react-navigation'
+
+import type { BottomTabNavigationOptions } from '@react-navigation/bottom-tabs'
+
+import type { ParamListBase, TabNavigationState } from '@react-navigation/native'
+
+const { Navigator } = createNativeBottomTabNavigator()
+
+export const NativeTabs = withLayoutContext<
+  BottomTabNavigationOptions,
+  typeof Navigator,
+  TabNavigationState<ParamListBase>,
+  NativeBottomTabNavigationEventMap
+>(Navigator)
diff --git a/...t/code/notifications/NotificationCard.tsx → ...t/code/notifications/NotificationCard.tsx b/...t/code/notifications/NotificationCard.tsx → ...t/code/notifications/NotificationCard.tsx
diff --git a/...les/testflight/code/notifications/data.ts → apps/testflight/code/notifications/data.ts b/...les/testflight/code/notifications/data.ts → apps/testflight/code/notifications/data.ts
diff --git a/examples/testflight/code/styles/base.css → apps/testflight/code/styles/base.css b/examples/testflight/code/styles/base.css → apps/testflight/code/styles/base.css
diff --git a/examples/testflight/code/styles/tamagui.css → apps/testflight/code/styles/tamagui.css b/examples/testflight/code/styles/tamagui.css → apps/testflight/code/styles/tamagui.css
diff --git a/...stflight/code/theme/ToggleThemeButton.tsx → ...stflight/code/theme/ToggleThemeButton.tsx b/...stflight/code/theme/ToggleThemeButton.tsx → ...stflight/code/theme/ToggleThemeButton.tsx
diff --git a/examples/testflight/code/ui/Card.tsx → apps/testflight/code/ui/Card.tsx b/examples/testflight/code/ui/Card.tsx → apps/testflight/code/ui/Card.tsx
diff --git a/examples/testflight/code/ui/Image.tsx → apps/testflight/code/ui/Image.tsx b/examples/testflight/code/ui/Image.tsx → apps/testflight/code/ui/Image.tsx
diff --git a/...ples/testflight/code/ui/PageContainer.tsx → apps/testflight/code/ui/PageContainer.tsx b/...ples/testflight/code/ui/PageContainer.tsx → apps/testflight/code/ui/PageContainer.tsx
diff --git a/examples/testflight/config/tamagui.config.ts → apps/testflight/config/tamagui.config.ts b/examples/testflight/config/tamagui.config.ts → apps/testflight/config/tamagui.config.ts
diff --git a/examples/testflight/docker-compose.yml → apps/testflight/docker-compose.yml b/examples/testflight/docker-compose.yml → apps/testflight/docker-compose.yml
diff --git a/examples/testflight/package.json → apps/testflight/package.json b/examples/testflight/package.json → apps/testflight/package.json
@@ -33,11 +33,13 @@
     "drizzle-kit": "^0.24.2",
     "drizzle-orm": "^0.33.0",
     "expo": "~51.0.28",
+    "expo-build-properties": "^0.12.5",
     "expo-modules-core": "^1.12.24",
     "one": "1.1.325",
     "postgres": "^3.4.4",
     "react": "^18.3.1",
     "react-native": "0.74.5",
+    "react-native-bottom-tabs": "0.0.12",
     "react-native-reanimated": "~3.10.1",
     "react-native-safe-area-context": "4.10.5",
     "react-native-screens": "3.31.1",

diff --git a/examples/testflight/public/app-icon.png → apps/testflight/public/app-icon.png b/examples/testflight/public/app-icon.png → apps/testflight/public/app-icon.png
diff --git a/examples/testflight/public/favicon.svg → apps/testflight/public/favicon.svg b/examples/testflight/public/favicon.svg → apps/testflight/public/favicon.svg
diff --git a/examples/testflight/public/splash.png → apps/testflight/public/splash.png b/examples/testflight/public/splash.png → apps/testflight/public/splash.png
diff --git a/examples/testflight/public/tamagui.css → apps/testflight/public/tamagui.css b/examples/testflight/public/tamagui.css → apps/testflight/public/tamagui.css
diff --git a/examples/testflight/react-native.config.cjs → apps/testflight/react-native.config.cjs b/examples/testflight/react-native.config.cjs → apps/testflight/react-native.config.cjs
diff --git a/examples/testflight/routes.d.ts → apps/testflight/routes.d.ts b/examples/testflight/routes.d.ts → apps/testflight/routes.d.ts
diff --git a/examples/testflight/tsconfig.json → apps/testflight/tsconfig.json b/examples/testflight/tsconfig.json → apps/testflight/tsconfig.json
diff --git a/examples/testflight/vite.config.ts → apps/testflight/vite.config.ts b/examples/testflight/vite.config.ts → apps/testflight/vite.config.ts
@@ -15,11 +15,11 @@ export default {
       },
     }),
 
-    tamaguiPlugin({
-      optimize: true,
-      components: ['tamagui'],
-      config: './config/tamagui.config.ts',
-      outputCSS: './code/styles/tamagui.css',
-    }),
+    // tamaguiPlugin({
+    //   optimize: true,
+    //   components: ['tamagui'],
+    //   config: './config/tamagui.config.ts',
+    //   outputCSS: './code/styles/tamagui.css',
+    // }),
   ],
 } satisfies UserConfig
diff --git a/packages/one/src/vite/one.ts b/packages/one/src/vite/one.ts
@@ -28,6 +28,8 @@ events.setMaxListeners(1_000)
 globalThis.__vxrnEnableNativeEnv = true
 
 export function one(options: One.PluginOptions = {}): PluginOption {
+  console.trace('??????????????')
+
   oneOptions = options
 
   // ensure tsconfig
@@ -52,6 +54,10 @@ export function one(options: One.PluginOptions = {}): PluginOption {
 
   const { clientEnvDefine } = loadEnv(vxrnOptions?.mode ?? 'development')
 
+  const disableDepsPreBundle = options.ssr?.disableAutoDepsPreBundling
+
+  console.log('wtf', !!disableDepsPreBundle)
+
   const devAndProdPlugins = [
     {
       name: 'one-define-env',
@@ -62,13 +68,10 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       },
     },
 
-    ...(options.ssr?.disableAutoDepsPreBundling
-      ? []
-      : [
-          autoPreBundleDepsForSsrPlugin({
-            root: vxrnOptions?.root || process.cwd(),
-          }),
-        ]),
+    autoPreBundleDepsForSsrPlugin({
+      root: vxrnOptions?.root || process.cwd(),
+      disable: !!disableDepsPreBundle,
+    }),
 
     // proxy because you cant add a plugin inside a plugin
     new Proxy(
@@ -142,6 +145,15 @@ export function one(options: One.PluginOptions = {}): PluginOption {
       },
     },
 
+    {
+      name: 'one-react-native-web',
+      enforce: 'pre',
+
+      resolveId(id) {
+        console.log('resolve?', id)
+      },
+    },
+
     {
       name: 'one:init-config',
 
@@ -251,6 +263,8 @@ export function one(options: One.PluginOptions = {}): PluginOption {
     } satisfies Plugin,
   ] satisfies Plugin[]
 
+  console.trace('gogogogo')
+
   // TODO make this passed into vxrn through real API
   globalThis.__vxrnAddNativePlugins = [clientTreeShakePlugin()]
   globalThis.__vxrnAddWebPluginsProd = devAndProdPlugins

diff --git a/packages/vxrn/src/plugins/autoPreBundleDepsForSsrPlugin.ts b/packages/vxrn/src/plugins/autoPreBundleDepsForSsrPlugin.ts
@@ -4,7 +4,18 @@ import type { Plugin } from 'vite'
 import { EXCLUDE_LIST, scanDepsToPreBundleForSsr } from '../utils/scanDepsToPreBundleForSsr'
 import { getFileHash, lookupFile } from '../utils/utils'
 
-export function autoPreBundleDepsForSsrPlugin({ root }: { root: string }) {
+export function autoPreBundleDepsForSsrPlugin({
+  root,
+  disable,
+}: { root: string; disable?: boolean }) {
+  console.trace('start123')
+
+  if (disable) {
+    return {
+      name: 'vxrn:auto-pre-bundle-deps-for-ssr',
+    }
+  }
+
   return {
     name: 'vxrn:auto-pre-bundle-deps-for-ssr',
     enforce: 'pre',

diff --git a/packages/vxrn/src/utils/scanDepsToPreBundleForSsr.ts b/packages/vxrn/src/utils/scanDepsToPreBundleForSsr.ts
@@ -82,9 +82,7 @@ export async function scanDepsToPreBundleForSsr(
   const currentRoot = path.dirname(packageJsonPath)
 
   const pkgJson = pkgJsonContent || (await readPackageJsonSafe(packageJsonPath))
-  const deps = [
-    ...Object.keys(pkgJson.dependencies || {}),
-  ]
+  const deps = [...Object.keys(pkgJson.dependencies || {})]
 
   return (
     await Promise.all(

diff --git a/packages/vxrn/types/plugins/autoPreBundleDepsForSsrPlugin.d.ts b/packages/vxrn/types/plugins/autoPreBundleDepsForSsrPlugin.d.ts
@@ -1,6 +1,11 @@
-export declare function autoPreBundleDepsForSsrPlugin({ root }: {
+export declare function autoPreBundleDepsForSsrPlugin({ root, disable, }: {
     root: string;
+    disable?: boolean;
 }): {
+    name: string;
+    enforce?: undefined;
+    config?: undefined;
+} | {
     name: string;
     enforce: "pre";
     config(this: void, _cfg: import("vite").UserConfig, env: import("vite").ConfigEnv): Promise<{

diff --git a/yarn.lock b/yarn.lock
@@ -2068,14 +2068,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@docsearch/css@npm:3.6.1, @docsearch/css@npm:^3.6.1":
+"@docsearch/css@npm:3.6.1":
   version: 3.6.1
   resolution: "@docsearch/css@npm:3.6.1"
   checksum: 10/9afddf93797d85519e18ba7b747a1dc7e2a7e46d5530180fbb890657bcf77039bd728e435a82b143363da6f05d4bb993a000963ac41491c60725874b55ccc696
   languageName: node
   linkType: hard
 
-"@docsearch/css@npm:3.6.2":
+"@docsearch/css@npm:3.6.2, @docsearch/css@npm:^3.6.1":
   version: 3.6.2
   resolution: "@docsearch/css@npm:3.6.2"
   checksum: 10/630a26b7a570cb8c04becad769d32be5371a37d0cde1f72114e4d37d4890ea228b6e04fa0ee4bc6f37653773ddaa9bab09ba887ccd2a95ed2b6d0ac43a48b7ac
@@ -7940,17 +7940,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*":
-  version: 18.3.6
-  resolution: "@types/react@npm:18.3.6"
-  dependencies:
-    "@types/prop-types": "npm:*"
-    csstype: "npm:^3.0.2"
-  checksum: 10/ba0d337244347ecbf921de174d9db9bb80b03d41ad3ae7aa65500b3339925852c97e501d7657b5cd629ffed9f7fe3820a63069847e7b8529e4d02934d0f182e9
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:^18.2.24":
+"@types/react@npm:*, @types/react@npm:^18.2.24, @types/react@npm:^18.3.11":
   version: 18.3.12
   resolution: "@types/react@npm:18.3.12"
   dependencies:
@@ -7960,16 +7950,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^18.3.11":
-  version: 18.3.11
-  resolution: "@types/react@npm:18.3.11"
-  dependencies:
-    "@types/prop-types": "npm:*"
-    csstype: "npm:^3.0.2"
-  checksum: 10/a36f0707fdfe9fe19cbe5892bcdab0f042ecadb501ea4e1c39519943f3e74cffbd31e892d3860f5c87cf33f5f223552b246a552bed0087b95954f2cb39d5cf65
-  languageName: node
-  linkType: hard
-
 "@types/resolve@npm:1.20.2":
   version: 1.20.2
   resolution: "@types/resolve@npm:1.20.2"
@@ -8753,7 +8733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.1":
+"ajv@npm:^8.0.1, ajv@npm:^8.11.0":
   version: 8.17.1
   resolution: "ajv@npm:8.17.1"
   dependencies:
@@ -12235,9 +12215,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"example-testflight@workspace:examples/testflight":
+"example-testflight@workspace:apps/testflight":
   version: 0.0.0-use.local
-  resolution: "example-testflight@workspace:examples/testflight"
+  resolution: "example-testflight@workspace:apps/testflight"
   dependencies:
     "@biomejs/biome": "npm:^1.8.3"
     "@dotenvx/dotenvx": "npm:^1.12.1"
@@ -12252,11 +12232,13 @@ __metadata:
     drizzle-kit: "npm:^0.24.2"
     drizzle-orm: "npm:^0.33.0"
     expo: "npm:~51.0.28"
+    expo-build-properties: "npm:^0.12.5"
     expo-modules-core: "npm:^1.12.24"
     one: "npm:1.1.325"
     postgres: "npm:^3.4.4"
     react: "npm:^18.3.1"
     react-native: "npm:0.74.5"
+    react-native-bottom-tabs: "npm:0.0.12"
     react-native-reanimated: "npm:~3.10.1"
     react-native-safe-area-context: "npm:4.10.5"
     react-native-screens: "npm:3.31.1"
@@ -12368,6 +12350,18 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"expo-build-properties@npm:^0.12.5":
+  version: 0.12.5
+  resolution: "expo-build-properties@npm:0.12.5"
+  dependencies:
+    ajv: "npm:^8.11.0"
+    semver: "npm:^7.6.0"
+  peerDependencies:
+    expo: "*"
+  checksum: 10/22a1c3fbe6ef00efe13976612766c665390df033d84203bb8d8133fec5d9291be333341119f35b4f5e60932b5829e9ac10c7aaa1a28cbfb5fa689b1b7917229a
+  languageName: node
+  linkType: hard
+
 "expo-camera@npm:^15.0.16":
   version: 15.0.16
   resolution: "expo-camera@npm:15.0.16"
@@ -18318,6 +18312,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-native-bottom-tabs@npm:0.0.12":
+  version: 0.0.12
+  resolution: "react-native-bottom-tabs@npm:0.0.12"
+  dependencies:
+    sf-symbols-typescript: "npm:^2.0.0"
+    use-latest-callback: "npm:^0.2.1"
+  peerDependencies:
+    "@react-navigation/native": ">=6"
+    react: "*"
+    react-native: "*"
+  peerDependenciesMeta:
+    "@react-navigation/native":
+      optional: true
+  checksum: 10/51cbc716a7efd6df10d516f58c120339fbb93da22daee984d7b97ab2d101c2232f29186e54558e193627c089e3bad2c6a5871f6c6af91cafc4a8d72dec248196
+  languageName: node
+  linkType: hard
+
 "react-native-gesture-handler@npm:^2.18.1":
   version: 2.19.0
   resolution: "react-native-gesture-handler@npm:2.19.0"
@@ -19557,6 +19568,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sf-symbols-typescript@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "sf-symbols-typescript@npm:2.0.0"
+  checksum: 10/dde81c01265bdff16f527e1242af03793460c3c5f34ca6950ab1ca73a3bccd54ebabfcd56961658e72f94baac06ad620134a0bc03b0674dd543d4883c7d5e18f
+  languageName: node
+  linkType: hard
+
 "shallow-clone@npm:^3.0.0":
   version: 3.0.1
   resolution: "shallow-clone@npm:3.0.1"
@@ -21007,7 +21025,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.2.2":
+"typescript@npm:^5.2.2, typescript@npm:^5.5.2, typescript@npm:^5.6.2":
   version: 5.6.3
   resolution: "typescript@npm:5.6.3"
   bin:
@@ -21017,17 +21035,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.5.2, typescript@npm:^5.6.2":
-  version: 5.6.2
-  resolution: "typescript@npm:5.6.2"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/f95365d4898f357823e93d334ecda9fcade54f009b397c7d05b7621cd9e865981033cf89ccde0f3e3a7b73b1fdbae18e92bc77db237b43e912f053fef0f9a53b
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
+"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.5.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.6.2#optional!builtin<compat/typescript>":
   version: 5.6.3
   resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
   bin:
@@ -21037,16 +21045,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.5.2#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.6.2#optional!builtin<compat/typescript>":
-  version: 5.6.2
-  resolution: "typescript@patch:typescript@npm%3A5.6.2#optional!builtin<compat/typescript>::version=5.6.2&hash=8c6c40"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/8bfc7ca0d9feca4c3fcbd6c70741abfcd714197d6448e68225ae71e462447d904d3bfba49759a8fbe4956d87f054e2d346833c8349c222daa594a2626d4e1be8
-  languageName: node
-  linkType: hard
-
 "ua-parser-js@npm:^1.0.35":
   version: 1.0.39
   resolution: "ua-parser-js@npm:1.0.39"