@scandipwa/magento-scripts 1.14.1-alpha.8 → 1.15.1

package/lib/commands/cli.js

@@ -4,10 +4,10 @@ const createBashrcConfigFile = require('../tasks/cli/create-bashrc-config');
 const getMagentoVersionConfig = require('../config/get-magento-version-config');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const getProjectConfiguration = require('../config/get-project-configuration');
-const localAuthJson = require('../tasks/composer/local-auth-json');
 const checkConfigurationFile = require('../config/check-configuration-file');
 const { installComposer, installPrestissimo } = require('../tasks/composer');
 const ConsoleBlock = require('../util/console-block');
+const checkComposerCredentials = require('../tasks/requirements/composer');
 
 /**
  * @param {import('yargs')} yargs
@@ -21,7 +21,7 @@ module.exports = (yargs) => {
             installComposer(),
             installPrestissimo(),
             createBashrcConfigFile(),
-            localAuthJson()
+            checkComposerCredentials()
         ], {
             concurrent: false,
             exitOnError: true,
@@ -55,13 +55,18 @@ module.exports = (yargs) => {
         block
             .addLine(`Clear Magento cache: ${logger.style.command('m c:c')}`)
             .addLine(`Magento setup upgrade: ${logger.style.command('m se:up')}`)
-            .addLine(`Magento DI compile: ${logger.style.command('m s:d:c')}`);
+            .addLine(`Magento DI compile: ${logger.style.command('m s:d:c')}`)
+            .addEmptyLine();
 
         block
-            .addEmptyLine()
             .addLine(`Clear Composer cache: ${logger.style.command('c cc')}`)
             .addEmptyLine();
 
+        block
+            .addLine(`Connect to MySQL server: ${logger.style.command('mysql')}`)
+            .addLine(`Connect to MySQL server as root: ${logger.style.command('mysqlroot')}`)
+            .addEmptyLine();
+
         block.log();
 
         return cli();

package/lib/commands/logs.js

@@ -18,6 +18,7 @@ Available scopes:
 - redis
 - nginx
 - elasticsearch
+- varnish (if enabled)
 
 And you can use name matching:
 npm run logs ma (will match magento)

package/lib/commands/start.js

@@ -4,12 +4,14 @@ const { Listr } = require('listr2');
 const { start } = require('../tasks/start');
 const pathExists = require('../util/path-exists');
 const { baseConfig } = require('../config');
-const googleAnalytics = require('@scandipwa/scandipwa-dev-utils/analytics');
+const googleAnalytics = require('../util/analytics');
 const systeminformation = require('systeminformation');
 const { getCSAThemes } = require('../util/CSA-theme');
 const shouldUseYarn = require('@scandipwa/scandipwa-dev-utils/should-use-yarn');
 const ConsoleBlock = require('../util/console-block');
 const { getInstanceMetadata } = require('../util/instance-metadata');
+const UnknownError = require('../errors/unknown-error');
+const KnownError = require('../errors/known-error');
 
 const cmaGaTrackingId = 'UA-127741417-7';
 
@@ -156,8 +158,8 @@ module.exports = (yargs) => {
                 }
 
                 try {
+                    await googleAnalytics.trackTiming('CMA start time', Date.now() - timeStamp);
                     if (!process.isFirstStart) {
-                        await googleAnalytics.trackTiming('CMA start time', Date.now() - timeStamp);
                         googleAnalytics.printAboutAnalytics();
                         process.exit(0);
                     }
@@ -171,7 +173,6 @@ module.exports = (yargs) => {
                     const paramInfo = `Platform: ${platform} ${kernel}, CPU model: ${manufacturer} ${brand}, RAM amount: ${totalRam}MB`;
 
                     await googleAnalytics.trackEvent('Params', paramInfo, 0, 'OS');
-                    await googleAnalytics.trackTiming('CMA first start time', Date.now() - timeStamp);
                     googleAnalytics.printAboutAnalytics();
                 } catch (e) {
                     await googleAnalytics.trackError(e.message || e);
@@ -179,8 +180,20 @@ module.exports = (yargs) => {
 
                 process.exit(0);
             } catch (e) {
-                logger.error(e.message || e);
-                await googleAnalytics.trackError(e.message || e);
+                if (e instanceof UnknownError || e instanceof KnownError) {
+                    logger.error(e.message);
+                    if (e instanceof UnknownError) {
+                        await googleAnalytics.trackError(`Unknown Error: ${e.stack}`);
+                    } else {
+                        await googleAnalytics.trackError(`Known Error: ${e.message}`);
+                    }
+                } else if (e instanceof Error) {
+                    logger.error(e.message);
+                    await googleAnalytics.trackError(`Regular Error: ${e.message}`);
+                } else {
+                    logger.error(e);
+                    await googleAnalytics.trackError(`Non Error: ${e}`); // track non-errors throws
+                }
                 process.exit(1);
             }
         }

package/lib/config/check-configuration-file.js

@@ -5,6 +5,7 @@ const pathExists = require('../util/path-exists');
 const { deepmerge } = require('../util/deepmerge');
 const { defaultMagentoConfig } = require('./magento-config');
 const setConfigFile = require('../util/set-config');
+const getJsonfileData = require('../util/get-jsonfile-data');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -16,6 +17,8 @@ const checkConfigurationFile = () => ({
         const { cacheDir, templateDir } = getBaseConfig(projectPath);
         const configJSFilePath = path.join(projectPath, 'cma.js');
         const magentoConfigFilePath = path.join(cacheDir, 'app-config.json');
+        const composerJsonPath = path.join(process.cwd(), 'composer.json');
+        const composerData = await getJsonfileData(composerJsonPath);
 
         if (!await pathExists(configJSFilePath)) {
             const legacyMagentoConfigExists = await pathExists(magentoConfigFilePath);
@@ -28,7 +31,19 @@ const checkConfigurationFile = () => ({
                 );
 
                 magentoConfiguration = legacyMagentoConfig.magento || legacyMagentoConfig;
-            } else {
+            } else if (composerData) {
+                if (composerData.require['magento/product-community-edition']) {
+                    magentoConfiguration = deepmerge(defaultMagentoConfig, {
+                        edition: 'community'
+                    });
+                } else if (composerData.require['magento/product-enterprise-edition']) {
+                    magentoConfiguration = deepmerge(defaultMagentoConfig, {
+                        edition: 'enterprise'
+                    });
+                }
+            }
+
+            if (!magentoConfiguration) {
                 const magentoEdition = await task.prompt({
                     type: 'Select',
                     message: `Please select Magento edition you want to install.

package/lib/config/cma-config.js

@@ -0,0 +1,16 @@
+const Conf = require('conf');
+
+const pkg = require('../../package.json');
+/**
+ * @type {import('conf/dist/source').default}
+ */
+const cmaGlobalConfig = new Conf({
+    configName: 'config',
+    projectName: 'create-magento-app',
+    projectVersion: pkg.version,
+    defaults: {}
+});
+
+module.exports = {
+    cmaGlobalConfig
+};

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

@@ -1,3 +1,5 @@
+const { getBrewCommandSync } = require('../util/get-brew-bin-path');
+
 const dependenciesForPlatforms = {
     darwin: {
         dependencies: [
@@ -15,7 +17,7 @@ const dependenciesForPlatforms = {
             'libxml2',
             'openssl@1.1'
         ],
-        installCommand: (deps) => `brew install ${deps}`,
+        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'Arch Linux': {
@@ -51,7 +53,12 @@ const dependenciesForPlatforms = {
             'libsodium',
             'libsodium-devel',
             'libtool-ltdl-devel',
-            'oniguruma-devel'
+            'oniguruma-devel',
+            'libxml2-devel',
+            'bzip2-devel',
+            'curl-devel',
+            'libxslt-devel',
+            'autoconf'
         ],
         installCommand: (deps) => `sudo yum install ${deps} -y`,
         packageManager: 'yum'
@@ -68,7 +75,12 @@ const dependenciesForPlatforms = {
             'libsodium',
             'libsodium-devel',
             'libtool-ltdl-devel',
-            'oniguruma-devel'
+            'oniguruma-devel',
+            'libxml2-devel',
+            'bzip2-devel',
+            'curl-devel',
+            'libxslt-devel',
+            'autoconf'
         ],
         installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`,
         packageManager: 'yum'

package/lib/config/docker.js

@@ -54,7 +54,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_nginx-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(cacheDir, 'nginx', 'conf.d') }`,
+                device: path.join(cacheDir, 'nginx', 'conf.d'),
                 o: 'bind'
             }
         };
@@ -62,7 +62,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_pub-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(magentoDir, 'pub') }`,
+                device: path.join(magentoDir, 'pub'),
                 o: 'bind'
             }
         };
@@ -70,7 +70,15 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_setup-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(magentoDir, 'setup') }`,
+                device: path.join(magentoDir, 'setup'),
+                o: 'bind'
+            }
+        };
+        volumes.sslTerminator = {
+            name: `${ prefix }_ssl-terminator-data`,
+            opts: {
+                type: 'nfs',
+                device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
                 o: 'bind'
             }
         };
@@ -80,7 +88,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 name: `${ prefix }_varnish-data`,
                 opts: {
                     type: 'nfs',
-                    device: `${ path.join(cacheDir, 'varnish') }`,
+                    device: path.join(cacheDir, 'varnish'),
                     o: 'bind'
                 }
             };
@@ -89,6 +97,31 @@ module.exports = async ({ configuration, ssl, host }, config) => {
 
     const getContainers = (ports = {}) => {
         const dockerConfig = {
+            sslTerminator: {
+                _: 'SSL Terminator (Nginx)',
+                ports: isNotNativeLinux ? [
+                    `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.sslTerminator }:80`
+                ] : [],
+                healthCheck: {
+                    cmd: 'service nginx status'
+                },
+                /**
+                 * Mount volumes directly on linux
+                 */
+                mountVolumes: [
+                    `${ isLinux ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
+                ],
+                restart: 'on-failure:5',
+                // TODO: use connect instead
+                network: isNotNativeLinux ? network.name : 'host',
+                image: `nginx:${ nginx.version }`,
+                imageDetails: {
+                    name: 'nginx',
+                    tag: nginx.version
+                },
+                name: `${ prefix }_ssl-terminator`,
+                command: "nginx -g 'daemon off;'"
+            },
             nginx: {
                 _: 'Nginx',
                 ports: isNotNativeLinux ? [
@@ -160,7 +193,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 command: [
                     '--log_bin_trust_function_creators=1',
                     '--default-authentication-plugin=mysql_native_password',
-                    '--max_allowed_packet=1GB'
+                    '--max_allowed_packet=1GB',
+                    '--bind-address=0.0.0.0'
                 ].join(' '),
                 securityOptions: [
                     'seccomp=unconfined'
@@ -192,9 +226,9 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some((sse42Flag) => cpuSupportedFlags.includes(sse42Flag))
                 },
                 network: network.name,
-                image: `docker.elastic.co/elasticsearch/elasticsearch:${ elasticsearch.version }`,
+                image: `elasticsearch:${ elasticsearch.version }`,
                 imageDetails: {
-                    name: 'docker.elastic.co/elasticsearch/elasticsearch',
+                    name: 'elasticsearch',
                     tag: elasticsearch.version
                 },
                 name: `${ prefix }_elasticsearch`
@@ -216,10 +250,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     tag: varnish.version
                 },
                 name: `${ prefix }_varnish`,
-                mountVolumes: isLinux ? [
-                    `${ path.join(cacheDir, 'varnish') }:/etc/varnish`
-                ] : [
-                    `${ volumes.varnish.name }:/etc/varnish`
+                mountVolumes: [
+                    `${ isLinux ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`
                 ],
                 ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
@@ -229,7 +261,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 },
                 restart: 'on-failure:30',
                 network: isNotNativeLinux ? network.name : 'host',
-                command: `varnishd -F -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl`,
+                // eslint-disable-next-line max-len
+                command: `/bin/bash -c "varnishd -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s malloc,512m && varnishlog"`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
                 ]

package/lib/config/get-port-config.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { baseConfig } = require('.');
+const KnownError = require('../errors/known-error');
 const pathExists = require('../util/path-exists');
 const {
     getPort,
@@ -26,6 +27,10 @@ const getAvailablePorts = () => ({
                     'utf-8'
                 )
             );
+            if (!ports.sslTerminator) {
+                ports.sslTerminator = ports.app;
+                ports.app = defaultPorts.app;
+            }
         }
         const {
             systemConfiguration: {
@@ -39,9 +44,9 @@ const getAvailablePorts = () => ({
         if (ctx.port) {
             const isPortAvailable = (await getPort(ctx.port)) === ctx.port;
             if (!isPortAvailable) {
-                throw new Error(`Port ${ctx.port} is not available`);
+                throw new KnownError(`Port ${ctx.port} is not available`);
             } else {
-                availablePorts.app = ctx.port;
+                availablePorts.sslTerminator = ctx.port;
             }
         }
 

package/lib/config/index.js

@@ -10,6 +10,7 @@ const { getMagentoConfig } = require('./magento-config');
 const { getPhpStormConfig } = require('./phpstorm/debug-config');
 const resolveConfigurationWithOverrides = require('../util/resolve-configuration-with-overrides');
 const { getPrefix, folderName } = require('../util/prefix');
+const UnknownError = require('../errors/unknown-error');
 
 const platforms = ['linux', 'darwin'];
 const darwinMinimalVersion = '10.5';
@@ -38,7 +39,7 @@ module.exports = {
         const newBaseConfig = getBaseConfig(projectPath, prefix);
         const configurations = getConfigurations(newBaseConfig);
         if (!configurations[magentoVersion]) {
-            throw new Error(`No config found for magento version ${magentoVersion}`);
+            throw new UnknownError(`No config found for magento version ${magentoVersion}`);
         }
 
         const {

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

@@ -2,6 +2,7 @@ const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const pathExists = require('../../../util/path-exists');
+const UnknownError = require('../../../errors/unknown-error');
 
 /**
  * @type {import('../../../../typings/index').PHPExtension}
@@ -21,7 +22,7 @@ module.exports = {
             );
 
             if (!await pathExists(sodiumDynamicLibraryPath)) {
-                throw new Error(`libsodium dynamic library file configuration not found: ${sodiumDynamicLibraryPath}`);
+                throw new UnknownError(`libsodium dynamic library file configuration not found: ${sodiumDynamicLibraryPath}`);
             }
             const fileContent = await fs.promises.readFile(sodiumDynamicLibraryPath, 'utf-8');
 

package/lib/config/port-config.js

@@ -54,8 +54,9 @@ const savePortsConfig = async (ports) => {
 
 // Map of default ports (key:value)
 const defaultPorts = {
-    app: 80,
+    app: 3031,
     varnish: 8080,
+    sslTerminator: 80,
     fpm: 9000,
     xdebug: 9111,
     mysql: 3306,

package/lib/config/scandipwa-versions.js

@@ -9,7 +9,8 @@ const scandipwaMagentoVersionMapping = {
     '2.4.0': '3.1.0 - 3.1.6',
     '2.4.1': '3.2.0 - 4.2.1',
     '2.4.2': '4.3.0 - 5.0.3',
-    '2.4.3': '5.0.4'
+    '2.4.3': '5.0.4 - 5.2.7',
+    '2.4.4': '5.3.0+'
 };
 
 module.exports = scandipwaMagentoVersionMapping;

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

@@ -0,0 +1,10 @@
+const path = require('path');
+
+const sslTerminator = ({ templateDir }) => ({
+    version: '1.18.0',
+    configTemplate: path.join(templateDir || '', 'ssl-terminator.template.conf')
+});
+
+module.exports = {
+    sslTerminator
+};

package/lib/config/system-config.js

@@ -4,6 +4,8 @@ const fs = require('fs');
 const pathExists = require('../util/path-exists');
 const { systemConfigurationSchema } = require('../util/config-file-validator');
 const { deepmerge } = require('../util/deepmerge');
+const pathExistsSync = require('../util/path-exists-sync');
+const KnownError = require('../errors/known-error');
 
 const defaultSystemConfig = {
     analytics: true,
@@ -14,19 +16,45 @@ const systemConfigPath = path.join(os.homedir(), '.cmarc');
 /**
  * @returns {Promise<typeof defaultSystemConfig>}
  */
-const getSystemConfig = async () => {
+const getSystemConfig = async ({ validate = true } = {}) => {
     if (await pathExists(systemConfigPath)) {
         const userSystemConfig = await fs.promises.readFile(systemConfigPath, 'utf-8');
         let userSystemConfigParsed;
         try {
             userSystemConfigParsed = JSON.parse(userSystemConfig);
         } catch (e) {
-            throw new Error(`System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`);
+            throw new KnownError(`System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`);
         }
+
+        if (validate) {
+            try {
+                await systemConfigurationSchema.validateAsync(userSystemConfigParsed);
+            } catch (e) {
+                throw new KnownError(`Configuration file validation error!\n\n${e.message}`);
+            }
+        }
+
+        return deepmerge(defaultSystemConfig, userSystemConfigParsed);
+    }
+
+    return defaultSystemConfig;
+};
+
+const getSystemConfigSync = ({ validate = true } = {}) => {
+    if (pathExistsSync(systemConfigPath)) {
+        const userSystemConfig = fs.readFileSync(systemConfigPath, { encoding: 'utf-8' });
+        let userSystemConfigParsed;
         try {
-            await systemConfigurationSchema.validateAsync(userSystemConfigParsed);
+            userSystemConfigParsed = JSON.parse(userSystemConfig);
         } catch (e) {
-            throw new Error(`Configuration file validation error!\n\n${e.message}`);
+            throw new KnownError(`System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`);
+        }
+        if (validate) {
+            try {
+                systemConfigurationSchema.validate(userSystemConfigParsed);
+            } catch (e) {
+                throw new KnownError(`Configuration file validation error!\n\n${e.message}`);
+            }
         }
 
         return deepmerge(defaultSystemConfig, userSystemConfigParsed);
@@ -48,5 +76,6 @@ const getSystemConfigTask = () => ({
 module.exports = {
     defaultSystemConfig,
     getSystemConfigTask,
-    getSystemConfig
+    getSystemConfig,
+    getSystemConfigSync
 };

package/lib/config/templates/magentorc.template

@@ -6,5 +6,7 @@ alias c="composer"
 <% if (it.varnishEnabled) { %>
 alias cvc="npm run exec varnish varnishadm ban req.url '~ /' && echo 'Varnish cache cleared!'"
 <% } %>
+alias mysql="npm run exec mysql 'mysql -umagento -pmagento'"
+alias mysqlroot="npm run exec mysql 'mysql -uroot -pscandipwa'"
 
 export BASH_SILENCE_DEPRECATION_WARNING=1

package/lib/config/templates/nginx.template.conf

@@ -1,8 +1,3 @@
-real_ip_header X-Forwarded-For;
-set_real_ip_from 10.0.0.0/8;
-set_real_ip_from 172.0.0.0/8;
-real_ip_recursive on;
-
 upstream fastcgi_backend {
     # use tcp connection
     server <%= it.hostMachine %>:<%= it.ports.fpm %>;
@@ -10,16 +5,7 @@ upstream fastcgi_backend {
 
 server {
     listen <%= it.hostPort %>;
-    <% if (it.config.ssl.enabled) { %>listen 443 ssl;<% } %>
-
-    <% if (it.config.ssl.enabled) { %>server_name <%= it.networkToBindTo %>;
-
-    ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
-    ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
-    ssl_protocols TLSv1.2;<% } else if (it.config.host) { %>server_name <%= it.config.host %>;
-    <% } else { %>
     server_name _;
-    <% } %>
 
     set $MAGE_ROOT <%= it.mageRoot %>;
     resolver 127.0.0.11;
@@ -39,16 +25,6 @@ server {
     }
 
     location / {
-        # proxy_set_header X-Real-IP $remote_addr;
-        # proxy_set_header X-Forwarded-For $remote_addr;
-        # proxy_set_header Host $http_host;
-
-        # if ($request_method = PURGE) {
-        #     rewrite ^/(.*)$  $1 break;
-        #     proxy_pass http://<%= it.hostMachine %>:<%= it.ports.varnish %>/;
-        #     break;
-        # }
-
         try_files $uri $uri/ /index.php$is_args$args;
     }
 
@@ -222,11 +198,4 @@ server {
     location @webp-to-jpg {
         rewrite ^(.*)\.webp$ $1.jpg last;
     }
-
-    # location @purgepass {
-    #     # some other configuration
-    #     proxy_pass http://<%= it.hostMachine %>:<%= it.ports.varnish %>;
-    #     proxy_set_header Host      $host;
-    #     proxy_set_header X-Real-IP $remote_addr;
-    # }
 }

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

@@ -0,0 +1,27 @@
+real_ip_header X-Forwarded-For;
+set_real_ip_from 10.0.0.0/8;
+set_real_ip_from 172.0.0.0/8;
+real_ip_recursive on;
+
+server {
+    listen <%= it.hostPort %>;
+<% if (it.config.ssl.enabled) { %>  listen 443 ssl;
+    server_name <%= it.networkToBindTo %>;
+
+    ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
+    ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
+    ssl_protocols TLSv1.2;<% } %>
+
+    server_name <% if (it.config.host) { %><%= it.config.host %><% } else { %>_<% } %>;
+
+    location / {
+        proxy_buffer_size   128k;
+        proxy_buffers   4 256k;
+        proxy_busy_buffers_size   256k;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header Host $http_host;
+
+        proxy_pass http://<%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
+    }
+}

package/lib/config/templates/varnish.template.vcl

@@ -81,6 +81,11 @@ sub vcl_recv {
         return (pass);
     }
 
+    # Bypass frontend static file caching
+    if (req.url ~ "^/static/frontend") {
+        return (pass);
+    }
+
     # Set initial grace period usage status
     set req.http.grace = "none";
 
@@ -114,12 +119,12 @@ sub vcl_recv {
     # Static files caching
     if (req.url ~ "^/(pub/)?(media|static)/") {
         # Static files should not be cached by default
-        return (pass);
+        # return (pass);
 
         # But if you use a few locales and don't use CDN you can enable caching static files by commenting previous line (#return (pass);) and uncommenting next 3 lines
-        #unset req.http.Https;
-        #unset req.http.X-Forwarded-Proto;
-        #unset req.http.Cookie;
+        unset req.http.Https;
+        unset req.http.X-Forwarded-Proto;
+        unset req.http.Cookie;
     }
 
     # Authenticated GraphQL requests should not be cached by default

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',