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
4 changes: 2 additions & 2 deletions .github/workflows/applications.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-nextjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/themebuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
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.16.0"
pnpm = "11.5.1"

[hooks]
enter = "mise install"

12 changes: 2 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
];

Expand Down
12 changes: 12 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -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"
Loading