Skip to content

Commit 5903a2b

Browse files
Update ng version to 17
1 parent 370999e commit 5903a2b

File tree

9 files changed

+68
-867
lines changed

9 files changed

+68
-867
lines changed

packages/devextreme-schematics/package-lock.json

Lines changed: 42 additions & 848 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/devextreme-schematics/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
],
2323
"schematics": "./src/collection.json",
2424
"dependencies": {
25-
"@angular-devkit/core": "^16.2.10",
26-
"@angular-devkit/schematics": "^16.2.10",
27-
"@schematics/angular": "^16.2.10"
25+
"@angular-devkit/core": "^17.2.1",
26+
"@angular-devkit/schematics": "^17.2.1",
27+
"@schematics/angular": "^17.2.1"
2828
},
2929
"devDependencies": {
3030
"@types/jasmine": "~3.10.18",
31-
"@types/node": "ts4.9",
31+
"@types/node": "ts5.2",
3232
"@types/semver": "^7.5.7",
3333
"jasmine": "^2.99.0",
3434
"rxjs": "^6.6.7",
3535
"tslint": "^5.20.1",
36-
"typescript": "^4.9.3"
36+
"typescript": "~5.2.1"
3737
}
3838
}

packages/devextreme-schematics/src/add-app-template/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"globalNgCliVersion": {
4545
"type":"string",
46-
"default": "^16.2.0"
46+
"default": "^17.2.0"
4747
},
4848
"empty": {
4949
"type": "boolean",

packages/devextreme-schematics/src/add-layout/index_spec.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@ describe('layout', () => {
2020
routing: false,
2121
style: 'scss',
2222
skipTests: false,
23-
skipPackageJson: false
23+
skipPackageJson: false,
24+
standalone: false
2425
};
2526

2627
const workspaceOptions: WorkspaceOptions = {
2728
name: 'workspace',
28-
version: '16.0.0'
29+
version: '17.0.0'
2930
};
3031

3132
const options: any = {
3233
layout: 'side-nav-outer-toolbar',
3334
resolveConflicts: 'override',
34-
globalNgCliVersion: '^16.2.0'
35+
globalNgCliVersion: '^17.2.0'
3536
};
3637

3738
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
@@ -181,7 +182,7 @@ describe('layout', () => {
181182
const tree = await runner.runSchematic('add-layout', options, appTree);
182183
const packageConfig = JSON.parse(tree.readContent('package.json'));
183184

184-
expect(packageConfig.dependencies['@angular/cdk']).toBe('~16.2.0');
185+
expect(packageConfig.dependencies['@angular/cdk']).toBe('~17.2.0');
185186
});
186187

187188
it('should update budgets if updateBudgets option is true', async () => {
@@ -231,7 +232,7 @@ describe('layout', () => {
231232

232233
const appContent = tree.readContent('/src/app/app.component.ts');
233234
expect(appContent).toMatch(/templateUrl: '.\/app.component.html',/);
234-
expect(appContent).toMatch(/styleUrls: \['.\/app.component.scss'\]/);
235+
expect(appContent).toMatch(/styleUrl: '.\/app.component.scss'/);
235236

236237
const newAppContent = tree.readContent('/src/app/app1.component.ts');
237238
expect(newAppContent).toMatch(/templateUrl: '.\/app1.component.html',/);
@@ -279,7 +280,8 @@ describe('layout', () => {
279280
appTree = await schematicRunner.runSchematic('application', {
280281
...appOptions,
281282
name: 'testApp2',
282-
projectRoot: 'projects/testApp2'
283+
projectRoot: 'projects/testApp2',
284+
standalone: false
283285
}, appTree);
284286

285287
const runner = new SchematicTestRunner('schematics', collectionPath);
@@ -299,7 +301,8 @@ describe('layout', () => {
299301
...appOptions,
300302
name: 'testApp2',
301303
prefix: 'app2',
302-
projectRoot: 'projects/testApp2'
304+
projectRoot: 'projects/testApp2',
305+
standalone: false
303306
}, appTree);
304307

305308
const runner = new SchematicTestRunner('schematics', collectionPath);

packages/devextreme-schematics/src/add-layout/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
"globalNgCliVersion": {
5151
"type":"string",
52-
"default": "16.2.0"
52+
"default": "17.2.0"
5353
}
5454
}
5555
}

packages/devextreme-schematics/src/add-sample-views/index_spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ describe('sample views', () => {
1313
routing: true,
1414
style: 'css',
1515
skipTests: false,
16-
skipPackageJson: false
16+
skipPackageJson: false,
17+
standalone: false
1718
};
1819

1920
const workspaceOptions: WorkspaceOptions = {

packages/devextreme-schematics/src/add-view/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ export default function(options: any): Rule {
152152
module,
153153
skipTests: options.skipTests,
154154
inlineStyle: options.inlineStyle,
155-
prefix: options.prefix
155+
prefix: options.prefix,
156+
standalone: false
156157
}),
157158
addContentToView({ name, project }) as any
158159
];

packages/devextreme-schematics/src/add-view/index_spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ describe('view', () => {
1313
routing: true,
1414
style: 'css',
1515
skipTests: false,
16-
skipPackageJson: false
16+
skipPackageJson: false,
17+
standalone: false
1718
};
1819

1920
const workspaceOptions: WorkspaceOptions = {

packages/devextreme-schematics/src/install/index_spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('install', () => {
2020

2121
const workspaceOptions: WorkspaceOptions = {
2222
name: 'workspace',
23-
version: '16.0.0'
23+
version: '17.0.0'
2424
};
2525

2626
const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
@@ -86,7 +86,8 @@ describe('install', () => {
8686
routing: true,
8787
style: 'css',
8888
skipTests: false,
89-
skipPackageJson: false
89+
skipPackageJson: false,
90+
standalone: false
9091
};
9192

9293
appTree = await schematicRunner.runSchematic('application', secondAppOptions, appTree);

0 commit comments

Comments
 (0)