Skip to content

Commit 78407bc

Browse files
authored
AngularFire v16 (#3449)
1 parent 5793d6f commit 78407bc

Some content is hidden

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

48 files changed

+25903
-24912
lines changed

.github/workflows/test.yml

+35-70
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,25 @@ jobs:
2626
uses: actions/setup-node@v3
2727
with:
2828
node-version: '18'
29-
check-latest: true
29+
check-latest: false
30+
- name: angular build cache
31+
uses: actions/cache@v3
32+
with:
33+
path: ./.angular
34+
key: angular-cache
3035
- name: node_modules cache
3136
uses: actions/cache@v3
3237
id: node_modules_cache
3338
with:
3439
path: ./node_modules
35-
key: ${{ runner.os }}-16-12-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
36-
- name: Yarn offline cache
37-
if: steps.node_modules_cache.outputs.cache-hit != 'true'
38-
uses: actions/cache@v3
39-
with:
40-
path: ~/.npm-packages-offline-cache
41-
key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
40+
key: ${{ runner.os }}-18-${{ hashFiles('package-lock.json') }}
41+
restore-keys: |
42+
${{ runner.os }}-18-
4243
- name: Install deps
4344
if: steps.node_modules_cache.outputs.cache-hit != 'true'
4445
run: |
45-
yarn config set ignore-engines true
46-
yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
47-
yarn config set network-timeout 300000
48-
yarn config set yarn-offline-mirror-pruning true
49-
yarn install --frozen-lockfile --prefer-offline
46+
npm ci
5047
- name: Build
51-
id: yarn-pack-dir
5248
run: ./tools/build.sh
5349
- name: 'Upload Artifact'
5450
uses: actions/upload-artifact@v3
@@ -79,36 +75,20 @@ jobs:
7975
uses: actions/cache@v3
8076
with:
8177
path: ./node_modules
82-
key: ${{ runner.os }}-${{ matrix.node }}-16-9-12-8-node_modules-${{ hashFiles('yarn.lock') }}
83-
- name: Yarn offline cache
84-
uses: actions/cache@v3
85-
with:
86-
path: ~/.npm-packages-offline-cache
87-
key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
88-
- name: Configure yarn
89-
run: |
90-
yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
91-
yarn config set network-timeout 300000
92-
yarn config set ignore-engines true
93-
- name: Yarn install
78+
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
79+
restore-keys: |
80+
${{ runner.os }}-${{ matrix.node }}-
81+
- name: Install deps
9482
if: steps.node_modules_cache.outputs.cache-hit != 'true'
95-
run: yarn install --frozen-lockfile --prefer-offline
83+
run: npm ci
9684
- name: Download Artifacts
9785
uses: actions/download-artifact@v3
9886
- name: Relocate Artifacts
9987
run: mv angularfire-${{ github.run_id }} dist
10088
- name: Test Node
10189
run: |
102-
yarn build:jasmine
103-
yarn test:node
104-
- name: ng-build yarn install
105-
run: |
106-
cd ./test/ng-build
107-
yarn --prefer-offline
108-
- name: ng-build prerender
109-
run: |
110-
cd ./test/ng-build
111-
yarn prerender
90+
npm run build:jasmine
91+
npm run test:node
11292
11393
browser:
11494
runs-on: ${{ matrix.os }}
@@ -122,14 +102,15 @@ jobs:
122102
# include:
123103
# - os: macos-latest
124104
# browser: safari
105+
fail-fast: false
125106
steps:
126107
- name: Checkout
127108
uses: actions/checkout@v3
128109
- name: Setup node
129110
uses: actions/setup-node@v3
130111
with:
131112
node-version: 18
132-
check-latest: true
113+
check-latest: false
133114
- name: Setup java
134115
uses: actions/setup-java@v3
135116
with:
@@ -140,20 +121,12 @@ jobs:
140121
uses: actions/cache@v3
141122
with:
142123
path: ./node_modules
143-
key: ${{ runner.os }}-${{ matrix.node }}-16-9-12-8-node_modules-${{ hashFiles('yarn.lock') }}
144-
- name: Yarn offline cache
145-
uses: actions/cache@v3
146-
with:
147-
path: ~/.npm-packages-offline-cache
148-
key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
149-
- name: Configure yarn
150-
run: |
151-
yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
152-
yarn config set network-timeout 300000
153-
yarn config set ignore-engines true
154-
- name: Yarn install
124+
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
125+
restore-keys: |
126+
${{ runner.os }}-${{ matrix.node }}-
127+
- name: Install deps
155128
if: steps.node_modules_cache.outputs.cache-hit != 'true'
156-
run: yarn install --frozen-lockfile --prefer-offline
129+
run: npm ci
157130
- name: Firebase emulator cache
158131
uses: actions/cache@v3
159132
with:
@@ -164,7 +137,7 @@ jobs:
164137
- name: Relocate Artifacts
165138
run: mv angularfire-${{ github.run_id }} dist
166139
- name: Test browser
167-
run: yarn test:${{ matrix.browser }}
140+
run: npm run test:${{ matrix.browser }}
168141

169142
contribute:
170143
runs-on: ${{ matrix.os }}
@@ -187,28 +160,20 @@ jobs:
187160
id: node_modules_cache
188161
with:
189162
path: ./node_modules
190-
key: ${{ runner.os }}-${{ matrix.node }}-12-9-9-6-node_modules-${{ hashFiles('yarn.lock') }}
191-
- name: Yarn offline cache
192-
if: steps.node_modules_cache.outputs.cache-hit != 'true'
193-
uses: actions/cache@v3
194-
with:
195-
path: ~/.npm-packages-offline-cache
196-
key: yarn-offline-${{ hashFiles('**/yarn.lock') }}
163+
key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('package-lock.json') }}
164+
restore-keys: |
165+
${{ runner.os }}-${{ matrix.node }}-
197166
- name: Install deps
198167
if: steps.node_modules_cache.outputs.cache-hit != 'true'
199-
run: |
200-
yarn config set yarn-offline-mirror ~/.npm-packages-offline-cache
201-
yarn config set network-timeout 300000
202-
yarn config set ignore-engines true
203-
yarn install --frozen-lockfile --prefer-offline
168+
run: npm ci
204169
- name: Lint
205-
run: yarn lint
170+
run: npm run lint
206171
- name: Build
207-
run: yarn build
172+
run: npm run build
208173
- name: Test Node
209174
run: |
210-
yarn build:jasmine
211-
yarn test:node
175+
npm run build:jasmine
176+
npm run test:node
212177
- name: Firebase emulator cache
213178
uses: actions/cache@v3
214179
with:
@@ -220,7 +185,7 @@ jobs:
220185
distribution: 'temurin'
221186
java-version: '11'
222187
- name: Test headless
223-
run: yarn test:chrome-headless
188+
run: npm run test:chrome-headless
224189
# Tests are flaky on Windows
225190
continue-on-error: ${{ matrix.os == 'windows-latest' }}
226191

@@ -243,7 +208,7 @@ jobs:
243208
with:
244209
node-version: '18'
245210
registry-url: 'https://registry.npmjs.org'
246-
check-latest: true
211+
check-latest: false
247212
- name: 'Download Artifacts'
248213
uses: actions/download-artifact@v3
249214
- name: Publish

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ angularfire2-*.tgz
1313
.DS_Store
1414
yarn-error.log
1515
*.bak
16-
package-lock.json
16+
yarn.lock
1717
test/ng-build/**/yarn.lock
1818
tools/build.js
1919
coverage

0 commit comments

Comments
 (0)