Skip to content

Commit 088e0d1

Browse files
davidIcedavidIce
committed
Merge commit '7d87cb4edb8981feb1bd8ccf5d25aa0ea7479b72' into support-bs-3
2 parents 686c853 + 7d87cb4 commit 088e0d1

File tree

641 files changed

+27164
-40810
lines changed

Some content is hidden

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

641 files changed

+27164
-40810
lines changed

‎.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Editor configuration, see http://editorconfig.org
1+
# Editor configuration, see https://editorconfig.org
22
root = true
33

44
[*]

‎.eslintrc.json

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
{
22
"root": true,
3-
"ignorePatterns": [
4-
"**/*"
5-
],
6-
"plugins": [
7-
"@nx"
8-
],
3+
"ignorePatterns": ["**/*"],
4+
"plugins": ["@nx"],
95
"rules": {},
106
"overrides": [
117
{
12-
"files": [
13-
"*.ts",
14-
"*.tsx",
15-
"*.js",
16-
"*.jsx"
17-
],
8+
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
9+
"excludedFiles": ["*.spec.ts"],
1810
"rules": {
1911
"@nx/enforce-module-boundaries": [
2012
"error",
@@ -24,42 +16,36 @@
2416
"depConstraints": [
2517
{
2618
"sourceTag": "*",
27-
"onlyDependOnLibsWithTags": [
28-
"*"
29-
]
19+
"onlyDependOnLibsWithTags": ["*"]
3020
}
3121
]
3222
}
3323
]
3424
}
3525
},
3626
{
37-
"files": [
38-
"*.ts",
39-
"*.tsx"
40-
],
41-
"extends": [
42-
"plugin:@nx/typescript"
43-
],
27+
"files": ["*.ts", "*.tsx"],
28+
"extends": ["plugin:@nx/typescript"],
4429
"parserOptions": {
4530
"project": "./tsconfig.*?.json"
4631
},
4732
"rules": {
4833
"semi": "off",
49-
"@typescript-eslint/semi": [
50-
"error"
34+
"@typescript-eslint/semi": ["error"],
35+
"@typescript-eslint/no-extra-semi": "error",
36+
"no-extra-semi": "off",
37+
"@angular-eslint/prefer-standalone": [
38+
"off"
5139
]
5240
}
5341
},
5442
{
55-
"files": [
56-
"*.js",
57-
"*.jsx"
58-
],
59-
"extends": [
60-
"plugin:@nx/javascript"
61-
],
62-
"rules": {}
43+
"files": ["*.js", "*.jsx"],
44+
"extends": ["plugin:@nx/javascript"],
45+
"rules": {
46+
"@typescript-eslint/no-extra-semi": "error",
47+
"no-extra-semi": "off"
48+
}
6349
}
6450
]
6551
}

‎.github/workflows/on-gh-release.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: on-gh-release
2+
on:
3+
release:
4+
types: [released]
5+
branches:
6+
- development
7+
8+
env:
9+
NX_BRANCH: ${{ github.event.number }}
10+
NX_RUN_GROUP: ${{ github.run_id }}
11+
NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
12+
MOZ_HEADLESS: 1
13+
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
15+
jobs:
16+
# one run
17+
one_run:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Cancel Previous Runs
21+
uses: styfle/[email protected]
22+
with:
23+
access_token: ${{ secrets.GITHUB_TOKEN }}
24+
25+
# update npm tags
26+
npm_tag_update:
27+
runs-on: ubuntu-latest
28+
needs: one_run
29+
steps:
30+
- uses: actions/checkout@v3
31+
- uses: actions/cache@v3
32+
- name: get-npm-version
33+
id: package-version
34+
uses: martinbeentjes/[email protected]
35+
- run: |
36+
npm config set registry https://registry.npmjs.org/
37+
npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
38+
npm dist-tag add ngx-bootstrap@${{ steps.package-version.outputs.current-version}} latest

‎.github/workflows/on-push-or-pull.yml

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: on-pull-request-or-push
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
push:
67
branches:
@@ -25,20 +26,20 @@ env:
2526
jobs:
2627
# one run
2728
one_run:
28-
runs-on: ubuntu-latest
29+
runs-on: ubuntu-22.04
2930
steps:
3031
- name: Cancel Previous Runs
31-
uses: styfle/cancel-workflow-action@0.9.0
32+
uses: styfle/cancel-workflow-action@0.11.0
3233
with:
3334
access_token: ${{ secrets.GITHUB_TOKEN }}
3435

3536
# install dependencies
3637
install:
37-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-22.04
3839
needs: one_run
3940
steps:
40-
- uses: actions/checkout@v2
41-
- uses: actions/cache@v2
41+
- uses: actions/checkout@v3
42+
- uses: actions/cache@v3
4243
id: cache
4344
with:
4445
path: ${{ env.CACHE_NODE_MODULES_PATH }}
@@ -49,61 +50,66 @@ jobs:
4950
# build ngx-bootstrap
5051
build:
5152
needs: install
52-
runs-on: ubuntu-latest
53+
runs-on: ubuntu-22.04
5354
steps:
54-
- uses: actions/checkout@v2
55-
- uses: actions/cache@v2
55+
- uses: actions/checkout@v3
56+
- uses: actions/cache@v3
5657
with:
5758
path: ${{ env.CACHE_NODE_MODULES_PATH }}
5859
key: node_modules-${{ hashFiles('**/package-lock.json') }}
59-
- uses: actions/cache@v2
60+
- uses: actions/cache@v3
6061
with:
6162
path: ${{ env.CACHE_DIST_PATH }}
6263
key: dist-${{ github.run_id }}
64+
# - run: |
65+
# npx nx build ngx-bootstrap --runner=cloud --configuration=production
66+
# npx nx build --runner=cloud --configuration=production
6367
- run: |
64-
npx nx build ngx-bootstrap --runner=cloud --configuration=production
65-
npx nx build --runner=cloud --configuration=production
68+
npx nx build ngx-bootstrap --configuration=production
69+
npx nx prerender --configuration=production
6670
6771
6872
# run unit tests
6973
unit_tests_with_coverage:
70-
runs-on: ubuntu-latest
74+
runs-on: ubuntu-22.04
7175
needs: build
7276
steps:
73-
- uses: actions/checkout@v2
74-
- uses: actions/cache@v2
77+
- uses: actions/checkout@v3
78+
- uses: actions/cache@v3
7579
with:
7680
path: ${{ env.CACHE_NODE_MODULES_PATH }}
7781
key: node_modules-${{ hashFiles('**/package-lock.json') }}
78-
- uses: actions/cache@v2
82+
- uses: actions/cache@v3
7983
with:
8084
path: ${{ env.CACHE_DIST_PATH }}
8185
key: dist-${{ github.run_id }}
82-
- run: npm test -- --runner=cloud --codeCoverage
86+
# - run: npm test -- --runner=cloud --codeCoverage
87+
- run: npm test -- --codeCoverage
8388
- run: npx codecov ./coverage/
8489
continue-on-error: true
8590

8691
# run linting
8792
linting:
88-
runs-on: ubuntu-latest
93+
runs-on: ubuntu-22.04
8994
needs: install
9095
steps:
91-
- uses: actions/checkout@v2
92-
- uses: actions/cache@v2
96+
- uses: actions/checkout@v3
97+
- uses: actions/cache@v3
9398
with:
9499
path: ${{ env.CACHE_NODE_MODULES_PATH }}
95100
key: node_modules-${{ hashFiles('**/package-lock.json') }}
96-
- run: npm run lint -- --runner=cloud
101+
# - run: npm run lint -- --runner=cloud
102+
- run: npm run lint --
97103

98104
# firebase deploy preview
99105
firebase_preview:
100-
runs-on: ubuntu-latest
106+
runs-on: ubuntu-22.04
101107
needs: build
102108
outputs:
103109
output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
104110
steps:
105-
- uses: actions/checkout@v2
106-
- uses: actions/cache@v2
111+
- uses: actions/checkout@v3
112+
- uses: actions/cache@v3
107113
with:
108114
path: ${{ env.CACHE_DIST_PATH }}
109115
key: dist-${{ github.run_id }}
@@ -120,20 +126,20 @@ jobs:
120126
# run playwright
121127
e2e_smoke:
122128
name: e2e smoke (${{ matrix.shard }}/${{ strategy.job-total }})
123-
runs-on: ubuntu-latest
129+
runs-on: ubuntu-22.04
124130
needs: [install, build, firebase_preview]
125131

126132
strategy:
127133
fail-fast: false
128134
matrix:
129135
shard: [1, 2]
130136
steps:
131-
- uses: actions/checkout@v2
132-
- uses: actions/cache@v2
137+
- uses: actions/checkout@v3
138+
- uses: actions/cache@v3
133139
with:
134140
path: ${{ env.CACHE_NODE_MODULES_PATH }}
135141
key: node_modules-${{ hashFiles('**/package-lock.json') }}
136-
- uses: actions/cache@v2
142+
- uses: actions/cache@v3
137143
with:
138144
path: ${{ env.CACHE_DIST_PATH }}
139145
key: dist-${{ github.run_id }}
@@ -145,35 +151,35 @@ jobs:
145151
146152
- name: smoke e2e on firebase
147153
if: ${{ needs.firebase_preview.outputs.output_url }}
148-
run: PLAYWRIGHT_TEST_BASE_URL="${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
154+
run: PLAYWRIGHT_TEST_BASE_URL="${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/" npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
149155

150156
- name: smoke e2e local
151157
if: ${{ !needs.firebase_preview.outputs.output_url }}
152158
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --shard=${{ matrix.shard }}/${{ strategy.job-total }}
153159

154-
- uses: actions/upload-artifact@v3
160+
- uses: actions/upload-artifact@v4
155161
if: always()
156162
with:
157163
name: playwright-report-smoke-${{ matrix.shard }}_${{ strategy.job-total }}
158164
path: apps/ngx-bootstrap-docs-e2e/playwright-report
159-
retention-days: 30
165+
retention-days: 14
160166

161167
e2e_full:
162168
name: e2e full
163-
runs-on: ubuntu-latest
169+
runs-on: ubuntu-22.04
164170
needs: [e2e_smoke]
165171

166172
strategy:
167173
fail-fast: false
168174
matrix:
169175
shard: [1, 2]
170176
steps:
171-
- uses: actions/checkout@v2
172-
- uses: actions/cache@v2
177+
- uses: actions/checkout@v3
178+
- uses: actions/cache@v3
173179
with:
174180
path: ${{ env.CACHE_NODE_MODULES_PATH }}
175181
key: node_modules-${{ hashFiles('**/package-lock.json') }}
176-
- uses: actions/cache@v2
182+
- uses: actions/cache@v3
177183
with:
178184
path: ${{ env.CACHE_DIST_PATH }}
179185
key: dist-${{ github.run_id }}
@@ -193,9 +199,9 @@ jobs:
193199
continue-on-error: true
194200
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --shard=${{ matrix.shard }}/${{ strategy.job-total }}
195201

196-
- uses: actions/upload-artifact@v3
202+
- uses: actions/upload-artifact@v4
197203
if: always()
198204
with:
199205
name: playwright-report-full-${{ matrix.shard }}_${{ strategy.job-total }}
200206
path: apps/ngx-bootstrap-docs-e2e/playwright-report
201-
retention-days: 30
207+
retention-days: 14

0 commit comments

Comments
 (0)