Skip to content

Commit 788b843

Browse files
authored
Generate reexports for common root module into common/index.ts instead of common/common.ts (#1377)
1 parent 84644f5 commit 788b843

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

packages/devextreme-angular-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Developer Express Inc.",
33
"name": "devextreme-angular-generator",
4-
"version": "2.0.1",
4+
"version": "2.0.2",
55
"description": "Angular UI and visualization components based on DevExtreme widgets",
66
"repository": {
77
"type": "git",

packages/devextreme-angular-generator/src/common-reexports-generator.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ export default class CommonReexportsGenerator {
1616
return;
1717
}
1818

19-
const commonPath = joinPaths(config.outputPath, 'common');
19+
const commonTargetFolderName = 'common';
20+
const commonPath = joinPaths(config.outputPath, commonTargetFolderName);
2021
if (!existsSync(commonPath)) {
2122
mkdirSync(commonPath);
2223
}
2324
Object.keys(metadata.CommonReexports).forEach((key) => {
25+
const targetFileName = key === commonTargetFolderName ? 'index.ts' : `${key.replace(`${commonTargetFolderName}/`, '')}.ts`;
2426
writeFileSync(
25-
joinPaths(commonPath, `${key.replace('common/', '')}.ts`),
27+
joinPaths(commonPath, targetFileName),
2628
this.generateReexports(key, metadata.CommonReexports[key]),
2729
{ encoding: 'utf8' },
2830
);

packages/devextreme-angular/build.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ module.exports = {
2828
}
2929
},
3030
commonImports: [
31-
'./common/common',
31+
'./common',
3232
'./common/grids',
3333
'./common/charts',
3434
]

packages/devextreme-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"core-js": "^2.6.12",
3939
"del": "^2.2.2",
4040
"devextreme": "23.1-next",
41-
"devextreme-angular-generator": "^2.0.1",
41+
"devextreme-angular-generator": "^2.0.2",
4242
"devextreme-internal-tools": "^10.0.0-beta.5",
4343
"gulp": "^4.0.2",
4444
"gulp-header": "^1.8.12",

0 commit comments

Comments
 (0)