Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore : Upgrade Angular 18 #6653

Merged
merged 2 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 16 additions & 33 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
{
"root": true,
"ignorePatterns": [
"**/*"
],
"plugins": [
"@nx"
],
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"rules": {},
"overrides": [
{
"files": [
"*.ts",
"*.tsx",
"*.js",
"*.jsx"
],
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"excludedFiles": ["*.spec.ts"],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
Expand All @@ -24,42 +16,33 @@
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": [
"*"
]
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": [
"*.ts",
"*.tsx"
],
"extends": [
"plugin:@nx/typescript"
],
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"parserOptions": {
"project": "./tsconfig.*?.json"
},
"rules": {
"semi": "off",
"@typescript-eslint/semi": [
"error"
]
"@typescript-eslint/semi": ["error"],
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": [
"*.js",
"*.jsx"
],
"extends": [
"plugin:@nx/javascript"
],
"rules": {}
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

# dependencies
/node_modules
src/root/node_modules

# IDEs and editors
/.idea
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ Here is the version compatibility list:

| ngx-bootstrap | Angular | Bootstrap CSS |
| ------------- | --------------- | ----------------------- |
| 13.x.x | 18.x.x | 5.x.x or 4.x.x |
| 12.x.x | 17.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 |
Expand Down
11 changes: 4 additions & 7 deletions apps/ngx-bootstrap-docs-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/ngx-bootstrap-docs-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["ngx-bootstrap-docs"],
"targets": {
"e2e": {
"executor": "@nxkit/playwright:test",
Expand Down Expand Up @@ -44,12 +46,7 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputPath}"],
"options": {
"lintFilePatterns": ["apps/ngx-bootstrap-docs-e2e/**/*.{js,ts}"]
}
"outputs": ["{options.outputPath}"]
}
},
"tags": [],
"implicitDependencies": ["ngx-bootstrap-docs"]
}
}
3 changes: 2 additions & 1 deletion apps/ngx-bootstrap-docs/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"../../.eslintrc.json"
],
"ignorePatterns": [
"!**/*"
"!**/*",
"**/assets/**"
],
"overrides": [
{
Expand Down
9 changes: 3 additions & 6 deletions apps/ngx-bootstrap-docs/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"projectType": "application",
"sourceRoot": "apps/ngx-bootstrap-docs/src",
"prefix": "ngx-bootstrap-base",
"implicitDependencies": ["ngx-bootstrap"],
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -87,11 +88,7 @@
}
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["apps/ngx-bootstrap-docs/src/**/*.ts", "apps/ngx-bootstrap-docs/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
},
"implicitDependencies": ["ngx-bootstrap"]
}
}
31 changes: 13 additions & 18 deletions apps/ngx-bootstrap-docs/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HttpClientModule } from '@angular/common/http';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
Expand All @@ -10,22 +10,17 @@ import { AppComponent } from './app.component';
import { DOCS_TOKENS, DocsModule, NgApiDoc, SIDEBAR_ROUTES, SidebarRoutesStructure } from '@ngx-bootstrap-doc/docs';
import { routes } from './app.routing';

@NgModule({
declarations: [
AppComponent
],
imports: [
BrowserAnimationsModule,
DocsModule,
HttpClientModule,
RouterModule.forRoot(routes, { useHash: environment.useHash }),
BsDropdownModule.forRoot()
],
providers: [
{ provide: NgApiDoc, useValue: ngdoc },
{ provide: DOCS_TOKENS, useValue: routes },
{ provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure }],
bootstrap: [AppComponent]
})
@NgModule({ declarations: [
AppComponent
],
bootstrap: [AppComponent], imports: [BrowserAnimationsModule,
DocsModule,
RouterModule.forRoot(routes, { useHash: environment.useHash }),
BsDropdownModule.forRoot()], providers: [
{ provide: NgApiDoc, useValue: ngdoc },
{ provide: DOCS_TOKENS, useValue: routes },
{ provide: SIDEBAR_ROUTES, useValue: SidebarRoutesStructure },
provideHttpClient(withInterceptorsFromDi())
] })
export class AppModule {
}
5 changes: 1 addition & 4 deletions libs/common-docs/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/common-docs/src/**/*.ts", "libs/common-docs/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class AddNavComponent implements OnChanges, AfterViewChecked, AfterViewIn
@HostListener('window:scroll')
onScrollEvent() {
this.initActiveMenuTab();
};
}

// eslint-disable-next-line @typescript-eslint/no-empty-function
constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface ICompany {
description: string;
link: string;
scale?: boolean;
};
}

@Component({
// eslint-disable-next-line @angular-eslint/component-selector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,16 @@ <h2 id="compatibility">
</tr>
</thead>
<tbody>
<tr>
<th>13.x.x</th>
<th>18.x.x</th>
<th>5.x.x or 4.x.x</th>
</tr>
<tr>
<th>12.x.x</th>
<th>17.x.x</th>
<th>5.x.x or 4.x.x</th>
</tr>
<tr>
<th>11.x.x</th>
<th>16.x.x</th>
Expand Down
5 changes: 1 addition & 4 deletions libs/doc-pages/accordion/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/accordion/src/**/*.ts", "libs/doc-pages/accordion/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/alerts/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/alerts/src/**/*.ts", "libs/doc-pages/alerts/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/buttons/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/buttons/src/**/*.ts", "libs/doc-pages/buttons/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/carousel/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/carousel/src/**/*.ts", "libs/doc-pages/carousel/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/collapse/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/collapse/src/**/*.ts", "libs/doc-pages/collapse/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/datepicker/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/datepicker/src/**/*.ts", "libs/doc-pages/datepicker/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/dropdown/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/dropdown/src/**/*.ts", "libs/doc-pages/dropdown/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/modal/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/modal/src/**/*.ts", "libs/doc-pages/modal/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/pagination/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/pagination/src/**/*.ts", "libs/doc-pages/pagination/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/popover/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/popover/src/**/*.ts", "libs/doc-pages/popover/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/progressbar/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/progressbar/src/**/*.ts", "libs/doc-pages/progressbar/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/rating/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/rating/src/**/*.ts", "libs/doc-pages/rating/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
5 changes: 1 addition & 4 deletions libs/doc-pages/sortable/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@
]
},
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["libs/doc-pages/sortable/src/**/*.ts", "libs/doc-pages/sortable/src/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
Loading
Loading