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

package/lib/config/docker.js

@@ -43,6 +43,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
     const isLinux = os.platform() === 'linux';
     const isWsl = await getIsWsl();
     const isArm = (await getArch()) === 'arm64';
+    const isNotNativeLinux = (!isLinux || isWsl);
 
     if (!isLinux) {
         /**
@@ -79,7 +80,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 name: `${ prefix }_varnish-vcl-data`,
                 opts: {
                     type: 'nfs',
-                    device: `${ path.join(cacheDir, 'varnish', 'default.vcl') }`
+                    device: `${ path.join(cacheDir, 'varnish') }`,
+                    o: 'bind'
                 }
             };
         }
@@ -89,7 +91,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
         const dockerConfig = {
             nginx: {
                 _: 'Nginx',
-                ports: (!isLinux || isWsl) ? [
+                ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.app }:80`
                 ] : [],
                 healthCheck: {
@@ -109,7 +111,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 ],
                 restart: 'on-failure:5',
                 // TODO: use connect instead
-                network: (!isLinux || isWsl) ? network.name : 'host',
+                network: isNotNativeLinux ? network.name : 'host',
                 image: `nginx:${ nginx.version }`,
                 imageDetails: {
                     name: 'nginx',
@@ -215,16 +217,19 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 },
                 name: `${ prefix }_varnish`,
                 mountVolumes: isLinux ? [
-                    `${ path.join(cacheDir, 'varnish', 'default.vcl') }:/etc/varnish/default.vcl:ro`
+                    `${ path.join(cacheDir, 'varnish') }:/etc/varnish`
                 ] : [
-                    `${ volumes.varnish.name }:/etc/varnish/default.vcl`
+                    `${ volumes.varnish.name }:/etc/varnish`
                 ],
+                ports: isNotNativeLinux ? [
+                    `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
+                ] : [],
                 env: {
                     VARNISH_SIZE: '2G'
                 },
                 restart: 'on-failure:30',
-                network: (!isLinux || isWsl) ? network.name : 'host',
-                command: `varnishd -F -a :${ ports.varnish } -t 600 -f /etc/varnish/default.vcl`,
+                network: isNotNativeLinux ? network.name : 'host',
+                command: `varnishd -F -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
                 ]

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

@@ -39,6 +39,16 @@ 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;
     }
 
@@ -212,4 +222,11 @@ 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/varnish.template.vcl

@@ -7,19 +7,28 @@ import std;
 
 backend default {
     .host = "<%= it.hostMachine %>";
-    .port = "<%= it.hostPort %>";
+    .host_header = "Host: localhost";
+    .port = "<%= it.nginxPort %>";
     .first_byte_timeout = 600s;
     .probe = {
-        .url = "/health_check.php";
-        .timeout = 2s;
-        .interval = 5s;
-        .window = 10;
-        .threshold = 5;
+        # .url = "/health_check.php";
+        .request =
+            "GET /health_check.php HTTP/1.1"
+            "Host: localhost"
+            "Connection: close"
+            "User-Agent: Varnish Health Probe";
+        .interval  = 10s;
+        .timeout   = 5s;
+        .window    = 5;
+        .threshold = 3;
    }
 }
 
 acl purge {
     "<%= it.hostMachine %>";
+    "localhost";
+    "172.0.0.0"/8;
+    "192.168.0.0"/16;
 }
 
 sub vcl_recv {

package/lib/config/varnish/varnish-6-0.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+const varnish60 = ({ templateDir }) => ({
+    enabled: true,
+    version: '6.0',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+});
+
+module.exports = {
+    varnish60
+};

package/lib/config/varnish/varnish-6-6.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+const varnish66 = ({ templateDir }) => ({
+    enabled: true,
+    version: '6.6',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+});
+
+module.exports = {
+    varnish66
+};

package/lib/config/varnish/varnish-7-0.js

@@ -0,0 +1,11 @@
+const path = require('path');
+
+const varnish70 = ({ templateDir }) => ({
+    enabled: true,
+    version: '7.0',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+});
+
+module.exports = {
+    varnish70
+};

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.0',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ 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 { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.1',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ 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 { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2-p2',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3-p1',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.2',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.3',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.2',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4-p2',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.2',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.4',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.2',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p1',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.3',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5-p2',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.3',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.5',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.3',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6-p1',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.4',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.6',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.4',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p1',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p2',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7-p3',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.7',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0-p1',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish60({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.0',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish60({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1-p1',
@@ -44,11 +45,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.2',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1',
@@ -42,11 +43,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: {
-            enabled: true,
-            version: '6.2',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p1',
@@ -46,11 +47,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.4',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p2',
@@ -46,11 +47,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.4',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2',
@@ -45,11 +46,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.4',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p1',
@@ -46,11 +47,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p2',
@@ -46,11 +47,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3',
@@ -46,11 +47,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '6.5',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish66({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

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

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { varnish70 } = require('../varnish/varnish-7-0');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4',
@@ -46,11 +47,7 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: {
-            enabled: true,
-            version: '7.0',
-            configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
-        }
+        varnish: varnish70({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/tasks/docker/containers.js

@@ -30,9 +30,11 @@ const run = (options) => {
         command = '',
         healthCheck,
         securityOptions = [],
-        tmpfs = []
+        tmpfs = [],
+        expose = []
     } = options;
 
+    const exposeArg = expose && expose.map((e) => `--expose=${ e }`);
     const restartArg = restart && `--restart ${ restart }`;
     const networkArg = network && `--network ${ network }`;
     const portsArgs = ports.map((port) => `-p ${ port }`).join(' ');
@@ -53,6 +55,7 @@ const run = (options) => {
         networkArg,
         restartArg,
         portsArgs,
+        exposeArg,
         mountsArgs,
         mountVolumesArgs,
         envArgs,

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

@@ -63,6 +63,9 @@ const createNginxConfig = () => ({
 
         const networkToBindTo = isIpAddress(host) ? host : '127.0.0.1';
         const isLinux = os.platform() === 'linux';
+        const isNativeLinux = isLinux && !isWsl;
+        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
+        const hostPort = isNativeLinux ? ports.app : 80;
 
         try {
             await setConfigFile({
@@ -77,8 +80,8 @@ const createNginxConfig = () => ({
                 templateArgs: {
                     ports,
                     mageRoot: baseConfig.magentoDir,
-                    hostMachine: (isLinux && !isWsl) ? '127.0.0.1' : 'host.docker.internal',
-                    hostPort: (isLinux && !isWsl) ? ports.app : 80,
+                    hostMachine,
+                    hostPort,
                     config: overridenConfiguration,
                     networkToBindTo
                 }

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

@@ -1,4 +1,3 @@
-const os = require('os');
 const path = require('path');
 const setConfigFile = require('../../util/set-config');
 
@@ -17,7 +16,8 @@ const createVarnishConfig = () => ({
                     cacheDir
                 }
             },
-            isWsl
+            isWsl,
+            platform
         } = ctx;
 
         const {
@@ -26,7 +26,8 @@ const createVarnishConfig = () => ({
             }
         } = overridenConfiguration;
 
-        const isLinux = os.platform() === 'linux';
+        const isLinux = platform === 'linux';
+        const isNativeLinux = isLinux && !isWsl;
 
         try {
             await setConfigFile({
@@ -38,8 +39,8 @@ const createVarnishConfig = () => ({
                 template: varnish.configTemplate,
                 overwrite: true,
                 templateArgs: {
-                    hostMachine: (isLinux && !isWsl) ? '127.0.0.1' : 'host.docker.internal',
-                    hostPort: (isLinux && !isWsl) ? ports.app : 80
+                    hostMachine: isNativeLinux ? '127.0.0.1' : 'host.docker.internal',
+                    nginxPort: ports.app
                 }
             });
         } catch (e) {

package/lib/tasks/magento/setup-magento/migrate-database.js

@@ -3,7 +3,6 @@ const runMagentoCommand = require('../../../util/run-magento');
 const configureElasticsearch = require('./configure-elasticsearch');
 const installMagento = require('./install-magento');
 const upgradeMagento = require('./upgrade-magento');
-const setupPersistedQuery = require('../../theme/setup-persisted-query');
 const varnishConfigSetup = require('./varnish-config');
 
 /**
@@ -25,6 +24,7 @@ const migrateDatabase = (options = {}) => ({
 
         if (tableCount === 0) {
             if (options.onlyInstallMagento) {
+                ctx.isSetupUpgradeNeeded = false;
                 return task.newListr(
                     installMagento({ isDbEmpty: true })
                 );
@@ -32,7 +32,6 @@ const migrateDatabase = (options = {}) => ({
 
             return task.newListr([
                 installMagento({ isDbEmpty: true }),
-                setupPersistedQuery(),
                 upgradeMagento(),
                 magentoTask('cache:enable'),
                 varnishConfigSetup(),
@@ -53,9 +52,9 @@ const migrateDatabase = (options = {}) => ({
 
         switch (code) {
         case 0: {
+            ctx.isSetupUpgradeNeeded = false;
             // no setup is needed, but still to be sure configure ES
             return task.newListr([
-                setupPersistedQuery(),
                 varnishConfigSetup(),
                 configureElasticsearch()
             ], {
@@ -69,6 +68,7 @@ const migrateDatabase = (options = {}) => ({
         }
         case 1: {
             if (options.onlyInstallMagento) {
+                ctx.isSetupUpgradeNeeded = false;
                 return task.newListr(
                     installMagento()
                 );
@@ -76,7 +76,6 @@ const migrateDatabase = (options = {}) => ({
 
             return task.newListr([
                 installMagento(),
-                setupPersistedQuery(),
                 upgradeMagento(),
                 magentoTask('cache:enable'),
                 varnishConfigSetup(),
@@ -92,7 +91,6 @@ const migrateDatabase = (options = {}) => ({
         }
         case 2: {
             return task.newListr([
-                setupPersistedQuery(),
                 varnishConfigSetup(),
                 configureElasticsearch(),
                 upgradeMagento()

package/lib/tasks/magento/setup-magento/upgrade-magento.js

@@ -4,9 +4,23 @@ const magentoTask = require('../../../util/magento-task');
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const upgradeMagento = () => ({
-    task: (ctx, task) => task.newListr(
-        magentoTask('setup:upgrade --no-interaction')
-    )
+    skip: (ctx) => {
+        if ('isSetupUpgradeNeeded' in ctx) {
+            return !ctx.isSetupUpgradeNeeded;
+        }
+
+        return false;
+    },
+    task: (_ctx, task) => task.newListr([
+        magentoTask('setup:upgrade --no-interaction'),
+        {
+            task: (ctx) => {
+                ctx.isSetupUpgradeNeeded = false;
+            }
+        }
+    ], {
+        concurrent: false
+    })
 });
 
 module.exports = upgradeMagento;

package/lib/tasks/magento/setup-magento/varnish-config.js

@@ -1,4 +1,6 @@
+const os = require('os');
 const { updateTableValues } = require('../../../util/database');
+const getIsWsl = require('../../../util/is-wsl');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -20,6 +22,10 @@ const varnishConfigSetup = () => ({
             ports
         } = ctx;
 
+        const isLinux = os.platform() === 'linux';
+        const isWsl = await getIsWsl();
+        // const host = (isLinux && !isWsl) ? 'localhost' : 'host.docker.internal';
+
         if (varnishEnabled) {
             await updateTableValues('core_config_data', [
                 {
@@ -32,7 +38,7 @@ const varnishConfigSetup = () => ({
                 },
                 {
                     path: 'system/full_page_cache/varnish/access_list',
-                    value: 'localhost'
+                    value: (!isLinux || isWsl) ? 'host.docker.internal,localhost' : 'localhost'
                 },
                 {
                     path: 'system/full_page_cache/caching_application',

package/lib/tasks/php/update-env-php.js

@@ -14,7 +14,7 @@ const updateEnvPHP = () => ({
             return;
         }
 
-        const useVarinsh = ctx.config.overridenConfiguration.configuration.varnish.enabled ? '1' : '';
+        const useVarnish = ctx.config.overridenConfiguration.configuration.varnish.enabled ? '1' : '';
         const varnishHost = '127.0.0.1';
         const varnishPort = ctx.ports.varnish;
         const previousVarnishPort = ctx.cachedPorts
@@ -25,7 +25,7 @@ const updateEnvPHP = () => ({
             phpTask(`-f ${ path.join(__dirname, 'update-env.php') }`, {
                 noTitle: true,
                 env: {
-                    USE_VARNISH: useVarinsh,
+                    USE_VARNISH: useVarnish,
                     VARNISH_PORT: `${ varnishPort }`,
                     VARNISH_HOST: varnishHost,
                     PREVIOUS_VARNISH_PORT: `${ previousVarnishPort }`

package/lib/tasks/php/update-env.php

@@ -161,6 +161,8 @@ class EnvUpdater
             } else {
                 $this->config['http_cache_hosts'] = [$varnishConfig];
             }
+        } else {
+            unset($this->config['http_cache_hosts']);
         }
     }
 

package/lib/tasks/start.js

@@ -126,6 +126,7 @@ const configureProject = () => ({
  */
 const finishProjectConfiguration = () => ({
     title: 'Finishing project configuration',
+    skip: ({ skipSetup }) => skipSetup,
     task: (ctx, task) => task.newListr([
         {
             skip: (ctx) => !ctx.importDb,
@@ -143,16 +144,10 @@ const finishProjectConfiguration = () => ({
                 });
             }
         },
-        {
-            title: 'Setting up themes',
-            skip: (ctx) => !ctx.magentoFirstInstall,
-            task: (subCtx, subTask) => subTask.newListr(
-                setupThemes()
-            )
-        }
+        setupThemes()
     ], {
         rendererOptions: {
-            collapse: true
+            collapse: false
         }
     })
 });

package/lib/tasks/theme/build-theme.js

@@ -1,7 +1,8 @@
 const path = require('path');
 const pathExists = require('../../util/path-exists');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
-const shouldUseYarn = require('@scandipwa/scandipwa-dev-utils/should-use-yarn');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const matchFilesystem = require('../../util/match-filesystem');
 
 /**
  * @type {(theme: import('../../../typings/theme').Theme) => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -13,15 +14,32 @@ const buildTheme = ({ themePath }) => ({
 
         if (!await pathExists(path.join(themePath, 'node_modules'))) {
             task.output = 'Installing theme dependencies';
-            await execAsyncSpawn(shouldUseYarn() ? 'yarn' : 'npm i', {
-                cwd: path.join(process.cwd(), themePath),
-                callback: !verbose ? undefined : (t) => {
-                    task.output = t;
-                }
-            });
+            const commandToInstallDependencies = await pathExists(path.join(themePath, 'package-lock.json'))
+                ? 'npm ci'
+                : 'npm i';
+
+            try {
+                await execAsyncSpawn(commandToInstallDependencies, {
+                    cwd: path.join(process.cwd(), themePath),
+                    callback: !verbose ? undefined : (t) => {
+                        task.output = t;
+                    }
+                });
+            } catch (e) {
+                throw new Error(`We were unable to install theme dependencies in ${themePath} using ${logger.style.code(commandToInstallDependencies)} command!
+If you have ${logger.style.file('package-lock.json')} in theme directory make sure it's up to date with ${logger.style.file('package.json')} file content.`);
+            }
         }
 
-        if (await pathExists(path.join(themePath, 'magento', 'Magento_Theme'))) {
+        const magentoThemeDirPath = path.join(themePath, 'magento', 'Magento_Theme');
+        const isMagentoThemeDirMatching = await matchFilesystem(magentoThemeDirPath, {
+            templates: true,
+            web: [
+                'static'
+            ]
+        });
+
+        if (isMagentoThemeDirMatching) {
             task.skip();
             return;
         }

package/lib/tasks/theme/install-theme.js

@@ -1,13 +1,23 @@
+const path = require('path');
+const getJsonfileData = require('../../util/get-jsonfile-data');
 const runComposerCommand = require('../../util/run-composer');
 
 /**
  * @type {(theme: import('../../../typings/theme').Theme) => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const installTheme = ({ composerData }) => ({
+const installTheme = (theme) => ({
     title: 'Installing theme in composer.json',
-    task: async ({ magentoVersion, verbose = false }, task) => {
+    task: async (ctx, task) => {
+        const { magentoVersion, verbose = false } = ctx;
+        const composerJsonData = await getJsonfileData(path.join(process.cwd(), 'composer.json'));
+
+        if (composerJsonData.require[theme.composerData.name]) {
+            task.skip();
+            return;
+        }
+
         try {
-            await runComposerCommand(`require ${composerData.name}`, {
+            await runComposerCommand(`require ${theme.composerData.name}`, {
                 magentoVersion,
                 callback: !verbose ? undefined : (t) => {
                     task.output = t;
@@ -16,9 +26,11 @@ const installTheme = ({ composerData }) => ({
         } catch (e) {
             throw new Error(
                 `Unexpected error while installing theme.
-                See ERROR log below.\n\n${e}`
+See ERROR log below.\n\n${e}`
             );
         }
+
+        ctx.isSetupUpgradeNeeded = true;
     },
     options: {
         bottomBar: 10

package/lib/tasks/theme/setup-themes.js

@@ -12,6 +12,7 @@ const buildTheme = require('./build-theme');
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const setupThemes = () => ({
+    title: 'Setting up themes',
     task: async (ctx, task) => {
         const { config: { baseConfig } } = ctx;
         const composerData = await getJsonfileData(path.join(baseConfig.magentoDir, 'composer.json'));

package/lib/tasks/theme/symlink-theme.js

@@ -1,13 +1,26 @@
+const path = require('path');
+const getJsonfileData = require('../../util/get-jsonfile-data');
 const runComposerCommand = require('../../util/run-composer');
 
 /**
  * @type {(theme: import('../../../typings/theme').Theme) => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const symlinkTheme = ({ absoluteThemePath }) => ({
+const symlinkTheme = (theme) => ({
     title: 'Setting symbolic link for theme in composer.json',
-    task: async ({ magentoVersion, verbose = false }, task) => {
+    task: async (ctx, task) => {
+        const { magentoVersion, verbose = false } = ctx;
+        const composerJsonData = await getJsonfileData(path.join(process.cwd(), 'composer.json'));
+        const repositories = Array.isArray(composerJsonData.repositories)
+            ? composerJsonData.repositories.reduce((acc, repo, index) => ({ ...acc, [`${index}`]: repo }), {})
+            : composerJsonData.repositories;
+
+        if (Object.values(repositories).some((value) => value.url === theme.themePath)) {
+            task.skip();
+            return;
+        }
+
         try {
-            await runComposerCommand(`config repo.scandipwa path ${absoluteThemePath}`, {
+            await runComposerCommand(`config repo.scandipwa path ${theme.absoluteThemePath}`, {
                 magentoVersion,
                 callback: !verbose ? undefined : (t) => {
                     task.output = t;
@@ -19,6 +32,8 @@ const symlinkTheme = ({ absoluteThemePath }) => ({
                 See ERROR log above.\n\n${e}`
             );
         }
+
+        ctx.isSetupUpgradeNeeded = true;
     }
 });
 

package/lib/util/match-filesystem.js

@@ -13,7 +13,8 @@ const matchFilesystem = async (cwd, structure) => {
             .every((value) => value === true);
 
         return ok;
-    } if (typeof structure === 'object') {
+    }
+    if (typeof structure === 'object') {
         const ok = (await Promise.all(Object.entries(structure).map(([key, value]) => {
             if (typeof value === 'boolean') {
                 return pathExists(path.join(cwd, key));

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "1.14.1-alpha.4",
+    "version": "1.14.1-alpha.7",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -51,5 +51,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "41436e9871ef44477f79f93c751b5d7315de8187"
+    "gitHead": "56b2ede6e6f7a92c4429ab7baa3b9fcdf432957f"
 }

package/typings/context.d.ts

@@ -16,6 +16,7 @@ export interface ListrContext {
     }
     arch: 'arm64' | 'x64'
     isArm: boolean
+    isWsl: boolean
     platform?: NodeJS.Platform
     platformVersion?: string
     /**
@@ -52,7 +53,7 @@ export interface ListrContext {
                     o: string
                 }
             }>
-            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch', {
+            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch' | 'varnish', {
                 _: string
                 ports: string[]
                 healthCheck: {
@@ -89,4 +90,5 @@ export interface ListrContext {
         useNonOverlappingPorts: boolean
     }
     mysqlConnection: mysql2.Connection
+    isSetupUpgradeNeeded?: boolean
 }