Update ng version to 17

DevExpress · Nov 25, 2024 · 5903a2b · 5903a2b
1 parent 370999e
commit 5903a2b
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 867 deletions.
diff --git a/packages/devextreme-schematics/package-lock.json b/packages/devextreme-schematics/package-lock.json
diff --git a/packages/devextreme-schematics/package.json b/packages/devextreme-schematics/package.json
@@ -22,17 +22,17 @@
   ],
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "^16.2.10",
-    "@angular-devkit/schematics": "^16.2.10",
-    "@schematics/angular": "^16.2.10"
+    "@angular-devkit/core": "^17.2.1",
+    "@angular-devkit/schematics": "^17.2.1",
+    "@schematics/angular": "^17.2.1"
   },
   "devDependencies": {
     "@types/jasmine": "~3.10.18",
-    "@types/node": "ts4.9",
+    "@types/node": "ts5.2",
     "@types/semver": "^7.5.7",
     "jasmine": "^2.99.0",
     "rxjs": "^6.6.7",
     "tslint": "^5.20.1",
-    "typescript": "^4.9.3"
+    "typescript": "~5.2.1"
   }
 }
diff --git a/packages/devextreme-schematics/src/add-app-template/schema.json b/packages/devextreme-schematics/src/add-app-template/schema.json
@@ -43,7 +43,7 @@
     },
     "globalNgCliVersion": {
       "type":"string",
-      "default": "^16.2.0"
+      "default": "^17.2.0"
     },
     "empty": {
       "type": "boolean",

diff --git a/packages/devextreme-schematics/src/add-layout/index_spec.ts b/packages/devextreme-schematics/src/add-layout/index_spec.ts
@@ -20,18 +20,19 @@ describe('layout', () => {
     routing: false,
     style: 'scss',
     skipTests: false,
-    skipPackageJson: false
+    skipPackageJson: false,
+    standalone: false
   };
 
   const workspaceOptions: WorkspaceOptions = {
     name: 'workspace',
-    version: '16.0.0'
+    version: '17.0.0'
   };
 
   const options: any = {
     layout: 'side-nav-outer-toolbar',
     resolveConflicts: 'override',
-    globalNgCliVersion: '^16.2.0'
+    globalNgCliVersion: '^17.2.0'
   };
 
   const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
@@ -181,7 +182,7 @@ describe('layout', () => {
     const tree = await runner.runSchematic('add-layout', options, appTree);
     const packageConfig = JSON.parse(tree.readContent('package.json'));
 
-    expect(packageConfig.dependencies['@angular/cdk']).toBe('~16.2.0');
+    expect(packageConfig.dependencies['@angular/cdk']).toBe('~17.2.0');
   });
 
   it('should update budgets if updateBudgets option is true', async () => {
@@ -231,7 +232,7 @@ describe('layout', () => {
 
     const appContent = tree.readContent('/src/app/app.component.ts');
     expect(appContent).toMatch(/templateUrl: '.\/app.component.html',/);
-    expect(appContent).toMatch(/styleUrls: \['.\/app.component.scss'\]/);
+    expect(appContent).toMatch(/styleUrl: '.\/app.component.scss'/);
 
     const newAppContent = tree.readContent('/src/app/app1.component.ts');
     expect(newAppContent).toMatch(/templateUrl: '.\/app1.component.html',/);
@@ -279,7 +280,8 @@ describe('layout', () => {
     appTree = await schematicRunner.runSchematic('application', {
       ...appOptions,
       name: 'testApp2',
-      projectRoot: 'projects/testApp2'
+      projectRoot: 'projects/testApp2',
+      standalone: false
     }, appTree);
 
     const runner = new SchematicTestRunner('schematics', collectionPath);
@@ -299,7 +301,8 @@ describe('layout', () => {
       ...appOptions,
       name: 'testApp2',
       prefix: 'app2',
-      projectRoot: 'projects/testApp2'
+      projectRoot: 'projects/testApp2',
+      standalone: false
     }, appTree);
 
     const runner = new SchematicTestRunner('schematics', collectionPath);

diff --git a/packages/devextreme-schematics/src/add-layout/schema.json b/packages/devextreme-schematics/src/add-layout/schema.json
@@ -49,7 +49,7 @@
     },
     "globalNgCliVersion": {
       "type":"string",
-      "default": "16.2.0"
+      "default": "17.2.0"
     }
   }
 }
diff --git a/packages/devextreme-schematics/src/add-sample-views/index_spec.ts b/packages/devextreme-schematics/src/add-sample-views/index_spec.ts
@@ -13,7 +13,8 @@ describe('sample views', () => {
     routing: true,
     style: 'css',
     skipTests: false,
-    skipPackageJson: false
+    skipPackageJson: false,
+    standalone: false
   };
 
   const workspaceOptions: WorkspaceOptions = {

diff --git a/packages/devextreme-schematics/src/add-view/index.ts b/packages/devextreme-schematics/src/add-view/index.ts
@@ -152,7 +152,8 @@ export default function(options: any): Rule {
         module,
         skipTests: options.skipTests,
         inlineStyle: options.inlineStyle,
-        prefix: options.prefix
+        prefix: options.prefix,
+        standalone: false
       }),
       addContentToView({ name, project }) as any
     ];

diff --git a/packages/devextreme-schematics/src/add-view/index_spec.ts b/packages/devextreme-schematics/src/add-view/index_spec.ts
@@ -13,7 +13,8 @@ describe('view', () => {
     routing: true,
     style: 'css',
     skipTests: false,
-    skipPackageJson: false
+    skipPackageJson: false,
+    standalone: false
   };
 
   const workspaceOptions: WorkspaceOptions = {

diff --git a/packages/devextreme-schematics/src/install/index_spec.ts b/packages/devextreme-schematics/src/install/index_spec.ts
@@ -20,7 +20,7 @@ describe('install', () => {
 
   const workspaceOptions: WorkspaceOptions = {
     name: 'workspace',
-    version: '16.0.0'
+    version: '17.0.0'
   };
 
   const angularSchematicsCollection = require.resolve('../../node_modules/@schematics/angular/collection.json');
@@ -86,7 +86,8 @@ describe('install', () => {
       routing: true,
       style: 'css',
       skipTests: false,
-      skipPackageJson: false
+      skipPackageJson: false,
+      standalone: false
     };
 
     appTree = await schematicRunner.runSchematic('application', secondAppOptions, appTree);