Skip to content

Commit 9d9290a

Browse files
Disable SystemJs devextreme-angular umd modules optimizations (DevExpress#29897)
1 parent 9e3c8ec commit 9d9290a

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

apps/demos/configs/Angular/config.bundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ function useBundle() {
7171
'devexpress-gantt',
7272
'devexpress-diagram',
7373
'rxjs',
74-
'devextreme/bundles/dx.all',
7574
].forEach((pkg) => delete window.config.map[pkg]);
76-
75+
/*
7776
Object.keys(window.config.map).forEach((pkg) => {
7877
if (pkg.startsWith('devextreme-angular/')) {
7978
delete window.config.map[pkg];
8079
}
8180
});
81+
*/
8282
}
8383
}
8484

apps/demos/configs/Angular/config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ window.config = {
177177

178178
/* devextreme */
179179
'devextreme': 'npm:devextreme/cjs',
180-
'devextreme/bundles/dx.all': 'npm:devextreme/bundles/dx.all.js',
181180
'devextreme-quill': 'npm:devextreme-quill/dist/dx-quill.min.js',
182181
'devexpress-diagram': 'npm:devexpress-diagram',
183182
'devexpress-gantt': 'npm:devexpress-gantt',

apps/demos/utils/internal/create-config.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ class CreateConfig {
4141

4242
baseContent += fs.readFileSync(path.join(this.configDir, approach, 'config.js'), 'utf8');
4343
if (this.useBundles) {
44+
// removes ending non bundle config.js call, config.bundle.js calls its own (single per merged file)
4445
baseContent = baseContent.replace('System.config(window.config);', '');
45-
baseContent = baseContent.replace('System.import(\'@angular/compiler\').catch(console.error.bind(console));', '');
46+
if (approach === 'Angular') {
47+
// removes ending non bundle Angular call, config.bundle.js calls its own (single per merged file)
48+
baseContent = baseContent.replace('System.import(\'@angular/compiler\').catch(console.error.bind(console));', '');
49+
}
4650
baseContent += fs.readFileSync(path.join(this.configDir, approach, 'config.bundle.js'), 'utf8');
4751
}
4852

0 commit comments

Comments
 (0)