Skip to content

Commit d6cf613

Browse files
authored
Merge pull request #3405 from IgniteUI/vnext
Promote staging to production
2 parents ca537d0 + b62af53 commit d6cf613

93 files changed

Lines changed: 9888 additions & 7242 deletions

File tree

Some content is hidden

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

.github/workflows/build-app-crm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
strategy:
3131
matrix:
32-
node-version: [16.x, 18.x]
32+
node-version: [18.x, 20.5.x]
3333

3434
# Steps represent a sequence of tasks that will be executed as part of the job
3535
steps:

.github/workflows/build-app-lob.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
strategy:
3636
matrix:
37-
node-version: [16.x, 18.x]
37+
node-version: [18.x, 20.5.x]
3838

3939
# Steps represent a sequence of tasks that will be executed as part of the job
4040
steps:

angular.json

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"root": "",
88
"sourceRoot": "src",
99
"projectType": "application",
10+
"prefix": "app",
1011
"architect": {
1112
"build": {
1213
"builder": "@angular-devkit/build-angular:browser",
@@ -15,7 +16,10 @@
1516
"index": "src/index.html",
1617
"main": "src/main.ts",
1718
"tsConfig": "src/tsconfig.app.json",
18-
"polyfills": "src/polyfills.ts",
19+
"polyfills": [
20+
"zone.js",
21+
"hammerjs"
22+
],
1923
"assets": [
2024
"src/assets",
2125
"src/favicon.ico"
@@ -44,7 +48,6 @@
4448
}
4549
],
4650
"optimization": true,
47-
"aot": true,
4851
"outputHashing": "all",
4952
"namedChunks": false,
5053
"extractLicenses": true,
@@ -63,18 +66,18 @@
6366
"serve": {
6467
"builder": "@angular-devkit/build-angular:dev-server",
6568
"options": {
66-
"browserTarget": "my-app:build"
69+
"buildTarget": "my-app:build"
6770
},
6871
"configurations": {
6972
"production": {
70-
"browserTarget": "my-app:build:production"
73+
"buildTarget": "my-app:build:production"
7174
}
7275
}
7376
},
7477
"extract-i18n": {
7578
"builder": "@angular-devkit/build-angular:extract-i18n",
7679
"options": {
77-
"browserTarget": "my-app:build"
80+
"buildTarget": "my-app:build"
7881
}
7982
},
8083
"test": {
@@ -187,18 +190,18 @@
187190
"serve": {
188191
"builder": "@angular-devkit/build-angular:dev-server",
189192
"options": {
190-
"browserTarget": "app-lob:build"
193+
"buildTarget": "app-lob:build"
191194
},
192195
"configurations": {
193196
"production": {
194-
"browserTarget": "app-lob:build:production"
197+
"buildTarget": "app-lob:build:production"
195198
}
196199
}
197200
},
198201
"extract-i18n": {
199202
"builder": "@angular-devkit/build-angular:extract-i18n",
200203
"options": {
201-
"browserTarget": "app-lob:build"
204+
"buildTarget": "app-lob:build"
202205
}
203206
},
204207
"test": {
@@ -310,18 +313,18 @@
310313
"serve": {
311314
"builder": "@angular-devkit/build-angular:dev-server",
312315
"options": {
313-
"browserTarget": "app-crm:build"
316+
"buildTarget": "app-crm:build"
314317
},
315318
"configurations": {
316319
"production": {
317-
"browserTarget": "app-crm:build:production"
320+
"buildTarget": "app-crm:build:production"
318321
}
319322
}
320323
},
321324
"extract-i18n": {
322325
"builder": "@angular-devkit/build-angular:extract-i18n",
323326
"options": {
324-
"browserTarget": "app-crm:build"
327+
"buildTarget": "app-crm:build"
325328
}
326329
},
327330
"test": {

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
- task: Npm@1
1818
inputs:
1919
command: 'custom'
20-
customCommand: 'install --legacy-peer-deps'
20+
customCommand: 'install'
2121
customEndpoint: 'public proget'
2222
env:
2323
AZURE_PIPELINES: "true"

live-editing/configs/ButtonGroupConfigGenerator.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import {IgxButtonGroupModule,
22
IgxButtonModule,
33
IgxIconModule,
4-
IgxRippleModule} from 'igniteui-angular';
4+
IgxRippleModule,
5+
IgxRadioModule} from 'igniteui-angular';
56
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
67
export class ButtonGroupConfigGenerator implements IConfigGenerator {
78

@@ -48,9 +49,9 @@ export class ButtonGroupConfigGenerator implements IConfigGenerator {
4849
component: 'ButtonGroupSampleComponent',
4950
appModuleConfig: new AppModuleConfig({
5051
imports: ['IgxButtonGroupModule', 'ButtonGroupSampleComponent', 'IgxIconModule',
51-
'IgxButtonModule', 'IgxRippleModule'],
52+
'IgxButtonModule', 'IgxRippleModule', 'IgxRadioModule'],
5253
ngDeclarations: ['ButtonGroupSampleComponent'],
53-
ngImports: ['IgxButtonGroupModule', 'IgxIconModule', 'IgxButtonModule', 'IgxRippleModule']
54+
ngImports: ['IgxButtonGroupModule', 'IgxIconModule', 'IgxButtonModule', 'IgxRippleModule', 'IgxRadioModule']
5455
}),
5556
shortenComponentPathBy: "/data-entries/buttonGroup/"
5657
}));

live-editing/configs/DropDownConfigGenerator.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import {
2121
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
2222
export class DropDownConfigGenerator implements IConfigGenerator {
2323
public additionalImports = {
24-
RemoteNWindService: '../../src/app/services/remoteNwind.service'
24+
RemoteNWindService: '../../src/app/services/remoteNwind.service',
25+
MultiLevelDirective: '../../src/app/data-entries/dropdown/dropdown-multi-level-menu/multi-level.directive'
2526
};
2627
public generateConfigs(): Config[] {
2728
const configs = new Array<Config>();
@@ -101,6 +102,20 @@ export class DropDownConfigGenerator implements IConfigGenerator {
101102
shortenComponentPathBy: '/data-entries/dropdown/'
102103
}));
103104

105+
configs.push(new Config({
106+
component: 'DropdownMultiLevelMenuComponent',
107+
additionalFiles: ['/src/app/data-entries/dropdown/dropdown-multi-level-menu/data.ts',
108+
'/src/app/data-entries/dropdown/dropdown-multi-level-menu/multi-level.directive.ts',
109+
'/src/app/data-entries/dropdown/dropdown-multi-level-menu/multi-level.service.ts'],
110+
appModuleConfig: new AppModuleConfig({
111+
imports: ['DropdownMultiLevelMenuComponent', 'MultiLevelDirective',
112+
'IgxDropDownModule', 'IgxIconModule', 'IgxNavbarModule', 'IgxButtonModule', 'IgxToggleModule'],
113+
ngDeclarations: ['DropdownMultiLevelMenuComponent', 'MultiLevelDirective'],
114+
ngImports: ['IgxDropDownModule', 'IgxIconModule', 'IgxNavbarModule', 'IgxButtonModule', 'IgxToggleModule']
115+
}),
116+
shortenComponentPathBy: '/data-entries/dropdown/'
117+
}));
118+
104119
configs.push(new Config({
105120
component: 'DropDownVirtualComponent',
106121
appModuleConfig: new AppModuleConfig({

live-editing/configs/GridConfigGenerator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,10 @@ export class GridConfigGenerator implements IConfigGenerator {
770770
'/src/app/grid/grid-save-state/about.component.html'
771771
],
772772
appModuleConfig: new AppModuleConfig({
773-
imports: ['GridSaveStateComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxCheckboxModule', 'IgxIconModule',
773+
imports: ['GridSaveStateComponent', 'IgxGridModule', 'IgxTooltipModule', 'IgxCheckboxModule', 'IgxIconModule', 'IgxButtonModule',
774774
'IgxToastModule', 'IgxSwitchModule', 'AboutComponent', 'Router', 'RouterModule', 'IgxPreventDocumentScrollModule'],
775775
ngDeclarations: ['GridSaveStateComponent', 'AboutComponent'],
776-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxTooltipModule', 'IgxCheckboxModule', 'IgxIconModule',
776+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxTooltipModule', 'IgxCheckboxModule', 'IgxIconModule', 'IgxButtonModule',
777777
'RouterModule.forRoot([\{component: AboutComponent, path: \'grid-about\'},\{component: GridSaveStateComponent, path: \'grid-state\'},\{ path: \'\', redirectTo: \'/grid-state\', pathMatch: \'full\' }])',
778778
'IgxToastModule', 'IgxSwitchModule']
779779
})

live-editing/configs/TreeGridConfigGenerator.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,9 +1022,9 @@ export class TreeGridConfigGenerator implements IConfigGenerator {
10221022
'/src/app/tree-grid/tree-grid-save-state/about.component.ts',
10231023
'/src/app/tree-grid/tree-grid-save-state/about.component.html'],
10241024
appModuleConfig: new AppModuleConfig({
1025-
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxCheckboxModule', 'IgxIconModule', 'TGridSaveStateComponent', 'TGridAboutComponent', 'Router', 'RouterModule'],
1025+
imports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxCheckboxModule', 'IgxIconModule', 'IgxButtonModule', 'TGridSaveStateComponent', 'TGridAboutComponent', 'Router', 'RouterModule'],
10261026
ngDeclarations: ['TGridSaveStateComponent', 'TGridAboutComponent'],
1027-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxCheckboxModule', 'IgxIconModule',
1027+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxTreeGridModule', 'IgxCheckboxModule', 'IgxIconModule', 'IgxButtonModule',
10281028
'RouterModule.forRoot([\{component: TGridAboutComponent, path: \'tree-grid-state-about\'},\{component: TGridSaveStateComponent, path: \'tree-grid-state\'},\{ path: \'\', redirectTo: \'/tree-grid-state\', pathMatch: \'full\' }])']
10291029

10301030
}),

0 commit comments

Comments
 (0)