diff --git a/.eslintrc.json b/.eslintrc.json index bc0d179f40..8710ec9e4c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -35,13 +35,18 @@ }, "rules": { "rxjs/no-unsafe-takeuntil": "error", - "rxjs-angular/prefer-takeuntil": "warn" + "rxjs-angular/prefer-takeuntil": "warn", + "@typescript-eslint/no-extra-semi": "error", + "no-extra-semi": "off" } }, { "files": ["*.js", "*.jsx"], "extends": ["plugin:@nx/javascript"], - "rules": {} + "rules": { + "@typescript-eslint/no-extra-semi": "error", + "no-extra-semi": "off" + } } ] } diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index f1f2bb1a96..757c2205f8 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -25,10 +25,10 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 # 👈 Required to retrieve git history - - name: Use Node.js 16 + - name: Use Node.js 18 uses: actions/setup-node@v2 with: - node-version: 16 + node-version: 18 cache: npm - run: npm ci # 👇 Adds Chromatic as a step in the workflow diff --git a/.prettierignore b/.prettierignore index 1d6e78b8cb..a8b4abedf8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,5 @@ /.nx/cache .angular + +/.nx/workspace-data \ No newline at end of file diff --git a/apps/docs-app/.browserslistrc b/apps/docs-app/.browserslistrc index 4f9ac26980..dd8e7041c2 100644 --- a/apps/docs-app/.browserslistrc +++ b/apps/docs-app/.browserslistrc @@ -3,7 +3,7 @@ # https://github.com/browserslist/browserslist#queries # For the full list of supported browsers by the Angular framework, please see: -# https://angular.io/guide/browser-support +# https://angular.dev/reference/versions#browser-support # You can see what browsers were selected by your queries by running: # npx browserslist diff --git a/apps/docs-app/src/app/app.module.ts b/apps/docs-app/src/app/app.module.ts index 65149f6b09..796c58e685 100644 --- a/apps/docs-app/src/app/app.module.ts +++ b/apps/docs-app/src/app/app.module.ts @@ -1,7 +1,11 @@ import { NgModule, LOCALE_ID } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { HttpClientModule, HttpClient } from '@angular/common/http'; +import { + HttpClient, + provideHttpClient, + withInterceptorsFromDi, +} from '@angular/common/http'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { @@ -53,13 +57,13 @@ import { HomeComponent } from './components/home/home.component'; import { ToolbarModule } from './components/toolbar/toolbar.module'; @NgModule({ - declarations: [DocsAppComponent, HomeComponent], // directives, components, and pipes owned by this NgModule + declarations: [DocsAppComponent, HomeComponent], // additional providers needed for this module + bootstrap: [DocsAppComponent], imports: [ BrowserAnimationsModule, CommonModule, FormsModule, BrowserModule, - HttpClientModule, /** Material Modules */ MatButtonModule, MatListModule, @@ -89,7 +93,7 @@ import { ToolbarModule } from './components/toolbar/toolbar.module'; ContentContainerModule, appRoutes, CovalentFileModule, - ], // modules needed to run this module + ], providers: [ appRoutingProviders, GitHubService, @@ -101,7 +105,7 @@ import { ToolbarModule } from './components/toolbar/toolbar.module'; deps: [TranslateService], }, SelectivePreloadingStrategyService, - ], // additional providers needed for this module - bootstrap: [DocsAppComponent], + provideHttpClient(withInterceptorsFromDi()), + ], }) export class AppModule {} diff --git a/apps/docs-app/src/app/components/shared/demo-tools/demo.module.ts b/apps/docs-app/src/app/components/shared/demo-tools/demo.module.ts index f33c238fd2..ca100324e9 100644 --- a/apps/docs-app/src/app/components/shared/demo-tools/demo.module.ts +++ b/apps/docs-app/src/app/components/shared/demo-tools/demo.module.ts @@ -6,7 +6,10 @@ import { MatCardModule } from '@angular/material/card'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonModule } from '@angular/material/button'; import { CovalentHighlightModule } from '@covalent/highlight'; -import { HttpClientModule } from '@angular/common/http'; +import { + provideHttpClient, + withInterceptorsFromDi, +} from '@angular/common/http'; import { MatToolbarModule } from '@angular/material/toolbar'; import { MatDividerModule } from '@angular/material/divider'; @@ -23,8 +26,8 @@ import { MatDividerModule } from '@angular/material/divider'; MatCardModule, MatIconModule, MatButtonModule, - HttpClientModule, MatDividerModule, ], + providers: [provideHttpClient(withInterceptorsFromDi())], }) export class DemoModule {} diff --git a/apps/docs-app/src/app/content/components/component-demos/dynamic-menu/demos/dynamic-menu-demo-basic/dynamic-menu-demo-basic.component.ts b/apps/docs-app/src/app/content/components/component-demos/dynamic-menu/demos/dynamic-menu-demo-basic/dynamic-menu-demo-basic.component.ts index 764fb4f28f..dc12dedf3f 100644 --- a/apps/docs-app/src/app/content/components/component-demos/dynamic-menu/demos/dynamic-menu-demo-basic/dynamic-menu-demo-basic.component.ts +++ b/apps/docs-app/src/app/content/components/component-demos/dynamic-menu/demos/dynamic-menu-demo-basic/dynamic-menu-demo-basic.component.ts @@ -70,7 +70,7 @@ export class DynamicMenuDemoBasicComponent { { // URL link text: 'Angular Homepage', - link: 'https://angular.io/', + link: 'https://angular.dev/', newTab: true, }, ], diff --git a/apps/docs-app/src/app/content/components/component-demos/flavored-markdown/demos/flavored-markdown-demo-basic/flavored-markdown-demo-basic.component.ts b/apps/docs-app/src/app/content/components/component-demos/flavored-markdown/demos/flavored-markdown-demo-basic/flavored-markdown-demo-basic.component.ts index d33e3d6840..48bd39ed44 100644 --- a/apps/docs-app/src/app/content/components/component-demos/flavored-markdown/demos/flavored-markdown-demo-basic/flavored-markdown-demo-basic.component.ts +++ b/apps/docs-app/src/app/content/components/component-demos/flavored-markdown/demos/flavored-markdown-demo-basic/flavored-markdown-demo-basic.component.ts @@ -16,17 +16,16 @@ export class FlavoredMarkdownDemoBasicComponent { ## List + One - + subline + + subline + Two + Three - + subline - + second subline - - - | Tables | Are | Cool | - | ------------- |:-------------:| -----:| - | **col 3 is** | right-aligned | $1600 | - | col 2 is | *centered* | $12 | - | zebra stripes | are neat | $1 | + + subline + + second subline + + Table in a list: + | Tables | Are | Cool | + | ------------- |:-------------:| -----:| + | **col 3 is** | right-aligned | $1600 | + | col 2 is | *centered* | $12 | + | zebra stripes | are neat | $1 | `; } diff --git a/apps/docs-app/src/app/content/docs/angular-material/angular-material.component.html b/apps/docs-app/src/app/content/docs/angular-material/angular-material.component.html index 4107bb6a2f..4a39dc963a 100644 --- a/apps/docs-app/src/app/content/docs/angular-material/angular-material.component.html +++ b/apps/docs-app/src/app/content/docs/angular-material/angular-material.component.html @@ -31,14 +31,14 @@