@scandipwa/magento-scripts 2.0.5 → 2.1.0-alpha.0

package/lib/config/docker.js

@@ -439,7 +439,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 command: `/bin/bash -c "varnishd -a :${
                     isDockerDesktop ? 80 : ports.varnish
                 } -t 600 -f /etc/varnish/default.vcl -s Cache=malloc,2048m -s Transient=malloc,512m -p http_resp_hdr_len=70000 -p http_resp_size=100000 && varnishlog"`,
-                tmpfs: ['/var/lib/varnish:exec'],
+                tmpfs: ['/var/lib/varnish/varnishd:exec'],
                 description: `Varnish HealthCheck status: ${logger.style.command(
                     varnish.healthCheck ? 'enabled' : 'disabled'
                 )}`

package/lib/config/services/elasticsearch/versions/elasticsearch-7.17.js

@@ -4,7 +4,7 @@ const defaultEnv = require('../default-es-env')
  * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
  */
 const elasticsearch717 = () => ({
-    image: 'elasticsearch:7.17.6',
+    image: 'elasticsearch:7.17.9',
     env: defaultEnv
 })
 

package/lib/config/services/elasticsearch/versions/elasticsearch-8.4.js

@@ -0,0 +1,11 @@
+const defaultEnv = require('../default-es-env')
+
+/**
+ * @returns {import('../../../../../typings/index').ElasticSearchConfiguration}
+ */
+const elasticsearch84 = () => ({
+    image: 'elasticsearch:8.4.3',
+    env: defaultEnv
+})
+
+module.exports = elasticsearch84

package/lib/config/services/elasticsearch/versions/index.js

@@ -6,6 +6,7 @@ const elasticsearch710 = require('./elasticsearch-7.10')
 const elasticsearch712 = require('./elasticsearch-7.12')
 const elasticsearch716 = require('./elasticsearch-7.16')
 const elasticsearch717 = require('./elasticsearch-7.17')
+const elasticsearch84 = require('./elasticsearch-8.4')
 
 module.exports = {
     elasticsearch68,
@@ -15,5 +16,6 @@ module.exports = {
     elasticsearch710,
     elasticsearch712,
     elasticsearch716,
-    elasticsearch717
+    elasticsearch717,
+    elasticsearch84
 }

package/lib/config/services/mariadb/versions/index.js

@@ -1,5 +1,6 @@
 module.exports = {
     mariadb102: require('./mariadb-10.2'),
     mariadb103: require('./mariadb-10.3'),
-    mariadb104: require('./mariadb-10.4')
+    mariadb104: require('./mariadb-10.4'),
+    mariadb106: require('./mariadb-10.6')
 }

package/lib/config/services/mariadb/versions/mariadb-10.6.js

@@ -0,0 +1,9 @@
+/**
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
+ */
+const mariadb106 = () => ({
+    image: 'mariadb:10.6',
+    useOptimizerSwitch: true
+})
+
+module.exports = mariadb106

package/lib/config/services/mysql/versions/index.js

@@ -0,0 +1,9 @@
+const mysql57 = require('./mysql-5.7')
+const mysql80 = require('./mysql-8.0')
+const mysql8028 = require('./mysql-8.0.28')
+
+module.exports = {
+    mysql57,
+    mysql80,
+    mysql8028
+}

package/lib/config/services/mysql/versions/mysql-5.7.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const mysql57 = () => ({
+    image: 'mysql:5.7'
+})
+
+module.exports = mysql57

package/lib/config/services/mysql/versions/mysql-8.0.28.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const mysql8028 = () => ({
+    image: 'mysql:8.0.28'
+})
+
+module.exports = mysql8028

package/lib/config/services/mysql/versions/mysql-8.0.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const mysql80 = () => ({
+    image: 'mysql:8.0'
+})
+
+module.exports = mysql80

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

@@ -10,5 +10,5 @@ module.exports = {
 && pecl install xdebug${version ? `-${version}` : ''} \
 && docker-php-ext-enable xdebug \
 && apk del -f .build-deps`,
-    version: '3.1.5'
+    version: '3.1.6'
 }

package/lib/config/services/php/versions/index.js

@@ -2,5 +2,6 @@ module.exports = {
     php72: require('./php-7.2'),
     php73: require('./php-7.3'),
     php74: require('./php-7.4'),
-    php81: require('./php-8.1')
+    php81: require('./php-8.1'),
+    php82: require('./php-8.2')
 }

package/lib/config/services/php/versions/php-8.2.js

@@ -0,0 +1,31 @@
+const path = require('path')
+const { repo } = require('../base-repo')
+const xdebug = require('../extensions/xdebug')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @param {import('../../../../../typings/index').PHPExtensions} [param0.extensions]
+ * @param {string} [param0.baseImage]
+ * @returns {import('../../../../../typings/index').PHPConfiguration}
+ */
+const php82 = ({
+    templateDir,
+    extensions = {},
+    baseImage = `${repo}:php-8.2`
+}) => ({
+    baseImage,
+    debugImage: `${baseImage}-debug`,
+    configTemplate: path.join(templateDir || '', 'php.template.ini'),
+    fpmConfigTemplate: path.join(templateDir || '', 'php-fpm.template.conf'),
+    debugTemplate: path.join(templateDir || '', 'php-debug.template.ini'),
+    extensions: {
+        xdebug: {
+            ...xdebug,
+            version: '3.2.1'
+        },
+        ...extensions
+    }
+})
+
+module.exports = php82

package/lib/config/services/redis/index.js

@@ -1,5 +1,6 @@
 module.exports = {
     redis50: require('./redis-5.0'),
     redis60: require('./redis-6.0'),
-    redis62: require('./redis-6.2')
+    redis62: require('./redis-6.2'),
+    redis70: require('./redis-7.0')
 }

package/lib/config/services/redis/redis-7.0.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../typings/index').ServiceWithImage}
+ */
+const redis70 = () => ({
+    image: 'redis:7.0-alpine'
+})
+
+module.exports = redis70

package/lib/config/services/varnish/index.js

@@ -1,5 +1,6 @@
 module.exports = {
     varnish60: require('./varnish-6-0'),
     varnish66: require('./varnish-6-6'),
-    varnish70: require('./varnish-7-0')
+    varnish70: require('./varnish-7-0'),
+    varnish71: require('./varnish-7-1')
 }

package/lib/config/services/varnish/varnish-7-1.js

@@ -0,0 +1,15 @@
+const path = require('path')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
+ */
+const varnish71 = ({ templateDir }) => ({
+    enabled: true,
+    healthCheck: false,
+    image: 'varnish:7.1',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+})
+
+module.exports = varnish71

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

@@ -134,8 +134,8 @@ sub vcl_recv {
         unset req.http.Cookie;
     }
 
-    # Authenticated GraphQL requests should not be cached by default
-    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+    # Bypass authenticated GraphQL requests without a X-Magento-Cache-Id
+    if (req.url ~ "/graphql" && !req.http.X-Magento-Cache-Id && req.http.Authorization ~ "^Bearer") {
         return (pass);
     }
 
@@ -143,7 +143,7 @@ sub vcl_recv {
 }
 
 sub vcl_hash {
-    if (req.http.cookie ~ "X-Magento-Vary=") {
+    if ((req.url !~ "/graphql" || !req.http.X-Magento-Cache-Id) && req.http.cookie ~ "X-Magento-Vary=") {
         hash_data(regsub(req.http.cookie, "^.*?X-Magento-Vary=([^;]+);*.*$", "\1"));
     }
 
@@ -158,6 +158,15 @@ sub vcl_hash {
 }
 
 sub process_graphql_headers {
+    if (req.http.X-Magento-Cache-Id) {
+        hash_data(req.http.X-Magento-Cache-Id);
+
+        # When the frontend stops sending the auth token, make sure users stop getting results cached for logged-in users
+        if (req.http.Authorization ~ "^Bearer") {
+            hash_data("Authorized");
+        }
+    }
+
     if (req.http.Store) {
         hash_data(req.http.Store);
     }
@@ -182,12 +191,10 @@ sub vcl_backend_response {
         set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
     }
 
-    # cache only successfully responses and 404s
-    if (beresp.status != 200 && beresp.status != 404) {
-        set beresp.ttl = 0s;
-        set beresp.uncacheable = true;
-        return (deliver);
-    } elsif (beresp.http.Cache-Control ~ "private") {
+    # cache only successfully responses and 404s that are not marked as private
+    if (beresp.status != 200 &&
+            beresp.status != 404 &&
+            beresp.http.Cache-Control ~ "private") {
         set beresp.uncacheable = true;
         set beresp.ttl = 86400s;
         return (deliver);
@@ -207,21 +214,23 @@ sub vcl_backend_response {
         # Mark as Hit-For-Pass for the next 2 minutes
         set beresp.ttl = 120s;
         set beresp.uncacheable = true;
+   }
+
+    # If the cache key in the Magento response doesn't match the one that was sent in the request, don't cache under the request's key
+    if (bereq.url ~ "/graphql" && bereq.http.X-Magento-Cache-Id && bereq.http.X-Magento-Cache-Id != beresp.http.X-Magento-Cache-Id) {
+        set beresp.ttl = 0s;
+        set beresp.uncacheable = true;
     }
 
     return (deliver);
 }
 
 sub vcl_deliver {
-    if (resp.http.X-Magento-Debug) {
-        if (resp.http.x-varnish ~ " ") {
-            set resp.http.X-Magento-Cache-Debug = "HIT";
-            set resp.http.Grace = req.http.grace;
-        } else {
-            set resp.http.X-Magento-Cache-Debug = "MISS";
-        }
+    if (resp.http.x-varnish ~ " ") {
+        set resp.http.X-Magento-Cache-Debug = "HIT";
+        set resp.http.Grace = req.http.grace;
     } else {
-        unset resp.http.Age;
+        set resp.http.X-Magento-Cache-Debug = "MISS";
     }
 
     # Not letting browser to cache non-static files.
@@ -231,6 +240,10 @@ sub vcl_deliver {
         set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
     }
 
+    if (!resp.http.X-Magento-Debug) {
+        unset resp.http.Age;
+    }
+
     unset resp.http.X-Magento-Debug;
     unset resp.http.X-Magento-Tags;
     unset resp.http.X-Powered-By;

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

@@ -0,0 +1,48 @@
+const { defaultMagentoConfig } = require('../magento-config')
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish71 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer2 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis62 } = require('../services/redis')
+const { mariadb104 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p3',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis62(),
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch717(),
+        composer: composer2(),
+        varnish: varnish71({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+})

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

@@ -0,0 +1,48 @@
+const { defaultMagentoConfig } = require('../magento-config')
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish71 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer2 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis62 } = require('../services/redis')
+const { mariadb104 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p2',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis62(),
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch717(),
+        composer: composer2(),
+        varnish: varnish71({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+})

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

@@ -0,0 +1,47 @@
+const { defaultMagentoConfig } = require('../magento-config')
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish71 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer2 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis70 } = require('../services/redis')
+const { mariadb104 } = require('../services/mariadb/versions')
+const { elasticsearch84 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb104(),
+        elasticsearch: elasticsearch84(),
+        composer: composer2(),
+        varnish: varnish71({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+})

package/lib/tasks/docker/project-image-builder.js

@@ -14,7 +14,6 @@ const { imageApi } = require('./image')
 const getEnabledExtensionsFromImage = async (imageWithTag) => {
     const output = await runContainerImage(
         imageWithTag,
-
         `php -r 'foreach (get_loaded_extensions() as $extension) echo "$extension:" . phpversion($extension) . "\n";'`
     )
 

package/lib/tasks/import-dump.js

@@ -49,10 +49,34 @@ const importDump = () => ({
 
                         return tableCount !== 0 || !isFsMatching
                     },
-                    task: (subCtx, subTask) =>
-                        subTask.newListr(
+                    task: async (subCtx, subTask) => {
+                        const doYouWantToRunSetupOnEmptyDB =
+                            await subTask.prompt({
+                                type: 'Select',
+                                message: `We detected that Magento is not installed in database. Do you want to install Magento in database BEFORE importing database dump?`,
+                                choices: [
+                                    {
+                                        name: 'try-install',
+                                        message:
+                                            'Try installing Magento before importing database'
+                                    },
+                                    {
+                                        name: 'skip',
+                                        message:
+                                            'Skip installing Magento and import database dump right away!'
+                                    }
+                                ]
+                            })
+
+                        if (doYouWantToRunSetupOnEmptyDB === 'skip') {
+                            subTask.skip()
+                            return
+                        }
+
+                        return subTask.newListr(
                             setupMagento({ onlyInstallMagento: true })
                         )
+                    }
                 },
                 dumpThemeConfig(),
                 importDumpToDatabase(),

package/lib/tasks/magento/setup-magento/disable-2fa.js

@@ -9,12 +9,25 @@ module.exports = () => ({
     task: async (ctx, task) => {
         const { modules } = await configPhpToJson(ctx)
 
-        if (
+        const isMagentoTFAEnabled =
             modules.Magento_TwoFactorAuth !== undefined &&
             modules.Magento_TwoFactorAuth !== 0
-        ) {
+
+        const isMagentoAdminAdobeImsTwoFactorAuthEnabled =
+            modules.Magento_AdminAdobeImsTwoFactorAuth !== undefined &&
+            modules.Magento_AdminAdobeImsTwoFactorAuth !== 0
+
+        if (isMagentoAdminAdobeImsTwoFactorAuthEnabled) {
+            await runMagentoCommand(
+                ctx,
+                'module:disable Magento_AdminAdobeImsTwoFactorAuth'
+            )
+        }
+        if (isMagentoTFAEnabled) {
             await runMagentoCommand(ctx, 'module:disable Magento_TwoFactorAuth')
+        }
 
+        if (isMagentoAdminAdobeImsTwoFactorAuthEnabled || isMagentoTFAEnabled) {
             return
         }
 

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": "2.0.5",
+    "version": "2.1.0-alpha.0",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -58,5 +58,5 @@
     "devDependencies": {
         "@types/yargs": "^17.0.13"
     },
-    "gitHead": "d12aab28f4ee25c341951dd1df962aa84ddf2782"
+    "gitHead": "889405f4c430f5a89f31ddd7bd0caf7beed2ec90"
 }

package/typings/index.d.ts

@@ -274,9 +274,7 @@ export interface CMAConfiguration {
         /**
          * @deprecated MySQL configuration
          */
-        mysql: {
-            version: string
-        }
+        mysql: ServiceWithImage
     }
     /**
      * Magento configuration