Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0e92005
migrate TS from gulp to nx, step 1
GoodDayForSurf May 21, 2026
b1a2429
migrate TS from gulp to nx
GoodDayForSurf May 25, 2026
d83e43f
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 26, 2026
ffdc906
fix lint
GoodDayForSurf May 26, 2026
448c4ed
Merge branch 'chore/migrate-devextreme-to-nx-TS' of https://github.co…
GoodDayForSurf May 26, 2026
44a6fa5
fix text in AGENTS.md
GoodDayForSurf May 26, 2026
f21e1d6
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 26, 2026
a910e42
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 26, 2026
6bd7d33
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 26, 2026
d529c5b
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 26, 2026
342a3a8
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 26, 2026
99f9da6
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 27, 2026
4e0b3db
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 27, 2026
bdd2fc7
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 27, 2026
8d7defd
fix review notes
GoodDayForSurf May 27, 2026
a930a5b
fix review notes
GoodDayForSurf May 27, 2026
70506c7
fix review notes
GoodDayForSurf May 27, 2026
9ffc151
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf May 27, 2026
5cc9ffc
fix review notes
GoodDayForSurf May 27, 2026
ba7ae60
fix review notes
GoodDayForSurf May 27, 2026
7a2b2d8
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 3, 2026
768b28e
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 3, 2026
ade8381
Merge branch '26_1' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Jun 10, 2026
2252d69
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 10, 2026
ccab022
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 11, 2026
c549fea
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 11, 2026
0c1b912
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 11, 2026
ba1b871
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 11, 2026
1e9b45c
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 11, 2026
e765373
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 11, 2026
e7b50b1
Potential fix for pull request finding
ajivanyandev Jun 26, 2026
9af38a7
Potential fix for pull request finding
ajivanyandev Jun 26, 2026
867a8f1
Potential fix for pull request finding
ajivanyandev Jun 26, 2026
9cc9551
Potential fix for pull request finding
ajivanyandev Jun 26, 2026
3f1318b
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
ajivanyandev Jun 26, 2026
cf0fe29
review fix
ajivanyandev Jun 26, 2026
9668d21
review fix
ajivanyandev Jun 26, 2026
a811a36
review fix
ajivanyandev Jun 26, 2026
15254b2
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 26, 2026
e3ce636
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 26, 2026
f61449c
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 26, 2026
412c2a4
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 26, 2026
f013b70
remake orchestration
GoodDayForSurf Jun 29, 2026
c839fab
add tests
GoodDayForSurf Jun 29, 2026
8e5f1e3
Merge branch '26_1' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Jun 29, 2026
5454506
fix lint
GoodDayForSurf Jun 30, 2026
1fa8011
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 30, 2026
e6a7fdc
fix nx cache problem for nx:run-commands executor
GoodDayForSurf Jun 30, 2026
8e25193
Merge remote-tracking branch 'origin/chore/migrate-devextreme-to-nx-T…
GoodDayForSurf Jun 30, 2026
c94f324
Merge branch '26_1' into chore/migrate-devextreme-to-nx-TS
GoodDayForSurf Jun 30, 2026
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
7 changes: 3 additions & 4 deletions packages/devextreme/build/gulp/npm.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
'use strict';

require('./ts');

const eol = require('gulp-eol');
const gulp = require('gulp');
const gulpIf = require('gulp-if');
Expand Down Expand Up @@ -156,7 +154,8 @@ const packagePath = `${resultPath}/${packageDir}`;
const distPath = `${resultPath}/${packageDistDir}`;

gulp.task('npm-sources', gulp.series(
'ts-sources',
shell.task(env.BUILD_INTERNAL_PACKAGE ? 'pnpm nx run devextreme:build:npm:dts-modules -c internal' : 'pnpm nx run devextreme:build:npm:dts-modules'),
shell.task(env.BUILD_INTERNAL_PACKAGE ? 'pnpm nx run devextreme:build:npm:dts-bundle -c internal' : 'pnpm nx run devextreme:build:npm:dts-bundle'),
() => gulp
.src(devextremeDistWorkspacePackageJsonPath)
.pipe(
Expand Down Expand Up @@ -212,4 +211,4 @@ gulp.task('npm-sass', gulp.series(
)
));

gulp.task('npm', gulp.series('npm-sources', 'npm-dist', 'ts-check-public-modules', 'npm-sass'));
gulp.task('npm', gulp.series('npm-sources', 'npm-dist', 'npm-sass'));
186 changes: 0 additions & 186 deletions packages/devextreme/build/gulp/ts.js

This file was deleted.

13 changes: 12 additions & 1 deletion packages/devextreme/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ gulp.task('clean', shell.task('pnpm nx clean:artifacts devextreme'));
require('./build/gulp/bundler-config');
require('./build/gulp/transpile');
require('./build/gulp/js-bundles');
require('./build/gulp/ts');
require('./build/gulp/localization');
require('./build/gulp/systemjs');

Expand All @@ -31,6 +30,12 @@ function getTranspileConfig() {

const transpileConfig = getTranspileConfig();

function getDeclarationsConfiguration() {
return env.BUILD_INTERNAL_PACKAGE ? 'internal' : '';
}

const declarationsConfig = getDeclarationsConfiguration();

gulp.task('transpile', shell.task(
transpileConfig
? `pnpm nx run devextreme:build:transpile -c ${transpileConfig}`
Expand All @@ -51,6 +56,12 @@ gulp.task('aspnet', shell.task(

gulp.task('vendor', shell.task('pnpm nx run devextreme:copy:vendor'));

gulp.task('ts', shell.task(
declarationsConfig
? `pnpm nx run devextreme:build:declarations -c ${declarationsConfig}`
: 'pnpm nx run devextreme:build:declarations'
));

gulp.task('check-license-notices', shell.task('pnpm nx run devextreme:verify:licenses'));

gulp.task('state-manager-optimize', shell.task('pnpm nx run devextreme:state-manager:optimize'));
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"update-ts-reexports": "dx-tools generate-reexports --sources ./js --exclude \"((dialog|export|list_light|notify|overlay|palette|set_template_engine|splitter_control|themes|themes_callback|track_bar|utils|validation_engine|validation_message)[.d.ts])\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"",
"update-ts-bundle": "dx-tools generate-ts-bundle --sources ./js --output-path ./ts/dx.all.d.ts",
"regenerate": "pnpm run update-ts-bundle && pnpm run update-ts-reexports",
"validate-ts": "gulp validate-ts",
"validate-ts": "pnpm nx run devextreme:validate:ts",
"check-types": "tsc --noEmit -p js/__internal/tsconfig.json",
"validate-declarations": "dx-tools validate-declarations --sources ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"",
"testcafe-in-docker": "docker build -f ./testing/testcafe/docker/Dockerfile -t testcafe-testing . && docker run -it testcafe-testing",
Expand Down
Loading
Loading