Skip to content

Commit 56097c1

Browse files
pubkeypubkey
authored
Merge pull request #427 from pubkey/feature/update-angular-17
Feature/update angular 17
2 parents c5235ab + c4d2270 commit 56097c1

52 files changed

Lines changed: 434 additions & 683 deletions

Some content is hidden

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

‎.eslintrc.js‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.eslintrc.json‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,49 @@
11
{
2-
"root": true,
3-
"ignorePatterns": [
4-
"projects/**/*"
5-
],
6-
"overrides": [
7-
{
8-
"files": [
9-
"*.ts"
10-
],
11-
"parserOptions": {
12-
"project": [
13-
"tsconfig.json",
14-
"e2e/tsconfig.json"
15-
],
16-
"createDefaultProgram": true
17-
},
18-
"extends": [
19-
"plugin:@angular-eslint/recommended",
20-
"plugin:@angular-eslint/template/process-inline-templates"
21-
],
22-
"rules": {
23-
"@angular-eslint/component-selector": [
24-
"error",
25-
{
26-
"prefix": "app",
27-
"style": "kebab-case",
28-
"type": "element"
29-
}
30-
],
31-
"@angular-eslint/directive-selector": [
32-
"error",
33-
{
34-
"prefix": "app",
35-
"style": "camelCase",
36-
"type": "attribute"
37-
}
38-
]
39-
}
40-
},
41-
{
42-
"files": [
43-
"*.html"
44-
],
45-
"extends": [
46-
"plugin:@angular-eslint/template/recommended"
47-
],
48-
"rules": {}
49-
}
50-
]
2+
"root": true,
3+
"ignorePatterns": [
4+
"projects/**/*"
5+
],
6+
"overrides": [
7+
{
8+
"files": [
9+
"*.ts"
10+
],
11+
"extends": [
12+
"eslint:recommended",
13+
"plugin:@typescript-eslint/recommended",
14+
"plugin:@angular-eslint/recommended",
15+
"plugin:@angular-eslint/template/process-inline-templates"
16+
],
17+
"rules": {
18+
"@typescript-eslint/no-explicit-any": "off",
19+
"@angular-eslint/no-output-native": "off"
20+
}
21+
},
22+
{
23+
"files": [
24+
"*.html"
25+
],
26+
"extends": [
27+
"plugin:@angular-eslint/template/recommended"
28+
],
29+
"rules": {
30+
"@angular-eslint/component-selector": [
31+
"error",
32+
{
33+
"prefix": "app",
34+
"style": "kebab-case",
35+
"type": "element"
36+
}
37+
],
38+
"@angular-eslint/directive-selector": [
39+
"error",
40+
{
41+
"prefix": "app",
42+
"style": "camelCase",
43+
"type": "attribute"
44+
}
45+
]
46+
}
47+
}
48+
]
5149
}

‎.github/workflows/main.yml‎

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ on:
1010

1111
workflow_dispatch:
1212

13+
# https://stackoverflow.com/a/72408109/3443137
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
16+
cancel-in-progress: true
17+
1318
jobs:
1419
test:
15-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
21+
timeout-minutes: 120
1622
steps:
1723
- uses: actions/checkout@v4
1824
- name: Setup Node.js environment
@@ -38,8 +44,7 @@ jobs:
3844
rm -f node_modules/__ngcc_entry_points__.json
3945
npm install --legacy-peer-deps --force
4046
41-
- name: build
42-
run: npm run build
47+
- run: npm run build
4348

4449
- name: test:aws
4550
uses: GabrielBB/xvfb-action@v1
@@ -67,6 +72,43 @@ jobs:
6772
with:
6873
run: npm run test:firebase
6974

75+
- run: npm run measure:size
76+
- run: npm run aggregate-metrics
77+
78+
- name: lint
79+
run: npm run lint
80+
81+
82+
test-some:
83+
runs-on: ubuntu-22.04
84+
timeout-minutes: 60
85+
steps:
86+
- uses: actions/checkout@v4
87+
- name: Setup Node.js environment
88+
uses: actions/setup-node@v4.0.0
89+
with:
90+
node-version-file: '.nvmrc'
91+
92+
- name: Reuse npm cache folder
93+
uses: actions/cache@v3
94+
env:
95+
cache-name: cache-node-modules
96+
with:
97+
path: |
98+
~/.npm
99+
./node_modules
100+
# invalidate cache when any package-lock.json changes
101+
key: ${{ runner.os }}-npm-test-x2-${{ hashFiles('**/package.json') }}
102+
restore-keys: |
103+
${{ runner.os }}-npm-test-x2-
104+
105+
- name: install npm dependencies
106+
run: |
107+
rm -f node_modules/__ngcc_entry_points__.json
108+
npm install --legacy-peer-deps --force
109+
110+
- run: npm run build
111+
70112
- name: test:pouchdb
71113
uses: GabrielBB/xvfb-action@v1
72114
with:
@@ -86,12 +128,3 @@ jobs:
86128
uses: GabrielBB/xvfb-action@v1
87129
with:
88130
run: npm run test:watermelondb
89-
90-
- name: measure build size
91-
run: npm run measure:size
92-
93-
- name: aggregate metrics
94-
run: npm run aggregate-metrics
95-
96-
- name: lint
97-
run: npm run lint

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/bazel-out
1010

1111
# generated files
12-
example-data.json
12+
example-data.ts
1313
/metrics
1414
feature-table.json
1515

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.20.2
1+
20.11.0

0 commit comments

Comments
 (0)