@scandipwa/magento-scripts 2.0.3 → 2.0.5

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

@@ -1,45 +1,50 @@
-const path = require('path');
-const fs = require('fs');
-const { getBaseConfig } = require('./index');
-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');
+const path = require('path')
+const fs = require('fs')
+const { getBaseConfig } = require('./index')
+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>}
+ * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const checkConfigurationFile = () => ({
     title: 'Checking configuration file',
     task: async (ctx, task) => {
-        const { projectPath = process.cwd() } = ctx;
-        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);
+        const { projectPath = process.cwd() } = ctx
+        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);
+        if (!(await pathExists(configJSFilePath))) {
+            const legacyMagentoConfigExists = await pathExists(
+                magentoConfigFilePath
+            )
 
-            let magentoConfiguration;
+            let magentoConfiguration
 
             if (legacyMagentoConfigExists) {
                 const legacyMagentoConfig = JSON.parse(
                     await fs.promises.readFile(magentoConfigFilePath, 'utf-8')
-                );
+                )
 
-                magentoConfiguration = legacyMagentoConfig.magento || legacyMagentoConfig;
+                magentoConfiguration =
+                    legacyMagentoConfig.magento || legacyMagentoConfig
             } else if (composerData) {
                 if (composerData.require['magento/product-community-edition']) {
                     magentoConfiguration = deepmerge(defaultMagentoConfig, {
                         edition: 'community'
-                    });
-                } else if (composerData.require['magento/product-enterprise-edition']) {
+                    })
+                } else if (
+                    composerData.require['magento/product-enterprise-edition']
+                ) {
                     magentoConfiguration = deepmerge(defaultMagentoConfig, {
                         edition: 'enterprise'
-                    });
+                    })
                 }
             }
 
@@ -50,11 +55,11 @@ const checkConfigurationFile = () => ({
 
 Note that Enterprise edition requires Magento Enterprise License keys.`,
                     choices: ['Community', 'Enterprise']
-                });
+                })
 
                 magentoConfiguration = deepmerge(defaultMagentoConfig, {
                     edition: magentoEdition.toLowerCase()
-                });
+                })
             }
 
             await setConfigFile({
@@ -64,9 +69,9 @@ Note that Enterprise edition requires Magento Enterprise License keys.`,
                 templateArgs: {
                     magentoConfiguration
                 }
-            });
+            })
         }
     }
-});
+})
 
-module.exports = checkConfigurationFile;
+module.exports = checkConfigurationFile

package/lib/config/cma-config.js

@@ -1,6 +1,6 @@
-const Conf = require('conf');
+const Conf = require('conf')
 
-const pkg = require('../../package.json');
+const pkg = require('../../package.json')
 /**
  * @type {import('conf/dist/source').default}
  */
@@ -9,8 +9,8 @@ const cmaGlobalConfig = new Conf({
     projectName: 'create-magento-app',
     projectVersion: pkg.version,
     defaults: {}
-});
+})
 
 module.exports = {
     cmaGlobalConfig
-};
+}

package/lib/config/config.js

@@ -1,6 +1,7 @@
-const Conf = require('conf');
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+const Conf = require('conf')
 
-const pkg = require('../../package.json');
+const pkg = require('../../package.json')
 
 /**
  * @typedef ProjectConfig
@@ -12,44 +13,65 @@ const pkg = require('../../package.json');
 /**
  * @type {import('conf').default<Record<string, ProjectConfig>>}
  */
+// @ts-ignore
 const projectsConfig = new Conf({
     configName: 'projects',
     projectName: 'create-magento-app',
     projectVersion: pkg.version,
     defaults: {}
-});
-const projectKey = process.cwd();
+})
+const projectKey = process.cwd()
 
+/**
+ * @param {string} key
+ * @param {any} value
+ */
 const setProjectConfig = (key, value) => {
-    projectsConfig.set(`${projectKey}.${key}`, value);
-};
+    projectsConfig.set(`${projectKey}.${key}`, value)
+}
 
-const getProjectConfig = () => projectsConfig.get(projectKey);
+const getProjectConfig = () => projectsConfig.get(projectKey)
 
+/**
+ * @param {string} path
+ * @param {ProjectConfig} project
+ * @returns {Record<string, ProjectConfig>}
+ */
 const getProjectsFromProjectKeys = (path, project) => {
     if (project.createdAt) {
-        return { [path]: project };
+        return { [path]: project }
     }
 
     return Object.entries(project)
-        .map(([subProjectPath, subProjectValue]) => getProjectsFromProjectKeys(`${path}.${subProjectPath}`, subProjectValue))
-        .reduce((acc, val) => ({ ...acc, ...val }), {});
-};
+        .map(([subProjectPath, subProjectValue]) =>
+            getProjectsFromProjectKeys(
+                `${path}.${subProjectPath}`,
+                subProjectValue
+            )
+        )
+        .reduce((acc, val) => ({ ...acc, ...val }), {})
+}
 /**
  *
  * @returns {Record<string, ProjectConfig>}
  */
 const getProjects = () => {
-    const projects = {};
+    /**
+     * @type {Record<string, ProjectConfig>}
+     */
+    const projects = {}
     for (const [projectPath, projectValueWithProjects] of projectsConfig) {
-        const projectList = getProjectsFromProjectKeys(projectPath, projectValueWithProjects);
+        const projectList = getProjectsFromProjectKeys(
+            projectPath,
+            projectValueWithProjects
+        )
         Object.entries(projectList).forEach(([key, value]) => {
-            projects[key] = value;
-        });
+            projects[key] = value
+        })
     }
 
-    return projects;
-};
+    return projects
+}
 /**
  * Those 2 functions are needed to remain compatibility with older CMA instances,
  * because when this part of code was written,
@@ -64,4 +86,4 @@ module.exports = {
     getProjects,
     setProjectConfig,
     getProjectConfig
-};
+}

package/lib/config/dependencies-for-platforms.js

@@ -1,22 +1,52 @@
+const { getBrewCommandSync } = require('../util/get-brew-bin-path')
+
 const dependenciesForPlatforms = {
     darwin: {
+        /**
+         * @param {string} deps
+         * @param {{ native?: boolean }} param1
+         */
+        installCommand: (deps, { native } = { native: false }) =>
+            `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'darwin-arm': {
+        /**
+         * @param {string} deps
+         */
+        installCommand: (deps, { native } = { native: false }) =>
+            `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'Arch Linux': {
+        /**
+         * @param {string} deps
+         */
+        installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`,
         packageManager: 'pacman'
     },
     Fedora: {
-        packageManager: 'dnf'
+        /**
+         * @param {string} deps
+         */
+        installCommand: (deps) => `sudo yum install ${deps} -y`,
+        packageManager: 'yum'
     },
     CentOS: {
+        /**
+         * @param {string} deps
+         */
+        installCommand: (deps) =>
+            `sudo yum install --enablerepo=PowerTools ${deps} -y`,
         packageManager: 'yum'
     },
     Ubuntu: {
+        /**
+         * @param {string} deps
+         */
+        installCommand: (deps) => `sudo apt install ${deps} -y`,
         packageManager: 'apt'
     }
-};
+}
 
-module.exports = dependenciesForPlatforms;
+module.exports = dependenciesForPlatforms