Skip to content

Commit a7b3537

Browse files
committed
fix: Reset typescript and @types/react versions
1 parent b647013 commit a7b3537

File tree

9 files changed

+21
-20330
lines changed

9 files changed

+21
-20330
lines changed

README.md

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# codinsonn.dev - Personal Website
1+
<img src="/packages/@aetherspace/assets/AetherspaceLogo.svg" width="50" height="50" />
2+
3+
# Thorr ⚡️ codinsonn.dev - Personal Website
24

35
<p>
46
<a href="https://codinsonn.dev">
@@ -124,8 +126,6 @@ This starter monorepo has three types of workspaces:
124126
│ └── head.tsx ➡️ HTML wrapper for head & meta tags (+ SSR styles)
125127
│ └── layout.tsx ➡️ Root layout for all web pages (e.g. headers / footers / nav)
126128
│ └── page.tsx ➡️ Web Homepage (e.g. using 'app-core/screens/HomeScreen.tsx')
127-
│ └── src/
128-
│ └── pages/ ➡️ directory based routes (using 'app-core/screens/')
129129
│ └── api/ ➡️ directory based api routes (using 'app-core/resolvers/')
130130
│ └── graphql.ts ➡️ GraphQL client from 'app-core/graphql/'
131131
│ └── babel.config.js ➡️ Babel transpilation config for Next.js
@@ -156,44 +156,6 @@ This starter monorepo has three types of workspaces:
156156
└── turbo.json ➡️ Monorepo config, manages dependencies in build scripts + caching of tasks
157157
```
158158

159-
```shell
160-
-i- Auto linking routes with 'yarn link-routes' ...
161-
-----------------------------------------------------------------
162-
✅ /bio/ -- Generated from "../../features/app-core/routes/bio/index.tsx"
163-
└── /apps/expo/app/(generated)/bio/index.tsx
164-
└── /apps/next/app/(generated)/bio/page.tsx
165-
✅ / -- Generated from "../../features/app-core/routes/index.tsx"
166-
└── /apps/expo/app/(generated)/index.tsx
167-
└── /apps/next/app/(generated)/page.tsx
168-
✅ /links/ -- Generated from "../../features/app-core/routes/links/index.tsx"
169-
└── /apps/expo/app/(generated)/links/index.tsx
170-
└── /apps/next/app/(generated)/links/page.tsx
171-
✅ /cv/[slug]/ -- Generated from "../../features/cv-page/routes/cv/[slug]/index.tsx"
172-
└── /apps/expo/app/(generated)/cv/[slug]/index.tsx
173-
└── /apps/next/app/(generated)/cv/[slug]/page.tsx
174-
✅ /cv/ -- Generated from "../../features/cv-page/routes/cv/index.tsx"
175-
└── /apps/expo/app/(generated)/cv/index.tsx
176-
└── /apps/next/app/(generated)/cv/page.tsx
177-
✅ /bio/[slug]/ -- Generated from "../../features/links-page/routes/bio/[slug].tsx"
178-
└── /apps/expo/app/(generated)/bio/[slug]/index.tsx
179-
└── /apps/next/app/(generated)/bio/[slug]/page.tsx
180-
---
181-
182-
✅ / -- Head from "../../features/app-core/routes/head.tsx"
183-
└── /apps/next/app/(generated)/head.tsx
184-
---
185-
186-
✅ /api/aetherspace/commerce/shopify/products/ -- API Route from "../../packages/@aetherspace-commerce/routes/api/aetherspace/commerce/shopify/products/route.ts"
187-
└── /apps/next/app/(generated)/api/aetherspace/commerce/shopify/products/route.ts
188-
✅ /api/graphql/ -- API Route from "../../features/app-core/routes/api/graphql/route.ts"
189-
└── /apps/next/app/(generated)/api/graphql/route.ts
190-
✅ /api/health/ -- API Route from "../../features/app-core/routes/api/health/route.ts"
191-
└── /apps/next/app/(generated)/api/health/route.ts
192-
✅ /api/bio/[slug]/ -- API Route from "../../features/links-page/routes/api/bio/[slug]/route.ts"
193-
└── /apps/next/app/(generated)/api/bio/[slug]/route.ts
194-
195-
```
196-
197159
> 💡 `{app-feature}`, `{app-name}` & `{comp-lib}` are just placeholders and you **can** have multiple of these
198160
199161
#### 📦 Keep your apps seperate with `/apps/*` & `/features/*` workspaces:

apps/expo/app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434
},
3535
"web": {
36-
"favicon": "../next/public/favicon.png"
36+
"favicon": "../next/public/favicon.ico"
3737
}
3838
}
3939
}

apps/expo/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
},
4848
"devDependencies": {
4949
"@expo/webpack-config": "^0.17.2",
50-
"@types/react": "18.0.27",
50+
"@types/react": "18.0.28",
5151
"dotenv": "^16.3.1",
52-
"typescript": "^4.9.4"
52+
"typescript": "^4.9.5"
5353
}
5454
}

apps/next/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"app": "*",
2020
"encoding": "^0.1.13",
2121
"expo-asset-web": "npm:expo-asset@8.7.0",
22-
"next": "^13.4.8",
22+
"next": "13.4.8",
2323
"next-fonts": "^1.5.1",
2424
"next-images": "^1.8.5",
2525
"next-pwa": "^5.6.0",

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
"webpack-merge": "^5.9.0"
5252
},
5353
"resolutions": {
54-
"typescript": "^4.9.4",
54+
"typescript": "^4.9.5",
5555
"zod": "~3.20.6",
5656
"@babel/core": "^7.20.0",
5757
"@expo/config": "^7.0.2",
58-
"@types/react": "18.0.27",
58+
"@types/react": "18.0.28",
5959
"@expo/webpack-config": "^0.17.2"
6060
},
6161
"scripts": {

packages/@aetherspace/navigation/AetherPage/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ We have a full working example of this in the Aetherspace demo app:
173173
- [/features/app-core/screens/HomeScreen.tsx#L39-L76](https://github.com/Aetherspace/green-stack-starter-demo/blob/main/features/app-core/screens/HomeScreen.tsx#L39-L76)
174174
- [/features/app-core/routes/index.tsx](https://github.com/Aetherspace/green-stack-starter-demo/blob/main/features/app-core/routes/index.tsx)
175175

176-
But again, you may want to save some time and skip the manual boilerplate and use a generator instead:
176+
But again, you may want to save some time by skipping the manual boilerplate entirely and use a generator instead:
177177

178178
## Generating GraphQL powered routes
179179

packages/@aetherspace/scripts/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ yarn document-components # runs `packages/@aetherspace/scripts/document-componen
2424

2525
## Explaining the magic
2626

27-
Most of these scripts contain of 2 steps to create their results:
27+
Most of these scripts contain 2 simple steps to create their results:
2828
1. Collect all relevant filePaths with `glob`
2929
2. Analyse, filter & generate template code from their file contents
3030

3131
Some examples of what these scripts enable:
32-
- File based routing for Next.js & Expo right from your feature / package modules
33-
- Automatic Storybook docgen for all components in the monorepo
34-
- GraphQL from your resolvers & schema files
35-
- Asset and Icon management through registries
32+
- File based routing for Next.js & Expo right from your feature / package modules -- with `yarn link-routes`
33+
- Automatic Storybook docgen for all components in the monorepo -- with `yarn document-components`
34+
- GraphQL from your resolvers & schema files -- with `yarn collect-resolvers`
35+
- Asset and Icon management through registries -- with `yarn collect-assets` and `yarn collect-icons`
3636

3737
## Deduplicated Routing between Expo & Next.js
3838

0 commit comments

Comments
 (0)