Skip to content

Commit 950a349

Browse files
authored
Revert deprecated folder removing (#810)
* Revert "Remove deprecated ui folder rendering (#808) This reverts commit 4637895.
1 parent 4637895 commit 950a349

File tree

5 files changed

+32
-1
lines changed

5 files changed

+32
-1
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.5",
4+
"version": "1.3.6",
55
"description": "DevExtreme React UI and Visualization Components",
66
"repository": {
77
"type": "git",

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ 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+
105115
const renderObjectEntry: (model: {
106116
key: string;
107117
value: string;
@@ -609,4 +619,5 @@ export {
609619
IOption,
610620
ISubscribableOption,
611621
IPropTyping,
622+
generateReExport,
612623
};

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

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

2223
import generateComponent, {
24+
generateReExport,
2325
IComponent,
2426
IIndependentEvents,
2527
INestedComponent,
@@ -246,6 +248,7 @@ function generate({
246248
},
247249
out: {
248250
componentsDir: string,
251+
oldComponentsDir: string,
249252
indexFileName: string
250253
},
251254
widgetsPackage: string
@@ -268,6 +271,15 @@ function generate({
268271
name: widgetFile.component.name,
269272
path: `./${removeExtension(getRelativePath(indexFileDir, widgetFilePath)).replace(pathSeparator, '/')}`,
270273
});
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+
);
271283
});
272284

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

packages/devextreme-react/build.config.js

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

packages/devextreme-react/gulpfile.js

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

17+
const OLD_OUTPUTDIR_CREATE = 'output-dir.create';
1718
const GEN_RUN = 'generator.run';
1819

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

32+
gulp.task(OLD_OUTPUTDIR_CREATE, (done) =>
33+
mkdir(config.oldComponentsDir, {}, done)
34+
);
35+
3136
gulp.task(GEN_RUN, (done) => {
3237
generateSync({
3338
metaData: JSON.parse(fs.readFileSync(config.metadataPath).toString()),
@@ -38,6 +43,7 @@ gulp.task(GEN_RUN, (done) => {
3843
},
3944
out: {
4045
componentsDir: config.generatedComponentsDir,
46+
oldComponentsDir: config.oldComponentsDir,
4147
indexFileName: config.indexFileName
4248
},
4349
widgetsPackage: 'devextreme'
@@ -48,6 +54,7 @@ gulp.task(GEN_RUN, (done) => {
4854

4955
gulp.task(GENERATE, gulp.series(
5056
CLEAN,
57+
OLD_OUTPUTDIR_CREATE,
5158
GEN_RUN
5259
));
5360

0 commit comments

Comments
 (0)