Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const { getPackageJsonPath } = require('../utility/package-json-utils');
const modifyJson = require('../utility/modify-json-file');
const schematicsVersion = latestVersions['devextreme-schematics'] || 'latest';

const minNgCliVersion = new semver('20.0.0');
const ngCliWithZoneless = new semver('20.0.0');
const minNgCliVersion = new semver('21.0.0');
const ngCliWithZoneless = new semver('21.0.0');

async function runSchematicCommand(schematicCommand, options, evaluatingOptions) {
const collectionName = 'devextreme-schematics';
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-cli/src/utility/ng-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const getLocalNgVersion = () => {
};

const getPublicNgVersion = () => {
const version = execSync('npm view @angular/cli@v20-lts version').toString();
const version = execSync('npm view @angular/cli@v21-lts version').toString();
return new semver(version);
};

Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-cli/testing/env.angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ exports.fileExtension = 'ts';
exports.createApp = async(depsVersionTag) => {
await rimraf(sandboxPath);
fs.mkdirSync(sandboxPath, { recursive: true });
fs.writeFileSync(path.join(sandboxPath, 'package-lock.json'), '{}');

await prepareSchematics();
const additionalArguments = depsVersionTag && [`--${depsVersionTagOptionName} ${depsVersionTag}`] || [];
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
],
"schematics": "./src/collection.json",
"dependencies": {
"@angular-devkit/core": "^20.3.37",
"@angular-devkit/schematics": "^20.3.37",
"@schematics/angular": "^20.3.37",
"@angular-devkit/core": "^21.2.23",
"@angular-devkit/schematics": "^21.2.23",
"@schematics/angular": "^21.2.23",
"parse5": "^7.3.0",
"picomatch": "^4.0.5",
"semver": "^7.8.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-schematics/src/add-layout/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ function addPackagesToDependency(globalNgCliVersion: string) {
addPackageJsonDependency(host, {
type: NodeDependencyType.Default,
name: 'zone.js',
version: version.major > 18 ? '~0.15.0' : '~0.14.0'
version: version.major > 18 ? '~0.16.0' : '~0.14.0'
});
}

Expand Down
93 changes: 71 additions & 22 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading