Skip to content

Commit b3a36f4

Browse files
bump: update to angular 16 (#6592)
* updates for angular 16 * * production build fix * * rebase adjustments * * playwright project.json * chore: CI build issues * chore: updated docs and peer deps * cjore(ci): make base_url work well for local and firebase deployment * chore: rocky mistake with && * chore: bump playwright version to 3 --------- Co-authored-by: Dmitriy Shekhovtsov <[email protected]>
1 parent 18b5a6f commit b3a36f4

File tree

138 files changed

+37219
-24520
lines changed

Some content is hidden

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

138 files changed

+37219
-24520
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: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,64 @@
11
{
22
"root": true,
3-
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
5-
"rules": {
6-
},
3+
"ignorePatterns": [
4+
"**/*"
5+
],
6+
"plugins": [
7+
"@nx"
8+
],
9+
"rules": {},
710
"overrides": [
811
{
9-
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
12+
"files": [
13+
"*.ts",
14+
"*.tsx",
15+
"*.js",
16+
"*.jsx"
17+
],
1018
"rules": {
11-
"@nrwl/nx/enforce-module-boundaries": [
19+
"@nx/enforce-module-boundaries": [
1220
"error",
1321
{
1422
"enforceBuildableLibDependency": true,
1523
"allow": [],
1624
"depConstraints": [
17-
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
25+
{
26+
"sourceTag": "*",
27+
"onlyDependOnLibsWithTags": [
28+
"*"
29+
]
30+
}
1831
]
1932
}
2033
]
2134
}
2235
},
2336
{
24-
"files": ["*.ts", "*.tsx"],
25-
"extends": ["plugin:@nrwl/nx/typescript"],
26-
"parserOptions": { "project": "./tsconfig.*?.json" },
37+
"files": [
38+
"*.ts",
39+
"*.tsx"
40+
],
41+
"extends": [
42+
"plugin:@nx/typescript"
43+
],
44+
"parserOptions": {
45+
"project": "./tsconfig.*?.json"
46+
},
2747
"rules": {
2848
"semi": "off",
29-
"@typescript-eslint/semi": ["error"]
49+
"@typescript-eslint/semi": [
50+
"error"
51+
]
3052
}
3153
},
3254
{
33-
"files": ["*.js", "*.jsx"],
34-
"extends": ["plugin:@nrwl/nx/javascript"],
55+
"files": [
56+
"*.js",
57+
"*.jsx"
58+
],
59+
"extends": [
60+
"plugin:@nx/javascript"
61+
],
3562
"rules": {}
3663
}
3764
]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ jobs:
6161
path: ${{ env.CACHE_DIST_PATH }}
6262
key: dist-${{ github.run_id }}
6363
- run: |
64-
npx nx build ngx-bootstrap --runner cloud --configuration production
65-
npx nx build --runner cloud --configuration production
64+
npx nx build ngx-bootstrap --runner=cloud --configuration=production
65+
npx nx build --runner=cloud --configuration=production
6666
6767
6868
# run unit tests
@@ -79,7 +79,7 @@ jobs:
7979
with:
8080
path: ${{ env.CACHE_DIST_PATH }}
8181
key: dist-${{ github.run_id }}
82-
- run: npm test -- --runner cloud --codeCoverage
82+
- run: npm test -- --runner=cloud --codeCoverage
8383
- run: npx codecov ./coverage/
8484
continue-on-error: true
8585

@@ -93,7 +93,7 @@ jobs:
9393
with:
9494
path: ${{ env.CACHE_NODE_MODULES_PATH }}
9595
key: node_modules-${{ hashFiles('**/package-lock.json') }}
96-
- run: npm run lint -- --runner cloud
96+
- run: npm run lint -- --runner=cloud
9797

9898
# firebase deploy preview
9999
firebase_preview:
@@ -145,7 +145,7 @@ jobs:
145145
146146
- name: smoke e2e on firebase
147147
if: ${{ needs.firebase_preview.outputs.output_url }}
148-
run: npx nx run ngx-bootstrap-docs-e2e:e2e --pwProject=chromium-integration --baseUrl=${{ needs.firebase_preview.outputs.output_url }}/ngx-bootstrap/ --skipServe --shard=${{ matrix.shard }}/${{ strategy.job-total }}
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 }}
149149

150150
- name: smoke e2e local
151151
if: ${{ !needs.firebase_preview.outputs.output_url }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ scully.log
5555
**/test-results/
5656
**/playwright-report/
5757
**/playwright/.cache/
58+
59+
migration.json

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ Here is the version compatibility list:
166166

167167
| ngx-bootstrap | Angular | Bootstrap CSS |
168168
|---------------|-----------------|----------------|
169-
| 10.x.x | 15.x.x | 5.x.x or 4.x.x |
169+
| 11.x.x | 16.x.x | 5.x.x or 4.x.x |
170+
| 10.x.x | 15.x.x | 5.x.x or 4.x.x |
170171
| 9.0.0 | 14.x.x | 5.x.x or 4.x.x or 3.x.x |
171172
| 8.0.0 | 12.x.x - 13.x.x | 5.x.x or 4.x.x or 3.x.x |
172173
| 7.1.0 | 11.x.x - 12.x.x | 5.x.x or 4.x.x or 3.x.x |

_root/tools/gen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buttons pagination rating timepicker \
66
carousel datepicker popover sortable tooltip typeahead )
77
for i in "${array[@]}"
88
do
9-
ng generate @nrwl/angular:library --name=$i --style=css --buildable --importPath=ngx-bootstrap/$i \
9+
ng generate @nx/angular:library --name=$i --style=css --buildable --importPath=ngx-bootstrap/$i \
1010
--publishable --skipPackageJson --strict --no-interactive
1111
done
1212

0 commit comments

Comments
 (0)