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
6 changes: 3 additions & 3 deletions .github/workflows/build_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ jobs:
working-directory: ./e2e/devextreme-bundler
run: |
pnpm install --filter devextreme-bundler-test --frozen-lockfile
pnpm add --filter devextreme-bundler-test ./devextreme.tgz
pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno ./devextreme.tgz

- name: Build bundle
working-directory: ./e2e/devextreme-bundler
run: |
pnpm exec devextreme-bundler-init custom-bundle
pnpm exec devextreme-bundler custom-bundle
./node_modules/.bin/devextreme-bundler-init custom-bundle
./node_modules/.bin/devextreme-bundler custom-bundle
18 changes: 10 additions & 8 deletions .github/workflows/visual-tests-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ jobs:

- name: Install tgz
working-directory: apps/demos
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

# - name: Build wrappers
# run: pnpm exec nx run-many -t pack -p devextreme-angular devextreme-react devetreme-vue
Expand Down Expand Up @@ -304,7 +304,8 @@ jobs:
run: pnpm install --frozen-lockfile

- name: Install tgz
run: pnpm add -w ./devextreme-installer.tgz ./devextreme-dist-installer.tgz ./devextreme-react-installer.tgz ./devextreme-vue-installer.tgz ./devextreme-angular-installer.tgz
working-directory: apps/demos
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Demos - Check Vue TS
working-directory: apps/demos
Expand Down Expand Up @@ -374,7 +375,8 @@ jobs:
run: pnpm install --frozen-lockfile

- name: Install tgz
run: pnpm add -w ./devextreme-installer.tgz ./devextreme-dist-installer.tgz ./devextreme-react-installer.tgz ./devextreme-vue-installer.tgz ./devextreme-angular-installer.tgz
working-directory: apps/demos
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Run lint on all demos
if: needs.determine-framework-tests-scope.outputs.framework-tests-scope == 'all'
Expand Down Expand Up @@ -501,7 +503,7 @@ jobs:
- name: Install tgz
if: steps.changed-react-demos.outputs.has-react-demos == 'true'
working-directory: apps/demos
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Prepare JS
if: steps.changed-react-demos.outputs.has-react-demos == 'true'
Expand Down Expand Up @@ -577,7 +579,7 @@ jobs:

- name: Install tgz
working-directory: apps/demos
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Prepare JS
working-directory: apps/demos
Expand Down Expand Up @@ -853,7 +855,7 @@ jobs:

- name: Install tgz
working-directory: apps/demos
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Prepare JS
working-directory: apps/demos
Expand Down Expand Up @@ -990,7 +992,7 @@ jobs:

- name: Install tgz
working-directory: apps/demos
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Prepare JS
working-directory: apps/demos
Expand Down Expand Up @@ -1229,7 +1231,7 @@ jobs:

- name: Install tgz
working-directory: apps/demos
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
run: pnpm add --ignore-workspace --allow-build=core-js --allow-build=inferno devextreme-aspnet-data@5.1.0 devextreme-aspnet-data-nojquery@5.1.0 ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz && rm -f pnpm-workspace.yaml pnpm-lock.yaml

- name: Start CSP Server
run: node apps/demos/utils/server/csp-server.js 8080 &
Expand Down
2 changes: 1 addition & 1 deletion .mise.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tools]
node = "24.15.0"
pnpm = "9.15.9"
pnpm = "11.5.1"

[hooks]
enter = "mise install"
Expand Down
5 changes: 0 additions & 5 deletions .npmrc

This file was deleted.

7 changes: 6 additions & 1 deletion apps/demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"devextreme-angular": "workspace:*",
"devextreme-dist": "workspace:*",
"devextreme-react": "workspace:*",
"devextreme-vue": "workspace:*"
"devextreme-vue": "workspace:*",
"eslint-migration-utils": "workspace:*"
},
"dependencies": {
"@angular/animations": "~21.2.15",
Expand Down Expand Up @@ -100,6 +101,7 @@
"@babel/preset-typescript": "7.28.5",
"@eslint/compat": "1.4.1",
"@eslint/eslintrc": "catalog:",
"@eslint/js": "catalog:",
"@rollup/plugin-babel": "6.1.0",
"@rollup/plugin-node-resolve": "15.3.1",
"@rollup/plugin-replace": "5.0.7",
Expand All @@ -123,12 +125,15 @@
"devextreme-screenshot-comparer": "2.0.17",
"eslint": "catalog:",
"eslint-config-airbnb-typescript": "catalog:",
"eslint-config-devextreme": "catalog:",
"eslint-plugin-deprecation": "3.0.0",
"eslint-plugin-import": "catalog:",
"eslint-plugin-jest": "29.15.0",
"eslint-plugin-no-only-tests": "catalog:",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "5.2.0",
"eslint-plugin-react-perf": "3.3.3",
"eslint-plugin-spellcheck": "0.0.20",
"eslint-plugin-vue": "catalog:",
"express": "4.22.1",
"glob": "11.1.0",
Expand Down
1 change: 1 addition & 0 deletions e2e/bundlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"devextreme": "workspace:*",
"eslint": "catalog:",
"@eslint/eslintrc": "catalog:",
"@eslint/js": "catalog:",
"@stylistic/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"eslint-config-devextreme": "catalog:",
Expand Down
1 change: 1 addition & 0 deletions e2e/compilation-cases/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"typescript": "catalog:angular",
"eslint": "catalog:",
"@eslint/eslintrc": "catalog:",
"@eslint/js": "catalog:",
"@stylistic/eslint-plugin": "catalog:",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
Expand Down
3 changes: 2 additions & 1 deletion e2e/testcafe-devextreme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"update-failed-etalons": "node update_failed_etalons.mjs"
},
"devDependencies": {
"@babel/eslint-parser": "catalog:eslint8",
"@babel/eslint-parser": "catalog:",
"@babel/plugin-transform-runtime": "7.29.0",
"@testcafe-community/axe": "3.5.0",
"@types/jquery": "catalog:",
Expand All @@ -24,6 +24,7 @@
"ts-node": "10.9.2",
"eslint": "catalog:",
"@eslint/eslintrc": "catalog:",
"@eslint/js": "catalog:",
"@stylistic/eslint-plugin": "catalog:",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion e2e/wrappers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@angular-devkit/build-angular": "catalog:angular",
"@angular/cli": "catalog:angular",
"@angular/compiler-cli": "catalog:angular",
"@eslint/js": "9.39.4",
"@eslint/js": "catalog:",
"@types/jasmine": "5.1.4",
"@types/react": "19.1.2",
"@types/react-dom": "19.1.3",
Expand Down
68 changes: 1 addition & 67 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,73 +64,7 @@
"lint-staged",
"pre-commit"
],
"pnpm": {
"overrides": {
"@devexpress/callsite-record@^4.1.6": "4.1.7",
"basic-ftp@<5.3.1": ">=5.3.1",
"@isaacs/brace-expansion@<=5.0.0": "^5.0.1",
"@modelcontextprotocol/sdk@>=1.10.0 <=1.25.3": "^1.26.0",
"form-data@<2.5.4": "2.5.5",
"form-data@>=4.0.0 <4.0.4": "^4.0.5",
"pbkdf2@<=3.1.2": "^3.1.3",
"sha.js@<=2.4.11": "^2.4.12",
"rollup@< 4.59.0": "^4.59.0",
"json5@<1.0.2": "^2.2.3",
"axios@<1.15.2": "^1.15.2",
"braces@<3.0.3": "^3.0.3",
"semver@<5.7.2": "^5.7.2",
"qs": ">=6.15.2",
"js-cookie@<3.0.7": "^3.0.7",
"glob@>=10.2.0 <10.5.0": "^10.5.0",
"node-forge@<1.4.0": "1.4.0",
"vite@>=6.0.0 <6.4.1": "^7.3.2",
"vite@>=7.0.0 <=7.3.1": "^7.3.2",
"tar@<=7.5.9": "^7.5.10",
"underscore@<=1.13.7": "^1.13.8",
"hono@<4.12.18": ">=4.12.18",
"@hono/node-server@<1.19.13": "^1.19.13",
"express-rate-limit@>=8.2.0 <8.2.2": "^8.2.2",
"fast-uri@<3.1.2": ">=3.1.2",
"immutable@>=5.0.0 <5.1.5": "^5.1.5",
"minimatch@<3.1.5": "3.1.5",
"minimatch@>=9.0.0 < 9.0.7": "9.0.9",
"minimatch@>=10.0.0 < 10.2.4": "10.2.5",
"picomatch@>=2.0.0 <2.3.2": "2.3.2",
"picomatch@>=4.0.0 <4.0.4": "4.0.4",
"path-to-regexp@0.1.12": "0.1.13",
"path-to-regexp@>=8.0.0 <8.4.0": "8.4.2",
"serialize-javascript@<=7.0.2": "7.0.5",
"flatted@<3.4.0": "^3.4.0",
"undici@<7.24.0": "^7.24.0",
"socket.io-parser@>=4.0.0 <4.2.6": "^4.2.6",
"lodash@<4.18.1": "^4.18.1",
"lodash.template@<4.18.1": "^4.18.1",
"tough-cookie@<4.1.3": "^4.1.3",
"micromatch@<4.0.8": "^4.0.8",
"esbuild@<=0.24.2": "^0.25.0",
"tmp@<0.2.6": ">=0.2.6",
"nanoid@<3.3.8": "^3.3.8",
"diff@>=4.0.0 <4.0.4": "^4.0.4",
"diff@>=5.0.0 <5.2.2": "^5.2.2",
"bn.js@>=5.0.0 <5.2.3": "^5.2.3",
"bn.js@<4.12.3": "^4.12.3",
"ajv@>=7.0.0-alpha.0 <8.18.0": "^8.18.0",
"@tootallnate/once@<3.0.1": "^3.0.1",
"dompurify@<=3.3.3": ">=3.4.0",
"brace-expansion@<1.1.13": "^1.1.13",
"brace-expansion@>=2.0.0 <2.0.3": "^5.0.6",
"brace-expansion@>=4.0.0 <5.0.6": "^5.0.6",
"yaml@>=2.0.0 <2.8.3": "^2.8.3",
"follow-redirects@<=1.15.11": ">=1.16.0",
"ws@>=8.0.0 <8.20.1": "^8.20.1",
"uuid@<14.0.0": "~14.0.0",
"postcss@<8.5.10": "8.5.10",
"ip-address@<=10.1.0": ">=10.1.1",
"webpack-dev-server@<=5.2.3": "^5.2.4",
"@babel/plugin-transform-modules-systemjs@>=7.12.0 <7.29.4": "^7.29.4"
}
},
"packageManager": "pnpm@9.15.9",
"packageManager": "pnpm@11.5.1",
"engines": {
"node": "24.15.0"
}
Expand Down
10 changes: 8 additions & 2 deletions packages/devextreme-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,18 @@
"ts-jest": "29.1.3",
"typescript": "4.9.5",
"eslint": "catalog:",
"@babel/eslint-parser": "catalog:",
"@eslint/eslintrc": "catalog:",
"@eslint/js": "catalog:",
"@stylistic/eslint-plugin": "catalog:",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-airbnb-typescript": "catalog:",
"eslint-config-devextreme": "catalog:",
"eslint-migration-utils": "workspace:*",
"eslint-plugin-i18n": "catalog:",
"eslint-plugin-import": "catalog:",
"@typescript-eslint/eslint-plugin": "catalog:",
"@typescript-eslint/parser": "catalog:",
"eslint-config-devextreme": "catalog:"
"@typescript-eslint/parser": "catalog:"
},
"publishConfig": {
"directory": "npm",
Expand Down
3 changes: 3 additions & 0 deletions packages/devextreme-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@
"@vue/shared": "3.4.26",
"vue-router": "4.2.5",
"eslint": "catalog:",
"@eslint-stylistic/metadata": "catalog:",
"@eslint/js": "catalog:",
"@stylistic/eslint-plugin": "catalog:",
"eslint-config-airbnb-typescript": "catalog:",
"eslint-plugin-i18n": "catalog:",
"eslint-plugin-import": "catalog:",
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"@devextreme-generator/inferno": "3.0.12",
"@devextreme-generator/react": "3.0.12",
"@devextreme-generator/vue": "3.0.12",
"@eslint/js": "catalog:",
"@eslint-stylistic/metadata": "catalog:",
"@eslint/eslintrc": "catalog:",
"@jest/globals": "29.7.0",
Expand Down
10 changes: 1 addition & 9 deletions packages/sbom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,5 @@
"devDependencies": {
"@devexpress/sbom-toolkit": "0.6.1"
},
"pnpm": {
"overrides": {
"fast-uri@<3.1.2": ">=3.1.2",
"@cyclonedx/cdxgen@>=9.9.5 <12.3.3": ">=12.3.3",
"brace-expansion@>=5.0.0 <5.0.6": "^5.0.6",
"qs@>=6.11.1 <=6.15.1": ">=6.15.2"
}
},
"packageManager": "pnpm@9.15.9"
"packageManager": "pnpm@11.5.1"
}
8 changes: 7 additions & 1 deletion packages/sbom/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
packages:
- '.'
- '.'

overrides:
"fast-uri@<3.1.2": ">=3.1.2"
"@cyclonedx/cdxgen@>=9.9.5 <12.3.3": ">=12.3.3"
"brace-expansion@>=5.0.0 <5.0.6": ^5.0.6
"qs@>=6.11.1 <=6.15.1": ">=6.15.2"
Loading