From bf11d6c43e9a6e566cac88378c4cd09052fa7e35 Mon Sep 17 00:00:00 2001 From: "ovchinnikov.andrey" Date: Fri, 13 Dec 2019 12:25:37 +0300 Subject: [PATCH 1/4] Downgrade ng-packagr --- gulpfile.js | 5 ++--- package.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7048bad24..b916230d4 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -130,11 +130,10 @@ gulp.task('build.copy-sources', ['clean.dist'], function() { // Note: workaround for https://github.com/angular/angular-cli/issues/4874 gulp.task('build.remove-unusable-variable', function() { - var config = buildConfig.components; + var config = buildConfig.npm; return gulp.src(path.join(config.outputPath, '**/*.js')) - .pipe(replace(/var.+devextreme\/bundles\/dx\.all.+/g, '')) - .pipe(replace(/import DevExpress from \'devextreme\/bundles\/dx\.all\';/g, '')) + .pipe(replace(/DevExpress\.[\w\.]+/g, 'Object')) .pipe(gulp.dest(config.outputPath)); }); diff --git a/package.json b/package.json index 1a376584c..c9973010b 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "karma-webpack": "^2.0.9", "lite-server": "^2.2.0", "mkdirp": "^0.5.1", - "ng-packagr": "^5.6.1", + "ng-packagr": "5.5.1", "plugin-typescript": "^8.0.0", "puppeteer": "^1.11.0", "run-sequence": "^1.2.2", From 263e5e2744af66c0686a9d17efaaf49db089a24e Mon Sep 17 00:00:00 2001 From: "ovchinnikov.andrey" Date: Fri, 13 Dec 2019 12:44:21 +0300 Subject: [PATCH 2/4] Fix tests --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index b916230d4..c4d0f1709 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -132,7 +132,7 @@ gulp.task('build.copy-sources', ['clean.dist'], function() { gulp.task('build.remove-unusable-variable', function() { var config = buildConfig.npm; - return gulp.src(path.join(config.outputPath, '**/*.js')) + return gulp.src(path.join(config.distPath, '**/*.js')) .pipe(replace(/DevExpress\.[\w\.]+/g, 'Object')) .pipe(gulp.dest(config.outputPath)); }); From 996c096e46fcd30a87458d9c734ada8b4106a7ed Mon Sep 17 00:00:00 2001 From: "ovchinnikov.andrey" Date: Fri, 13 Dec 2019 12:45:30 +0300 Subject: [PATCH 3/4] Fix tests --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index c4d0f1709..f7285fb52 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -134,7 +134,7 @@ gulp.task('build.remove-unusable-variable', function() { return gulp.src(path.join(config.distPath, '**/*.js')) .pipe(replace(/DevExpress\.[\w\.]+/g, 'Object')) - .pipe(gulp.dest(config.outputPath)); + .pipe(gulp.dest(config.distPath)); }); gulp.task('build.components', ['generate.facades'], function(done) { From ab8a682dff51636c98cc5c79561ffb47f7e4b78c Mon Sep 17 00:00:00 2001 From: "ovchinnikov.andrey" Date: Fri, 13 Dec 2019 13:34:34 +0300 Subject: [PATCH 4/4] Update devextreme --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c9973010b..7b77b60e1 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "author": "Developer Express Inc.", "license": "MIT", "peerDependencies": { - "devextreme": "~19.2.4", + "devextreme": "~19.2.5", "@angular/core": ">6.0.0", "@angular/common": ">6.0.0", "@angular/forms": ">6.0.0" @@ -45,7 +45,7 @@ "del": "^2.2.0", "devexpress-diagram": "^0.1.43", "devexpress-gantt": "0.0.8", - "devextreme": "~19.2.4", + "devextreme": "~19.2.5-build-19347-0331", "dot": "^1.0.3", "gulp": "^3.9.1", "gulp-header": "^1.8.8",