Skip to content

Commit 0f7589b

Browse files
jhuleattjhuleatt
authored
Update CI and tooling (#365)
1 parent ea3747e commit 0f7589b

File tree

26 files changed

+10593
-8508
lines changed

26 files changed

+10593
-8508
lines changed

‎.github/workflows/node.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ jobs:
1313
strategy:
1414
matrix:
1515
node-version:
16-
- 12.x
16+
- 18.x
17+
- 20.x
1718
steps:
18-
- uses: actions/checkout@v1
19-
- uses: actions/setup-node@v1
19+
- uses: actions/checkout@v3
20+
- uses: actions/setup-node@v3
2021
with:
2122
node-version: ${{ matrix.node-version }}
2223

2324
- name: Cache npm
24-
uses: actions/cache@v1
25+
uses: actions/cache@v3
2526
with:
2627
path: ~/.npm
2728
key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}

‎auth/functions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"author": "",
66
"license": "Apache-2.0",
77
"scripts": {
8-
"compile": "cp ../../tsconfig.json.template ./tsconfig.json && tsc"
8+
"compile": "cp ../../tsconfig.template.json ./tsconfig.json && tsc"
99
},
1010
"dependencies": {
11-
"firebase-admin": "^10.0.0",
12-
"firebase-functions": "^3.16.0"
11+
"firebase-admin": "^11.8.0",
12+
"firebase-functions": "^4.4.0"
1313
}
1414
}

‎auth/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"author": "Firebase (https://firebase.google.com/)",
66
"license": "Apache-2.0",
77
"scripts": {
8-
"compile": "cp ../tsconfig.json.template ./tsconfig.json && tsc"
8+
"compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
99
},
1010
"dependencies": {
11-
"express": "^4.17.1",
12-
"firebase-admin": "^10.0.0",
13-
"firebase-functions": "^3.16.0"
11+
"express": "^4.18.2",
12+
"firebase-admin": "^11.8.0",
13+
"firebase-functions": "^4.4.0"
1414
}
1515
}

‎config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"description": "",
55
"main": "index.js",
66
"scripts": {
7-
"compile": "cp ../tsconfig.json.template ./tsconfig.json && tsc"
7+
"compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
88
},
99
"dependencies": {
10-
"firebase-admin": "^10.0.0"
10+
"firebase-admin": "^11.8.0"
1111
},
1212
"author": "",
1313
"license": "ISC"

‎database/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"author": "",
77
"license": "Apache-2.0",
88
"scripts": {
9-
"compile": "cp ../tsconfig.json.template ./tsconfig.json && tsc"
9+
"compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
1010
},
1111
"dependencies": {
12-
"firebase-admin": "^10.0.0"
12+
"firebase-admin": "^11.8.0"
1313
}
1414
}

‎firebaseapp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"author": "",
77
"license": "Apache-2.0",
88
"scripts": {
9-
"compile": "cp ../tsconfig.json.template ./tsconfig.json && tsc"
9+
"compile": "cp ../tsconfig.template.json ./tsconfig.json && tsc"
1010
},
1111
"dependencies": {
12-
"firebase-admin": "^10.0.0"
12+
"firebase-admin": "^11.8.0"
1313
}
1414
}

‎firestore/extend-with-functions/functions/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"description": "Cloud Functions and Firestore",
44
"main": "index.js",
55
"scripts": {
6-
"compile": "cp ../../../tsconfig.json.template ./tsconfig.json && tsc"
6+
"compile": "cp ../../../tsconfig.template.json ./tsconfig.json && tsc"
77
},
88
"dependencies": {
9-
"@google-cloud/firestore": "^4.4.0",
10-
"firebase-admin": "^10.0.0",
11-
"firebase-functions": "^3.16.0"
9+
"@google-cloud/firestore": "^6.6.0",
10+
"firebase-admin": "^11.8.0",
11+
"firebase-functions": "^4.4.0"
1212
}
1313
}

‎firestore/main/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
"scripts": {
77
"test-debug": "env DEBUG=firestore-snippets-node mocha index.js",
88
"test": "firebase --project=$GCLOUD_PROJECT emulators:exec './node_modules/.bin/mocha --timeout 20000 index.js'",
9-
"compile": "cp ../../tsconfig.json.template ./tsconfig.json && tsc"
9+
"compile": "cp ../../tsconfig.template.json ./tsconfig.json && tsc"
1010
},
1111
"author": "",
1212
"license": "ISC",
1313
"dependencies": {
14-
"@google-cloud/firestore": "^4.4.0",
15-
"firebase-admin": "^10.0.0",
16-
"firebase-functions": "^3.16.0"
14+
"@google-cloud/firestore": "^6.6.0",
15+
"firebase-admin": "^11.8.0",
16+
"firebase-functions": "^4.4.0"
1717
},
1818
"devDependencies": {
19-
"@types/mocha": "^7.0.2",
20-
"firebase-tools": "^9.21.0",
21-
"mocha": "^6.2.2"
19+
"@types/mocha": "^10.0.1",
20+
"firebase-tools": "^12.2.1",
21+
"mocha": "^10.2.0"
2222
}
2323
}

‎firestore/solution-aggregation/functions/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"start": "npm run shell",
88
"deploy": "firebase deploy --only functions",
99
"logs": "firebase functions:log",
10-
"compile": "cp ../../../tsconfig.json.template ./tsconfig.json && tsc"
10+
"compile": "cp ../../../tsconfig.template.json ./tsconfig.json && tsc"
1111
},
1212
"dependencies": {
13-
"firebase-admin": "^10.0.0",
14-
"firebase-functions": "^3.16.0"
13+
"firebase-admin": "^11.8.0",
14+
"firebase-functions": "^4.4.0"
1515
},
1616
"private": true
1717
}

‎firestore/solution-deletes/functions/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
"description": "Firestore delete data solution",
55
"main": "index.js",
66
"engines": {
7-
"node": "8"
7+
"node": "18"
88
},
99
"author": "",
1010
"license": "Apache-2.0",
1111
"scripts": {
12-
"compile": "cp ../../../tsconfig.json.template ./tsconfig.json && tsc"
12+
"compile": "cp ../../../tsconfig.template.json ./tsconfig.json && tsc"
1313
},
1414
"dependencies": {
15-
"firebase-admin": "^10.0.0",
16-
"firebase-functions": "^3.16.0",
17-
"firebase-tools": "^11.3.0"
15+
"firebase-admin": "^11.8.0",
16+
"firebase-functions": "^4.4.0",
17+
"firebase-tools": "^12.2.1"
1818
}
1919
}

‎firestore/solution-scheduled-backups/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ app.get('/cloud-firestore-export', async (req, res) => {
5757
.send(response.data)
5858
.end();
5959
} catch (e) {
60-
if (e.response) {
60+
if (axios.default.isAxiosError(e)) {
6161
console.warn(e.response.data);
6262
}
6363

0 commit comments

Comments
 (0)