Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a085ff3

Browse files
edbznedbzn
authored
Merge branch 'main' into fix/rm-scroll
2 parents 7766fbf + 3455de4 commit a085ff3

File tree

205 files changed

+3531
-4433
lines changed

Some content is hidden

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

205 files changed

+3531
-4433
lines changed

‎.eslintrc.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -38,7 +38,7 @@
3838
"extends": [
3939
"prettier",
4040
"eslint:recommended",
41-
"plugin:@nrwl/nx/typescript",
41+
"plugin:@nx/typescript",
4242
"plugin:@angular-eslint/recommended",
4343
"plugin:@typescript-eslint/recommended"
4444
],
@@ -61,7 +61,7 @@
6161
"extends": [
6262
"prettier",
6363
"plugin:@angular-eslint/template/recommended",
64-
"plugin:@nrwl/nx/javascript"
64+
"plugin:@nx/javascript"
6565
],
6666
"rules": {
6767
"@typescript-eslint/no-non-null-assertion": "off"

‎apps/demos/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
}
113113
},
114114
"test": {
115-
"executor": "@nrwl/jest:jest",
115+
"executor": "@nx/jest:jest",
116116
"options": {
117117
"jestConfig": "apps/demos/jest.config.ts",
118118
"passWithNoTests": true

‎apps/demos/src/app/app-component/app-control-panel/app-control-panel.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/materia
99
import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
1010
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
1111
import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list';
12-
import { LetModule } from '@rx-angular/template/let';
12+
import { RxLet } from '@rx-angular/template/let';
1313
import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox';
1414
import { StrategySelectModule } from '../../shared/debug-helper/strategy-select';
1515
import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
@@ -25,7 +25,7 @@ import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/mat
2525
MatFormFieldModule,
2626
MatSelectModule,
2727
MatButtonModule,
28-
LetModule,
28+
RxLet,
2929
MatListModule,
3030
MatCheckboxModule,
3131
StrategySelectModule,

‎apps/demos/src/app/app-shell/app-shell.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { AppShellComponent } from './app-shell-component/app-shell.component';
1717
import { AppShellSideNavItemDirective } from './side-nav/side-nav-item.directive';
1818
import { AppShellSideNavComponent } from './side-nav/side-nav.component';
1919
import { RxLetModule } from '../rx-angular-pocs/template/directives/let';
20-
import { IfModule } from '@rx-angular/template/if';
20+
import { RxIf } from '@rx-angular/template/if';
2121

2222
const exportedDeclarations = [
2323
AppShellHeaderContent,
@@ -40,7 +40,7 @@ const exportedDeclarations = [
4040
MatSelectModule,
4141
CdkTreeModule,
4242
RxLetModule,
43-
IfModule,
43+
RxIf,
4444
],
4545
exports: exportedDeclarations,
4646
})

‎apps/demos/src/app/features/concepts/coalescing/coalescing.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
4-
import { PushModule } from '@rx-angular/template/push';
5-
import { UnpatchModule } from '@rx-angular/template/unpatch';
4+
import { RxPush } from '@rx-angular/template/push';
5+
import { RxUnpatch } from '@rx-angular/template/unpatch';
66

77
import { ROUTES } from './coalescing.routes';
88
import { CoalescingComponent } from './coalescing/coalescing.component';
@@ -19,9 +19,9 @@ const DECLARATIONS = [CoalescingComponent];
1919
RouterModule.forChild(ROUTES),
2020
VisualizerModule,
2121
StrategySelectModule,
22-
UnpatchModule,
22+
RxUnpatch,
2323
MatButtonModule,
24-
PushModule,
24+
RxPush,
2525
],
2626
providers: [],
2727
exports: [DECLARATIONS],

‎apps/demos/src/app/features/concepts/nested-vs-injected/nested-vs-injected.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { RouterModule } from '@angular/router';
44
import { ROUTES } from './nested-vs-injected.routes';
55
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
66
import { DirtyChecksModule } from '../../../shared/debug-helper/dirty-checks';
7-
import { UnpatchModule } from '@rx-angular/template/unpatch';
7+
import { RxUnpatch } from '@rx-angular/template/unpatch';
88
import { DetectChangesInjectedComponent } from './injected/detect-changes.injected.component';
99
import { CdDefaultModule } from '../../../shared/debug-helper/cd-default/cd-default.module';
1010
import { VisualizerModule } from '../../../shared/debug-helper/visualizer';
@@ -39,7 +39,7 @@ import { MatButtonToggleModule } from '@angular/material/button-toggle';
3939
RouterModule.forChild(ROUTES),
4040
MatButtonModule,
4141
DirtyChecksModule,
42-
UnpatchModule,
42+
RxUnpatch,
4343
CdDefaultModule,
4444
VisualizerModule,
4545
CdOnPushModule,

‎apps/demos/src/app/features/concepts/passing-values/passing-values.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy
66
import { RouterModule } from '@angular/router';
77
import { ROUTES } from './passing-values.routes';
88
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
9-
import { PushModule } from '@rx-angular/template/push';
10-
import { UnpatchModule } from '@rx-angular/template/unpatch';
9+
import { RxPush } from '@rx-angular/template/push';
10+
import { RxUnpatch } from '@rx-angular/template/unpatch';
1111
import { PassingValuesComponent } from './passing-values.component';
1212
import { VisualizerModule } from '../../../shared/debug-helper/visualizer';
1313
import { ValueProvidersModule } from '../../../shared/debug-helper/value-provider';
@@ -29,9 +29,9 @@ import { FormsModule } from '@angular/forms';
2929
MatIconModule,
3030
RecursiveModule,
3131
FormsModule,
32-
UnpatchModule,
32+
RxUnpatch,
3333
MatButtonModule,
34-
PushModule,
34+
RxPush,
3535
],
3636
exports: [],
3737
})

‎apps/demos/src/app/features/concepts/projected-views/projected-views.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
4-
import { UnpatchModule } from '@rx-angular/template/unpatch';
4+
import { RxUnpatch } from '@rx-angular/template/unpatch';
55
import { StrategySelectModule } from '../../../shared/debug-helper/strategy-select/strategy-select.module';
66
import { ROUTES } from './projected-views.routes';
77
import { ProjectedViewsComponent } from './projected-views.component';
@@ -21,7 +21,7 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega
2121
CommonModule,
2222
RouterModule.forChild(ROUTES),
2323
VisualizerModule,
24-
UnpatchModule,
24+
RxUnpatch,
2525
MatButtonModule,
2626
RxLetModule,
2727
StrategySelectModule,

‎apps/demos/src/app/features/concepts/scheduling/scheduling.module.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
44
import { SchedulingComponent } from './scheduling/scheduling.component';
5-
import { PushModule } from '@rx-angular/template/push';
6-
import { LetModule } from '@rx-angular/template/let';
7-
import { UnpatchModule } from '@rx-angular/template/unpatch';
5+
import { RxPush } from '@rx-angular/template/push';
6+
import { RxLet } from '@rx-angular/template/let';
7+
import { RxUnpatch } from '@rx-angular/template/unpatch';
88
import { ROUTES } from './scheduling.routes';
99
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
1010
import { VisualizerModule } from '../../../shared/debug-helper/visualizer';
@@ -16,9 +16,9 @@ const DECLARATIONS = [SchedulingComponent];
1616
imports: [
1717
CommonModule,
1818
RouterModule.forChild(ROUTES),
19-
LetModule,
20-
PushModule,
21-
UnpatchModule,
19+
RxLet,
20+
RxPush,
21+
RxUnpatch,
2222
MatButtonModule,
2323
VisualizerModule,
2424
],

‎apps/demos/src/app/features/concepts/view-vs-embedded-view/view-vs-embedded-view.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { OriginalLetDirective } from './original-let.directive';
44
import { Poc1LetDirective } from './poc1-let.directive';
55
import { ViewVsEmbeddedViewComponent } from './view-vs-embedded-view.component';
66
import { VisualizerModule } from '../../../shared/debug-helper/visualizer';
7-
import { UnpatchModule } from '@rx-angular/template/unpatch';
7+
import { RxUnpatch } from '@rx-angular/template/unpatch';
88
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
99

1010
@NgModule({
@@ -14,6 +14,6 @@ import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/lega
1414
ViewVsEmbeddedViewComponent,
1515
],
1616
exports: [Poc1LetDirective],
17-
imports: [CommonModule, VisualizerModule, UnpatchModule, MatButtonModule],
17+
imports: [CommonModule, VisualizerModule, RxUnpatch, MatButtonModule],
1818
})
1919
export class ViewVsEmbeddedViewModule {}

‎apps/demos/src/app/features/concepts/zone-patched-apis/zone-patched-apis.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
44
import { ROUTES } from './zone-patched-apis.routes';
55
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
6-
import { PushModule } from '@rx-angular/template/push';
7-
import { UnpatchModule } from '@rx-angular/template/unpatch';
6+
import { RxPush } from '@rx-angular/template/push';
7+
import { RxUnpatch } from '@rx-angular/template/unpatch';
88
import { ZonePatchedApisComponent } from './zone-patched-apis.component';
99
import { DirtyChecksModule } from '../../../shared/debug-helper/dirty-checks';
1010
import { VisualizerModule } from '../../../shared/debug-helper/visualizer/visualizer.module';
@@ -18,8 +18,8 @@ import { ValueProvidersModule } from '../../../shared/debug-helper/value-provide
1818
RouterModule.forChild(ROUTES),
1919
MatButtonModule,
2020
DirtyChecksModule,
21-
UnpatchModule,
22-
PushModule,
21+
RxUnpatch,
22+
RxPush,
2323
VisualizerModule,
2424
CdDefaultModule,
2525
ValueProvidersModule,

‎apps/demos/src/app/features/experiments/state/rx-state.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-l
99
import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
1010
import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table';
1111
import { MatToolbarModule } from '@angular/material/toolbar';
12-
import { PushModule } from '@rx-angular/template/push';
13-
import { LetModule } from '@rx-angular/template/let';
12+
import { RxPush } from '@rx-angular/template/push';
13+
import { RxLet } from '@rx-angular/template/let';
1414
import { RouterModule } from '@angular/router';
1515
import { ROUTES as RX_STATE_ROUTES } from './rx-state.routes';
1616

@@ -45,8 +45,8 @@ import { RxStateSelectSliceComponent } from './selectslice/select-slice.componen
4545
MatFormFieldModule,
4646
MatInputModule,
4747
MatSelectModule,
48-
LetModule,
49-
PushModule,
48+
RxLet,
49+
RxPush,
5050
FormsModule,
5151
ReactiveFormsModule,
5252
],

‎apps/demos/src/app/features/experiments/structural-directives/if-visible-poc/if-visible.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { VisualizerModule } from '../../../../shared/debug-helper/visualizer';
33
import { ValueProvidersModule } from '../../../../shared/debug-helper/value-provider';
44
import { IfVisibleComponent } from './if-visible.component';
55
import { RxLetModule } from '../../../../rx-angular-pocs';
6-
import { IfModule } from '@rx-angular/template/if';
6+
import { RxIf } from '@rx-angular/template/if';
77

88
const DECLARATIONS = [IfVisibleComponent];
99

1010
@NgModule({
1111
declarations: DECLARATIONS,
12-
imports: [VisualizerModule, ValueProvidersModule, RxLetModule, IfModule],
12+
imports: [VisualizerModule, ValueProvidersModule, RxLetModule, RxIf],
1313
exports: DECLARATIONS,
1414
providers: [],
1515
})

‎apps/demos/src/app/features/experiments/structural-directives/rx-switch-poc/rx-switch-poc.module.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { CommonModule } from '@angular/common';
33
import { RouterModule } from '@angular/router';
44
import { ROUTES } from './rx-switch-poc.routes';
55
import { VisualizerModule } from '../../../../shared/debug-helper/visualizer';
6-
import { PushModule } from '@rx-angular/template/push';
7-
import { LetModule } from '@rx-angular/template/let';
8-
import { UnpatchModule } from '@rx-angular/template/unpatch';
6+
import { RxPush } from '@rx-angular/template/push';
7+
import { RxLet } from '@rx-angular/template/let';
8+
import { RxUnpatch } from '@rx-angular/template/unpatch';
99
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
1010
import { RxSwitchPocComponent } from './rx-switch-poc.component';
1111
import { DirtyChecksModule } from '../../../../shared/debug-helper/dirty-checks';
@@ -14,7 +14,7 @@ import { MatLegacySliderModule as MatSliderModule } from '@angular/material/lega
1414
import { MatButtonToggleModule } from '@angular/material/button-toggle';
1515
import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
1616
import { RxSwichModule } from '../../../../rx-angular-pocs/';
17-
import { IfModule } from '@rx-angular/template/if';
17+
import { RxIf } from '@rx-angular/template/if';
1818
import { ValueProvidersModule } from '../../../../shared/debug-helper/value-provider';
1919

2020
@NgModule({
@@ -23,16 +23,16 @@ import { ValueProvidersModule } from '../../../../shared/debug-helper/value-prov
2323
CommonModule,
2424
RouterModule.forChild(ROUTES),
2525
VisualizerModule,
26-
UnpatchModule,
26+
RxUnpatch,
2727
MatButtonModule,
2828
DirtyChecksModule,
29-
PushModule,
30-
LetModule,
29+
RxPush,
30+
RxLet,
3131
MatFormFieldModule,
3232
MatSliderModule,
3333
MatButtonToggleModule,
3434
MatInputModule,
35-
IfModule,
35+
RxIf,
3636
RxSwichModule,
3737
ValueProvidersModule,
3838
],

‎apps/demos/src/app/features/integrations/dynamic-counter/shared/shared.module.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
44
import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
5-
import { PushModule } from '@rx-angular/template/push';
6-
import { LetModule } from '@rx-angular/template/let';
5+
import { RxPush } from '@rx-angular/template/push';
6+
import { RxLet } from '@rx-angular/template/let';
77
import { CounterDisplayComponent } from './counter-display.component';
88
import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field';
99
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -13,16 +13,16 @@ const DECLARATIONS = [CounterDisplayComponent];
1313

1414
@NgModule({
1515
declarations: DECLARATIONS,
16-
imports: [CommonModule, LetModule, PushModule, UtilsModule],
16+
imports: [CommonModule, RxLet, RxPush, UtilsModule],
1717
exports: [
1818
DECLARATIONS,
1919
FormsModule,
2020
ReactiveFormsModule,
2121
MatInputModule,
2222
MatButtonModule,
2323
MatFormFieldModule,
24-
LetModule,
25-
PushModule,
24+
RxLet,
25+
RxPush,
2626
UtilsModule,
2727
],
2828
})

‎apps/demos/src/app/features/integrations/pokemon-pagination/pokemon-pagination.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import { MatLegacyPaginatorModule as MatPaginatorModule } from '@angular/materia
77
import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
88
import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table';
99
import { RouterModule } from '@angular/router';
10-
import { LetModule } from '@rx-angular/template/let';
10+
import { RxLet } from '@rx-angular/template/let';
1111
import { ROUTES } from './pokemon-pagination.routes';
1212
import { PokemonComponent } from './pokemon.component';
1313

1414
@NgModule({
1515
imports: [
1616
CommonModule,
1717
HttpClientModule,
18-
LetModule,
18+
RxLet,
1919
RouterModule.forChild(ROUTES),
2020
ReactiveFormsModule,
2121
MatTableModule,

‎apps/demos/src/app/features/performance/rx-let-vs-push/rx-let-vs-push.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import { RenderingWorkModule } from '../../../shared/debug-helper/rendering-work
55
import { RouterModule } from '@angular/router';
66
import { ROUTES as RX_LET_VS_PUSH_ROUTES } from './rx-let-vs-push.routes';
77
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
8-
import { PushModule } from '@rx-angular/template/push';
9-
import { LetModule } from '@rx-angular/template/let';
8+
import { RxPush } from '@rx-angular/template/push';
9+
import { RxLet } from '@rx-angular/template/let';
1010
import { ListToggleTestComponent } from './list-toggle-test-component/list-toggle-test.component';
1111

1212
@NgModule({
1313
declarations: [RxLetVsPushComponent, ListToggleTestComponent],
1414
imports: [
15-
LetModule,
16-
PushModule,
15+
RxLet,
16+
RxPush,
1717
CommonModule,
1818
RenderingWorkModule,
1919
MatButtonModule,

‎apps/demos/src/app/features/template/pipes/memo-poc/memo-poc.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33
import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
44
import { RouterModule } from '@angular/router';
5-
import { UnpatchModule } from '@rx-angular/template/unpatch';
5+
import { RxUnpatch } from '@rx-angular/template/unpatch';
66
import { DirtyChecksModule } from '../../../../shared/debug-helper/dirty-checks';
77
import { MemoPocComponent } from './memo-poc.component';
88
import { ROUTES } from './memo-poc.routes';
@@ -21,7 +21,7 @@ const DECLARATIONS = [MemoPocComponent, FibonacciPipe, FibonacciMemoPipe];
2121
PushModule,
2222
DirtyChecksModule,
2323
MatButtonModule,
24-
UnpatchModule,
24+
RxUnpatch,
2525
MatButtonToggleModule,
2626
MemoModule,
2727
],

0 commit comments

Comments
 (0)