chore: Merge PR #27 from feat/update-expo-sdk-49

codinsonn · web-flow · commit b647013f97c6 · 2023-07-07T16:04:22.000+02:00
diff --git a/.storybook/main.js b/.storybook/main.js
@@ -36,6 +36,9 @@ module.exports = {
       '../packages/@aetherspace/assets',
       '../apps/next/public',
     ],
+    // typesript: {
+    //   reactDocgen: 'react-docgen-typescript-plugin',
+    // },
     webpackFinal: (config) => {
         // Add TS & react-native-web support
         config.module.rules.push({
diff --git a/apps/expo/app.json b/apps/expo/app.json
@@ -4,7 +4,7 @@
     "slug": "codinsonn-dot-dev",
     "version": "1.0.0",
     "privacy": "public",
-    "sdkVersion": "48.0.0",
+    "sdkVersion": "49.0.0",
     "orientation": "default",
     "icon": "../next/public/icon.png",
     "description": "Personal Website for @codinsonn.dev, built with the GREEN stack, Aetherspace, Expo & Next.js",
diff --git a/apps/expo/index.js b/apps/expo/index.js
@@ -4,9 +4,11 @@
 import 'expo/build/Expo.fx';
 import 'expo/build/Expo.fx.web';
 import { activateKeepAwakeAsync } from 'expo-keep-awake';
+import { Logs } from 'expo';
 
 /* --- Start ----------------------------------------------------------------------------------- */
 // -i- Expo Router setup
 import 'expo-router/entry';
 
+if (__DEV__) Logs.disableExpoCliLogging();
 if (__DEV__) activateKeepAwakeAsync();
diff --git a/apps/expo/package.json b/apps/expo/package.json
@@ -24,31 +24,31 @@
     "preset": "jest-expo"
   },
   "dependencies": {
-    "@react-navigation/core": "^6.4.7",
-    "@react-navigation/native": "^6.1.5",
-    "@react-navigation/stack": "^6.3.15",
+    "@react-navigation/core": "^6.4.9",
+    "@react-navigation/native": "^6.1.7",
+    "@react-navigation/stack": "^6.3.17",
     "app": "*",
-    "expo": "~48.0.19",
-    "expo-font": "~11.1.1",
-    "expo-image": "~1.2.3",
-    "expo-router": "^1.5.3",
-    "expo-status-bar": "~1.4.4",
-    "expo-updates": "~0.16.4",
+    "expo": "^49.0.0",
+    "expo-font": "~11.4.0",
+    "expo-image": "~1.3.1",
+    "expo-router": "^2.0.0",
+    "expo-status-bar": "~1.6.0",
+    "expo-updates": "~0.18.8",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-native": "0.71.3",
-    "react-native-gesture-handler": "~2.9.0",
-    "react-native-reanimated": "~2.14.4",
-    "react-native-safe-area-context": "4.5.0",
-    "react-native-screens": "~3.20.0",
-    "react-native-svg": "13.4.0",
-    "react-native-web": "~0.18.10",
+    "react-native": "0.72.1",
+    "react-native-gesture-handler": "2.12.0",
+    "react-native-reanimated": "3.3.0",
+    "react-native-safe-area-context": "4.6.3",
+    "react-native-screens": "3.22.1",
+    "react-native-svg": "13.9.0",
+    "react-native-web": "~0.19.6",
     "registries": "*"
   },
   "devDependencies": {
     "@expo/webpack-config": "^0.17.2",
-    "@types/react": "~18.0.14",
-    "dotenv": "^16.0.3",
+    "@types/react": "18.0.27",
+    "dotenv": "^16.3.1",
     "typescript": "^4.9.4"
   }
 }
diff --git a/apps/next/package.json b/apps/next/package.json
@@ -19,7 +19,7 @@
         "app": "*",
         "encoding": "^0.1.13",
         "expo-asset-web": "npm:expo-asset@8.7.0",
-        "next": "^13.4.7",
+        "next": "^13.4.8",
         "next-fonts": "^1.5.1",
         "next-images": "^1.8.5",
         "next-pwa": "^5.6.0",
diff --git a/features/app-core/package.json b/features/app-core/package.json
@@ -13,6 +13,6 @@
         "cors": "^2.8.5",
         "links-page": "*",
         "registries": "*",
-        "swr": "^2.0.0"
+        "swr": "^2.2.0"
     }
 }
diff --git a/features/app-core/screens/ErrorBoundary.tsx b/features/app-core/screens/ErrorBoundary.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-native-a11y/has-valid-accessibility-descriptors */
 import { H1 } from 'aetherspace/html-elements'
 import { Pressable, Text, View } from 'aetherspace/primitives'
 import React from 'react'
@@ -39,7 +40,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundarySta
         <View tw="w-full h-full min-h-full min-w-full items-center justify-center">
           <H1 tw="mb-4">Hmm, something went wrong</H1>
           <Pressable
-            accessibilityRole="button"
+            role="button"
             tw="p-4 bg-slate-800 rounded-md text-white"
             onPress={() => this.setState({ hasError: false })}
           >
diff --git a/features/links-page/components/BioLink.tsx b/features/links-page/components/BioLink.tsx
@@ -26,7 +26,7 @@ export const BioLink = (props: AetherProps<typeof BioLinkProps>) => {
   // -- Render --
 
   return (
-    <StLinkWrapper accessibilityRole="button" onPress={() => openLink(link)}>
+    <StLinkWrapper role="button" onPress={() => openLink(link)}>
       <StImageWrapper>
         <Link href={link}>
           <Image
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "@storybook/manager-webpack5": "^6.5.16",
     "@storybook/mdx2-csf": "^0.0.4",
     "@storybook/react": "^6.5.16",
-    "@turbo/gen": "^1.10.3",
+    "@turbo/gen": "^1.10.7",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
     "chromatic": "^6.17.1",
@@ -45,16 +45,17 @@
     "patch-package": "^7.0.0",
     "prettier": "^2.8.4",
     "prettier-eslint": "^15.0.1",
-    "turbo": "^1.10.2",
+    "react-docgen-typescript-plugin": "^1.0.5",
+    "turbo": "^1.10.7",
     "webpack": "*",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.9.0"
   },
   "resolutions": {
-    "typescript": "^4.9.5",
+    "typescript": "^4.9.4",
     "zod": "~3.20.6",
     "@babel/core": "^7.20.0",
     "@expo/config": "^7.0.2",
-    "@types/react": "~18.0.28",
+    "@types/react": "18.0.27",
     "@expo/webpack-config": "^0.17.2"
   },
   "scripts": {
diff --git a/packages/@aetherspace/hooks/useAetherStyles/useAetherStyles.tsx b/packages/@aetherspace/hooks/useAetherStyles/useAetherStyles.tsx
@@ -11,7 +11,7 @@ import { addMediaQuery } from '../../styles/aetherQueries'
 
 export type StylePropsType<C extends JSXElementConstructor<any>> = TAetherStyleProps & {
   style?: ComponentProps<C>['style']
-  nativeID?: string
+  id?: string
   children?: any
 }
 
@@ -89,7 +89,7 @@ const useAetherStyles = <
 
   // -- bindStyles --
 
-  const bindStyles = { style: styles, ...(mediaIds ? { nativeID: mediaIds } : {}) }
+  const bindStyles = { style: styles, ...(mediaIds ? { id: mediaIds } : {}) }
 
   // -- Return --
 
diff --git a/packages/@aetherspace/package.json b/packages/@aetherspace/package.json
@@ -24,22 +24,21 @@
         "add-route": "cd ../.. && yarn gen aether-route"
     },
     "dependencies": {
-        "@apollo/client": "^3.6.9",
-        "@apollo/server": "^4.7.1",
-        "@as-integrations/next": "^2.0.0",
-        "@expo/html-elements": "^0.2.0",
-        "@graphql-tools/schema": "^9.0.1",
-        "axios": "^1.3.4",
-        "expo-linking": "~4.0.1",
-        "expo-web-browser": "~12.1.1",
-        "graphql": "^16.6.0",
-        "graphql-request": "^5.2.0",
-        "micro": "^9.4.1",
-        "swr": "^2.0.4",
-        "twrnc": "^3.6",
+        "@apollo/client": "^3.7.16",
+        "@apollo/server": "^4.7.5",
+        "@as-integrations/next": "^2.0.1",
+        "@expo/html-elements": "^0.5.1",
+        "@graphql-tools/schema": "^10.0.0",
+        "axios": "^1.4.0",
+        "expo-linking": "5.0.2",
+        "expo-web-browser": "12.3.2",
+        "graphql": "^16.7.1",
+        "graphql-request": "^6.1.0",
+        "swr": "^2.2.0",
+        "twrnc": "^3.6.1",
         "zod": "~3.20.6"
     },
     "devDependencies": {
-        "@types/json-schema": "^7.0.11"
+        "@types/json-schema": "^7.0.12"
     }
 }
diff --git a/packages/@aetherspace/primitives/AetherImage/AetherImage.web.tsx b/packages/@aetherspace/primitives/AetherImage/AetherImage.web.tsx
@@ -79,7 +79,7 @@ const AetherImage = forwardRef<typeof Image, AetherImageType>((props, ref) => {
   return (
     <AetherView
       style={bindStyles.style as ComponentProps<typeof ExpoImage>['style']}
-      nativeID={bindStyles.nativeID}
+      id={bindStyles.id}
     >
       <Image
         src={src!} // @ts-ignore
diff --git a/packages/@config/transpiledModules.js b/packages/@config/transpiledModules.js
@@ -4,7 +4,7 @@
 module.exports = [
     // - Modules -
     'twrnc',
-    '@react-native/assets',
+    '@react-native/assets-registry',
     '@expo/vector-icons',
     // - Packages -
     'registries',
diff --git a/patches/@expo+html-elements+0.5.1.patch b/patches/@expo+html-elements+0.5.1.patch
@@ -0,0 +1,25 @@
+diff --git a/node_modules/@expo/html-elements/.DS_Store b/node_modules/@expo/html-elements/.DS_Store
+new file mode 100644
+index 0000000..e69de29
+diff --git a/node_modules/@expo/html-elements/build/.DS_Store b/node_modules/@expo/html-elements/build/.DS_Store
+new file mode 100644
+index 0000000..e69de29
+diff --git a/node_modules/@expo/html-elements/build/elements/Headings.js b/node_modules/@expo/html-elements/build/elements/Headings.js
+index 775b8d0..2ec94e4 100644
+--- a/node_modules/@expo/html-elements/build/elements/Headings.js
++++ b/node_modules/@expo/html-elements/build/elements/Headings.js
+@@ -5,12 +5,12 @@ import Text from '../primitives/Text';
+ function createHeadingComponent(level) {
+     const nativeProps = Platform.select({
+         web: {
+-            accessibilityLevel: level,
++            'aria-level': level,
+         },
+         default: {},
+     });
+     return forwardRef((props, ref) => {
+-        return (React.createElement(Text, { ...nativeProps, accessibilityRole: "header", ...props, style: [styles[`h${level}`], props.style], ref: ref }));
++        return (React.createElement(Text, { ...nativeProps, role: "heading", ...props, style: [styles[`h${level}`], props.style], ref: ref }));
+     });
+ }
+ export const H1 = createHeadingComponent(1);
diff --git a/patches/expo-image+1.2.3.patch b/patches/expo-image+1.2.3.patch
diff --git a/patches/next+13.4.7.patch b/patches/next+13.4.7.patch
diff --git a/patches/react-native-svg+13.9.0.patch b/patches/react-native-svg+13.9.0.patch
@@ -0,0 +1,18 @@
+diff --git a/node_modules/react-native-svg/lib/module/ReactNativeSVG.web.js b/node_modules/react-native-svg/lib/module/ReactNativeSVG.web.js
+index 5bb83a4..b1b2776 100644
+--- a/node_modules/react-native-svg/lib/module/ReactNativeSVG.web.js
++++ b/node_modules/react-native-svg/lib/module/ReactNativeSVG.web.js
+@@ -1,11 +1,11 @@
+ import * as React from 'react';
+ import {
+ // @ts-ignore
+-unstable_createElement as ucE, createElement as cE } from 'react-native';
++unstable_createElement as ucE } from 'react-native';
+ import SvgTouchableMixin from './lib/SvgTouchableMixin';
+ import { resolve } from './lib/resolve';
+ import { transformsArrayToProps } from './lib/extract/extractTransform';
+-const createElement = cE || ucE;
++const createElement = ucE;
+ const hasTouchableProperty = props => props.onPress || props.onPressIn || props.onPressOut || props.onLongPress;
+ const camelCaseToDashed = camelCase => {
+   return camelCase.replace(/[A-Z]/g, m => '-' + m.toLowerCase());
diff --git a/yarn-error.log b/yarn-error.log
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@`
`13`	`13`	`"cors": "^2.8.5",`
`14`	`14`	`"links-page": "*",`
`15`	`15`	`"registries": "*",`
`16`		`- "swr": "^2.0.0"`
	`16`	`+ "swr": "^2.2.0"`
`17`	`17`	`}`
`18`	`18`	`}`