Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 739064f

Browse files
authored
Merge pull request #997 from ghiscoding/bugfix/angular13-downgrade
fix(deps): downgrade to Angular 13 to avoid breaking changes, fixes #994
2 parents a4b51ea + edad232 commit 739064f

File tree

7 files changed

+2503
-3661
lines changed

7 files changed

+2503
-3661
lines changed

.github/renovate.json5

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,27 @@
2626
}
2727
],
2828
schedule: ['on Thursday'],
29-
ignoreDeps: ['typescript'],
29+
ignoreDeps: [
30+
// ignore any of the packages related to Angular major versions, since we will update them manually
31+
'@angular-devkit/build-angular',
32+
'@angular-eslint/builder',
33+
'@angular-eslint/eslint-plugin',
34+
'@angular-eslint/eslint-plugin-template',
35+
'@angular-eslint/schematics',
36+
'@angular-eslint/template-parser',
37+
'@angular/animations',
38+
'@angular/cli',
39+
'@angular/common',
40+
'@angular/compiler',
41+
'@angular/compiler-cli',
42+
'@angular/core',
43+
'@angular/forms',
44+
'@angular/language-service',
45+
'@angular/platform-browser',
46+
'@angular/platform-browser-dynamic',
47+
'@angular/router',
48+
'@ng-select/ng-select',
49+
'ngx-bootstrap',
50+
'typescript'
51+
],
3052
}

angular.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
}
136136
}
137137
},
138+
"defaultProject": "angular-slickgrid",
138139
"schematics": {
139140
"@schematics/angular:component": {
140141
"prefix": "app",
@@ -146,8 +147,6 @@
146147
},
147148
"cli": {
148149
"packageManager": "yarn",
149-
"schematicCollections": [
150-
"@angular-eslint/schematics"
151-
]
150+
"defaultCollection": "@angular-eslint/schematics"
152151
}
153152
}

package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,26 +84,26 @@
8484
"@ngx-translate/core": ">=14.0.0"
8585
},
8686
"devDependencies": {
87-
"@angular-devkit/build-angular": "^14.2.2",
88-
"@angular-eslint/builder": "^14.0.4",
89-
"@angular-eslint/eslint-plugin": "^14.0.4",
90-
"@angular-eslint/eslint-plugin-template": "^14.0.4",
91-
"@angular-eslint/schematics": "^14.0.4",
92-
"@angular-eslint/template-parser": "^14.0.4",
93-
"@angular/animations": "^14.2.1",
94-
"@angular/cli": "^14.2.2",
95-
"@angular/common": "^14.2.1",
96-
"@angular/compiler": "^14.2.1",
97-
"@angular/compiler-cli": "^14.2.1",
98-
"@angular/core": "^14.2.1",
99-
"@angular/forms": "^14.2.1",
100-
"@angular/language-service": "^14.2.1",
101-
"@angular/platform-browser": "^14.2.1",
102-
"@angular/platform-browser-dynamic": "^14.2.1",
103-
"@angular/router": "^14.2.1",
87+
"@angular-devkit/build-angular": "~13.3.9",
88+
"@angular-eslint/builder": "^14.0.2",
89+
"@angular-eslint/eslint-plugin": "^14.0.2",
90+
"@angular-eslint/eslint-plugin-template": "^14.0.2",
91+
"@angular-eslint/schematics": "^14.0.2",
92+
"@angular-eslint/template-parser": "^14.0.2",
93+
"@angular/animations": "^13.3.11",
94+
"@angular/cli": "^13.3.9",
95+
"@angular/common": "^13.3.11",
96+
"@angular/compiler": "^13.3.11",
97+
"@angular/compiler-cli": "^13.3.11",
98+
"@angular/core": "^13.3.11",
99+
"@angular/forms": "^13.3.11",
100+
"@angular/language-service": "^13.3.11",
101+
"@angular/platform-browser": "^13.3.11",
102+
"@angular/platform-browser-dynamic": "^13.3.11",
103+
"@angular/router": "^13.3.11",
104104
"@faker-js/faker": "^7.5.0",
105105
"@fnando/sparkline": "^0.3.10",
106-
"@ng-select/ng-select": "^9.0.2",
106+
"@ng-select/ng-select": "^8.3.0",
107107
"@ngx-translate/core": "^14.0.0",
108108
"@ngx-translate/http-loader": "^7.0.0",
109109
"@slickgrid-universal/composite-editor-component": "~1.4.0",
@@ -116,10 +116,10 @@
116116
"@types/fnando__sparkline": "^0.3.4",
117117
"@types/jest": "^29.0.1",
118118
"@types/moment": "^2.13.0",
119-
"@types/node": "^18.0.0",
119+
"@types/node": "^18.7.16",
120120
"@types/text-encoding-utf-8": "^1.0.2",
121-
"@typescript-eslint/eslint-plugin": "^5.36.2",
122-
"@typescript-eslint/parser": "^5.36.2",
121+
"@typescript-eslint/eslint-plugin": "^5.37.0",
122+
"@typescript-eslint/parser": "^5.37.0",
123123
"autoprefixer": "^10.4.9",
124124
"bootstrap": "^5.2.1",
125125
"conventional-changelog": "^3.1.25",
@@ -130,8 +130,8 @@
130130
"jest": "^29.0.3",
131131
"jest-extended": "^3.1.0",
132132
"jest-preset-angular": "^12.2.2",
133-
"ng-packagr": "^14.2.1",
134-
"ngx-bootstrap": "^9.0.0",
133+
"ng-packagr": "^13.3.1",
134+
"ngx-bootstrap": "^8.0.0",
135135
"npm-run-all2": "^6.0.2",
136136
"postcss": "^8.4.16",
137137
"postcss-cli": "^10.0.0",
@@ -141,7 +141,7 @@
141141
"stream-browserify": "^3.0.0",
142142
"ts-node": "^10.9.1",
143143
"tslib": "^2.4.0",
144-
"typescript": "~4.7.4",
144+
"typescript": "~4.4.4",
145145
"zone.js": "~0.11.8"
146146
},
147147
"engines": {

src/app/app.module.ts

Lines changed: 86 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -86,82 +86,90 @@ export function appInitializerFactory(translate: TranslateService, injector: Inj
8686

8787
// @dynamic
8888
@NgModule({
89-
declarations: [
90-
AppComponent,
91-
CustomTitleFormatterComponent,
92-
EditorNgSelectComponent,
93-
FilterNgSelectComponent,
94-
GridAddItemComponent,
95-
GridAngularComponent,
96-
GridAutoHeightComponent,
97-
GridBasicComponent,
98-
GridClientSideComponent,
99-
GridColspanComponent,
100-
GridCompositeEditorComponent,
101-
GridContextMenuComponent,
102-
GridCustomTooltipComponent,
103-
GridDraggableGroupingComponent,
104-
GridEditorComponent,
105-
GridFormatterComponent,
106-
GridFrozenComponent,
107-
GridGraphqlComponent,
108-
GridGraphqlWithoutPaginationComponent,
109-
GridGroupingComponent,
110-
GridHeaderButtonComponent,
111-
GridHeaderMenuComponent,
112-
GridLocalizationComponent,
113-
GridMenuComponent,
114-
GridOdataComponent,
115-
GridRangeComponent,
116-
GridRemoteComponent,
117-
GridResizeByContentComponent,
118-
GridRowDetailComponent,
119-
GridRowMoveComponent,
120-
GridRowSelectionComponent,
121-
GridStateComponent,
122-
GridTabsComponent,
123-
GridTradingComponent,
124-
GridTreeDataParentChildComponent,
125-
GridTreeDataHierarchicalComponent,
126-
RowDetailPreloadComponent,
127-
RowDetailViewComponent,
128-
SwtCommonGridTestComponent,
129-
SwtCommonGridPaginationComponent,
130-
SwtCommonGridComponent,
131-
HomeComponent
132-
],
133-
imports: [
134-
AppRoutingRoutingModule,
135-
BrowserModule,
136-
FormsModule,
137-
HttpClientModule,
138-
NgSelectModule,
139-
TabsModule.forRoot(),
140-
TranslateModule.forRoot({
141-
loader: {
142-
provide: TranslateLoader,
143-
useFactory: (createTranslateLoader),
144-
deps: [HttpClient]
145-
}
146-
}),
147-
AngularSlickgridModule.forRoot({
148-
// add any Global Grid Options/Config you might want
149-
// to avoid passing the same options over and over in each grids of your App
150-
enableAutoResize: true,
151-
autoResize: {
152-
container: '#grid-container',
153-
rightPadding: 10
154-
}
155-
})
156-
],
157-
providers: [
158-
{
159-
provide: APP_INITIALIZER,
160-
useFactory: appInitializerFactory,
161-
deps: [TranslateService, Injector],
162-
multi: true
163-
}
164-
],
165-
bootstrap: [AppComponent]
89+
declarations: [
90+
AppComponent,
91+
CustomTitleFormatterComponent,
92+
EditorNgSelectComponent,
93+
FilterNgSelectComponent,
94+
GridAddItemComponent,
95+
GridAngularComponent,
96+
GridAutoHeightComponent,
97+
GridBasicComponent,
98+
GridClientSideComponent,
99+
GridColspanComponent,
100+
GridCompositeEditorComponent,
101+
GridContextMenuComponent,
102+
GridCustomTooltipComponent,
103+
GridDraggableGroupingComponent,
104+
GridEditorComponent,
105+
GridFormatterComponent,
106+
GridFrozenComponent,
107+
GridGraphqlComponent,
108+
GridGraphqlWithoutPaginationComponent,
109+
GridGroupingComponent,
110+
GridHeaderButtonComponent,
111+
GridHeaderMenuComponent,
112+
GridLocalizationComponent,
113+
GridMenuComponent,
114+
GridOdataComponent,
115+
GridRangeComponent,
116+
GridRemoteComponent,
117+
GridResizeByContentComponent,
118+
GridRowDetailComponent,
119+
GridRowMoveComponent,
120+
GridRowSelectionComponent,
121+
GridStateComponent,
122+
GridTabsComponent,
123+
GridTradingComponent,
124+
GridTreeDataParentChildComponent,
125+
GridTreeDataHierarchicalComponent,
126+
RowDetailPreloadComponent,
127+
RowDetailViewComponent,
128+
SwtCommonGridTestComponent,
129+
SwtCommonGridPaginationComponent,
130+
SwtCommonGridComponent,
131+
HomeComponent
132+
],
133+
imports: [
134+
AppRoutingRoutingModule,
135+
BrowserModule,
136+
FormsModule,
137+
HttpClientModule,
138+
NgSelectModule,
139+
TabsModule.forRoot(),
140+
TranslateModule.forRoot({
141+
loader: {
142+
provide: TranslateLoader,
143+
useFactory: (createTranslateLoader),
144+
deps: [HttpClient]
145+
}
146+
}),
147+
AngularSlickgridModule.forRoot({
148+
// add any Global Grid Options/Config you might want
149+
// to avoid passing the same options over and over in each grids of your App
150+
enableAutoResize: true,
151+
autoResize: {
152+
container: '#grid-container',
153+
rightPadding: 10
154+
}
155+
})
156+
],
157+
entryComponents: [
158+
// dynamically created components
159+
CustomTitleFormatterComponent,
160+
EditorNgSelectComponent,
161+
FilterNgSelectComponent,
162+
RowDetailPreloadComponent,
163+
RowDetailViewComponent,
164+
],
165+
providers: [
166+
{
167+
provide: APP_INITIALIZER,
168+
useFactory: appInitializerFactory,
169+
deps: [TranslateService, Injector],
170+
multi: true
171+
}
172+
],
173+
bootstrap: [AppComponent]
166174
})
167-
export class AppModule { }
175+
export class AppModule { }

src/app/modules/angular-slickgrid/modules/angular-slickgrid.module.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@ import { BsDropDownService } from '../services/bsDropdown.service';
99
import { ContainerService } from '../services/container.service';
1010

1111
@NgModule({
12-
imports: [
13-
CommonModule,
14-
TranslateModule
15-
],
16-
declarations: [
17-
AngularSlickgridComponent,
18-
],
19-
exports: [
20-
AngularSlickgridComponent,
21-
]
12+
imports: [
13+
CommonModule,
14+
TranslateModule
15+
],
16+
declarations: [
17+
AngularSlickgridComponent,
18+
],
19+
exports: [
20+
AngularSlickgridComponent,
21+
],
22+
entryComponents: [AngularSlickgridComponent]
2223
})
2324
export class AngularSlickgridModule {
2425
static forRoot(config: GridOption = {}): ModuleWithProviders<AngularSlickgridModule> {

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"noImplicitReturns": true,
1515
"emitDecoratorMetadata": true,
1616
"experimentalDecorators": true,
17-
"target": "es2020",
17+
"target": "es2015",
1818
"typeRoots": [
1919
"node_modules/@types",
2020
"typings"

0 commit comments

Comments
 (0)