Skip to content

Commit 97a3985

Browse files
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into vNext
2 parents bc7d092 + 458a654 commit 97a3985

21 files changed

Lines changed: 4767 additions & 3355 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v2
3434

3535
- name: Install dependencies
36-
run: npm ci
36+
run: npm ci --force
3737

3838
- name: Run lint
3939
run: npm run lint

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/checkout@v2
3939

4040
- name: Install dependencies
41-
run: npm ci
41+
run: npm ci --force
4242

4343
- name: Run lint
4444
run: npm run lint

angular.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@
357357
}
358358
}
359359
},
360-
"defaultProject": "my-app",
361360
"schematics": {
362361
"@schematics/angular:component": {
363362
"prefix": "app",

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
- script: npm config set $(igScope):_auth=$(token)
1313
displayName: 'Npm config auth'
1414

15-
- script: npm ci
15+
- script: npm ci --force
1616
displayName: 'Install dependencies'
1717
env:
1818
AZURE_PIPELINES: "true"

live-editing/configs/InputGroupConfigGenerator.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ export class InputGroupConfigGenerator implements IConfigGenerator {
6868
appModuleConfig: new AppModuleConfig({
6969
imports: ['IgxIconModule', 'IgxInputGroupModule', 'IgxButtonModule',
7070
'IgxRippleModule', 'ReactiveFormsSampleComponent', 'IgxDatePickerModule', 'IgxTimePickerModule',
71-
'IgxComboModule', 'FormsModule', 'ReactiveFormsModule', 'IgxDropDownModule', 'IgxSelectModule'],
71+
'IgxComboModule', 'ReactiveFormsModule', 'IgxDropDownModule', 'IgxSelectModule'],
72+
7273
ngDeclarations: ['ReactiveFormsSampleComponent'],
7374
ngImports: ['IgxIconModule', 'IgxInputGroupModule', 'IgxButtonModule',
74-
'IgxRippleModule', 'IgxDatePickerModule', 'IgxTimePickerModule', 'IgxComboModule',
75-
'FormsModule', 'ReactiveFormsModule', 'IgxDropDownModule', 'IgxSelectModule']
75+
'IgxRippleModule', 'IgxDatePickerModule', 'IgxTimePickerModule', 'IgxComboModule', 'ReactiveFormsModule', 'IgxDropDownModule', 'IgxSelectModule']
7676
}),
7777
shortenComponentPathBy: "/data-entries/"
7878
}));

0 commit comments

Comments
 (0)