Move devextreme-themebuilder to the devDependencies (#154)

Author: nightskylark

packages/devextreme-cli/commands/application.react.js

@@ -20,20 +20,17 @@ const layouts = [
 ];
 
 const preparePackageJsonForTemplate = (appPath, appName) => {
-    const depends = [
+    const dependencies = [
         { name: 'node-sass', version: '^4.11.0' },
+        { name: 'devextreme-cli', version: latestVersions['devextreme-cli'], dev: true },
         { name: 'react-router-dom', version: '^5.0.0' }
     ];
-    const devDepends = [
-        { name: 'devextreme-cli', version: latestVersions['devextreme-cli'] }
-    ];
     const scripts = [
         { name: 'build-themes', value: 'devextreme build' },
         { name: 'postinstall', value: 'npm run build-themes' }
     ];
 
-    packageJsonUtils.addDependencies(appPath, depends);
-    packageJsonUtils.addDependencies(appPath, devDepends, 'dev');
+    packageJsonUtils.addDependencies(appPath, dependencies);
     packageJsonUtils.updateScripts(appPath, scripts);
     packageJsonUtils.updateName(appPath, appName);
 };

packages/devextreme-cli/commands/application.vue.js

@@ -19,21 +19,18 @@ const layouts = [
 ];
 
 const preparePackageJsonForTemplate = (appPath, appName) => {
-    const depends = [
+    const dependencies = [
         { name: 'node-sass', version: '^4.11.0' },
-        { name: 'vue-router', version: '^3.0.1' }
-    ];
-    const devDepends = [
-        { name: 'devextreme-cli', version: latestVersions['devextreme-cli'] },
-        { name: 'sass-loader', version: '^7.1.0' }
+        { name: 'vue-router', version: '^3.0.1' },
+        { name: 'devextreme-cli', version: latestVersions['devextreme-cli'], dev: true },
+        { name: 'sass-loader', version: '^7.1.0', dev: true }
     ];
     const scripts = [
         { name: 'build-themes', value: 'devextreme build' },
         { name: 'postinstall', value: 'npm run build-themes' }
     ];
 
-    packageJsonUtils.addDependencies(appPath, depends);
-    packageJsonUtils.addDependencies(appPath, devDepends, 'dev');
+    packageJsonUtils.addDependencies(appPath, dependencies);
     packageJsonUtils.updateScripts(appPath, scripts);
     packageJsonUtils.updateName(appPath, appName);
 };

packages/devextreme-cli/utility/package-json-utils.js

@@ -11,31 +11,37 @@ const getPackageJsonPath = (appPath) => {
     return packageJsonPath;
 };
 
-const addDependencies = (appPath, packages, type) => {
-    const propName = type === 'dev' ? 'devDependencies' : 'dependencies';
-
-    modifyJson(getPackageJsonPath(appPath), content => {
-        if(!content[propName]) {
-            content[propName] = {};
-        }
-
-        packages.forEach(item => {
-            content[propName][item.name] = item.version;
+const addDependencies = (appPath, dependencies) => {
+    modifyJson(getPackageJsonPath(appPath), packageConfig => {
+        dependencies.forEach(dependency => {
+            const sectionName = dependency.dev ? 'devDependencies' : 'dependencies';
+            const section = packageConfig[sectionName] = packageConfig[sectionName] || {};
+            section[dependency.name] = dependency.version;
         });
 
-        return content;
+        return packageConfig;
     });
 };
 
 const addDevextreme = (appPath, dxversion, engine) => {
     const dxWrapperPackage = `devextreme-${engine}`;
-    const depends = [
-        { name: 'devextreme', version: dxversion || latestVersions['devextreme'] },
-        { name: 'devextreme-themebuilder', version: dxversion || latestVersions['devextreme'] },
-        { name: dxWrapperPackage, version: dxversion || latestVersions[dxWrapperPackage] }
+    const dependencies = [
+        {
+            name: 'devextreme',
+            version: dxversion || latestVersions['devextreme']
+        },
+        {
+            name: 'devextreme-themebuilder',
+            version: dxversion || latestVersions['devextreme'],
+            dev: true
+        },
+        {
+            name: dxWrapperPackage,
+            version: dxversion || latestVersions[dxWrapperPackage]
+        }
     ];
 
-    addDependencies(getPackageJsonPath(appPath), depends);
+    addDependencies(getPackageJsonPath(appPath), dependencies);
 };
 
 const updateName = (appPath, name) => {