Skip to content

Commit

Permalink
explicitly specify /index in bags
Browse files Browse the repository at this point in the history
  • Loading branch information
VasilyStrelyaev committed Dec 5, 2024
1 parent b503826 commit 8f2b426
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 44 deletions.
6 changes: 0 additions & 6 deletions apps/demos/utils/bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ const getDefaultBuilderConfig = (framework, additionPaths, map) => ({
'devexpress-gantt': 'node_modules/devexpress-gantt/dist/dx-gantt.min.js',
'devexpress-diagram': 'node_modules/devexpress-diagram/dist/dx-diagram.min.js',
[`devextreme-${framework}/*`]: `node_modules/devextreme-${framework}/${['react', 'vue'].includes(framework) ? 'cjs/*' : '*'}`,
'devextreme-react/common.js': 'node_modules/devextreme-react/cjs/common/index.js',
'devextreme-react/common/core.js': 'node_modules/devextreme-react/cjs/common/core/index.js',
'devextreme-react/common/export.js': 'node_modules/devextreme-react/cjs/common/export/index.js',
'devextreme-vue/common.js': 'node_modules/devextreme-vue/cjs/common/index.js',
'devextreme-vue/common/core.js': 'node_modules/devextreme-vue/cjs/common/core/index.js',
'devextreme-vue/common/export.js': 'node_modules/devextreme-vue/cjs/common/export/index.js',
...additionPaths,
},
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"axe-core": "4.10.2",
"cheerio": "1.0.0-rc.10",
"codelyzer": "6.0.2",
"devextreme-internal-tools": "16.0.0-beta.19",
"devextreme-internal-tools": "16.0.0",
"http-server": "14.1.1",
"husky": "8.0.3",
"jest": "29.7.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/devextreme-angular/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,14 @@ gulp.task('before-generate.preserve-component-files', (done) => {
gulp.task('generate.facades', gulp.series('generate.moduleFacades', (done) => {
const facadeGenerator = new AngularFacadeGenerator();

facadeGenerator.generate(buildConfig.tools.facadeGenerator);
facadeGenerator.generate({
...buildConfig.tools.facadeGenerator,
templatingOptions: {
quotes: 'single',
excplicitIndexInImports: true,
},
});

done();
}));

Expand All @@ -94,6 +101,10 @@ gulp.task('generate.common-reexports', (done) => {
AngularCommonReexportsGenerator.generate({
outputPath,
metadata: JSON.parse(fs.readFileSync(imdMetadataFilePath).toString()),
templatingOptions: {
quotes: 'single',
excplicitIndexInImports: true,
},
});
done();
});
Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-angular/src/common/core/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * as Animation from "./animation";
export * as Environment from "./environment";
export * as Events from "./events";
export * as Localization from "./localization";
export * as Animation from './animation';
export * as Environment from './environment';
export * as Events from './events';
export * as Localization from './localization';
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/common/export/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export * as Excel from "./excel";
export * as Pdf from "./pdf";
export * as Excel from './excel';
export * as Pdf from './pdf';
10 changes: 5 additions & 5 deletions packages/devextreme-angular/src/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ export {
VerticalEdge,
} from 'devextreme/common';

export * as Charts from "./charts";
export * as Core from "./core";
export * as Data from "./data";
export * as Export from "./export";
export * as Grids from "./grids";
export * as Charts from './charts';
export * as Core from './core/index';
export * as Data from './data';
export * as Export from './export/index';
export * as Grids from './grids';
2 changes: 1 addition & 1 deletion packages/devextreme-angular/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ export { DxValidationGroupComponent, DxValidationGroupModule } from 'devextreme-
export { DxValidationSummaryComponent, DxValidationSummaryModule } from 'devextreme-angular/ui/validation-summary';
export { DxValidatorComponent, DxValidatorModule } from 'devextreme-angular/ui/validator';
export { DxVectorMapComponent, DxVectorMapModule } from 'devextreme-angular/ui/vector-map';
export * as Common from './common';
export * as Common from './common/index';
4 changes: 4 additions & 0 deletions packages/devextreme-react/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ gulp.task(GEN_RUN, (done) => {
generateReexports: true,
generateCustomTypes: true,
},
templatingOptions: {
quotes: 'double',
excplicitIndexInImports: true,
},
});

done();
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-react/src/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export {
} from "devextreme/common";

export * as Charts from "./charts";
export * as Core from "./core";
export * as Core from "./core/index";
export * as Data from "./data";
export * as Export from "./export";
export * as Export from "./export/index";
export * as Grids from "./grids";
2 changes: 1 addition & 1 deletion packages/devextreme-react/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ export { ValidationSummary } from "./validation-summary";
export { Validator } from "./validator";
export { VectorMap } from "./vector-map";

export * as Common from "./common";
export * as Common from "./common/index";
6 changes: 5 additions & 1 deletion packages/devextreme-vue/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ gulp.task(GENERATE,
},
config.widgetsPackage,
VUE_VERSION,
true
true,
{
quotes: 'double',
excplicitIndexInImports: true,
}
);

done();
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export {
} from "devextreme/common";

export * as Charts from "./charts";
export * as Core from "./core";
export * as Core from "./core/index";
export * as Data from "./data";
export * as Export from "./export";
export * as Export from "./export/index";
export * as Grids from "./grids";
2 changes: 1 addition & 1 deletion packages/devextreme-vue/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ export { DxValidationSummary } from "./validation-summary";
export { DxValidator } from "./validator";
export { DxVectorMap } from "./vector-map";

export * as Common from "./common";
export * as Common from "./common/index";
32 changes: 15 additions & 17 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8f2b426

Please sign in to comment.