Skip to content

Commit b8c3bbc

Browse files
GoodDayForSurfajivanyandevCopilot
authored
chore: migrate remaining gulp build TS task to nx (#33710)
Signed-off-by: Arman Jivanyan <arman.jivanyan@devexpress.com> Co-authored-by: Arman Jivanyan <arman.jivanyan@devexpress.com> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 5b7bb4a commit b8c3bbc

14 files changed

Lines changed: 835 additions & 204 deletions

File tree

packages/devextreme/build/gulp/npm.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
require('./ts');
4-
53
const eol = require('gulp-eol');
64
const gulp = require('gulp');
75
const gulpIf = require('gulp-if');
@@ -156,7 +154,8 @@ const packagePath = `${resultPath}/${packageDir}`;
156154
const distPath = `${resultPath}/${packageDistDir}`;
157155

158156
gulp.task('npm-sources', gulp.series(
159-
'ts-sources',
157+
shell.task(env.BUILD_INTERNAL_PACKAGE ? 'pnpm nx run devextreme:build:npm:dts-modules -c internal' : 'pnpm nx run devextreme:build:npm:dts-modules'),
158+
shell.task(env.BUILD_INTERNAL_PACKAGE ? 'pnpm nx run devextreme:build:npm:dts-bundle -c internal' : 'pnpm nx run devextreme:build:npm:dts-bundle'),
160159
() => gulp
161160
.src(devextremeDistWorkspacePackageJsonPath)
162161
.pipe(
@@ -212,4 +211,4 @@ gulp.task('npm-sass', gulp.series(
212211
)
213212
));
214213

215-
gulp.task('npm', gulp.series('npm-sources', 'npm-dist', 'ts-check-public-modules', 'npm-sass'));
214+
gulp.task('npm', gulp.series('npm-sources', 'npm-dist', 'npm-sass'));

packages/devextreme/build/gulp/ts.js

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

packages/devextreme/gulpfile.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ gulp.task('clean', shell.task('pnpm nx clean:artifacts devextreme'));
1313
require('./build/gulp/bundler-config');
1414
require('./build/gulp/transpile');
1515
require('./build/gulp/js-bundles');
16-
require('./build/gulp/ts');
1716
require('./build/gulp/localization');
1817
require('./build/gulp/systemjs');
1918

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

3231
const transpileConfig = getTranspileConfig();
3332

33+
function getDeclarationsConfiguration() {
34+
return env.BUILD_INTERNAL_PACKAGE ? 'internal' : '';
35+
}
36+
37+
const declarationsConfig = getDeclarationsConfiguration();
38+
3439
gulp.task('transpile', shell.task(
3540
transpileConfig
3641
? `pnpm nx run devextreme:build:transpile -c ${transpileConfig}`
@@ -51,6 +56,12 @@ gulp.task('aspnet', shell.task(
5156

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

59+
gulp.task('ts', shell.task(
60+
declarationsConfig
61+
? `pnpm nx run devextreme:build:declarations -c ${declarationsConfig}`
62+
: 'pnpm nx run devextreme:build:declarations'
63+
));
64+
5465
gulp.task('check-license-notices', shell.task('pnpm nx run devextreme:verify:licenses'));
5566

5667
gulp.task('state-manager-optimize', shell.task('pnpm nx run devextreme:state-manager:optimize'));

packages/devextreme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
"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\\\": [] }\"",
200200
"update-ts-bundle": "dx-tools generate-ts-bundle --sources ./js --output-path ./ts/dx.all.d.ts",
201201
"regenerate": "pnpm run update-ts-bundle && pnpm run update-ts-reexports",
202-
"validate-ts": "gulp validate-ts",
202+
"validate-ts": "pnpm nx run devextreme:validate:ts",
203203
"check-types": "tsc --noEmit -p js/__internal/tsconfig.json",
204204
"validate-declarations": "dx-tools validate-declarations --sources ./js --exclude \"js/(renovation|__internal|.eslintrc.js)\" --compiler-options \"{ \\\"typeRoots\\\": [] }\"",
205205
"testcafe-in-docker": "docker build -f ./testing/testcafe/docker/Dockerfile -t testcafe-testing . && docker run -it testcafe-testing",

0 commit comments

Comments
 (0)