Skip to content

Commit c6198b2

Browse files
committed
Update node version, use npx firebase-tools, and drop firebase from root (no common tsc version)
1 parent 20b15bb commit c6198b2

File tree

10 files changed

+2661
-2947
lines changed

10 files changed

+2661
-2947
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ build-functions: build-shared
1313
&& cd -
1414

1515
deploy-functions: build-functions
16-
firebase --project=$(PROD_PROJECT) deploy --only functions
16+
npx -y firebase-tools --project=$(PROD_PROJECT) deploy --only functions
1717

1818
build-hosting: build-shared
1919
cd frontend \
2020
&& npm install \
21-
&& npm run export \
21+
&& npm run generate \
2222
&& cd -
2323

2424
deploy-hosting: build-hosting
25-
firebase --project=$(PROD_PROJECT) deploy --only hosting
25+
npx -y firebase-tools --project=$(PROD_PROJECT) deploy --only hosting
2626

2727
deploy: deploy-functions deploy-hosting

frontend/package-lock.json

Lines changed: 2632 additions & 1875 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,23 @@
1414
"lint": "eslint .",
1515
"lint:fix": "eslint . --fix",
1616
"typecheck": "nuxt typecheck .",
17-
"deploy": "npm run generate && firebase --project=default deploy",
18-
"deploy:hosting": "npm run generate && firebase --project=default deploy --only hosting"
17+
"deploy": "npm run generate && npx -y firebase-tools --project=default deploy",
18+
"deploy:hosting": "npm run generate && npx -y firebase-tools --project=default deploy --only hosting"
1919
},
2020
"devDependencies": {
2121
"@docsearch/js": "^3.9.0",
2222
"@nuxt/eslint": "^1.1.0",
2323
"@nuxtjs/sitemap": "^7.2.6",
2424
"date-fns": "^4.1.0",
2525
"eslint": "^9.20.1",
26-
"isomorphic-dompurify": "^2.21.0",
26+
"firebase": "^11.3.1",
27+
"isomorphic-dompurify": "^2.22.0",
2728
"nuxt": "^3.15.4",
2829
"sass": "^1.85.0",
29-
"vue": "latest",
30-
"vue-router": "latest"
30+
"vue": "^3.5.13",
31+
"vue-router": "^4.5.0"
32+
},
33+
"overrides": {
34+
"esbuild": "~0.25.0"
3135
}
3236
}

functions/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525
"node": "12"
2626
},
2727
"scripts": {
28-
"dev": "npm run build && firebase functions:config:get > .runtimeconfig.json && firebase serve --only functions",
28+
"dev": "npm run build && npx -y firebase-tools functions:config:get > .runtimeconfig.json && npx -y firebase-tools serve --only functions",
2929
"build": "npm run fmt && tsc",
3030
"build:watch": "tsc -w",
31-
"fmt": "prettier --write src/*.ts src/test/*.ts"
31+
"fmt": "prettier --write src/*.ts src/test/*.ts",
32+
"deploy:functions": "npm run build && npx -y firebase-tools --project=default deploy --only functions"
3233
},
3334
"private": true,
3435
"devDependencies": {

functions/src/cron.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ const buildConfig = {
55
timeout: "1800s",
66
steps: [
77
{
8-
name: "node:12",
8+
name: "node:22",
99
entrypoint: "npm",
1010
args: ["install"]
1111
},
1212
{
13-
name: "node:12",
13+
name: "node:22",
1414
entrypoint: "npm",
1515
args: ["--prefix=frontend", "install"]
1616
},
1717
{
18-
name: "node:12",
18+
name: "node:22",
1919
entrypoint: "npm",
2020
args: ["--prefix=frontend", "run", "build"]
2121
},
2222
{
23-
name: "node:12",
23+
name: "node:22",
2424
entrypoint: "npm",
2525
args: ["--prefix=frontend", "run", "deploy:hosting"]
26-
},
26+
}
2727
],
2828
source: {
2929
repoSource: {

functions/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"noImplicitAny": true,
1313
"noImplicitReturns": true,
1414
"sourceMap": true,
15+
"skipLibCheck": true,
1516
"baseUrl": ".",
1617
"paths": {
1718
"*": [

0 commit comments

Comments
 (0)