Skip to content

Commit 782fbea

Browse files
authored
Merge branch 'development' into feature/fr-ca-integration
2 parents 24df17b + b1b1f54 commit 782fbea

File tree

168 files changed

+25130
-40484
lines changed

Some content is hidden

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

168 files changed

+25130
-40484
lines changed

.eslintrc.json

Lines changed: 16 additions & 33 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,33 @@
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"
51-
]
34+
"@typescript-eslint/semi": ["error"],
35+
"@typescript-eslint/no-extra-semi": "error",
36+
"no-extra-semi": "off"
5237
}
5338
},
5439
{
55-
"files": [
56-
"*.js",
57-
"*.jsx"
58-
],
59-
"extends": [
60-
"plugin:@nx/javascript"
61-
],
62-
"rules": {}
40+
"files": ["*.js", "*.jsx"],
41+
"extends": ["plugin:@nx/javascript"],
42+
"rules": {
43+
"@typescript-eslint/no-extra-semi": "error",
44+
"no-extra-semi": "off"
45+
}
6346
}
6447
]
6548
}

.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

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
# dependencies
1010
/node_modules
11+
src/root/node_modules
1112

1213
# IDEs and editors
1314
/.idea
@@ -57,3 +58,5 @@ scully.log
5758
**/playwright/.cache/
5859

5960
migration.json
61+
62+
.nx/cache

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
/dist
44
/coverage
5+
6+
/.nx/cache

.prettierrc

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,43 @@
66
"singleQuote": true,
77
"trailingComma": "none",
88
"bracketSpacing": true,
9-
"parser": "typescript"
9+
"parser": "typescript",
10+
"overrides": [
11+
{
12+
"files": "*.json",
13+
"options": {
14+
"parser": "json"
15+
}
16+
},
17+
{
18+
"files": "*.html",
19+
"options": {
20+
"parser": "html"
21+
}
22+
},
23+
{
24+
"files": ["*.components.html", "*.component.html"],
25+
"options": {
26+
"parser": "angular"
27+
}
28+
},
29+
{
30+
"files": "*.md",
31+
"options": {
32+
"parser": "markdown"
33+
}
34+
},
35+
{
36+
"files": "*.yml",
37+
"options": {
38+
"parser": "yaml"
39+
}
40+
},
41+
{
42+
"files": "*.scss",
43+
"options": {
44+
"parser": "scss"
45+
}
46+
}
47+
]
1048
}

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11

22

3+
## [18.0.0](https://github.com/valor-software/ngx-bootstrap/compare/v11.0.2...v18.0.0) (2024-07-1)
4+
* Migration to Angular 18
5+
* Synced major version of the lib with major version of Angular
6+
7+
38
## [11.0.2](https://github.com/valor-software/ngx-bootstrap/compare/v11.0.1...v11.0.2) (2023-07-13)
49

510

@@ -2513,4 +2518,4 @@
25132518

25142519
* **build:** works good with [email protected] ([31c513b](https://github.com/valor-software/ngx-bootstrap/commit/31c513b4f4f084ae0eabe82b2d8bec028bb48572))
25152520
* **ng 2.0.37:** ts errors fixed ([1e19f55](https://github.com/valor-software/ngx-bootstrap/commit/1e19f555da161f1f572ed6747eb6d72796060ed8))
2516-
* **typeahead:** ts style fixes ([3eab1e4](https://github.com/valor-software/ngx-bootstrap/commit/3eab1e428ebe3ce2ddf1013d48693bc38e23c150))
2521+
* **typeahead:** ts style fixes ([3eab1e4](https://github.com/valor-software/ngx-bootstrap/commit/3eab1e428ebe3ce2ddf1013d48693bc38e23c150))

README.md

Lines changed: 43 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<a href="http://valor-software.com/ngx-bootstrap/#/">
22
<div align="center">
3-
<img class="mx-auto center-block d-block" src="https://valor-software.com/ngx-bootstrap/assets/images/logos/ngx-bootstrap-logo.svg" alt="ngx-bootstrap" width="200" height="200">
3+
<img class="mx-auto center-block d-block" src="https://valor-software.com/ngx-bootstrap/assets/images/logos/ngx-bootstrap-logo.svg" alt="ngx-bootstrap" width="200" height="200" />
44
<h1>ngx-bootstrap</h1>
55
</div>
66
</a>
@@ -39,6 +39,7 @@ development
3939
-->
4040

4141
## Table of contents
42+
4243
1. [Getting Started](#getting-started)
4344
2. [Usage & Demo](#usage--demo)
4445
3. [Supporting](#supporting-ngx-bootstrap)
@@ -54,45 +55,52 @@ development
5455

5556
ngx-bootstrap provides Bootstrap components powered by Angular, so you don't need to include original JS components.
5657

57-
Check our [Getting started guide](https://valor-software.com/ngx-bootstrap/#/documentation#getting-started) if it's your
58+
Check our [Getting started guide](https://valor-software.com/ngx-bootstrap/#/documentation#getting-started) if it's your
5859
first project with Angular Bootstrap.
5960

6061
## Usage & Demo
6162

6263
Bootstrap components for Angular applications, dozens of demos and API documentation could be found here:
6364
[https://valor-software.com/ngx-bootstrap/](https://valor-software.com/ngx-bootstrap/).
6465

65-
<!-- Server side rendered version of this documentation available <a href="https://ngx-universal.herokuapp.com/">here</a>
66+
<!-- Server side rendered version of this documentation available <a href="https://ngx-universal.herokuapp.com/">here</a>
6667
served with Angular universal and [nest.js](https://nestjs.com/). -->
6768

6869
## Supporting ngx-bootstrap
69-
ngx-bootstrap is an Open Source (MIT Licensed) project, it's an independent project with ongoing development made possible
70+
71+
ngx-bootstrap is an Open Source (MIT Licensed) project, it's an independent project with ongoing development made possible
7072
thanks to the support of our awesome backers.
71-
If you also would like to show support or simply give back to Open Source community, please consider becoming a backing
73+
If you also would like to show support or simply give back to Open Source community, please consider becoming a backing
7274
sponsor of [ngx-bootstrap on OpenCollective](https://opencollective.com/ngx-bootstrap).
7375

74-
All donated funds are managed transparently on OpenCollective and will be used solely for compensating work and expenses
76+
All donated funds are managed transparently on OpenCollective and will be used solely for compensating work and expenses
7577
for contributors. Valor Software employees and contractors are not eligible for use of these funds.
7678

7779
What's in it for you? Proper recognition and exposure of your name/logo/website on our page.
7880
Our main sponsors will be presented under this section! Be the first!
7981

8082
## Installation
83+
8184
You can see the below simple example working on [StackBlitz](https://stackblitz.com/edit/vs-ngx-bootstrap-tooltip?file=src%2Findex.html)
8285

8386
##### Angular CLI way
87+
8488
Use the Angular CLI ng add command for updating your Angular project.
89+
8590
```bash
8691
ng add ngx-bootstrap
8792
```
8893

8994
##### Manual way
95+
9096
Install `ngx-bootstrap` from `npm`:
97+
9198
```bash
9299
npm install ngx-bootstrap --save
93100
```
94101

95102
Add wanted package to NgModule imports:
103+
96104
```
97105
import { TooltipModule } from 'ngx-bootstrap/tooltip';
98106
@@ -104,6 +112,7 @@ import { TooltipModule } from 'ngx-bootstrap/tooltip';
104112
```
105113

106114
Add component to your page:
115+
107116
```
108117
<button type="button" class="btn btn-primary"
109118
tooltip="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
@@ -112,29 +121,33 @@ Add component to your page:
112121
```
113122

114123
You will need to add bootstrap css:
115-
This can be done with the css file directly in the index.html, or alternatively through a styles import in the
124+
This can be done with the css file directly in the index.html, or alternatively through a styles import in the
116125
`angular.json` file or via `styles.scss` import. However the latter two options require additionally installing bootstrap via npm.
126+
117127
- `Bootstrap 5`
128+
118129
```
119130
<!--- index.html -->
120131
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
121132
```
122133

123134
- `Bootstrap 4`
135+
124136
```
125137
<!--- index.html -->
126138
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2">
127139
```
128140

129141
### Setting up the bootstrap version manually
130142

131-
As you may know `ngx-bootstrap` supports several `bootstrap.css` versions at the same time and has automatic tool
132-
to guess current used version of library, but if this guess fails you can specify version of `bootstrap.css` manually.
143+
As you may know `ngx-bootstrap` supports several `bootstrap.css` versions at the same time and has automatic tool
144+
to guess current used version of library, but if this guess fails you can specify version of `bootstrap.css` manually.
133145

134146
Sometimes, your project might contain some library that could interfere with the bootstrap framework, or you might
135-
have a customized version of bootstrap. The consequence is that the process of determining bootstrap version might
136-
be failed, which can break the UI. In that case, we can still set the bootstrap version manually in the bootstrapping
147+
have a customized version of bootstrap. The consequence is that the process of determining bootstrap version might
148+
be failed, which can break the UI. In that case, we can still set the bootstrap version manually in the bootstrapping
137149
component (i.e. `AppComponent`):
150+
138151
```
139152
import { setTheme } from 'ngx-bootstrap/utils';
140153
@@ -164,29 +177,30 @@ npm start
164177
The only two dependencies are [Angular](https://angular.io) and [Bootstrap](https://getbootstrap.com) CSS.
165178
Here is the version compatibility list:
166179

167-
| ngx-bootstrap | Angular | Bootstrap CSS |
168-
|---------------|-----------------|----------------|
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 |
180+
| ngx-bootstrap | Angular | Bootstrap CSS |
181+
|---------------| --------------- | ----------------------- |
182+
| 18.x.x | 18.x.x | 5.x.x or 4.x.x |
183+
| 12.x.x | 17.x.x | 5.x.x or 4.x.x |
184+
| 11.x.x | 16.x.x | 5.x.x or 4.x.x |
185+
| 10.x.x | 15.x.x | 5.x.x or 4.x.x |
171186
| 9.0.0 | 14.x.x | 5.x.x or 4.x.x or 3.x.x |
172187
| 8.0.0 | 12.x.x - 13.x.x | 5.x.x or 4.x.x or 3.x.x |
173188
| 7.1.0 | 11.x.x - 12.x.x | 5.x.x or 4.x.x or 3.x.x |
174-
| 7.0.0 | 11.x.x - 12.x.x | 3.x.x or 4.x.x |
175-
| 6.0.0 | 9.x.x - 10.x.x | 3.x.x or 4.x.x |
176-
| 5.6.x | 7.x.x - 9.1.0 | 3.x.x or 4.x.x |
177-
| 5.0.0 - 5.6.0 | 7.x.x - 8.x.x | 3.x.x or 4.x.x |
178-
| 4.x.x | 6.x.x - 7.x.x | 3.x.x or 4.x.x |
179-
| 3.x.x | 6.x.x - 7.x.x | 3.x.x or 4.x.x |
180-
| 2.x.x | 2.x.x - 4.x.x | 3.x.x or 4.x.x |
181-
| 1.x.x | 2.x.x | 3.x.x or 4.x.x |
182-
189+
| 7.0.0 | 11.x.x - 12.x.x | 3.x.x or 4.x.x |
190+
| 6.0.0 | 9.x.x - 10.x.x | 3.x.x or 4.x.x |
191+
| 5.6.x | 7.x.x - 9.1.0 | 3.x.x or 4.x.x |
192+
| 5.0.0 - 5.6.0 | 7.x.x - 8.x.x | 3.x.x or 4.x.x |
193+
| 4.x.x | 6.x.x - 7.x.x | 3.x.x or 4.x.x |
194+
| 3.x.x | 6.x.x - 7.x.x | 3.x.x or 4.x.x |
195+
| 2.x.x | 2.x.x - 4.x.x | 3.x.x or 4.x.x |
196+
| 1.x.x | 2.x.x | 3.x.x or 4.x.x |
183197

184198
## Troubleshooting
185199

186200
So if you are in trouble, here's where you can look for help.
187201

188-
The best place to ask questions is on [StackOverflow (under the `ngx-bootstrap` tag)](https://stackoverflow.com/questions/tagged/ngx-bootstrap)
189-
where there is a strong community of individuals asking and answering questions.
202+
The best place to ask questions is on [StackOverflow (under the `ngx-bootstrap` tag)](https://stackoverflow.com/questions/tagged/ngx-bootstrap)
203+
where there is a strong community of individuals asking and answering questions.
190204

191205
You can also join [our Slack channel](https://join.slack.com/t/ngx-home/shared_invite/enQtNTExMTY5MzcwMTM0LWVjZGU2MjI4MTVhMGVlMTc2OWRiMzA0NzBhNDU5YzQ0MDM3MWI5NzJjZTUzNzIxZmNjYmFlMjU2MzE0YmY0NWY) and link your stackoverflow question there. But try to avoid asking generic help questions directly on Slack since they can easily get lost in the chat. You can also [search among the existing GitHub issues](https://github.com/valor-software/ngx-bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue).
192206

@@ -199,6 +213,7 @@ All contributions very welcome! And remember, contribution is not only PRs and c
199213
Please read our [contribution guidelines](https://github.com/valor-software/ngx-bootstrap/blob/development/CONTRIBUTING.md).
200214

201215
### Credits
216+
202217
Crossbrowser testing sponsored by [Saucelabs](https://saucelabs.com/)
203218
[<img src="https://avatars2.githubusercontent.com/u/88837?s=200&v=4" alt="Saucelabs" width="31" height="31" align="middle">](https://saucelabs.com/)
204219

@@ -208,6 +223,6 @@ Crossbrowser testing sponsored by [Saucelabs](https://saucelabs.com/)
208223

209224
### Valor Software Can Help
210225

211-
At [Valor Software](https://valor-software.com/) our people are not resources, our people are human beings, helping to create a better world through our efforts and knowledge.
212-
We are here to assist you with your project. We have a wonderful, ever-growing team that is ready and able. If you're looking for someone to guide you and your team
226+
At [Valor Software](https://valor-software.com/) our people are not resources, our people are human beings, helping to create a better world through our efforts and knowledge.
227+
We are here to assist you with your project. We have a wonderful, ever-growing team that is ready and able. If you're looking for someone to guide you and your team
213228
please feel free to reach out to us on our site or at [email protected], we would love to chat.

0 commit comments

Comments
 (0)