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
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
"lint-sandbox": "eslint --config .github/eslint-security.config.mjs"
},
"devDependencies": {
"@angular-eslint/schematics": "^20.7.0",
"@devexpress/eslint-plugin-dx-security": "^0.2.11",
"@typescript-eslint/parser": "^8.63.0",
"eslint": "^9.39.4",
"@typescript-eslint/parser": "catalog:",
"eslint": "catalog:",
"pre-commit": "^1.2.2",
"puppeteer": "^25.6.0"
},
Expand Down
22 changes: 6 additions & 16 deletions packages/devextreme-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,22 @@
"strip-bom": "^4.0.0"
},
"devDependencies": {
"@eslint/compat": "^1.4.1",
"@eslint/eslintrc": "^3.3.7",
"@eslint/js": "^9.39.4",
"@types/node": "20.19.43",
"@typescript-eslint/eslint-plugin": "^8.63.0",
"@typescript-eslint/parser": "^8.63.0",
"@types/node": "catalog:",
"@typescript-eslint/parser": "catalog:",
"create-vite": "7.1.3",
"cross-env": "^5.2.1",
"eslint": "^9.39.4",
"eslint": "catalog:",
"eslint-config-angular": "^0.5.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-angular": "^4.1.0",
"eslint-plugin-jest": "^28.14.0",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-unused-imports": "^4.4.1",
"eslint-plugin-vue": "^10.11.1",
"globals": "^15.15.0",
"eslint-plugin-angular": "^5.1.0",
"globals": "^17.14.0",
"pixelmatch": "^7.2.0",
"pngjs": "^7.0.0",
"prettier": "^2.8.8",
"rimraf": "^2.7.1",
"tree-kill": "^1.2.2",
"tree-kill-promise": "^1.0.12",
"typescript": "^4.9.5",
"vitest": "^5.0.5",
"vitest": "catalog:",
"vue-eslint-parser": "^10.4.1",
"wait-on": "8.0.5"
}
Expand Down
7 changes: 1 addition & 6 deletions packages/devextreme-cli/testing/env.angular.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const fs = require('fs');
const path = require('path');

const packageManager = require('../src/utility/package-manager');
const rimraf = require('./utils/rimraf-async');
const runCommand = require('../src/utility/run-command');
const { depsVersionTagOptionName } = require('../src/utility/extract-deps-version-tag');
Expand All @@ -15,11 +14,7 @@ const appComponentTemplatePath = path.join(appPath, 'src/app/app.html');
const appComponentPath = path.join(appPath, 'src/app/app.ts');

async function prepareSchematics() {
await packageManager.runInstall({
cwd: schematicsPath
});

await packageManager.run(['run', 'build'], {
await runCommand('pnpm', ['run', 'build'], {
cwd: schematicsPath
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { fixupPluginRules } from '@eslint/compat';
import angularConfig from 'eslint-config-angular';
import angularPlugin from 'eslint-plugin-angular';
import globals from 'globals';
Expand All @@ -10,7 +9,7 @@ export default [
{
files: tsFiles,
plugins: {
angular: fixupPluginRules(angularPlugin)
angular: angularPlugin
},
languageOptions: {
parser: tsParser,
Expand Down
64 changes: 0 additions & 64 deletions packages/devextreme-cli/testing/lint-config/react-ts.config.mjs

This file was deleted.

53 changes: 0 additions & 53 deletions packages/devextreme-cli/testing/lint-config/react.config.mjs

This file was deleted.

5 changes: 0 additions & 5 deletions packages/devextreme-cli/testing/lint-config/vue.config.mjs

This file was deleted.

10 changes: 5 additions & 5 deletions packages/devextreme-schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"semver": "^7.8.5"
},
"devDependencies": {
"@types/node": "20.19.43",
"@types/node": "catalog:",
"@types/picomatch": "^4.0.3",
"@types/semver": "^7.7.1",
"@typescript-eslint/eslint-plugin": "^8.63.0",
"@typescript-eslint/parser": "^8.63.0",
"eslint": "^9.39.4",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"eslint": "catalog:",
"rxjs": "^7.8.2",
"typescript": "~5.6.3",
"vitest": "^5.0.5"
"vitest": "catalog:"
}
}
Loading
Loading