Skip to content

Commit 0dd9ebd

Browse files
committed
Merge branch 'master' into mc/firestore
2 parents 89f29bb + f1869ee commit 0dd9ebd

Some content is hidden

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

46 files changed

+5083
-57683
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') }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ firebase-debug.log
1313

1414
.idea/
1515

16+
# pnpm manages deps in the pnpm-lock.yaml file instead
17+
**/package-lock.json
18+
# keep the root package-lock so that tools are consistent
19+
!/package-lock.json
20+

auth/email_action_links.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const actionCodeSettings = {
1818
installApp: true,
1919
minimumVersion: '12',
2020
},
21-
// FDL custom domain.
22-
dynamicLinkDomain: 'coolapp.page.link',
21+
// The domain must be configured in Firebase Hosting and owned by the project.
22+
linkDomain: 'custom-domain.com',
2323
};
2424
// [END init_action_code_settings]
2525

0 commit comments

Comments
 (0)