Skip to content

Commit 568c7a1

Browse files
authored
Merge branch 'master' into service_account_param
2 parents e9d8e47 + 56fb8a3 commit 568c7a1

File tree

306 files changed

+47836
-10558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+47836
-10558
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ lib
44
node_modules
55
standalone
66
templates
7+
.firebase

.eslintrc.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ module.exports = {
122122
// TODO(jamesdaniels): add this to overrides instead
123123
ignorePatterns: [
124124
"src/dynamicImport.js",
125-
"scripts/webframeworks-deploy-tests/hosting/**",
125+
"scripts/webframeworks-deploy-tests/nextjs/**",
126+
"scripts/webframeworks-deploy-tests/angular/**",
126127
"scripts/frameworks-tests/vite-project/**",
128+
"/src/frameworks/docs/**",
129+
// This file is taking a very long time to lint, 2-4m
130+
"src/emulator/auth/schema.ts",
127131
],
128132
};

.github/workflows/node-test.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
matrix:
2626
node-version:
27-
- "16"
27+
- "18"
2828
steps:
2929
- uses: actions/checkout@v3
3030
with:
@@ -35,7 +35,7 @@ jobs:
3535
cache: npm
3636
cache-dependency-path: npm-shrinkwrap.json
3737

38-
- run: npm i -g npm@8.7
38+
- run: npm i -g npm@9.5
3939
- run: npm ci
4040
- run: npm run lint:changed-files
4141

@@ -44,7 +44,6 @@ jobs:
4444
strategy:
4545
matrix:
4646
node-version:
47-
- "14"
4847
- "16"
4948
- "18"
5049
steps:
@@ -55,12 +54,12 @@ jobs:
5554
cache: npm
5655
cache-dependency-path: npm-shrinkwrap.json
5756

58-
- run: npm i -g npm@8.7
57+
- run: npm i -g npm@9.5
5958
- run: npm ci
6059
- run: npm test -- -- --forbid-only
6160

6261
- uses: codecov/codecov-action@v3
63-
if: matrix.node-version == '14'
62+
if: matrix.node-version == '16'
6463

6564
integration:
6665
needs: unit
@@ -80,7 +79,7 @@ jobs:
8079
fail-fast: false
8180
matrix:
8281
node-version:
83-
- "16"
82+
- "18"
8483
script:
8584
- npm run test:client-integration
8685
- npm run test:emulator
@@ -94,6 +93,7 @@ jobs:
9493
- npm run test:storage-emulator-integration
9594
- npm run test:triggers-end-to-end
9695
- npm run test:triggers-end-to-end:inspect
96+
- npm run test:webframeworks-deploy
9797
steps:
9898
- uses: actions/checkout@v3
9999
- uses: actions/setup-node@v3
@@ -109,7 +109,7 @@ jobs:
109109
key: ${{ runner.os }}-firebase-emulators-${{ hashFiles('emulator-cache/**') }}
110110
continue-on-error: true
111111

112-
- run: npm i -g npm@8.7
112+
- run: npm i -g npm@9.5
113113
- run: npm ci
114114
- run: echo ${{ secrets.service_account_json_base64 }} | base64 -d > ./scripts/service-account.json
115115
- run: ${{ matrix.script }}
@@ -136,13 +136,13 @@ jobs:
136136
fail-fast: false
137137
matrix:
138138
node-version:
139-
- "16"
139+
- "18"
140140
script:
141141
- npm run test:hosting
142142
# - npm run test:hosting-rewrites # Long-running test that might conflict across test runs. Run this manually.
143143
- npm run test:client-integration
144144
- npm run test:emulator
145-
# - npm run test:import-export # Fails becuase port 4000 is taken after first run - hub not shhutting down?
145+
# - npm run test:import-export # Fails becuase port 4000 is taken after first run - hub not shutting down?
146146
# - npm run test:extensions-emulator # Fails due to cannot find module sharp (not waiting for npm install?)
147147
- npm run test:functions-discover
148148
- npm run test:triggers-end-to-end
@@ -172,7 +172,7 @@ jobs:
172172

173173
- run: echo ${{ secrets.service_account_json_base64 }} > tmp.txt
174174
- run: certutil -decode tmp.txt scripts/service-account.json
175-
- run: npm i -g npm@8.7
175+
- run: npm i -g npm@9.5
176176
- run: npm ci
177177
- run: ${{ matrix.script }}
178178
- name: Print debug logs
@@ -185,7 +185,7 @@ jobs:
185185
strategy:
186186
matrix:
187187
node-version:
188-
- "16"
188+
- "18"
189189

190190
steps:
191191
- uses: actions/checkout@v3
@@ -195,7 +195,7 @@ jobs:
195195
node-version: ${{ matrix.node-version }}
196196
cache: npm
197197
cache-dependency-path: npm-shrinkwrap.json
198-
- run: npm i -g npm@8.7
198+
- run: npm i -g npm@9.5
199199
# --ignore-scripts prevents the `prepare` script from being run.
200200
- run: npm install --package-lock-only --ignore-scripts
201201
- run: "git diff --exit-code -- npm-shrinkwrap.json || (echo 'Error: npm-shrinkwrap.json is changed during npm install! Please make sure to use npm >= 8 and commit npm-shrinkwrap.json.' && false)"
@@ -206,7 +206,7 @@ jobs:
206206
strategy:
207207
matrix:
208208
node-version:
209-
- "16"
209+
- "18"
210210

211211
steps:
212212
- uses: actions/checkout@v3

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ scripts/*.json
2222

2323
lib/
2424
dev/
25+
clean/

.prettierignore

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
/lib/**/*
44
/CONTRIBUTING.md
55
/scripts/frameworks-tests/vite-project/**
6+
/scripts/webframeworks-deploy-tests/angular/**
7+
/scripts/webframeworks-deploy-tests/nextjs/**
8+
/src/frameworks/docs/**

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
- Releases Cloud Firestore emulator v1.16.1, which adds support for read_time in ListCollectionIds.
1+
- Fixes an issue in the EventArc emualtor where events missing optional fields would cause crashes. (#5803)
2+
- Fixes an issue running `firebase emulators:start` and `firebase deploy` when Python Cloud Functions directory path has spaces. (#5830)
23
- Supports parametrized configuration of ServiceAccount in Functions and Function triggers.

0 commit comments

Comments
 (0)