Merge remote-tracking branch 'origin/main' into main

jan-jagoda · jan-jagoda · commit 1c53dd96442f · 2025-03-10T14:39:45.000+01:00
diff --git a/apps/frontend/CHANGELOG.md b/apps/frontend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @o2s/frontend
 
+## 0.12.1
+
+### Patch Changes
+
+- 6e5870c: removed `loading.tsx` in favor of component-specific loaders
+
 ## 0.12.0
 
 ### Minor Changes
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@o2s/frontend",
-    "version": "0.12.0",
+    "version": "0.12.1",
     "private": true,
     "scripts": {
         "prepare": "npx prisma generate && dotenv -e .env.local -- prisma migrate deploy && dotenv -e .env.local -- prisma db seed",
diff --git a/apps/frontend/src/app/[locale]/loading.tsx b/apps/frontend/src/app/[locale]/loading.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@o2s/frontend",`
`3`		`- "version": "0.12.0",`
	`3`	`+ "version": "0.12.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"prepare": "npx prisma generate && dotenv -e .env.local -- prisma migrate deploy && dotenv -e .env.local -- prisma db seed",`