Skip to content

Commit

Permalink
Merge branch 'development' into feature/fr-ca-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
alihasan00 authored Jul 12, 2023
2 parents effeb24 + 6132a7c commit 368f9f5
Show file tree
Hide file tree
Showing 167 changed files with 37,294 additions and 24,552 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
53 changes: 40 additions & 13 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,64 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"rules": {
},
"ignorePatterns": [
"**/*"
],
"plugins": [
"@nx"
],
"rules": {},
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"files": [
"*.ts",
"*.tsx",
"*.js",
"*.jsx"
],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": [
"*"
]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"parserOptions": { "project": "./tsconfig.*?.json" },
"files": [
"*.ts",
"*.tsx"
],
"extends": [
"plugin:@nx/typescript"
],
"parserOptions": {
"project": "./tsconfig.*?.json"
},
"rules": {
"semi": "off",
"@typescript-eslint/semi": ["error"]
"@typescript-eslint/semi": [
"error"
]
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"files": [
"*.js",
"*.jsx"
],
"extends": [
"plugin:@nx/javascript"
],
"rules": {}
}
]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/on-push-or-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- run: |
npx nx build ngx-bootstrap --runner cloud --configuration production
npx nx build --runner cloud --configuration production
npx nx build ngx-bootstrap --runner=cloud --configuration=production
npx nx build --runner=cloud --configuration=production
# run unit tests
Expand All @@ -79,7 +79,7 @@ jobs:
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- run: npm test -- --runner cloud --codeCoverage
- run: npm test -- --runner=cloud --codeCoverage
- run: npx codecov ./coverage/
continue-on-error: true

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

# firebase deploy preview
firebase_preview:
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
- name: smoke e2e on firebase
if: ${{ needs.firebase_preview.outputs.output_url }}
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 }}
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 }}

- name: smoke e2e local
if: ${{ !needs.firebase_preview.outputs.output_url }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
path: dist
key: dist-${{ github.run_id }}
- run: |
npx nx build ngx-bootstrap --runner cloud --configuration production
npx ng build --runner cloud --configuration production
npx nx build ngx-bootstrap --runner=cloud --configuration=production
npx ng build --runner=cloud --configuration=production
# update release notes in github
update_release_draft:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ scully.log
**/test-results/
**/playwright-report/
**/playwright/.cache/

migration.json
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
# [11.0.0](https://github.com/valor-software/ngx-bootstrap/compare/v9.0.0...v11.0.0) (2023-07-11)


### Bug Fixes

* **carousel:** changed carousel id ([#6512](https://github.com/valor-software/ngx-bootstrap/issues/6512)) ([0380c3c](https://github.com/valor-software/ngx-bootstrap/commit/0380c3c420225e2f0e84d8ae07808f7c0879df95))
* **datepicker:** fixed disabled state on datepickers ([#6540](https://github.com/valor-software/ngx-bootstrap/issues/6540)) ([818e889](https://github.com/valor-software/ngx-bootstrap/commit/818e889bc8f12267a3daf8cf3a13248b50f56d66))
* **docs:** added target attribute for docs links ([#6542](https://github.com/valor-software/ngx-bootstrap/issues/6542)) ([d72b7df](https://github.com/valor-software/ngx-bootstrap/commit/d72b7dfb7d21e8f4a6c64334ceee3ffbc3dcce4c))
* **docs:** fixed logos on users docs page ([#6532](https://github.com/valor-software/ngx-bootstrap/issues/6532)) ([9af5c56](https://github.com/valor-software/ngx-bootstrap/commit/9af5c56e343b64cf75622e1516be391017292b09))
* **docs:** fixed schematics page ([cff1e91](https://github.com/valor-software/ngx-bootstrap/commit/cff1e91842ff50582aef04b80f784f7cf73cea21))
* **docs:** hide themes route ([#6541](https://github.com/valor-software/ngx-bootstrap/issues/6541)) ([7d2f845](https://github.com/valor-software/ngx-bootstrap/commit/7d2f8451db26a937bb7067ac636fbbaef7ac302c))
* hide event registration leak ([#6521](https://github.com/valor-software/ngx-bootstrap/issues/6521)) ([795b378](https://github.com/valor-software/ngx-bootstrap/commit/795b378678201e2a1bd0e52613ddcaf082226787))
* **modal:** hide works even if show hasn't finished ([#6518](https://github.com/valor-software/ngx-bootstrap/issues/6518)) ([8f0807e](https://github.com/valor-software/ngx-bootstrap/commit/8f0807eaaa089e46df381a009781427300eaa5e0))
* **popover:** fixed popover using after chrome updates ([#6548](https://github.com/valor-software/ngx-bootstrap/issues/6548)) ([5f1af42](https://github.com/valor-software/ngx-bootstrap/commit/5f1af42e59ffe59ffd89f2b03795f1e3cff8db97))
* **schematics:** fixed schematics for version 9.0.0 ([#6508](https://github.com/valor-software/ngx-bootstrap/issues/6508)) ([fb636dd](https://github.com/valor-software/ngx-bootstrap/commit/fb636dd305f532cc4405364327696f5f247c8886))


### Features

* **bootstrap 3:** BREAKING CHANGE dropped bootstrap 3 ([#6417](https://github.com/valor-software/ngx-bootstrap/issues/6417)) ([fd8a296](https://github.com/valor-software/ngx-bootstrap/commit/fd8a29669e2cea3232706ee73ad15c2992411f7f))
* **button:** allow any type for the value binding of the btnRadio directive ([#6446](https://github.com/valor-software/ngx-bootstrap/issues/6446)) ([1c41c6c](https://github.com/valor-software/ngx-bootstrap/commit/1c41c6ccf819b4d9c9489e1fd834ef9b8263ca73))
* **chore:** added information regarding new versions ([#6533](https://github.com/valor-software/ngx-bootstrap/issues/6533)) ([7e085f9](https://github.com/valor-software/ngx-bootstrap/commit/7e085f99e2726b3bf29b97a794bf5255803b218d))
* **chore:** updated angular up to angular 15 ([dc03fcf](https://github.com/valor-software/ngx-bootstrap/commit/dc03fcfe6a5f3dab9eedd13f0bd432166aaba8af))
* **datepicker:** added new config property keepDatesOutOfRules ([#6554](https://github.com/valor-software/ngx-bootstrap/issues/6554)) ([1cd4ae1](https://github.com/valor-software/ngx-bootstrap/commit/1cd4ae17d8678abfb4ab73586687c6e7dbda4880))
* **datepicker:** added new config property to keep datepicker opened if only time is changed ([#6537](https://github.com/valor-software/ngx-bootstrap/issues/6537)) ([b9c9f8d](https://github.com/valor-software/ngx-bootstrap/commit/b9c9f8de5011df94ffbc0c5edefcc5a16c85b563))
* **doc:** added information regarding v10.0.0 ([#6513](https://github.com/valor-software/ngx-bootstrap/issues/6513)) ([e373248](https://github.com/valor-software/ngx-bootstrap/commit/e3732488154c811e50ff2bf215ce8386dea8f36c))
* **doc:** doc updates for version 9.0.0 ([#6506](https://github.com/valor-software/ngx-bootstrap/issues/6506)) ([7c79ca7](https://github.com/valor-software/ngx-bootstrap/commit/7c79ca7df803392f97b7838af49c5c1f6794ba06))
* **docs:** changelog updates ([4440667](https://github.com/valor-software/ngx-bootstrap/commit/44406670b7e22530f5526fc6898f5324bc0ddb8e))
* **docs:** fixed readme ([6dd7f68](https://github.com/valor-software/ngx-bootstrap/commit/6dd7f6842d38444adca742381ea9fb5340532dc8))
* **dootstrap:** updated default version up to 5.2.3 ([d1686b3](https://github.com/valor-software/ngx-bootstrap/commit/d1686b3c910a275467b3b4fe8e8f49fbb98e2539))
* **footer:** added footer for all pages ([#6443](https://github.com/valor-software/ngx-bootstrap/issues/6443)) ([af8be81](https://github.com/valor-software/ngx-bootstrap/commit/af8be8116a50729cddd0f724245c4fb9ff832133))
* Migration to Playwright ([#6590](https://github.com/valor-software/ngx-bootstrap/issues/6590)) ([e2958bf](https://github.com/valor-software/ngx-bootstrap/commit/e2958bf490feb5ae5566449d7eada429afe100f7))
* **modal:** return focus to element after closing modal ([#6549](https://github.com/valor-software/ngx-bootstrap/issues/6549)) ([72e0a75](https://github.com/valor-software/ngx-bootstrap/commit/72e0a759952191ba3691e96aeb4e908c2ba18a03))
* **readme:** updated readme ([6bf7136](https://github.com/valor-software/ngx-bootstrap/commit/6bf7136bafcaf4304312e9bbe7be4c338b91c810))
* **readme:** updated readme file ([663c70e](https://github.com/valor-software/ngx-bootstrap/commit/663c70e688dfbc0215683c76cc259b440896a712))


### BREAKING CHANGES

* **bootstrap 3:** dropped bootstrap 3 support
* supporting only angular v16



# [10.3.0](https://github.com/valor-software/ngx-bootstrap/compare/v9.0.0...v10.3.0) (2023-02-17)


Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ Here is the version compatibility list:

| ngx-bootstrap | Angular | Bootstrap CSS |
|---------------|-----------------|----------------|
| 10.x.x | 15.x.x | 5.x.x or 4.x.x |
| 11.x.x | 16.x.x | 5.x.x or 4.x.x |
| 10.x.x | 15.x.x | 5.x.x or 4.x.x |
| 9.0.0 | 14.x.x | 5.x.x or 4.x.x or 3.x.x |
| 8.0.0 | 12.x.x - 13.x.x | 5.x.x or 4.x.x or 3.x.x |
| 7.1.0 | 11.x.x - 12.x.x | 5.x.x or 4.x.x or 3.x.x |
Expand Down
2 changes: 1 addition & 1 deletion _root/tools/gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buttons pagination rating timepicker \
carousel datepicker popover sortable tooltip typeahead )
for i in "${array[@]}"
do
ng generate @nrwl/angular:library --name=$i --style=css --buildable --importPath=ngx-bootstrap/$i \
ng generate @nx/angular:library --name=$i --style=css --buildable --importPath=ngx-bootstrap/$i \
--publishable --skipPackageJson --strict --no-interactive
done

Loading

0 comments on commit 368f9f5

Please sign in to comment.