@scandipwa/magento-scripts 1.16.0-alpha.4 → 2.0.0-alpha.0

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

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

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

@@ -1,9 +1,12 @@
+/* eslint-disable max-len */
 /**
- * @type {import('../../../../typings/index').PHPExtension}
+ * @type {import('../../../../typings/index').PHPExtensionInstallationInstruction}
  */
-const xdebugExtension = {
-    extensionName: 'xdebug',
+module.exports = {
+    name: 'xdebug',
+    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'
 };
-
-module.exports = xdebugExtension;

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

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

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

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

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

@@ -0,0 +1,23 @@
+const path = require('path');
+const { repo } = require('../base-repo');
+const xdebug = require('../extensions/xdebug');
+
+/**
+ * @returns {import('../../../../typings/index').PHPConfiguration}
+ */
+const php72 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${ repo }:php-7.2`
+} = {}) => ({
+    baseImage,
+    debugImage: `${ baseImage }-debug`,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    extensions: {
+        xdebug,
+        ...extensions
+    }
+});
+
+module.exports = php72;

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

@@ -0,0 +1,23 @@
+const path = require('path');
+const { repo } = require('../base-repo');
+const xdebug = require('../extensions/xdebug');
+
+/**
+ * @returns {import('../../../../typings/index').PHPConfiguration}
+ */
+const php73 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${ repo }:php-7.3`
+} = {}) => ({
+    baseImage,
+    debugImage: `${ baseImage }-debug`,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    extensions: {
+        xdebug,
+        ...extensions
+    }
+});
+
+module.exports = php73;

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

@@ -0,0 +1,23 @@
+const path = require('path');
+const { repo } = require('../base-repo');
+const xdebug = require('../extensions/xdebug');
+
+/**
+ * @returns {import('../../../../typings/index').PHPConfiguration}
+ */
+const php74 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${ repo }:php-7.4`
+} = {}) => ({
+    baseImage,
+    debugImage: `${ baseImage }-debug`,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    extensions: {
+        xdebug,
+        ...extensions
+    }
+});
+
+module.exports = php74;

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

@@ -0,0 +1,23 @@
+const path = require('path');
+const { repo } = require('../base-repo');
+const xdebug = require('../extensions/xdebug');
+
+/**
+ * @returns {import('../../../../typings/index').PHPConfiguration}
+ */
+const php81 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${ repo }:php-8.1`
+} = {}) => ({
+    baseImage,
+    debugImage: `${ baseImage }-debug`,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    extensions: {
+        xdebug,
+        ...extensions
+    }
+});
+
+module.exports = php81;

package/lib/config/php-config.js

@@ -1,23 +1,19 @@
 const path = require('path');
-const phpbrewConfig = require('./phpbrew');
 
-module.exports = (app, config) => {
-    const { php } = app;
+/**
+ * @param {import('../../typings/context').ListrContext['config']['overridenConfiguration']} overridenConfiguration
+ * @param {import('../../typings/context').ListrContext['config']['baseConfig']} baseConfig
+ */
+module.exports = (overridenConfiguration, baseConfig) => {
+    const { php } = overridenConfiguration;
 
-    const { cacheDir } = config;
-
-    const phpVersionDir = path.join(
-        phpbrewConfig.phpPath,
-        `php-${ php.version }`
-    );
+    const { cacheDir } = baseConfig;
 
     const phpConfiguration = {
-        binPath: path.join(phpVersionDir, 'bin', 'php'),
         iniPath: path.join(cacheDir, 'php.ini'),
         iniTemplatePath: php.configTemplate,
-        fpmBinPath: path.join(phpVersionDir, 'sbin', 'php-fpm'),
+        fpmTemplatePath: php.fpmConfigTemplate,
         fpmConfPath: path.join(cacheDir, 'php-fpm.conf'),
-        fpmPidFilePath: path.join(cacheDir, 'php-fpm.pid'),
         extensions: php.extensions,
         version: php.version
     };

package/lib/config/port-config.js

@@ -58,7 +58,6 @@ const defaultPorts = {
     varnish: 8080,
     sslTerminator: 80,
     fpm: 9000,
-    xdebug: 9111,
     mysql: 3306,
     redis: 6379,
     elasticsearch: 9200
@@ -74,10 +73,7 @@ const defaultPorts = {
 const getPortsConfig = async (ports, options = {}) => {
     const { useNonOverlappingPorts } = options;
     const mergedPorts = deepmerge(defaultPorts, ports || {});
-    let p = [
-        9003,
-        9111
-    ];
+    let p = [];
 
     if (useNonOverlappingPorts) {
         p = p.concat(await getUsedByOtherCMAProjectsPorts());

package/lib/config/templates/magentorc.template

@@ -2,11 +2,11 @@ RED='\033[0;31m'
 GREEN='\033[0;32m'
 NC='\033[0m' # No Color
 
-alias php="$HOME/.phpbrew/php/php-<%= it.php.version %>/bin/php -c $PWD/node_modules/.create-magento-app-cache/php.ini"
-alias magento="php $PWD/bin/magento"
+alias php="npm run exec php php"
+alias magento="php bin/magento"
 alias magneto="echo -e 'Not ${RED}magneto${NC} but ${GREEN}magento${NC} please! or at least ${GREEN}m${NC}!' && magento"
 alias m="magento"
-alias composer="php $PWD/node_modules/.create-magento-app-cache/composer/composer.phar"
+alias composer="npm run exec php composer"
 alias c="composer"
 <% if (it.varnishEnabled) { %>
 alias cvc="npm run exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache cleared!'"

package/lib/config/templates/php-fpm.template.conf

@@ -1,5 +1,5 @@
 [global]
-
+daemonize = no
 log_level = debug
 
 [www]
@@ -12,10 +12,10 @@ catch_workers_output = yes
 
 pm = ondemand
 pm.max_children = 32
-pm.start_servers = 15
+pm.start_servers = 3
 pm.max_requests = 5000
 pm.process_idle_timeout = 10s
 pm.status_path = /fpmstatus
-listen = 127.0.0.1:<%= it.ports.fpm %>
+listen = <%~ it.port %>
 
 env[PATH] = $PATH

package/lib/config/templates/php.template.ini

@@ -1999,28 +1999,34 @@ opcache.save_comments=1
 
 [xdebug]
 <% if (it.debug) { %>
+error_reporting=E_ALL
+
+xdebug.idekey=PHPSTORM
 
 <% if (it.isXDebug2) { %>
 xdebug.remote_autostart=1
 xdebug.remote_enable=1
-xdebug.remote_host=127.0.0.1
-xdebug.remote_port=9111
 
-xdebug.idekey=PHPSTORM
+xdebug.remote_host=<%~ it.hostMachine %>
+
+xdebug.remote_port=9003
+
+xdebug.remote_log=<%~ it.mageRoot %>/var/log/xdebug.log
 
 <% } else { %>
 
 xdebug.mode=debug
-xdebug.client_host=localhost
+xdebug.client_host=<%~ it.hostMachine %>
+
 xdebug.client_port=9003
-xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
 
 ; THIS THING WILL BREAK PHP
 ; xdebug.start_with_request=yes
 
 xdebug.discover_client_host=false
 xdebug.start_upon_error=yes
-xdebug.idekey=PHPSTORM
+
+xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
 
 <% } %>
 

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

@@ -4,7 +4,7 @@ set_real_ip_from 172.0.0.0/8;
 real_ip_recursive on;
 
 upstream app_backend {
-    server <%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
+    server <%= it.hostMachine %>:<% if (!it.debug && it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
 
     keepalive 16;
 }

package/lib/config/templates/vscode-launch.template.json

@@ -9,7 +9,9 @@
             "type": "php",
             "request": "launch",
             "port": <%~ it.XDebugPort %>,
-            "runtimeExecutable": "<%~ it.PHPBinPath %>"
+            "pathMappings": {
+                "<%~ it.baseConfig.containerMagentoDir %>": "${workspaceFolder}"
+            }
         }
     ]
 }

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

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

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

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

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

@@ -0,0 +1,44 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
+const { repo } = require('../php/base-repo');
+const { php72 } = require('../php/versions');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.3.2-p1',
+    configuration: {
+        php: php72({
+            templateDir,
+            extensions: magento23PHPExtensionList,
+            baseImage: `${ repo }:php-7.2-magento-2.3`
+        }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '5'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: {
+            version: '6.8.16'
+        },
+        composer: {
+            version: '1'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

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

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

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

package/lib/config/versions/magento-2.3.3-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.3-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.3.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.3',
     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.4-p1.js

@@ -0,0 +1,44 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+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.4-p1',
+    configuration: {
+        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')
+        },
+        redis: {
+            version: '5'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: {
+            version: '6.8.16'
+        },
+        composer: {
+            version: '1'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

package/lib/config/versions/magento-2.3.4-p2.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.4-p2',
     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.4.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.4',
     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.5-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.5-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.5-p2.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.5-p2',
     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.5.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.5',
     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')