From 87d53adbf8c847f80594237acce6df4aa0a1bb2f Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Thu, 4 Jun 2026 11:40:07 +0400 Subject: [PATCH 1/3] chore(deps): update pnpm to v11 --- .mise.toml | 2 +- package.json | 12 ++---------- pnpm-workspace.yaml | 12 ++++++++++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.mise.toml b/.mise.toml index 098510c69..6f9d955ed 100644 --- a/.mise.toml +++ b/.mise.toml @@ -1,6 +1,6 @@ [tools] node = "24.16.0" +pnpm = "11.5.1" [hooks] enter = "mise install" - diff --git a/package.json b/package.json index da0328972..57bd2b933 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "devextreme-cli-monorepo", "version": "1.2.7", - "packageManager": "pnpm@9.15.9", + "packageManager": "pnpm@11.5.1", "scripts": { "test": "pnpm -r run test", "test-dev": "pnpm --filter devextreme-cli run test-dev", @@ -22,13 +22,5 @@ "pre-commit": "^1.2.2", "puppeteer": "^24.43.1" }, - "pre-commit": "lint", - "pnpm": { - "overrides": { - "cross-spawn": "7.0.6", - "semver@>=2.0.0-alpha <5.7.2": ">=5.7.2", - "ip-address@<=10.1.0": ">=10.2.0", - "basic-ftp@<=5.3.0": ">=5.3.1" - } - } + "pre-commit": "lint" } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index dee51e928..561cc1362 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,14 @@ packages: - "packages/*" + +allowBuilds: + "@parcel/watcher": true + pre-commit: true + puppeteer: true + spawn-sync: true + +overrides: + cross-spawn: 7.0.6 + semver@>=2.0.0-alpha <5.7.2: ">=5.7.2" + ip-address@<=10.1.0: ">=10.2.0" + basic-ftp@<=5.3.0: ">=5.3.1" From 57e6480a775b3b97331a36c2a2f6efa7911361e4 Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Thu, 4 Jun 2026 12:14:29 +0400 Subject: [PATCH 2/3] update --- .github/workflows/applications.yml | 4 ++-- .github/workflows/check-nextjs.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/themebuilder.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/applications.yml b/.github/workflows/applications.yml index 148f03008..356e425e3 100644 --- a/.github/workflows/applications.yml +++ b/.github/workflows/applications.yml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v6 - name: Use Node.js uses: actions/setup-node@v4 @@ -120,7 +120,7 @@ jobs: uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v6 - name: Set up Node.js and restore cache uses: actions/setup-node@v4 diff --git a/.github/workflows/check-nextjs.yml b/.github/workflows/check-nextjs.yml index 762644765..30b262123 100644 --- a/.github/workflows/check-nextjs.yml +++ b/.github/workflows/check-nextjs.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v6 - name: Set up Node.js uses: actions/setup-node@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 081dbbc58..75f38d404 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v6 - name: Use Node.js uses: actions/setup-node@v4 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 733fbbd1c..c9c59e2a1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v6 - name: Use Node.js uses: actions/setup-node@v4 diff --git a/.github/workflows/themebuilder.yml b/.github/workflows/themebuilder.yml index 86be81306..c11222e3a 100644 --- a/.github/workflows/themebuilder.yml +++ b/.github/workflows/themebuilder.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: Install pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v6 - name: Use Node.js uses: actions/setup-node@v4 From 0d0318f824c87b5efd3476e50cbd5cab4af364ca Mon Sep 17 00:00:00 2001 From: EugeniyKiyashko Date: Thu, 4 Jun 2026 13:26:18 +0400 Subject: [PATCH 3/3] Update application.vue.js --- packages/devextreme-cli/src/applications/application.vue.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/devextreme-cli/src/applications/application.vue.js b/packages/devextreme-cli/src/applications/application.vue.js index 2080a66c5..e1bd75bd8 100644 --- a/packages/devextreme-cli/src/applications/application.vue.js +++ b/packages/devextreme-cli/src/applications/application.vue.js @@ -18,6 +18,7 @@ const preparePackageJsonForTemplate = (appPath, appName) => { const dependencies = [ { name: 'sass-embedded', version: '^1.85.1' }, { name: 'vue-router', version: '^4.0.1' }, + { name: 'vue-eslint-parser', version: '^10.4.1', dev: true }, { name: 'devextreme-cli', version: latestVersions['devextreme-cli'], dev: true } ];