Skip to content

Commit b8e8cd9

Browse files
lexasqlexasq
authored
Merge branch 'development' into fix-modal-closure
2 parents 39dcf2f + b1b1f54 commit b8e8cd9

File tree

492 files changed

+29507
-48404
lines changed

Some content is hidden

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

492 files changed

+29507
-48404
lines changed

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

‎.eslintrc.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,48 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
5-
"rules": {
6-
},
4+
"plugins": ["@nx"],
5+
"rules": {},
76
"overrides": [
87
{
98
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
9+
"excludedFiles": ["*.spec.ts"],
1010
"rules": {
11-
"@nrwl/nx/enforce-module-boundaries": [
11+
"@nx/enforce-module-boundaries": [
1212
"error",
1313
{
1414
"enforceBuildableLibDependency": true,
1515
"allow": [],
1616
"depConstraints": [
17-
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
17+
{
18+
"sourceTag": "*",
19+
"onlyDependOnLibsWithTags": ["*"]
20+
}
1821
]
1922
}
2023
]
2124
}
2225
},
2326
{
2427
"files": ["*.ts", "*.tsx"],
25-
"extends": ["plugin:@nrwl/nx/typescript"],
26-
"parserOptions": { "project": "./tsconfig.*?.json" },
28+
"extends": ["plugin:@nx/typescript"],
29+
"parserOptions": {
30+
"project": "./tsconfig.*?.json"
31+
},
2732
"rules": {
2833
"semi": "off",
29-
"@typescript-eslint/semi": ["error"]
34+
"@typescript-eslint/semi": ["error"],
35+
"@typescript-eslint/no-extra-semi": "error",
36+
"no-extra-semi": "off"
3037
}
3138
},
3239
{
3340
"files": ["*.js", "*.jsx"],
34-
"extends": ["plugin:@nrwl/nx/javascript"],
35-
"rules": {}
41+
"extends": ["plugin:@nx/javascript"],
42+
"rules": {
43+
"@typescript-eslint/no-extra-semi": "error",
44+
"no-extra-semi": "off"
45+
}
3646
}
3747
]
3848
}

‎.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: 57 additions & 47 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:
@@ -13,9 +14,8 @@ env:
1314
MOZ_HEALESS: 1
1415
SAUCE_USERNAME_PR: valorkinpr
1516
SAUCE_ACCESS_KEY_PR: e0a97bd3-4b74-4408-89bf-cce1b44a8bf1
16-
CYPRESS_CACHE_FOLDER: 'node_modules/.cypress'
17-
CYPRESS_RECORD_KEY: 4aa7a1c0-3a4f-444e-b324-6fc305a543a8
1817
FIREBASE_CHANNEL: ${{ fromJSON('["", "live"]')[!github.base_ref] }}
18+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 0
1919

2020
CACHE_NODE_MODULES_PATH: |
2121
~/.npm
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Cancel Previous Runs
32-
uses: styfle/cancel-workflow-action@0.9.0
32+
uses: styfle/cancel-workflow-action@0.11.0
3333
with:
3434
access_token: ${{ secrets.GITHUB_TOKEN }}
3535

@@ -38,8 +38,8 @@ jobs:
3838
runs-on: ubuntu-latest
3939
needs: one_run
4040
steps:
41-
- uses: actions/checkout@v2
42-
- uses: actions/cache@v2
41+
- uses: actions/checkout@v3
42+
- uses: actions/cache@v3
4343
id: cache
4444
with:
4545
path: ${{ env.CACHE_NODE_MODULES_PATH }}
@@ -52,35 +52,35 @@ jobs:
5252
needs: install
5353
runs-on: ubuntu-latest
5454
steps:
55-
- uses: actions/checkout@v2
56-
- uses: actions/cache@v2
55+
- uses: actions/checkout@v3
56+
- uses: actions/cache@v3
5757
with:
5858
path: ${{ env.CACHE_NODE_MODULES_PATH }}
5959
key: node_modules-${{ hashFiles('**/package-lock.json') }}
60-
- uses: actions/cache@v2
60+
- uses: actions/cache@v3
6161
with:
6262
path: ${{ env.CACHE_DIST_PATH }}
6363
key: dist-${{ github.run_id }}
6464
- run: |
65-
npx nx build ngx-bootstrap --runner cloud --configuration production
66-
npx nx build --runner cloud --configuration production
65+
npx nx build ngx-bootstrap --runner=cloud --configuration=production
66+
npx nx build --runner=cloud --configuration=production
6767
6868
6969
# run unit tests
7070
unit_tests_with_coverage:
7171
runs-on: ubuntu-latest
7272
needs: build
7373
steps:
74-
- uses: actions/checkout@v2
75-
- uses: actions/cache@v2
74+
- uses: actions/checkout@v3
75+
- uses: actions/cache@v3
7676
with:
7777
path: ${{ env.CACHE_NODE_MODULES_PATH }}
7878
key: node_modules-${{ hashFiles('**/package-lock.json') }}
79-
- uses: actions/cache@v2
79+
- uses: actions/cache@v3
8080
with:
8181
path: ${{ env.CACHE_DIST_PATH }}
8282
key: dist-${{ github.run_id }}
83-
- run: npm test -- --runner cloud --codeCoverage
83+
- run: npm test -- --runner=cloud --codeCoverage
8484
- run: npx codecov ./coverage/
8585
continue-on-error: true
8686

@@ -89,12 +89,12 @@ jobs:
8989
runs-on: ubuntu-latest
9090
needs: install
9191
steps:
92-
- uses: actions/checkout@v2
93-
- uses: actions/cache@v2
92+
- uses: actions/checkout@v3
93+
- uses: actions/cache@v3
9494
with:
9595
path: ${{ env.CACHE_NODE_MODULES_PATH }}
9696
key: node_modules-${{ hashFiles('**/package-lock.json') }}
97-
- run: npm run lint -- --runner cloud
97+
- run: npm run lint -- --runner=cloud
9898

9999
# firebase deploy preview
100100
firebase_preview:
@@ -103,8 +103,8 @@ jobs:
103103
outputs:
104104
output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
105105
steps:
106-
- uses: actions/checkout@v2
107-
- uses: actions/cache@v2
106+
- uses: actions/checkout@v3
107+
- uses: actions/cache@v3
108108
with:
109109
path: ${{ env.CACHE_DIST_PATH }}
110110
key: dist-${{ github.run_id }}
@@ -118,75 +118,85 @@ jobs:
118118
channelId: ${{ env.FIREBASE_CHANNEL }}
119119
expires: 7d
120120

121-
# run cypress
121+
# run playwright
122122
e2e_smoke:
123-
name: e2e smoke
123+
name: e2e smoke (${{ matrix.shard }}/${{ strategy.job-total }})
124124
runs-on: ubuntu-latest
125125
needs: [install, build, firebase_preview]
126126

127127
strategy:
128-
# when one test fails, DO NOT cancel the other
129-
# containers, because this will kill Cypress processes
130-
# leaving the Dashboard hanging ...
131-
# https://github.com/cypress-io/github-action/issues/48
132128
fail-fast: false
133129
matrix:
134-
# run 3 copies of the current job in parallel
135-
containers: [1, 2, 3, 4, 5]
130+
shard: [1, 2]
136131
steps:
137-
- uses: actions/checkout@v2
138-
- uses: actions/cache@v2
132+
- uses: actions/checkout@v3
133+
- uses: actions/cache@v3
139134
with:
140135
path: ${{ env.CACHE_NODE_MODULES_PATH }}
141136
key: node_modules-${{ hashFiles('**/package-lock.json') }}
142-
- uses: actions/cache@v2
137+
- uses: actions/cache@v3
143138
with:
144139
path: ${{ env.CACHE_DIST_PATH }}
145140
key: dist-${{ github.run_id }}
146141

147-
# because of "record" and "parallel" parameters
148-
# these containers will load balance all found tests among themselves
142+
- name: Install playwright browsers
143+
run: |
144+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npx playwright install
145+
npx playwright install-deps chromium
146+
149147
- name: smoke e2e on firebase
150148
if: ${{ needs.firebase_preview.outputs.output_url }}
151-
run: npx nx run ngx-bootstrap-docs-e2e:e2e -- --configuration firebase --runner cloud --record --group smoke --baseUrl=${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/ --parallel
149+
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 }}
152150

153151
- name: smoke e2e local
154152
if: ${{ !needs.firebase_preview.outputs.output_url }}
155-
run: npx nx run ngx-bootstrap-docs-e2e:e2e -- --configuration production --runner cloud --record --group smoke --parallel
153+
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --shard=${{ matrix.shard }}/${{ strategy.job-total }}
154+
155+
- uses: actions/upload-artifact@v3
156+
if: always()
157+
with:
158+
name: playwright-report-smoke-${{ matrix.shard }}_${{ strategy.job-total }}
159+
path: apps/ngx-bootstrap-docs-e2e/playwright-report
160+
retention-days: 14
156161

157162
e2e_full:
158163
name: e2e full
159164
runs-on: ubuntu-latest
160165
needs: [e2e_smoke]
161166

162167
strategy:
163-
# when one test fails, DO NOT cancel the other
164-
# containers, because this will kill Cypress processes
165-
# leaving the Dashboard hanging ...
166-
# https://github.com/cypress-io/github-action/issues/48
167168
fail-fast: false
168169
matrix:
169-
# run 3 copies of the current job in parallel
170-
containers: [1, 2, 3, 4, 5]
170+
shard: [1, 2]
171171
steps:
172-
- uses: actions/checkout@v2
173-
- uses: actions/cache@v2
172+
- uses: actions/checkout@v3
173+
- uses: actions/cache@v3
174174
with:
175175
path: ${{ env.CACHE_NODE_MODULES_PATH }}
176176
key: node_modules-${{ hashFiles('**/package-lock.json') }}
177-
- uses: actions/cache@v2
177+
- uses: actions/cache@v3
178178
with:
179179
path: ${{ env.CACHE_DIST_PATH }}
180180
key: dist-${{ github.run_id }}
181181

182-
# because of "record" and "parallel" parameters
183-
# these containers will load balance all found tests among themselves
182+
- name: Install playwright browsers
183+
run: |
184+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 npx playwright install
185+
npx playwright install-deps chromium
186+
184187
- name: full e2e on firebase
185188
if: ${{ needs.firebase_preview.outputs.output_url }}
186189
continue-on-error: true
187-
run: npx nx run ngx-bootstrap-docs-e2e:e2e -- --configuration firebase --runner cloud --cypressConfig ./apps/ngx-bootstrap-docs-e2e/cypress-full.json --record --group full --baseUrl=${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/ --parallel
190+
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --baseUrl=${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/ --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
188191

189192
- name: full e2e on local
190193
if: ${{ !needs.firebase_preview.outputs.output_url }}
191194
continue-on-error: true
192-
run: npx nx run ngx-bootstrap-docs-e2e:e2e -- --configuration production --runner cloud --cypressConfig ./apps/ngx-bootstrap-docs-e2e/cypress-full.json --record --group full --parallel
195+
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-full --shard=${{ matrix.shard }}/${{ strategy.job-total }}
196+
197+
- uses: actions/upload-artifact@v3
198+
if: always()
199+
with:
200+
name: playwright-report-full-${{ matrix.shard }}_${{ strategy.job-total }}
201+
path: apps/ngx-bootstrap-docs-e2e/playwright-report
202+
retention-days: 14

0 commit comments

Comments
 (0)