@scandipwa/magento-scripts 1.16.1 → 2.0.0-alpha.0

package/lib/config/versions/magento-2.3.6-p1.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6-p1',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.3.6.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php73 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php73 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6',
     configuration: {
-        php: php73({ templateDir }),
+        php: php73({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.3-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.3.7-p1.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p1',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.3.7-p2.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p2',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.3.7-p3.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p3',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.3.7.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.3`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.4.0-p1.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0-p1',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: magento24PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.4`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -22,7 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '10.2'
         },
         elasticsearch: {
-            version: '7.6.2'
+            version: '7.12.1'
         },
         composer: {
             version: '1'

package/lib/config/versions/magento-2.4.0.js

@@ -1,13 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: magento24PHPExtensionList,
+            baseImage: `${ repo }:php-7.4-magento-2.4`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')
@@ -22,7 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '10.2'
         },
         elasticsearch: {
-            version: '7.6.2'
+            version: '7.12.1'
         },
         composer: {
             version: '1'

package/lib/config/versions/magento-2.4.1-p1.js

@@ -1,18 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1-p1',
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',

package/lib/config/versions/magento-2.4.1.js

@@ -1,13 +1,20 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1',
     configuration: {
-        php: php74({ templateDir }),
+        php: php74({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/config/versions/magento-2.4.2-p1.js

@@ -1,9 +1,11 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p1',
@@ -11,9 +13,8 @@ module.exports = ({ templateDir } = {}) => ({
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',

package/lib/config/versions/magento-2.4.2-p2.js

@@ -1,9 +1,11 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p2',
@@ -11,10 +13,8 @@ module.exports = ({ templateDir } = {}) => ({
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium,
-                fileinfo: {}
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',

package/lib/config/versions/magento-2.4.2.js

@@ -1,19 +1,19 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2',
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium,
-                fileinfo: {}
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',

package/lib/config/versions/magento-2.4.3-p1.js

@@ -1,9 +1,11 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p1',
@@ -11,10 +13,8 @@ module.exports = ({ templateDir } = {}) => ({
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium,
-                fileinfo: {}
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',
@@ -30,7 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '10.4'
         },
         elasticsearch: {
-            version: '7.12.1'
+            version: '7.16.3'
         },
         composer: {
             version: '2'

package/lib/config/versions/magento-2.4.3-p2.js

@@ -1,9 +1,11 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p2',
@@ -11,10 +13,8 @@ module.exports = ({ templateDir } = {}) => ({
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium,
-                fileinfo: {}
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',
@@ -30,7 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '10.4'
         },
         elasticsearch: {
-            version: '7.12.1'
+            version: '7.16.3'
         },
         composer: {
             version: '2'

package/lib/config/versions/magento-2.4.3.js

@@ -1,9 +1,11 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { libsodium } = require('../php/extensions');
-const { php74 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3',
@@ -11,10 +13,8 @@ module.exports = ({ templateDir } = {}) => ({
     configuration: {
         php: php74({
             templateDir,
-            additionalExtensions: {
-                libsodium,
-                fileinfo: {}
-            }
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
         nginx: {
             version: '1.18.0',
@@ -30,7 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
             version: '10.4'
         },
         elasticsearch: {
-            version: '7.12.1'
+            version: '7.16.3'
         },
         composer: {
             version: '2'

package/lib/config/versions/magento-2.4.4.js

@@ -1,14 +1,21 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
-const { php81 } = require('../php/releases');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php81 } = require('../php/versions');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4',
     isDefault: true,
     configuration: {
-        php: php81({ templateDir }),
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-8.1-magento-2.4`
+        }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

package/lib/tasks/cleanup.js

@@ -6,7 +6,7 @@ const {
     removeMagento
 } = require('./magento');
 const getMagentoVersionConfig = require('../config/get-magento-version-config');
-const { stopPhpFpm } = require('./php-fpm');
+// const { stopPhpFpm } = require('./php-fpm');
 const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
 
@@ -19,7 +19,7 @@ const cleanup = () => ({
         checkConfigurationFile(),
         getMagentoVersionConfig(),
         getProjectConfiguration(),
-        stopPhpFpm(),
+        // stopPhpFpm(),
         stopServices(),
         removeVolumes(),
         removeCacheFolder(),

package/lib/tasks/composer/index.js

@@ -1,127 +1,33 @@
-const fs = require('fs');
-const path = require('path');
-const semver = require('semver');
-const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const downloadFile = require('../../util/download-file');
-const { execAsyncSpawn } = require('../../util/exec-async-command');
-const pathExists = require('../../util/path-exists');
 const safeRegexExtract = require('../../util/safe-regex-extract');
-const installPrestissimo = require('./install-prestissimo');
 const UnknownError = require('../../errors/unknown-error');
-const KnownError = require('../../errors/known-error');
+const { runContainerImage } = require('../../util/run-container-image');
 
 /**
- * @param {import('../../../typings/context').ListrContext['config']} param0
+ * @param {import('../../../typings/context').ListrContext} ctx
  * @returns {Promise<string>}
  */
-const getComposerVersion = async ({ composer, php }) => {
-    const composerVersionOutput = await execAsyncSpawn(`${php.binPath} -c ${php.iniPath} ${composer.binPath} --version --no-ansi`);
+const getComposerVersion = async (ctx) => {
+    const { php } = ctx.config.docker.getContainers(ctx.ports);
+    const composerVersionOutput = await runContainerImage(php.image, 'composer --version --no-ansi');
 
     const composerVersion = safeRegexExtract({
         string: composerVersionOutput,
         regex: /composer.+(\d+\.\d+\.\d+)/i,
         onNoMatch: () => {
-            throw new UnknownError(`
-No composer version found in composer version output!\n\n${composerVersionOutput}
-
-Follow steps below to resolve this issue:
-1. Check ${logger.style.file(path.relative(process.cwd(), composer.binPath))} file content, inside this file should be Composer PHP code.
-2. If file content is not correct, try deleting this file and run ${logger.style.command('start')} command again, CMA will try re-download this file.
-3. If steps above didn't help, manually download Composer version ${composer.version} from ${logger.style.code('https://getcomposer.org/download/')} and put it inside cache directory ${logger.style.file(path.relative(process.cwd(), composer.dirPath))} with ${logger.style.code('composer.phar')} file name.
-`);
+            throw new UnknownError(`No composer version found in composer version output!\n\n${composerVersionOutput}`);
         }
     });
 
     return composerVersion;
 };
 
-/**
- * @param {import('../../../typings/context').ListrContext['config']} param0
- */
-const createComposerDir = async ({ composer }) => {
-    const dirExists = await pathExists(composer.dirPath);
-    if (!dirExists) {
-        await fs.promises.mkdir(composer.dirPath, { recursive: true });
-    }
-};
-
-/**
- * @param {import('../../../typings/context').ListrContext['config']} param0
- */
-const downloadComposerBinary = async ({ composer }) => {
-    const composerVersion = /^\d$/.test(composer.version)
-        ? `latest-${composer.version}.x`
-        : composer.version;
-
-    try {
-        await downloadFile(`https://getcomposer.org/download/${composerVersion}/composer.phar`, {
-            destination: composer.binPath
-        });
-    } catch (e) {
-        throw new UnknownError(
-            `Unexpected issue, while installing composer.
-            Please see the error log below.\n\n${e}`
-        );
-    }
-};
-
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const installComposer = () => ({
-    title: 'Installing Composer',
+const getComposerVersionTask = () => ({
+    title: 'Retrieving Composer version',
     task: async (ctx, task) => {
-        const { composer, php } = ctx.config;
-        const hasComposerInCache = await pathExists(composer.binPath);
-
-        if (!hasComposerInCache) {
-            task.title = 'Installing Composer';
-            await createComposerDir({ composer });
-            await downloadComposerBinary({ composer });
-        } else {
-            const currentComposerVersion = await getComposerVersion({ composer, php });
-            const expectedComposerVersion = /^\d$/.test(composer.version)
-                ? `${composer.version}.x`
-                : composer.version;
-
-            if (!semver.satisfies(currentComposerVersion, expectedComposerVersion)) {
-                const continueComposerBinaryVersionSwitch = await task.prompt({
-                    type: 'Select',
-                    message: `You have Composer ${logger.style.misc(`${currentComposerVersion}`)} while your Magento version requires ${logger.style.misc(expectedComposerVersion)}!`,
-                    choices: [
-                        {
-                            message: `Continue with current installed version (${logger.style.misc(`${currentComposerVersion}`)})`,
-                            name: 'continue'
-                        },
-                        {
-                            message: 'Install correct version and continue (you will probably have to fix composer dependencies versions)',
-                            name: 'install-and-continue'
-                        },
-                        {
-                            message: 'Exit installation.',
-                            name: 'exit'
-                        }
-                    ]
-                });
-
-                switch (continueComposerBinaryVersionSwitch) {
-                case 'install-and-continue': {
-                    await downloadComposerBinary({ composer });
-                    break;
-                }
-                case 'exit': {
-                    throw new KnownError(`Current composer version ${logger.style.misc(`v${currentComposerVersion}`)} is not compatible with version ${logger.style.misc(expectedComposerVersion)}!`);
-                }
-                case 'continue':
-                default: {
-                    ctx.continueWithExistingComposerVersion = true;
-                    break;
-                }
-                }
-            }
-        }
-
-        const composerVersion = await getComposerVersion({ composer, php });
+        const composerVersion = await getComposerVersion(ctx);
         task.title = `Using Composer version ${composerVersion}`;
         ctx.composerVersion = composerVersion;
     },
@@ -130,4 +36,8 @@ const installComposer = () => ({
     }
 });
 
-module.exports = { installComposer, installPrestissimo, getComposerVersion };
+module.exports = {
+    getComposerVersionTask,
+    // installPrestissimo,
+    getComposerVersion
+};