@scandipwa/magento-scripts 1.14.1-alpha.3 → 1.14.1-alpha.4

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

@@ -18,6 +18,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -39,6 +43,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.3',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -18,6 +18,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -39,6 +43,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.3',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -18,6 +18,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -39,6 +43,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.3',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -18,6 +18,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -39,6 +43,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.4',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -18,6 +18,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -39,6 +43,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.4',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -18,6 +18,10 @@ module.exports = ({ templateDir } = {}) => ({
                 libsodium,
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -39,6 +43,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.2',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -16,6 +16,10 @@ module.exports = ({ templateDir } = {}) => ({
                 SimpleXML: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -37,6 +41,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '1'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.2',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -20,6 +20,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -41,6 +45,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.4',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -20,6 +20,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -41,6 +45,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.4',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -19,6 +19,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -40,6 +44,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.4',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -20,6 +20,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -41,6 +45,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -20,6 +20,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -41,6 +45,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -20,6 +20,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.2'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -41,6 +45,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '6.5',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

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

@@ -20,6 +20,10 @@ module.exports = ({ templateDir } = {}) => ({
                 fileinfo: {},
                 xdebug: {
                     version: '3.1.4'
+                },
+                apcu: {},
+                opcache: {
+                    extensionName: 'Zend OPcache'
                 }
             }
         },
@@ -41,6 +45,11 @@ module.exports = ({ templateDir } = {}) => ({
         },
         composer: {
             version: '2'
+        },
+        varnish: {
+            enabled: true,
+            version: '7.0',
+            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
         }
     },
     magento: defaultMagentoConfig,

package/lib/tasks/cli/create-bashrc-config.js

@@ -6,14 +6,17 @@ const setConfigFile = require('../../util/set-config');
  */
 const createBashrcConfigFile = () => ({
     title: 'Setting Bashrc config',
-    task: async ({ config: { php, baseConfig } }) => {
+    task: async (ctx) => {
+        const { config: { php, baseConfig, overridenConfiguration } } = ctx;
+        const varnishEnabled = overridenConfiguration.configuration.varnish.enabled;
         try {
             await setConfigFile({
                 configPathname: path.join(baseConfig.cacheDir, '.magentorc'),
                 template: path.join(baseConfig.templateDir, 'magentorc.template'),
                 overwrite: true,
                 templateArgs: {
-                    php
+                    php,
+                    varnishEnabled
                 }
             });
         } catch (e) {

package/lib/tasks/docker/containers.js

@@ -14,6 +14,7 @@ const { execAsyncSpawn } = require('../../util/exec-async-command');
  * @param {string} [options.command] Container command
  * @param {Record<"cmd" | "interval" | "retries" | "start-period" | "timeout", string>} [options.healthCheck] Container heathcheck properties
  * @param {string[]} [options.securityOptions] Security options [docs](https://docs.docker.com/engine/reference/commandline/run/#optional-security-options---security-opt)
+ * @param {string[]} [options.tmpfs]
  */
 const run = (options) => {
     const {
@@ -28,7 +29,8 @@ const run = (options) => {
         entrypoint,
         command = '',
         healthCheck,
-        securityOptions = []
+        securityOptions = [],
+        tmpfs = []
     } = options;
 
     const restartArg = restart && `--restart ${ restart }`;
@@ -41,6 +43,7 @@ const run = (options) => {
     const entrypointArg = entrypoint && `--entrypoint "${entrypoint}"`;
     const healthCheckArg = healthCheck && Object.entries(healthCheck).map(([key, value]) => `--health-${key} '${value}'`).join(' ');
     const securityArg = securityOptions.length > 0 && securityOptions.map((opt) => `--security-opt ${opt}`).join(' ');
+    const tmpfsArg = tmpfs.length > 0 && tmpfs.map((t) => `--tmpfs ${t}`).join(' ');
 
     const dockerCommand = [
         'docker',
@@ -56,6 +59,7 @@ const run = (options) => {
         entrypointArg,
         healthCheckArg,
         securityArg,
+        tmpfsArg,
         image,
         command
     ].filter(Boolean).join(' ');
@@ -107,7 +111,7 @@ const pullContainers = () => ({
 const startContainers = () => ({
     title: 'Starting containers',
     task: async ({ ports, config: { docker } }, task) => {
-        const containerList = await execAsyncSpawn('docker container ls');
+        const containerList = (await execAsyncSpawn('docker container ls --all --format="{{.Names}}"')).split('\n');
 
         const missingContainers = Object.values(docker.getContainers(ports)).filter(
             ({ name }) => !containerList.includes(name)
@@ -133,19 +137,17 @@ const startContainers = () => ({
  */
 const stopContainers = () => ({
     title: 'Stopping Docker containers',
-    task: async ({ ports, config: { docker } }, task) => {
-        const containerList = await execAsyncSpawn('docker container ls -a');
+    task: async ({ config: { baseConfig: { prefix } } }, task) => {
+        const containerList = (await execAsyncSpawn('docker container ls --all --format="{{.Names}}"')).split('\n');
 
-        const runningContainers = Object.values(docker.getContainers(ports)).filter(
-            ({ name }) => containerList.includes(name)
-        );
+        const runningContainers = containerList.filter((containerName) => containerName.startsWith(prefix));
 
         if (runningContainers.length === 0) {
             task.skip();
             return;
         }
 
-        await stop(runningContainers.map(({ name }) => name));
+        await stop(runningContainers);
     }
 });
 

package/lib/tasks/docker/volumes.js

@@ -20,10 +20,10 @@ const create = ({
 const createVolumes = () => ({
     title: 'Creating volumes',
     task: async ({ config: { docker } }, task) => {
-        const volumeList = (await execAsyncSpawn('docker volume ls -q')).split('\n');
+        const volumeList = (await execAsyncSpawn('docker volume ls --format "{{.Name}}"')).split('\n');
 
         const missingVolumes = Object.values(docker.volumes).filter(
-            ({ name }) => !volumeList.some((volume) => volume === name)
+            ({ name }) => !volumeList.includes(name)
         );
 
         if (missingVolumes.length === 0) {
@@ -41,10 +41,10 @@ const createVolumes = () => ({
 const removeVolumes = () => ({
     title: 'Removing volumes',
     task: async ({ config: { docker } }, task) => {
-        const volumeList = (await execAsyncSpawn('docker volume ls -q')).split('\n');
+        const volumeList = (await execAsyncSpawn('docker volume ls --format "{{.Name}}"')).split('\n');
 
         const deployedVolumes = Object.values(docker.volumes).filter(
-            ({ name }) => volumeList.some((volume) => volume === name)
+            ({ name }) => volumeList.includes(name)
         );
 
         if (deployedVolumes.length === 0) {

package/lib/tasks/file-system/create-nginx-config.js

@@ -36,6 +36,11 @@ const createNginxConfig = () => ({
                 throw new Error('ssl.ssl_certificate_key file does not exist!');
             }
 
+            const nginxCacheDir = path.join(baseConfig.cacheDir, 'nginx', 'conf.d');
+            if (!await pathExists(nginxCacheDir)) {
+                await fs.promises.mkdir(nginxCacheDir, { recursive: true });
+            }
+
             await fs.promises.copyFile(
                 ssl.ssl_certificate,
                 path.join(

package/lib/tasks/file-system/create-varnish-config.js

@@ -0,0 +1,51 @@
+const os = require('os');
+const path = require('path');
+const setConfigFile = require('../../util/set-config');
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createVarnishConfig = () => ({
+    title: 'Setting Varnish config',
+    skip: (ctx) => !ctx.config.overridenConfiguration.configuration.varnish.enabled,
+    task: async (ctx) => {
+        const {
+            ports,
+            config: {
+                overridenConfiguration,
+                baseConfig: {
+                    cacheDir
+                }
+            },
+            isWsl
+        } = ctx;
+
+        const {
+            configuration: {
+                varnish
+            }
+        } = overridenConfiguration;
+
+        const isLinux = os.platform() === 'linux';
+
+        try {
+            await setConfigFile({
+                configPathname: path.join(
+                    cacheDir,
+                    'varnish',
+                    'default.vcl'
+                ),
+                template: varnish.configTemplate,
+                overwrite: true,
+                templateArgs: {
+                    hostMachine: (isLinux && !isWsl) ? '127.0.0.1' : 'host.docker.internal',
+                    hostPort: (isLinux && !isWsl) ? ports.app : 80
+                }
+            });
+        } catch (e) {
+            throw new Error(`Unexpected error accrued during varnish config creation\n\n${e}`);
+        }
+    }
+});
+
+module.exports = createVarnishConfig;

package/lib/tasks/file-system/index.js

@@ -2,6 +2,7 @@ const createNginxConfig = require('./create-nginx-config');
 const createPhpConfig = require('./create-php-config');
 const createPhpFpmConfig = require('./create-php-fpm-config');
 const createPhpStormConfig = require('./create-php-storm-config');
+const createVarnishConfig = require('./create-varnish-config');
 const createVSCodeConfig = require('./create-vscode-config');
 
 /**
@@ -14,7 +15,8 @@ const prepareFileSystem = () => ({
         createPhpFpmConfig(),
         createPhpConfig(),
         createPhpStormConfig(),
-        createVSCodeConfig()
+        createVSCodeConfig(),
+        createVarnishConfig()
     ], {
         concurrent: true
     })

package/lib/tasks/magento/setup-magento/configure-elasticsearch.js

@@ -4,7 +4,7 @@ const { updateTableValues, isTableExists } = require('../../../util/database');
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
-    title: 'Configuring elasticsearch',
+    title: 'Configuring Elasticsearch',
     skip: async (ctx) => !(await isTableExists('magento', 'core_config_data', ctx)),
     task: async ({ ports, mysqlConnection }, task) => {
         await updateTableValues('core_config_data', [