@scandipwa/magento-scripts 1.15.5 → 1.16.0-alpha.0

package/lib/commands/execute.js

@@ -17,7 +17,8 @@ Available containers:
 - nginx
 - redis
 - elasticsearch
-- varnish (if enabled)`);
+- varnish (if enabled)
+- sslTerminator`);
         },
         async (argv) => {
             const containers = (await docker).getContainers();
@@ -38,6 +39,8 @@ Available containers:
                         argv.commands.push('bash');
                     }
                 }
+
+                logger.logN(`Executing container ${logger.style.misc(container._)}`);
                 await executeInContainer({
                     containerName: container.name,
                     commands: argv.commands

package/lib/commands/logs.js

@@ -19,6 +19,7 @@ Available scopes:
 - nginx
 - elasticsearch
 - varnish (if enabled)
+- sslTerminator
 
 And you can use name matching:
 npm run logs ma (will match magento)
@@ -90,6 +91,8 @@ npm run logs re (will match redis)`);
                     argv.until && `--until ${argv.until}`
                 ].filter(Boolean).join(' ');
                 const command = `docker logs ${containers[containerName].name} ${commandArguments}`;
+
+                logger.logN(`Looking at the logs of ${logger.style.misc(containerName)}:`);
                 await execAsyncSpawn(command, {
                     callback: logger.log
                 });

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

@@ -20,6 +20,16 @@ const dependenciesForPlatforms = {
         installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
+    'darwin-arm': {
+        dependencies: [
+            'php',
+            'autoconf',
+            'pkg-config',
+            'gd'
+        ],
+        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
+        packageManager: 'brew'
+    },
     'Arch Linux': {
         dependencies: [
             'freetype2',
@@ -36,7 +46,9 @@ const dependenciesForPlatforms = {
             'sqlite',
             'readline',
             'perl',
-            'libsodium'
+            'libsodium',
+            'php',
+            'pkgconf'
         ],
         installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`,
         packageManager: 'pacman'
@@ -58,7 +70,8 @@ const dependenciesForPlatforms = {
             'bzip2-devel',
             'curl-devel',
             'libxslt-devel',
-            'autoconf'
+            'autoconf',
+            'php'
         ],
         installCommand: (deps) => `sudo yum install ${deps} -y`,
         packageManager: 'yum'
@@ -80,7 +93,8 @@ const dependenciesForPlatforms = {
             'bzip2-devel',
             'curl-devel',
             'libxslt-devel',
-            'autoconf'
+            'autoconf',
+            'php'
         ],
         installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`,
         packageManager: 'yum'
@@ -109,7 +123,8 @@ const dependenciesForPlatforms = {
             'php-bz2',
             'pkg-config',
             'autoconf',
-            'cmake'
+            'cmake',
+            'php'
         ],
         installCommand: (deps) => `sudo apt install ${deps} -y`,
         packageManager: 'apt'

package/lib/config/docker.js

@@ -102,6 +102,11 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.sslTerminator }:80`
                 ] : [],
+                forwardedPorts: [
+                    isNotNativeLinux
+                        ? `127.0.0.1:${ ports.sslTerminator }:80`
+                        : `127.0.0.1:${ ports.sslTerminator }`
+                ],
                 healthCheck: {
                     cmd: 'service nginx status'
                 },
@@ -127,6 +132,11 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.app }:80`
                 ] : [],
+                forwardedPorts: [
+                    isNotNativeLinux
+                        ? `127.0.0.1:${ ports.app }:80`
+                        : `127.0.0.1:${ ports.app }`
+                ],
                 healthCheck: {
                     cmd: 'service nginx status'
                 },
@@ -159,6 +169,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     cmd: 'redis-cli ping'
                 },
                 ports: [`127.0.0.1:${ ports.redis }:6379`],
+                forwardedPorts: [`127.0.0.1:${ ports.redis }:6379`],
                 mounts: [`source=${ volumes.redis.name },target=/data`],
                 // TODO: use connect instead
                 network: network.name,
@@ -176,6 +187,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     cmd: 'mysqladmin ping --silent'
                 },
                 ports: [`127.0.0.1:${ ports.mysql }:3306`],
+                forwardedPorts: [`127.0.0.1:${ ports.mysql }:3306`],
                 mounts: [`source=${ volumes.mysql.name },target=/var/lib/mysql`],
                 env: {
                     MYSQL_PORT: 3306,
@@ -194,7 +206,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     '--log_bin_trust_function_creators=1',
                     '--default-authentication-plugin=mysql_native_password',
                     '--max_allowed_packet=1GB',
-                    '--bind-address=0.0.0.0'
+                    '--bind-address=0.0.0.0',
+                    '--secure-file-priv=NULL'
                 ].join(' '),
                 securityOptions: [
                     'seccomp=unconfined'
@@ -216,6 +229,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     cmd: 'curl --silent --fail localhost:9200/_cluster/health || exit 1'
                 },
                 ports: [`127.0.0.1:${ ports.elasticsearch }:9200`],
+                forwardedPorts: [`127.0.0.1:${ ports.elasticsearch }:9200`],
                 mounts: [`source=${ volumes.elasticsearch.name },target=/usr/share/elasticsearch/data`],
                 env: {
                     'bootstrap.memory_lock': true,
@@ -256,6 +270,11 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
                 ] : [],
+                forwardedPorts: [
+                    isNotNativeLinux
+                        ? `127.0.0.1:${ ports.varnish }:80`
+                        : `127.0.0.1:${ ports.varnish }`
+                ],
                 env: {
                     VARNISH_SIZE: '2G'
                 },

package/lib/config/php/extensions/index.js

@@ -1,3 +1,4 @@
 module.exports = {
-    libsodium: require('./libsodium')
+    libsodium: require('./libsodium'),
+    xdebug: require('./xdebug')
 };

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

@@ -0,0 +1,9 @@
+/**
+ * @type {import('../../../../typings/index').PHPExtension}
+ */
+const xdebugExtension = {
+    extensionName: 'xdebug',
+    version: '3.1.5'
+};
+
+module.exports = xdebugExtension;

package/lib/config/php/releases/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+    php72: require('./php-7.2'),
+    php73: require('./php-7.3'),
+    php74: require('./php-7.4'),
+    php81: require('./php-8.1')
+};

package/lib/config/php/releases/php-7.2.js

@@ -0,0 +1,25 @@
+const path = require('path');
+const { xdebug } = require('../extensions');
+
+const php72 = ({ templateDir, additionalExtensions = {} }) => ({
+    version: '7.2.34',
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    extensions: {
+        gd: {
+            macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
+        },
+        intl: {},
+        zlib: {},
+        openssl: {},
+        sockets: {},
+        SimpleXML: {},
+        xdebug,
+        apcu: {},
+        opcache: {
+            extensionName: 'Zend OPcache'
+        },
+        ...additionalExtensions
+    }
+});
+
+module.exports = php72;

package/lib/config/php/releases/php-7.3.js

@@ -0,0 +1,25 @@
+const path = require('path');
+const { xdebug } = require('../extensions');
+
+const php73 = ({ templateDir, additionalExtensions = {} }) => ({
+    version: '7.3.33',
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    extensions: {
+        gd: {
+            macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
+        },
+        intl: {},
+        zlib: {},
+        openssl: {},
+        sockets: {},
+        SimpleXML: {},
+        xdebug,
+        apcu: {},
+        opcache: {
+            extensionName: 'Zend OPcache'
+        },
+        ...additionalExtensions
+    }
+});
+
+module.exports = php73;

package/lib/config/php/releases/php-7.4.js

@@ -0,0 +1,23 @@
+const path = require('path');
+const { xdebug } = require('../extensions');
+
+const php74 = ({ templateDir, additionalExtensions = {} } = {}) => ({
+    version: '7.4.30',
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    extensions: {
+        gd: {},
+        intl: {},
+        zlib: {},
+        openssl: {},
+        sockets: {},
+        SimpleXML: {},
+        xdebug,
+        apcu: {},
+        opcache: {
+            extensionName: 'Zend OPcache'
+        },
+        ...additionalExtensions
+    }
+});
+
+module.exports = php74;

package/lib/config/php/releases/php-8.1.js

@@ -0,0 +1,25 @@
+const path = require('path');
+const { libsodium, xdebug } = require('../extensions');
+
+const php81 = ({ templateDir, additionalExtensions = {} } = {}) => ({
+    version: '8.1.7',
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    extensions: {
+        gd: {},
+        intl: {},
+        zlib: {},
+        openssl: {},
+        sockets: {},
+        SimpleXML: {},
+        libsodium,
+        fileinfo: {},
+        xdebug,
+        apcu: {},
+        opcache: {
+            extensionName: 'Zend OPcache'
+        },
+        ...additionalExtensions
+    }
+});
+
+module.exports = php81;

package/lib/config/php-config.js

@@ -17,8 +17,8 @@ module.exports = (app, config) => {
         binPath: path.join(phpVersionDir, 'bin', 'php'),
         iniPath: path.join(cacheDir, 'php.ini'),
         iniTemplatePath: php.configTemplate,
-        fpmBinPath: path.resolve(phpVersionDir, 'sbin', 'php-fpm'),
-        fpmConfPath: path.resolve(cacheDir, 'php-fpm.conf'),
+        fpmBinPath: path.join(phpVersionDir, 'sbin', 'php-fpm'),
+        fpmConfPath: path.join(cacheDir, 'php-fpm.conf'),
         fpmPidFilePath: path.join(cacheDir, 'php-fpm.pid'),
         extensions: php.extensions,
         version: php.version

package/lib/config/templates/ssl-terminator.template.conf

@@ -21,6 +21,12 @@ server {
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $http_host;
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
+        proxy_connect_timeout       300;
+        proxy_send_timeout          300;
+        proxy_read_timeout          300;
+        send_timeout                300;
 
         proxy_pass http://<%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
     }

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php72 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.0',
     configuration: {
-        php: {
-            version: '7.2.33',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php72({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php72 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.1',
     configuration: {
-        php: {
-            version: '7.2.33',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php72({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php72 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2-p2',
     configuration: {
-        php: {
-            version: '7.2.33',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php72({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php72 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2',
     configuration: {
-        php: {
-            version: '7.2.33',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php72({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3-p1',
     configuration: {
-        php: {
-            version: '7.3.28',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php73({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3',
     configuration: {
-        php: {
-            version: '7.3.28',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php73({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4-p2',
     configuration: {
-        php: {
-            version: '7.3.28',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php73({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4',
     configuration: {
-        php: {
-            version: '7.3.28',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php73({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p1',
     configuration: {
-        php: {
-            version: '7.3.28',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php73({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')

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

@@ -1,32 +1,13 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
 const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p2',
     configuration: {
-        php: {
-            version: '7.3.28',
-            configTemplate: path.join(templateDir || '', 'php.template.ini'),
-            extensions: {
-                gd: {
-                    macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-                },
-                intl: {},
-                zlib: {},
-                openssl: {},
-                sockets: {},
-                SimpleXML: {},
-                xdebug: {
-                    version: '3.1.2'
-                },
-                apcu: {},
-                opcache: {
-                    extensionName: 'Zend OPcache'
-                }
-            }
-        },
+        php: php73({ templateDir }),
         nginx: {
             version: '1.18.0',
             configTemplate: path.join(templateDir || '', 'nginx.template.conf')