Skip to content

Commit 0c8f33f

Browse files
authored
Update major version of packages (#484)
merge major package updates
1 parent 57cbcd4 commit 0c8f33f

5 files changed

Lines changed: 619 additions & 636 deletions

File tree

‎.vscode/launch.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "CodingCat server",
6+
"cwd": "${workspaceFolder}/apps/codingcatdev",
7+
"request": "launch",
8+
"runtimeArgs": ["run-script", "dev"],
9+
"runtimeExecutable": "pnpm",
10+
"skipFiles": ["<node_internals>/**"],
11+
"type": "node",
12+
"console": "integratedTerminal"
13+
},
14+
{
15+
"name": "CodingCat client",
16+
"request": "launch",
17+
"type": "chrome",
18+
"url": "http://localhost:5173",
19+
"webRoot": "${workspaceFolder}/apps/codingcatdev"
20+
}
21+
],
22+
"compounds": [
23+
{
24+
"name": "CodingCat Full",
25+
"configurations": ["CodingCat server", "CodingCat client"]
26+
}
27+
]
28+
}

‎apps/codingcatdev/package.json‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,54 +14,51 @@
1414
"format": "prettier --plugin-search-dir . --write ."
1515
},
1616
"devDependencies": {
17-
"@auth/core": "^0.5.1",
1817
"@auth/sveltekit": "^0.3.7",
19-
"@codingcatdev/blackcatui": "^0.0.5",
18+
"@codingcatdev/blackcatui": "^0.1.0",
2019
"@firebase/app-types": "~0.9.0",
2120
"@playwright/test": "^1.38.1",
2221
"@steeze-ui/heroicons": "^2.2.3",
2322
"@steeze-ui/simple-icons": "^1.5.1",
2423
"@steeze-ui/svelte-icon": "^1.5.0",
2524
"@sveltejs/adapter-auto": "^2.1.0",
26-
"@sveltejs/adapter-vercel": "^2.4.3",
25+
"@sveltejs/adapter-vercel": "^3.0.3",
2726
"@sveltejs/kit": "^1.25.1",
2827
"@tailwindcss/forms": "^0.5.6",
29-
"@types/marked": "^4.3.2",
28+
"@types/marked": "^5.0.2",
3029
"@types/prismjs": "^1.26.1",
3130
"@types/video.js": "^7.3.53",
3231
"autoprefixer": "^10.4.16",
3332
"eslint": "^8.50.0",
34-
"eslint-config-prettier": "^8.10.0",
33+
"eslint-config-prettier": "^9.0.0",
3534
"eslint-plugin-svelte3": "^4.0.0",
3635
"feed": "^4.2.2",
3736
"firebase-admin": "^11.11.0",
3837
"flexsearch": "^0.7.31",
39-
"marked": "^4.3.0",
38+
"marked": "^9.0.3",
39+
"mdsvex": "^0.11.0",
4040
"postcss": "^8.4.31",
4141
"postcss-load-config": "^4.0.1",
42-
"prettier": "^2.8.8",
43-
"prettier-plugin-svelte": "^2.10.1",
42+
"prettier": "^3.0.3",
43+
"prettier-plugin-svelte": "^3.0.3",
4444
"prismjs": "^1.29.0",
4545
"svelte": "^4.2.1",
4646
"svelte-check": "^3.5.2",
4747
"svelte-preprocess": "^5.0.4",
4848
"tailwindcss": "^3.3.3",
4949
"typescript": "^5.2.2",
5050
"vite": "^4.4.9",
51-
"vitest": "^0.29.8"
51+
"vitest": "^0.34.6"
5252
},
5353
"type": "module",
5454
"dependencies": {
5555
"@cloudinary/html": "^1.11.2",
5656
"@cloudinary/url-gen": "^1.11.2",
5757
"@floating-ui/dom": "^1.5.3",
5858
"esm-env": "^1.0.0",
59-
"firebase": "^9.23.0",
59+
"firebase": "^10.4.0",
6060
"gsap": "^3.12.2",
61-
"mdsvex": "^0.10.6",
6261
"prism-svelte": "^0.5.0",
63-
"prism-themes": "^1.9.0",
64-
"theme-change": "^2.5.0",
65-
"videojs-youtube": "^2.6.1"
62+
"prism-themes": "^1.9.0"
6663
}
6764
}

‎apps/codingcatdev/src/lib/client/firebase.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { getAnalytics, type Analytics, logEvent, type AnalyticsCallOptions } fro
99

1010
import { env } from '$env/dynamic/public';
1111

12-
const firebaseConfig = {
12+
export const firebaseConfig = {
1313
apiKey: env.PUBLIC_FB_API_KEY,
1414
authDomain: env.PUBLIC_FB_AUTH_DOMAIN,
1515
projectId: env.PUBLIC_FB_PROJECT_ID,
@@ -43,6 +43,8 @@ if (!app &&
4343
db = getFirestore(app);
4444
functions = getFunctions(app);
4545
analytics = getAnalytics(app);
46+
} else {
47+
console.debug('Skipping Firebase Initialization, check firebaseconfig.')
4648
}
4749

4850
/* AUTH */
@@ -84,6 +86,8 @@ export const ccdSignInWithPopUp = async (provider: AuthProvider) => {
8486
background: 'variant-filled-error'
8587
})
8688
}
89+
} else {
90+
console.error(err);
8791
}
8892
}
8993
}
@@ -130,5 +134,10 @@ export const analyticsLogPageView = async (eventParams?: {
130134
// eslint-disable-next-line @typescript-eslint/no-explicit-any
131135
[key: string]: any;
132136
}, options?: AnalyticsCallOptions) => {
133-
logEvent(analytics, "page_view", eventParams, options)
137+
138+
if (firebaseConfig.apiKey) {
139+
logEvent(analytics, "page_view", eventParams, options)
140+
} else {
141+
console.debug('Skipping Firebase Analytics, no key specified.')
142+
}
134143
}

‎apps/codingcatdev/src/routes/login/GoogleAuth.svelte‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
class="flex justify-center w-full"
1717
method="POST"
1818
{action}
19-
use:enhance={async ({ action, cancel, controller, data, form }) => {
19+
use:enhance={async () => {
2020
await ccdSignInWithPopUp(provider);
2121

22-
return async ({ result, update }) => {
23-
// `result` is an `ActionResult` object
22+
return async ({ update }) => {
2423
// `update` is a function which triggers the logic that would be triggered if this callback wasn't set
25-
2624
update();
2725
};
2826
}}

0 commit comments

Comments
 (0)