Skip to content

Commit 19a14c1

Browse files
fixes for pass lint check
1 parent 26ba254 commit 19a14c1

File tree

5 files changed

+6
-40
lines changed

5 files changed

+6
-40
lines changed

packages/devextreme-cli/src/applications/application.react.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,22 @@ const updateJsonPropName = (path, name) => {
5454
const create = async(appName, options) => {
5555
const templateType = await getTemplateTypeInfo(options.template);
5656
const layoutType = await getLayoutInfo(options.layout);
57-
const isTs = typescriptUtils.isTypeScript(templateType);
5857

5958
const templateOptions = Object.assign({}, options, {
6059
project: stringUtils.humanize(appName),
6160
layout: stringUtils.classify(layoutType),
62-
isTypeScript: isTs,
61+
isTypeScript: typescriptUtils.isTypeScript(templateType),
6362
});
6463

6564
const toolingVersion = extractToolingVersion(options);
6665
const commandArguments = [`-p=create-vite${toolingVersion}`, 'create-vite', appName];
6766

68-
commandArguments.push(`--template react${isTs ? '-ts' : ''}`);
67+
commandArguments.push(`--template react${templateOptions.isTypeScript ? '-ts' : ''}`);
6968

7069
await runCommand('npx', commandArguments);
7170

7271
const appPath = path.join(process.cwd(), appName);
7372

74-
if(isTs) {
75-
patchTsConfig(appPath);
76-
}
77-
7873
modifyIndexHtml(appPath, templateOptions.project);
7974

8075
addTemplate(appPath, appName, templateOptions);
@@ -123,15 +118,6 @@ const addTemplate = (appPath, appName, templateOptions) => {
123118
install({}, appPath, styles);
124119
};
125120

126-
function patchTsConfig(appPath) {
127-
const tsConfigPath = path.join(appPath, 'tsconfig.json');
128-
const tsConfig = JSON.parse(fs.readFileSync(tsConfigPath, 'utf8'));
129-
130-
tsConfig.include = ['src'];
131-
132-
fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2), 'utf8');
133-
}
134-
135121
const install = (options, appPath, styles) => {
136122
appPath = appPath ? appPath : process.cwd();
137123

packages/devextreme-cli/src/templates/react/application/src/App.test.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/devextreme-cli/src/templates/react/application/src/App.test.tsx

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/devextreme-cli/src/templates/react/application/src/utils/media-query.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ const largeMedia = window.matchMedia('(min-width: 1280px)');
4444

4545
[xSmallMedia, smallMedia, mediumMedia, largeMedia].forEach(media => {
4646
media.addListener((e) => {
47-
e.matches && handlers.forEach(handler => handler());
47+
if(e.matches) {
48+
handlers.forEach(handler => handler())
49+
}
4850
});
4951
});
5052

packages/devextreme-cli/testing/linting.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const customLint = async(env) => {
4848

4949
async function lint(env) {
5050

51-
if(env.engine.startsWith('vue')) {
51+
if(env.engine.startsWith('vue') || env.engine.startsWith('react')) {
5252
await projectLint(env.engine);
5353
} else {
5454
await customLint(env);

0 commit comments

Comments
 (0)