@scandipwa/magento-scripts 2.0.0-alpha.0 → 2.0.0-alpha.11

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

@@ -1,9 +1,10 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { composer2 } = require('../services/composer/versions');
+const { nginx118 } = require('../services/nginx/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: magento23PHPExtensionList,
             baseImage: `${ repo }:php-7.4-magento-2.3`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6'
         },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.9.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,9 +1,10 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { composer1 } = require('../services/composer/versions');
+const { nginx118 } = require('../services/nginx/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: magento24PHPExtensionList,
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '5'
         },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '1'
-        },
+        composer: composer1(),
         varnish: varnish60({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,9 +1,10 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { composer1 } = require('../services/composer/versions');
+const { nginx118 } = require('../services/nginx/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +15,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: magento24PHPExtensionList,
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '5'
         },
@@ -30,9 +28,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '1'
-        },
+        composer: composer1(),
         varnish: varnish60({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer1 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1-p1',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0.10-alpine'
         },
@@ -31,9 +29,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '1'
-        },
+        composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer1 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.1',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0.10-alpine'
         },
@@ -31,9 +29,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '1'
-        },
+        composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p1',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2-p2',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.2',
@@ -15,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -31,9 +29,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.12.1'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p1',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3-p2',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -0,0 +1,42 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php74 } = require('../php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.3-p3',
+    isDefault: true,
+    configuration: {
+        php: php74({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-7.4-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: composer2(),
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php74 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.3',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-7.4-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -0,0 +1,42 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php81 } = require('../php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.4-p1',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: composer2(),
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -1,11 +1,12 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const sodium = require('../php/extensions/sodium');
 const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
 const { php81 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
 const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.4.4',
@@ -16,10 +17,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: { ...magento24PHPExtensionList, sodium },
             baseImage: `${ repo }:php-8.1-magento-2.4`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '6.0'
         },
@@ -32,9 +30,7 @@ module.exports = ({ templateDir } = {}) => ({
         elasticsearch: {
             version: '7.16.3'
         },
-        composer: {
-            version: '2'
-        },
+        composer: composer2(),
         varnish: varnish70({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -0,0 +1,42 @@
+const { defaultMagentoConfig } = require('../magento-config');
+const sodium = require('../php/extensions/sodium');
+const { magento24PHPExtensionList } = require('../magento/required-php-extensions');
+const { php81 } = require('../php/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
+const { varnish70 } = require('../varnish/varnish-7-0');
+const { repo } = require('../php/base-repo');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer2 } = require('../services/composer/versions');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.5',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${ repo }:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.17.5'
+        },
+        composer: composer2(),
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

package/lib/tasks/cleanup.js

@@ -1,6 +1,6 @@
 const { removeCacheFolder } = require('./cache');
 const { stopServices } = require('./docker');
-const { removeVolumes } = require('./docker/volumes');
+const { removeVolumes } = require('./docker/volume/tasks');
 const {
     uninstallMagento,
     removeMagento

package/lib/tasks/composer/local-auth-json.js

@@ -27,7 +27,7 @@ const localAuthJson = () => ({
                 throw new KnownError(`Your ./auth.json file does not contain the ${ logger.style.misc("{ 'http-basic': { 'repo.magento.com': <> } }") } field.`);
             }
 
-            process.env.COMPOSER_AUTH = localAuthJson;
+            process.env.COMPOSER_AUTH = JSON.stringify(JSON.parse(localAuthJson), null, 0);
         }
     },
     options: {