Skip to content

Commit 4637895

Browse files
authored
Remove deprecated ui folder rendering (#808)
1 parent 0f58355 commit 4637895

File tree

5 files changed

+1
-32
lines changed

5 files changed

+1
-32
lines changed

packages/devextreme-react-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-react-generator",
4-
"version": "1.3.4",
4+
"version": "1.3.5",
55
"description": "DevExtreme React UI and Visualization Components",
66
"repository": {
77
"type": "git",

packages/devextreme-react-generator/src/component-generator.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,6 @@ function getIndent(indent: number) {
102102
return Array(indent * 2 + 1).join(' ');
103103
}
104104

105-
const renderReExport: (model: { path: string, fileName: string }) => string = createTempate(
106-
'/** @deprecated Use \'devextreme-react/<#= it.fileName #>\' file instead */\n'
107-
+ 'export * from "<#= it.path #>";\n'
108-
+ 'export { default } from "<#= it.path #>";\n',
109-
);
110-
111-
function generateReExport(path: string, fileName: string): string {
112-
return renderReExport({ path, fileName });
113-
}
114-
115105
const renderObjectEntry: (model: {
116106
key: string;
117107
value: string;
@@ -619,5 +609,4 @@ export {
619609
IOption,
620610
ISubscribableOption,
621611
IPropTyping,
622-
generateReExport,
623612
};

packages/devextreme-react-generator/src/generator.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { writeFileSync as writeFile } from 'fs';
33
import {
44
dirname as getDirName,
55
join as joinPaths,
6-
normalize as normalizePath,
76
relative as getRelativePath,
87
sep as pathSeparator,
98
} from 'path';
@@ -21,7 +20,6 @@ import { convertTypes } from './converter';
2120
import generateIndex, { IReExport } from './index-generator';
2221

2322
import generateComponent, {
24-
generateReExport,
2523
IComponent,
2624
IIndependentEvents,
2725
INestedComponent,
@@ -248,7 +246,6 @@ function generate({
248246
},
249247
out: {
250248
componentsDir: string,
251-
oldComponentsDir: string,
252249
indexFileName: string
253250
},
254251
widgetsPackage: string
@@ -271,15 +268,6 @@ function generate({
271268
name: widgetFile.component.name,
272269
path: `./${removeExtension(getRelativePath(indexFileDir, widgetFilePath)).replace(pathSeparator, '/')}`,
273270
});
274-
275-
writeFile(
276-
joinPaths(out.oldComponentsDir, widgetFile.fileName),
277-
generateReExport(
278-
normalizePath(`./${removeExtension(getRelativePath(out.oldComponentsDir, widgetFilePath))}`)
279-
.replace(pathSeparator, '/'),
280-
removeExtension(widgetFile.fileName),
281-
),
282-
);
283271
});
284272

285273
writeFile(out.indexFileName, generateIndex(modulePaths), { encoding: 'utf8' });

packages/devextreme-react/build.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ module.exports = {
1111
metadataPath: './metadata/integration-data.json',
1212
generatedComponentsDir: './src',
1313
coreComponentsDir: './src/core',
14-
oldComponentsDir: './src/ui',
1514
indexFileName: './src/index.ts',
1615
baseComponent: './core/component',
1716
extensionComponent: './core/extension-component',

packages/devextreme-react/gulpfile.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const generateSync = require('devextreme-react-generator').default;
1414
const GENERATE = 'generate';
1515
const CLEAN = 'clean';
1616

17-
const OLD_OUTPUTDIR_CREATE = 'output-dir.create';
1817
const GEN_RUN = 'generator.run';
1918

2019
const NPM_CLEAN = 'npm.clean';
@@ -29,10 +28,6 @@ gulp.task(CLEAN, (c) =>
2928
del([`${config.generatedComponentsDir}\\*`, `!${config.coreComponentsDir}`], c)
3029
);
3130

32-
gulp.task(OLD_OUTPUTDIR_CREATE, (done) =>
33-
mkdir(config.oldComponentsDir, {}, done)
34-
);
35-
3631
gulp.task(GEN_RUN, (done) => {
3732
generateSync({
3833
metaData: JSON.parse(fs.readFileSync(config.metadataPath).toString()),
@@ -43,7 +38,6 @@ gulp.task(GEN_RUN, (done) => {
4338
},
4439
out: {
4540
componentsDir: config.generatedComponentsDir,
46-
oldComponentsDir: config.oldComponentsDir,
4741
indexFileName: config.indexFileName
4842
},
4943
widgetsPackage: 'devextreme'
@@ -54,7 +48,6 @@ gulp.task(GEN_RUN, (done) => {
5448

5549
gulp.task(GENERATE, gulp.series(
5650
CLEAN,
57-
OLD_OUTPUTDIR_CREATE,
5851
GEN_RUN
5952
));
6053

0 commit comments

Comments
 (0)