Skip to content

Commit caceb2c

Browse files
Migrate to NX 19
1 parent 636296c commit caceb2c

7 files changed

Lines changed: 4637 additions & 3934 deletions

File tree

.eslintrc.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,18 @@
3939
"extends": ["plugin:@nx/typescript"],
4040
"rules": {
4141
"@typescript-eslint/no-explicit-any": "off",
42-
"no-shadow": "error"
42+
"no-shadow": "error",
43+
"@typescript-eslint/no-extra-semi": "error",
44+
"no-extra-semi": "off"
4345
}
4446
},
4547
{
4648
"files": ["*.js", "*.jsx"],
4749
"extends": ["plugin:@nx/javascript"],
48-
"rules": {}
50+
"rules": {
51+
"@typescript-eslint/no-extra-semi": "error",
52+
"no-extra-semi": "off"
53+
}
4954
}
5055
]
5156
}

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ compliance
1717
apps/test-tokenizer/src/test-maker/cache/cache.json
1818
.angular
1919

20-
/.nx/cache
20+
/.nx/cache
21+
/.nx/workspace-data

apps/idl-webview/src/app/app.module.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { HttpClientModule } from '@angular/common/http';
1+
import {
2+
provideHttpClient,
3+
withInterceptorsFromDi,
4+
} from '@angular/common/http';
25
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
36
import { BrowserModule } from '@angular/platform-browser';
47
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -13,6 +16,8 @@ import { TranslocoRootModule } from './transloco-root.module';
1316

1417
@NgModule({
1518
declarations: [AppComponent],
19+
bootstrap: [AppComponent],
20+
schemas: [CUSTOM_ELEMENTS_SCHEMA],
1621
imports: [
1722
TranslocoRootModule,
1823
BrowserModule,
@@ -22,10 +27,7 @@ import { TranslocoRootModule } from './transloco-root.module';
2227
ServicesModule,
2328
HomeModule,
2429
ProfilerModule,
25-
HttpClientModule,
2630
],
27-
providers: [],
28-
bootstrap: [AppComponent],
29-
schemas: [CUSTOM_ELEMENTS_SCHEMA],
31+
providers: [provideHttpClient(withInterceptorsFromDi())],
3032
})
3133
export class AppModule {}

apps/notebook/components/src/app/app.module.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { HttpClientModule } from '@angular/common/http';
1+
import {
2+
provideHttpClient,
3+
withInterceptorsFromDi,
4+
} from '@angular/common/http';
25
import { ApplicationRef, DoBootstrap, Injector, NgModule } from '@angular/core';
36
import { createCustomElement } from '@angular/elements';
47
import { MatIconRegistry } from '@angular/material/icon';
@@ -28,16 +31,19 @@ import { VSCodeRendererMessenger } from './services/vscode-renderer-messenger.se
2831

2932
@NgModule({
3033
declarations: [AppComponent],
34+
bootstrap: [],
35+
exports: [],
3136
imports: [
3237
BrowserModule,
33-
HttpClientModule,
3438
MaterialCssVarsModule.forRoot({}),
3539
MaterialModule,
3640
ComponentsModule,
3741
],
38-
providers: [MaterialCssVarsService, VSCodeRendererMessenger],
39-
bootstrap: [],
40-
exports: [],
42+
providers: [
43+
MaterialCssVarsService,
44+
VSCodeRendererMessenger,
45+
provideHttpClient(withInterceptorsFromDi()),
46+
],
4147
})
4248
export class AppModule implements DoBootstrap {
4349
constructor(

apps/notebook/components/src/app/components/components.module.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { CommonModule } from '@angular/common';
2-
import { HttpClientModule } from '@angular/common/http';
2+
import {
3+
provideHttpClient,
4+
withInterceptorsFromDi,
5+
} from '@angular/common/http';
36
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
47
import { MaterialCssVarsModule } from 'angular-material-css-vars';
58

@@ -22,12 +25,6 @@ import { PlotComponent } from './plot/plot.component';
2225
MapPropertySheetComponent,
2326
AnimationControlsComponent,
2427
],
25-
imports: [
26-
CommonModule,
27-
HttpClientModule,
28-
MaterialCssVarsModule,
29-
MaterialModule,
30-
],
3128
exports: [
3229
EntryComponent,
3330
ImageComponent,
@@ -38,6 +35,7 @@ import { PlotComponent } from './plot/plot.component';
3835
AnimationControlsComponent,
3936
],
4037
schemas: [CUSTOM_ELEMENTS_SCHEMA],
41-
providers: [],
38+
imports: [CommonModule, MaterialCssVarsModule, MaterialModule],
39+
providers: [provideHttpClient(withInterceptorsFromDi())],
4240
})
4341
export class ComponentsModule {}

0 commit comments

Comments
 (0)