@scandipwa/magento-scripts 1.15.0 → 1.15.1

package/lib/config/check-configuration-file.js

@@ -5,6 +5,7 @@ const pathExists = require('../util/path-exists');
 const { deepmerge } = require('../util/deepmerge');
 const { defaultMagentoConfig } = require('./magento-config');
 const setConfigFile = require('../util/set-config');
+const getJsonfileData = require('../util/get-jsonfile-data');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -16,6 +17,8 @@ const checkConfigurationFile = () => ({
         const { cacheDir, templateDir } = getBaseConfig(projectPath);
         const configJSFilePath = path.join(projectPath, 'cma.js');
         const magentoConfigFilePath = path.join(cacheDir, 'app-config.json');
+        const composerJsonPath = path.join(process.cwd(), 'composer.json');
+        const composerData = await getJsonfileData(composerJsonPath);
 
         if (!await pathExists(configJSFilePath)) {
             const legacyMagentoConfigExists = await pathExists(magentoConfigFilePath);
@@ -28,7 +31,19 @@ const checkConfigurationFile = () => ({
                 );
 
                 magentoConfiguration = legacyMagentoConfig.magento || legacyMagentoConfig;
-            } else {
+            } else if (composerData) {
+                if (composerData.require['magento/product-community-edition']) {
+                    magentoConfiguration = deepmerge(defaultMagentoConfig, {
+                        edition: 'community'
+                    });
+                } else if (composerData.require['magento/product-enterprise-edition']) {
+                    magentoConfiguration = deepmerge(defaultMagentoConfig, {
+                        edition: 'enterprise'
+                    });
+                }
+            }
+
+            if (!magentoConfiguration) {
                 const magentoEdition = await task.prompt({
                     type: 'Select',
                     message: `Please select Magento edition you want to install.

package/lib/util/analytics.js

@@ -253,6 +253,9 @@ class Analytics {
         // eslint-disable-next-line no-empty
         } catch (e) {
             console.log('Failed to report telemetry data');
+            if (process.env.GA_DEBUG) {
+                logger.error(e);
+            }
         }
     }
 

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "1.15.0",
+    "version": "1.15.1",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -36,7 +36,7 @@
         "mysql2": "2.3.2",
         "node-ssh": "12.0.0",
         "semver": "7.3.5",
-        "smol-request": "2.1.1",
+        "smol-request": "^2.1.2",
         "systeminformation": "5.11.7",
         "yargs": "17.3.1"
     },
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "a38fc88b515a4a44d8e037f54b66d6021888e8e4"
+    "gitHead": "ba6f9e613e4448cf449c6e82f8d95ff546de2294"
 }