Skip to content

Commit f0033b2

Browse files
Merge branch '26_1' of https://github.com/DevExpress/DevExtreme into 26_1_global_format
# Conflicts: # packages/devextreme/js/__internal/core/m_config.ts
2 parents 9e3c6fc + 7041e92 commit f0033b2

2,020 files changed

Lines changed: 61529 additions & 53800 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/run-qunit-tests/action.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@ runs:
3939
echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE"
4040
echo "MATRIX_ENVS_NAME_SAFE=$MATRIX_ENVS_NAME_SAFE" >> $GITHUB_ENV
4141
42-
# - name: Setup Chrome
43-
# uses: ./.github/actions/setup-chrome-headless-shell
44-
# with:
45-
# chrome-version: '145.0.7632.67'
46-
47-
# - name: Use Node.js
48-
# uses: actions/setup-node@v4
49-
# with:
50-
# node-version: '20'
51-
5242
- name: Download artifacts
5343
uses: actions/download-artifact@v4
5444
with:

.github/actions/setup-chrome-headless-shell/action.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/copilot-instructions.md

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pnpm install --frozen-lockfile
3535

3636
2. **For development builds of devextreme package:**
3737
```bash
38-
pnpx nx build:dev devextreme
38+
pnpm exec nx build:dev devextreme
3939
```
4040
OR from monorepo root:
4141
```bash
@@ -120,17 +120,17 @@ pnpm run all:build
120120

121121
**Build specific package:**
122122
```bash
123-
pnpx nx build devextreme
124-
pnpx nx build devextreme-angular
125-
pnpx nx build devextreme-react
126-
pnpx nx build devextreme-vue
127-
pnpx nx build devextreme-scss
128-
pnpx nx build devextreme-themebuilder
123+
pnpm exec nx build devextreme
124+
pnpm exec nx build devextreme-angular
125+
pnpm exec nx build devextreme-react
126+
pnpm exec nx build devextreme-vue
127+
pnpm exec nx build devextreme-scss
128+
pnpm exec nx build devextreme-themebuilder
129129
```
130130

131131
**Build with Nx cache skip:**
132132
```bash
133-
pnpx nx build devextreme --skipNxCache
133+
pnpm exec nx build devextreme --skipNxCache
134134
```
135135

136136
### DevExtreme Package Build Details
@@ -162,16 +162,16 @@ pnpm run clean
162162

163163
**Granular Nx build targets (can be run individually):**
164164
```bash
165-
pnpx nx build:localization devextreme # Generate localization files
166-
pnpx nx build:transpile devextreme # Transpile source code
167-
pnpx nx bundle:debug devextreme # Create debug bundle
168-
pnpx nx bundle:prod devextreme # Create production bundle
169-
pnpx nx build:npm devextreme # Prepare NPM packages
165+
pnpm exec nx build:localization devextreme # Generate localization files
166+
pnpm exec nx build:transpile devextreme # Transpile source code
167+
pnpm exec nx bundle:debug devextreme # Create debug bundle
168+
pnpm exec nx bundle:prod devextreme # Create production bundle
169+
pnpm exec nx build:npm devextreme # Prepare NPM packages
170170
```
171171

172172
**Build with testing configuration (for CI):**
173173
```bash
174-
pnpx nx build devextreme -c=testing
174+
pnpm exec nx build devextreme -c=testing
175175
```
176176

177177
**Important environment variables:**
@@ -223,7 +223,7 @@ The `packages/nx-infra-plugin` provides custom Nx executors for build automation
223223
**1. Lint (ALWAYS run before committing):**
224224
```bash
225225
# From root - runs lint on all packages
226-
pnpx nx run-many -t lint,test --exclude devextreme devextreme-themebuilder devextreme-angular devextreme-react devextreme-vue devextreme-react-storybook devextreme-angular-playground devextreme-testcafe-tests devextreme-demos devextreme-react-playground devextreme-vue-playground
226+
pnpm exec nx run-many -t lint,test --exclude devextreme devextreme-themebuilder devextreme-angular devextreme-react devextreme-vue devextreme-react-storybook devextreme-angular-playground devextreme-testcafe-tests devextreme-demos devextreme-react-playground devextreme-vue-playground
227227

228228
# From packages/devextreme
229229
pnpm run lint # All linting
@@ -244,7 +244,7 @@ pnpm run test-jest:all # Both JSDOM and Node tests
244244
**3. QUnit Tests (Legacy unit tests):**
245245
```bash
246246
# Requires build first
247-
pnpx nx build:dev devextreme
247+
pnpm exec nx build:dev devextreme
248248

249249
# Run from packages/devextreme
250250
pnpm run test-env # Launches test runner
@@ -253,14 +253,14 @@ pnpm run test-env # Launches test runner
253253
**4. TestCafe Tests (E2E):**
254254
```bash
255255
# From e2e/testcafe-devextreme
256-
pnpx nx run testcafe-devextreme:test
256+
pnpm exec nx run testcafe-devextreme:test
257257
```
258258

259259
**5. Wrapper Tests:**
260260
```bash
261-
pnpx nx test devextreme-angular
262-
pnpx nx test devextreme-react
263-
pnpx nx test devextreme-vue
261+
pnpm exec nx test devextreme-angular
262+
pnpm exec nx test devextreme-react
263+
pnpm exec nx test devextreme-vue
264264
```
265265

266266
### Pre-commit Checks
@@ -279,7 +279,7 @@ npm run lint-staged
279279
### What Gets Checked on PRs
280280

281281
**1. Default Workflow (`.github/workflows/default_workflow.yml`):**
282-
- Runs `pnpx nx run-many -t lint,test` on most packages
282+
- Runs `pnpm exec nx run-many -t lint,test` on most packages
283283
- Timeout: 30 minutes
284284
- Node: 20.x
285285

@@ -352,7 +352,7 @@ pnpm run lint-ts -- --fix
352352

353353
3. **Build the affected package:**
354354
```bash
355-
pnpx nx build:dev devextreme # For core changes
355+
pnpm exec nx build:dev devextreme # For core changes
356356
```
357357

358358
4. **Run tests:**
@@ -388,9 +388,9 @@ pnpm run lint-ts -- --fix
388388

389389
**✅ DO:**
390390
- Always use `pnpm install --frozen-lockfile`
391-
- Build before testing: `pnpx nx build:dev devextreme`
391+
- Build before testing: `pnpm exec nx build:dev devextreme`
392392
- Run `pnpm run regenerate-all` after modifying wrapper generators, TypeScript declarations, or devextreme-internal-tools (may affect code generators and/or metadata generators)
393-
- Use Nx commands for better caching: `pnpx nx build devextreme`
393+
- Use Nx commands for better caching: `pnpm exec nx build devextreme`
394394
- Check CI workflows to understand what will be validated
395395

396396
### File Modification Guidelines
@@ -418,7 +418,7 @@ pnpm run lint-ts -- --fix
418418
- Clean and rebuild: `pnpm run clean && pnpm run build:dev`
419419

420420
**Test failures:**
421-
- Ensure build is up-to-date: `pnpx nx build:dev devextreme`
421+
- Ensure build is up-to-date: `pnpm exec nx build:dev devextreme`
422422
- Check if test requires specific environment variables
423423
- Review test logs in `packages/devextreme/testing/` directory
424424

@@ -429,7 +429,7 @@ pnpm run lint-ts -- --fix
429429

430430
## Key Facts
431431

432-
- **Nx is used for task orchestration** - prefer `pnpx nx` commands over direct npm scripts
432+
- **Nx is used for task orchestration** - prefer `pnpm exec nx` commands over direct npm scripts
433433
- **Custom Nx executors** - `devextreme-nx-infra-plugin` provides specialized executors for localization, file operations, and build tasks
434434
- **Frozen lockfile is mandatory** - CI will fail without it
435435
- **Build artifacts are in gitignore** - never commit `artifacts/` directories
@@ -453,27 +453,27 @@ pnpm run all:build-dev
453453
pnpm run all:build
454454

455455
# Build with testing configuration (for CI)
456-
pnpx nx build devextreme -c=testing
456+
pnpm exec nx build devextreme -c=testing
457457

458458
# Build specific targets
459-
pnpx nx build:localization devextreme
460-
pnpx nx build:transpile devextreme
461-
pnpx nx bundle:debug devextreme
459+
pnpm exec nx build:localization devextreme
460+
pnpm exec nx build:transpile devextreme
461+
pnpm exec nx bundle:debug devextreme
462462

463463
# Test
464-
pnpx nx run-many -t test
464+
pnpm exec nx run-many -t test
465465
pnpm run test-jest # From devextreme package
466466

467467
# Lint
468-
pnpx nx run-many -t lint
468+
pnpm exec nx run-many -t lint
469469
pnpm run lint # From devextreme package
470470

471471
# Regenerate wrappers
472472
pnpm run regenerate-all
473473

474474
# Clean
475475
pnpm run clean # From devextreme package
476-
pnpx nx clean:artifacts devextreme # Clean build artifacts only
476+
pnpm exec nx clean:artifacts devextreme # Clean build artifacts only
477477

478478
# Run demos
479479
pnpm run webserver # From root, then visit localhost:8080

.github/labeler.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.d.ts:
2+
- changed-files:
3+
- any-glob-to-any-file: '**/*.d.ts'

.github/workflows/build_all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ jobs:
109109
- name: Build bundle
110110
working-directory: ./e2e/devextreme-bundler
111111
run: |
112-
npx devextreme-bundler-init custom-bundle
113-
npx devextreme-bundler custom-bundle
112+
pnpm exec devextreme-bundler-init custom-bundle
113+
pnpm exec devextreme-bundler custom-bundle

.github/workflows/default_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Run targets
5454
run: >
55-
pnpx nx run-many
55+
pnpm exec nx run-many
5656
-t lint,test
5757
-c ci
5858
--exclude

.github/workflows/demos_unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ jobs:
6565

6666
- name: Run unit tests
6767
working-directory: apps/demos
68-
run: pnpx nx test
68+
run: pnpm exec nx test

.github/workflows/labeler.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Label PR by changed files
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, synchronize, reopened]
6+
7+
jobs:
8+
label:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
contents: read
12+
pull-requests: write
13+
steps:
14+
- uses: actions/labeler@v5
15+
with:
16+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,25 @@ jobs:
4949

5050
- name: Build
5151
working-directory: ./packages/devextreme
52-
run: pnpx nx build
52+
run: pnpm exec nx build
5353

5454
- name: Lint TS
5555
working-directory: ./packages/devextreme
5656
env:
5757
DEBUG: eslint:cli-engine
58-
run: pnpx nx lint-ts
58+
run: pnpm exec nx lint-ts
5959

6060
- name: Lint .d.ts
6161
working-directory: ./packages/devextreme
6262
env:
6363
DEBUG: eslint:cli-engine
64-
run: pnpx nx lint-dts
64+
run: pnpm exec nx lint-dts
6565

6666
- name: Lint Testcafe tests
6767
working-directory: ./e2e/testcafe-devextreme
6868
env:
6969
DEBUG: eslint:cli-engine
70-
run: pnpx nx lint
70+
run: pnpm exec nx lint
7171

7272
JS:
7373
runs-on: devextreme-shr2
@@ -103,13 +103,13 @@ jobs:
103103

104104
- name: Build
105105
working-directory: ./packages/devextreme
106-
run: pnpx nx build
106+
run: pnpm exec nx build
107107

108108
- name: Lint JS
109109
working-directory: ./packages/devextreme
110110
env:
111111
DEBUG: eslint:cli-engine
112-
run: pnpx nx lint-js
112+
run: pnpm exec nx lint-js
113113

114114
texts:
115115
runs-on: devextreme-shr2
@@ -145,7 +145,7 @@ jobs:
145145

146146
- name: Check texts
147147
working-directory: ./packages/devextreme
148-
run: pnpx nx lint-texts
148+
run: pnpm exec nx lint-texts
149149

150150
component_exports:
151151
runs-on: devextreme-shr2
@@ -227,7 +227,7 @@ jobs:
227227
run: pnpm install --frozen-lockfile
228228

229229
- name: Lint wrappers
230-
run: pnpx nx run-many -t lint -p devextreme-angular devextreme-react devextreme-vue
230+
run: pnpm exec nx run-many -t lint -p devextreme-angular devextreme-react devextreme-vue
231231

232232
notify:
233233
runs-on: devextreme-shr2

.github/workflows/packages_publishing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
pnpm nx build sbom;
9393
9494
- name: Build artifacts package
95-
run: npx ts-node tools/scripts/make-artifacts-package
95+
run: pnpm run make-artifacts-package
9696

9797
- name: Upload SBOM artifact
9898
uses: actions/upload-artifact@v4
@@ -162,7 +162,7 @@ jobs:
162162
PACKAGE: ${{ matrix.package }}
163163
run: |
164164
SCOPE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]');
165-
PACKAGE_DIR=$(npx ts-node tools/scripts/change-package-scope --tgz $PACKAGE.tgz --scope $SCOPE)
165+
PACKAGE_DIR=$(pnpm --silent run change-package-scope --tgz $PACKAGE.tgz --scope $SCOPE)
166166
echo "packageDir=$PACKAGE_DIR" >> "$GITHUB_OUTPUT";
167167
cd $PACKAGE_DIR;
168168
pnpm pkg get name --workspaces=false | tr -d '"' | sed -r 's/(.*)/name=\1/' >> "$GITHUB_OUTPUT";

0 commit comments

Comments
 (0)