@scandipwa/magento-scripts 2.0.3 → 2.0.4

package/lib/config/services/php/extensions/soap.js

@@ -1,10 +1,8 @@
 /**
- * @type {import('../../../../typings/index').PHPExtensionInstallationInstruction}
+ * @type {import('../../../../../typings/index').PHPExtensionInstallationInstruction}
  */
 module.exports = {
     name: 'soap',
     command: 'docker-php-ext-install soap',
-    dependencies: [
-        'libxml2-dev'
-    ]
-};
+    dependencies: ['libxml2-dev']
+}

package/lib/config/services/php/extensions/sodium.js

@@ -1,10 +1,8 @@
 /**
- * @type {import('../../../../typings/index').PHPExtensionInstallationInstruction}
+ * @type {import('../../../../../typings/index').PHPExtensionInstallationInstruction}
  */
 module.exports = {
     name: 'sodium',
     command: 'docker-php-ext-install sodium',
-    dependencies: [
-        'libsodium-dev'
-    ]
-};
+    dependencies: ['libsodium-dev']
+}

package/lib/config/services/php/extensions/xdebug.js

@@ -1,12 +1,14 @@
 /* eslint-disable max-len */
 /**
- * @type {import('../../../../typings/index').PHPExtensionInstallationInstruction}
+ * @type {import('../../../../../typings/index').PHPExtensionInstallationInstruction}
  */
 module.exports = {
     name: 'xdebug',
-    command: ({ version = '' } = {}) => `apk add --no-cache --virtual .build-deps \\$PHPIZE_DEPS \
+    command: ({
+        version = ''
+    }) => `apk add --no-cache --virtual .build-deps \\$PHPIZE_DEPS \
 && pecl install xdebug${version ? `-${version}` : ''} \
 && docker-php-ext-enable xdebug \
 && apk del -f .build-deps`,
     version: '3.1.5'
-};
+}

package/lib/config/services/php/extensions/xsl.js

@@ -1,10 +1,8 @@
 /**
- * @type {import('../../../../typings/index').PHPExtensionInstallationInstruction}
+ * @type {import('../../../../../typings/index').PHPExtensionInstallationInstruction}
  */
 module.exports = {
     name: 'xsl',
     command: 'docker-php-ext-install xsl',
-    dependencies: [
-        'libxslt-dev'
-    ]
-};
+    dependencies: ['libxslt-dev']
+}

package/lib/config/services/php/extensions/zip.js

@@ -1,10 +1,8 @@
 /**
- * @type {import('../../../../typings/index').PHPExtensionInstallationInstruction}
+ * @type {import('../../../../../typings/index').PHPExtensionInstallationInstruction}
  */
 module.exports = {
     name: 'zip',
     command: 'docker-php-ext-install zip',
-    dependencies: [
-        'libzip-dev'
-    ]
-};
+    dependencies: ['libzip-dev']
+}

package/lib/config/services/php/versions/index.js

@@ -3,4 +3,4 @@ module.exports = {
     php73: require('./php-7.3'),
     php74: require('./php-7.4'),
     php81: require('./php-8.1')
-};
+}

package/lib/config/services/php/versions/php-7.2.js

@@ -1,17 +1,21 @@
-const path = require('path');
-const { repo } = require('../base-repo');
-const xdebug = require('../extensions/xdebug');
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
 
 /**
- * @returns {import('../../../../typings/index').PHPConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
  */
 const php72 = ({
     templateDir,
     extensions = {},
-    baseImage = `${ repo }:php-7.2`
-} = {}) => ({
+    baseImage = `${repo}:php-7.2`
+}) => ({
     baseImage,
-    debugImage: `${ baseImage }-debug`,
+    debugImage: `${baseImage}-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
     debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
@@ -19,6 +23,6 @@ const php72 = ({
         xdebug,
         ...extensions
     }
-});
+})
 
-module.exports = php72;
+module.exports = php72

package/lib/config/services/php/versions/php-7.3.js

@@ -1,17 +1,21 @@
-const path = require('path');
-const { repo } = require('../base-repo');
-const xdebug = require('../extensions/xdebug');
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
 
 /**
- * @returns {import('../../../../typings/index').PHPConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
  */
 const php73 = ({
     templateDir,
     extensions = {},
-    baseImage = `${ repo }:php-7.3`
-} = {}) => ({
+    baseImage = `${repo}:php-7.3`
+}) => ({
     baseImage,
-    debugImage: `${ baseImage }-debug`,
+    debugImage: `${baseImage}-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
     debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
@@ -19,6 +23,6 @@ const php73 = ({
         xdebug,
         ...extensions
     }
-});
+})
 
-module.exports = php73;
+module.exports = php73

package/lib/config/services/php/versions/php-7.4.js

@@ -1,17 +1,21 @@
-const path = require('path');
-const { repo } = require('../base-repo');
-const xdebug = require('../extensions/xdebug');
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
 
 /**
- * @returns {import('../../../../typings/index').PHPConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
  */
 const php74 = ({
     templateDir,
     extensions = {},
-    baseImage = `${ repo }:php-7.4`
-} = {}) => ({
+    baseImage = `${repo}:php-7.4`
+}) => ({
     baseImage,
-    debugImage: `${ baseImage }-debug`,
+    debugImage: `${baseImage}-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
     debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
@@ -19,6 +23,6 @@ const php74 = ({
         xdebug,
         ...extensions
     }
-});
+})
 
-module.exports = php74;
+module.exports = php74

package/lib/config/services/php/versions/php-8.1.js

@@ -1,17 +1,21 @@
-const path = require('path');
-const { repo } = require('../base-repo');
-const xdebug = require('../extensions/xdebug');
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
 
 /**
- * @returns {import('../../../../typings/index').PHPConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
  */
 const php81 = ({
     templateDir,
     extensions = {},
-    baseImage = `${ repo }:php-8.1`
-} = {}) => ({
+    baseImage = `${repo}:php-8.1`
+}) => ({
     baseImage,
-    debugImage: `${ baseImage }-debug`,
+    debugImage: `${baseImage}-debug`,
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
     debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
@@ -19,6 +23,6 @@ const php81 = ({
         xdebug,
         ...extensions
     }
-});
+})
 
-module.exports = php81;
+module.exports = php81

package/lib/config/services/redis/index.js

@@ -2,4 +2,4 @@ module.exports = {
     redis50: require('./redis-5.0'),
     redis60: require('./redis-6.0'),
     redis62: require('./redis-6.2')
-};
+}

package/lib/config/services/redis/redis-5.0.js

@@ -3,6 +3,6 @@
  */
 const redis50 = () => ({
     image: 'redis:5.0-alpine'
-});
+})
 
-module.exports = redis50;
+module.exports = redis50

package/lib/config/services/redis/redis-6.0.js

@@ -3,6 +3,6 @@
  */
 const redis60 = () => ({
     image: 'redis:6.0-alpine'
-});
+})
 
-module.exports = redis60;
+module.exports = redis60

package/lib/config/services/redis/redis-6.2.js

@@ -3,6 +3,6 @@
  */
 const redis62 = () => ({
     image: 'redis:6.2-alpine'
-});
+})
 
-module.exports = redis62;
+module.exports = redis62

package/lib/config/services/ssl-terminator/index.js

@@ -1,13 +1,14 @@
-const path = require('path');
+const path = require('path')
 
 /**
- * @returns {import('../../../../typings/index').SSLTerminatorConfiguration}
+ * @param {{ templateDir: string }} param0
+ * @returns {import('../../../../typings/index').NginxConfiguration}
  */
 const sslTerminator = ({ templateDir }) => ({
-    version: '1.18.0',
+    image: 'nginx:1.18.0',
     configTemplate: path.join(templateDir || '', 'ssl-terminator.template.conf')
-});
+})
 
 module.exports = {
     sslTerminator
-};
+}

package/lib/config/services/varnish/index.js

@@ -2,4 +2,4 @@ module.exports = {
     varnish60: require('./varnish-6-0'),
     varnish66: require('./varnish-6-6'),
     varnish70: require('./varnish-7-0')
-};
+}

package/lib/config/services/varnish/varnish-6-0.js

@@ -1,13 +1,15 @@
-const path = require('path');
+const path = require('path')
 
 /**
- * @returns {import('../../../typings/index').VarnishConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
  */
 const varnish60 = ({ templateDir }) => ({
     enabled: true,
     healthCheck: false,
-    version: '6.0',
+    image: 'varnish:6.0',
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-});
+})
 
-module.exports = varnish60;
+module.exports = varnish60

package/lib/config/services/varnish/varnish-6-6.js

@@ -1,13 +1,15 @@
-const path = require('path');
+const path = require('path')
 
 /**
- * @returns {import('../../../typings/index').VarnishConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
  */
 const varnish66 = ({ templateDir }) => ({
     enabled: true,
     healthCheck: false,
-    version: '6.6',
+    image: 'varnish:6.6',
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-});
+})
 
-module.exports = varnish66;
+module.exports = varnish66

package/lib/config/services/varnish/varnish-7-0.js

@@ -1,13 +1,15 @@
-const path = require('path');
+const path = require('path')
 
 /**
- * @returns {import('../../../typings/index').VarnishConfiguration}
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
  */
 const varnish70 = ({ templateDir }) => ({
     enabled: true,
     healthCheck: false,
-    version: '7.0',
+    image: 'varnish:7.0',
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-});
+})
 
-module.exports = varnish70;
+module.exports = varnish70

package/lib/config/system-config.js

@@ -1,81 +1,104 @@
-const os = require('os');
-const path = require('path');
-const fs = require('fs');
-const pathExists = require('../util/path-exists');
-const { systemConfigurationSchema } = require('../util/config-file-validator');
-const { deepmerge } = require('../util/deepmerge');
-const pathExistsSync = require('../util/path-exists-sync');
-const KnownError = require('../errors/known-error');
+const os = require('os')
+const path = require('path')
+const fs = require('fs')
+const pathExists = require('../util/path-exists')
+const { systemConfigurationSchema } = require('../util/config-file-validator')
+const { deepmerge } = require('../util/deepmerge')
+const pathExistsSync = require('../util/path-exists-sync')
+const KnownError = require('../errors/known-error')
 
 const defaultSystemConfig = {
     analytics: true,
     useNonOverlappingPorts: false
-};
-const systemConfigPath = path.join(os.homedir(), '.cmarc');
+}
+const systemConfigPath = path.join(os.homedir(), '.cmarc')
 
 /**
  * @returns {Promise<typeof defaultSystemConfig>}
  */
 const getSystemConfig = async ({ validate = true } = {}) => {
     if (await pathExists(systemConfigPath)) {
-        const userSystemConfig = await fs.promises.readFile(systemConfigPath, 'utf-8');
-        let userSystemConfigParsed;
+        const userSystemConfig = await fs.promises.readFile(
+            systemConfigPath,
+            'utf-8'
+        )
+        let userSystemConfigParsed
         try {
-            userSystemConfigParsed = JSON.parse(userSystemConfig);
+            userSystemConfigParsed = JSON.parse(userSystemConfig)
         } catch (e) {
-            throw new KnownError(`System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`);
+            throw new KnownError(
+                `System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`
+            )
         }
 
         if (validate) {
             try {
-                await systemConfigurationSchema.validateAsync(userSystemConfigParsed);
+                await systemConfigurationSchema.validateAsync(
+                    userSystemConfigParsed
+                )
             } catch (e) {
-                throw new KnownError(`Configuration file validation error!\n\n${e.message}`);
+                if (e instanceof Error) {
+                    throw new KnownError(
+                        `Configuration file validation error!\n\n${e.message}`
+                    )
+                }
+
+                throw e
             }
         }
 
-        return deepmerge(defaultSystemConfig, userSystemConfigParsed);
+        return deepmerge(defaultSystemConfig, userSystemConfigParsed)
     }
 
-    return defaultSystemConfig;
-};
+    return defaultSystemConfig
+}
 
 const getSystemConfigSync = ({ validate = true } = {}) => {
     if (pathExistsSync(systemConfigPath)) {
-        const userSystemConfig = fs.readFileSync(systemConfigPath, { encoding: 'utf-8' });
-        let userSystemConfigParsed;
+        const userSystemConfig = fs.readFileSync(systemConfigPath, {
+            encoding: 'utf-8'
+        })
+        let userSystemConfigParsed
         try {
-            userSystemConfigParsed = JSON.parse(userSystemConfig);
+            userSystemConfigParsed = JSON.parse(userSystemConfig)
         } catch (e) {
-            throw new KnownError(`System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`);
+            throw new KnownError(
+                `System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`
+            )
         }
         if (validate) {
             try {
-                systemConfigurationSchema.validate(userSystemConfigParsed);
+                systemConfigurationSchema.validate(userSystemConfigParsed)
             } catch (e) {
-                throw new KnownError(`Configuration file validation error!\n\n${e.message}`);
+                if (e instanceof Error) {
+                    throw new KnownError(
+                        `Configuration file validation error!\n\n${e.message}`
+                    )
+                }
+
+                throw e
             }
         }
 
-        return deepmerge(defaultSystemConfig, userSystemConfigParsed);
+        return deepmerge(defaultSystemConfig, userSystemConfigParsed)
     }
 
-    return defaultSystemConfig;
-};
+    return defaultSystemConfig
+}
 
 /**
  * Get system configuration from configuration file located in user root directory.
- * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
+ * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const getSystemConfigTask = () => ({
     task: async (ctx) => {
-        ctx.systemConfiguration = await getSystemConfig();
+        ctx.systemConfiguration = await getSystemConfig()
     }
-});
+})
 
 module.exports = {
     defaultSystemConfig,
     getSystemConfigTask,
     getSystemConfig,
     getSystemConfigSync
-};
+}

package/lib/config/templates/mariadb.template.cnf

@@ -187,5 +187,7 @@ key_buffer              = 16M
 [mariadb]
 skip-host-cache
 skip-name-resolve
+optimizer_switch='rowid_filter=off'
+optimizer_use_condition_selectivity=1
 
 !includedir /etc/mysql/conf.d/

package/lib/config/versions/index.js

@@ -1,48 +1,69 @@
-const path = require('path');
-const fs = require('fs');
-const semver = require('semver');
-const { deepmerge } = require('../../util/deepmerge');
+const path = require('path')
+const fs = require('fs')
+const semver = require('semver')
+const { deepmerge } = require('../../util/deepmerge')
 
 const defaultCMAConfig = {
     prefix: true
-};
+}
 
-const magentoVersions = fs.readdirSync(__dirname, {
-    withFileTypes: true
-})
+const magentoVersions = fs
+    .readdirSync(__dirname, {
+        withFileTypes: true
+    })
     .filter((f) => f.isFile())
     .filter((f) => f.name.includes('magento'))
-    .map((f) => require(path.join(__dirname, f.name)));
+    .map((f) => require(path.join(__dirname, f.name)))
 
-const getConfigurations = (config = {}) => magentoVersions.reduce(
-    (acc, val) => ({
-        ...acc,
-        [val().magentoVersion]: deepmerge(defaultCMAConfig, {
-            ...val(config)
-        })
-    }),
-    {}
-);
+const getConfigurations = (config = {}) =>
+    magentoVersions.reduce(
+        (acc, val) => ({
+            ...acc,
+            [val({}).magentoVersion]: deepmerge(defaultCMAConfig, {
+                ...val(config)
+            })
+        }),
+        {}
+    )
 
 const allVersions = Object.entries(getConfigurations())
     .map(([name, magentoConfig]) => ({ ...magentoConfig, name }))
     .sort((a, b) => {
-        if (a.magentoVersion.replace(/-p[0-9]+$/i, '') === b.magentoVersion.replace(/-p[0-9]+$/i, '')) {
-            if (a.magentoVersion.includes('-p') && !b.magentoVersion.includes('-p')) {
-                return 1;
+        if (
+            a.magentoVersion.replace(/-p[0-9]+$/i, '') ===
+            b.magentoVersion.replace(/-p[0-9]+$/i, '')
+        ) {
+            if (
+                a.magentoVersion.includes('-p') &&
+                !b.magentoVersion.includes('-p')
+            ) {
+                return 1
             }
-            const aPatchVersion = (a.magentoVersion.includes('-p') && Number.parseInt(a.magentoVersion.match(/-p([0-9]+)$/i)[1], 10)) || 0;
-            const bPatchVersion = (b.magentoVersion.includes('-p') && Number.parseInt(b.magentoVersion.match(/-p([0-9]+)$/i)[1], 10)) || 0;
+            const aPatchVersion =
+                (a.magentoVersion.includes('-p') &&
+                    Number.parseInt(
+                        a.magentoVersion.match(/-p([0-9]+)$/i)[1],
+                        10
+                    )) ||
+                0
+            const bPatchVersion =
+                (b.magentoVersion.includes('-p') &&
+                    Number.parseInt(
+                        b.magentoVersion.match(/-p([0-9]+)$/i)[1],
+                        10
+                    )) ||
+                0
 
-            return aPatchVersion - bPatchVersion;
+            return aPatchVersion - bPatchVersion
         }
 
-        return semver.gt(a.magentoVersion, b.magentoVersion) ? 1 : -1;
-    }).reverse();
+        return semver.gt(a.magentoVersion, b.magentoVersion) ? 1 : -1
+    })
+    .reverse()
 
 module.exports = {
     allVersions,
     getConfigurations,
     defaultConfiguration: allVersions.find((config) => config.isDefault),
     defaultCMAConfig
-};
+}