@scandipwa/magento-scripts 2.0.0 → 2.0.1

package/lib/commands/status.js

@@ -10,6 +10,7 @@ const getProjectConfiguration = require('../config/get-project-configuration');
 const checkConfigurationFile = require('../config/check-configuration-file');
 const checkPHPVersion = require('../tasks/requirements/php-version');
 const { getComposerVersionTask } = require('../tasks/composer');
+const { systemApi } = require('../tasks/docker/system');
 
 /**
  * @param {import('yargs')} yargs
@@ -23,9 +24,18 @@ module.exports = (yargs) => {
             getProjectConfiguration(),
             getCachedPorts(),
             {
-                task: (ctx, task) => task.newListr([
+                task: (_ctx, task) => task.newListr([
                     checkPHPVersion(),
-                    getComposerVersionTask()
+                    getComposerVersionTask(),
+                    {
+                        title: 'Retrieving Docker System data',
+                        task: async (ctx) => {
+                            ctx.systemDFData = await systemApi.df({
+                                formatToJSON: true,
+                                verbose: true
+                            });
+                        }
+                    }
                 ], {
                     concurrent: true
                 })

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

@@ -1,132 +1,20 @@
-const { getBrewCommandSync } = require('../util/get-brew-bin-path');
-
 const dependenciesForPlatforms = {
     darwin: {
-        dependencies: [
-            'zlib',
-            'bzip2',
-            'libiconv',
-            'libzip',
-            'libsodium',
-            'curl',
-            'libpng',
-            'gd',
-            'freetype',
-            'oniguruma',
-            'icu4c',
-            'libxml2',
-            'openssl@1.1'
-        ],
-        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'darwin-arm': {
-        dependencies: [
-            'php',
-            'autoconf',
-            'pkg-config',
-            'gd'
-        ],
-        installCommand: (deps, { native } = { native: false }) => `${getBrewCommandSync({ native })} install ${deps}`,
         packageManager: 'brew'
     },
     'Arch Linux': {
-        dependencies: [
-            'freetype2',
-            'openssl',
-            'oniguruma',
-            'libxslt',
-            'bzip2',
-            ['libjpeg', 'libjpeg-turbo', 'libjpeg6-turbo'],
-            'libpng',
-            'icu',
-            'libxml2',
-            'autoconf',
-            'libzip',
-            'sqlite',
-            'readline',
-            'perl',
-            'libsodium',
-            'php',
-            'pkgconf'
-        ],
-        installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`,
         packageManager: 'pacman'
     },
     Fedora: {
-        dependencies: [
-            'openssl-devel',
-            'libjpeg-turbo-devel',
-            'libpng-devel',
-            'gd-devel',
-            'libicu',
-            'libicu-devel',
-            'libzip-devel',
-            'libsodium',
-            'libsodium-devel',
-            'libtool-ltdl-devel',
-            'oniguruma-devel',
-            'libxml2-devel',
-            'bzip2-devel',
-            'libcurl-devel',
-            'libxslt-devel',
-            'autoconf',
-            'php'
-        ],
-        installCommand: (deps) => `sudo yum install ${deps} -y`,
-        packageManager: 'yum'
+        packageManager: 'dnf'
     },
     CentOS: {
-        dependencies: [
-            'openssl-devel',
-            'libjpeg-turbo-devel',
-            'libpng-devel',
-            'gd-devel',
-            'libicu',
-            'libicu-devel',
-            'libzip-devel',
-            'libsodium',
-            'libsodium-devel',
-            'libtool-ltdl-devel',
-            'oniguruma-devel',
-            'libxml2-devel',
-            'bzip2-devel',
-            'curl-devel',
-            'libxslt-devel',
-            'autoconf',
-            'php'
-        ],
-        installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`,
         packageManager: 'yum'
     },
     Ubuntu: {
-        dependencies: [
-            'libcurl4-openssl-dev',
-            'libonig-dev',
-            'libjpeg-dev',
-            'libjpeg8-dev',
-            'libjpeg-turbo8-dev',
-            'libpng-dev',
-            'libicu-dev',
-            'libfreetype6-dev',
-            'libzip-dev',
-            'libssl-dev',
-            'build-essential',
-            'libbz2-dev',
-            'libreadline-dev',
-            'libsodium-dev',
-            'libsqlite3-dev',
-            'libxml2-dev',
-            ['libxslt-dev', 'libxslt1-dev'],
-            'libonig-dev',
-            'php-cli',
-            'php-bz2',
-            'pkg-config',
-            'autoconf',
-            'cmake',
-            'php'
-        ],
-        installCommand: (deps) => `sudo apt install ${deps} -y`,
         packageManager: 'apt'
     }
 };

package/lib/config/docker.js

@@ -51,14 +51,14 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         elasticsearch: {
             name: `${ prefix }_elasticsearch-data`
         },
+        maildev: {
+            name: `${ prefix }_maildev-data`
+        },
         composer_cache: {
             name: 'composer_cache-data',
             opts: {
                 mode: 'z'
             }
-        },
-        maildev: {
-            name: `${ prefix }_maildev-data`
         }
     };
 

package/lib/config/magento/required-php-extensions/index.js

@@ -1,7 +1,7 @@
 const magento23RequiredPHPExtensions = require('./magento-2.3');
 const magento24RequiredPHPExtensions = require('./magento-2.4');
 
-const { phpExtensionInstallationInstructions } = require('../../php/extensions');
+const { phpExtensionInstallationInstructions } = require('../../services/php/extensions');
 
 /**
  * @param {string[]} requiredPHPExtensions

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,19 @@
 const elasticsearch68 = require('./elasticsearch-6.8');
+const elasticsearch76 = require('./elasticsearch-7.6');
+const elasticsearch77 = require('./elasticsearch-7.7');
+const elasticsearch79 = require('./elasticsearch-7.9');
+const elasticsearch710 = require('./elasticsearch-7.10');
+const elasticsearch712 = require('./elasticsearch-7.12');
+const elasticsearch716 = require('./elasticsearch-7.16');
+const elasticsearch717 = require('./elasticsearch-7.17');
 
 module.exports = {
-    elasticsearch68
+    elasticsearch68,
+    elasticsearch76,
+    elasticsearch77,
+    elasticsearch79,
+    elasticsearch710,
+    elasticsearch712,
+    elasticsearch716,
+    elasticsearch717
 };

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

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

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

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const mariadb102 = () => ({
+    version: '10.2'
+});
+
+module.exports = mariadb102;

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

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const mariadb103 = () => ({
+    version: '10.3'
+});
+
+module.exports = mariadb103;

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

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ServiceWithImage}
+ */
+const mariadb104 = () => ({
+    version: '10.4'
+});
+
+module.exports = mariadb104;

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

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

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

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

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

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

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

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

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

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

package/lib/config/{varnish → services/varnish}/varnish-6-0.js

@@ -10,6 +10,4 @@ const varnish60 = ({ templateDir }) => ({
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
 });
 
-module.exports = {
-    varnish60
-};
+module.exports = varnish60;

package/lib/config/{varnish → services/varnish}/varnish-6-6.js

@@ -10,6 +10,4 @@ const varnish66 = ({ templateDir }) => ({
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
 });
 
-module.exports = {
-    varnish66
-};
+module.exports = varnish66;

package/lib/config/{varnish → services/varnish}/varnish-7-0.js

@@ -10,6 +10,4 @@ const varnish70 = ({ templateDir }) => ({
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
 });
 
-module.exports = {
-    varnish70
-};
+module.exports = varnish70;

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

@@ -9,7 +9,7 @@ server {
     listen <%= it.hostPort %>;
     server_name _;
 
-    set $MAGE_ROOT <%= it.mageRoot %>;
+    set $MAGE_ROOT "<%= it.mageRoot %>";
     resolver 127.0.0.11;
 
     root $MAGE_ROOT/pub;

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

@@ -1,13 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php72 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php72 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.2.10',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5.0'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php72 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php72 } = require('../services/php/versions');
 const { composer1 } = require('../services/composer/versions');
 const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { maildev } = require('../services/maildev');
 const { nginx118 } = require('../services/nginx/versions');
+const { redis50 } = require('../services/redis');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.0',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5.0'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php72 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php72 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.1',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),

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

@@ -1,13 +1,15 @@
 const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
-const { repo } = require('../php/base-repo');
-const { php72 } = require('../php/versions');
+const { repo } = require('../services/php/base-repo');
+const { php72 } = require('../services/php/versions');
 const { sslTerminator } = require('../services/ssl-terminator');
-const { varnish66 } = require('../varnish/varnish-6-6');
+const { varnish66 } = require('../services/varnish');
 const { nginx118 } = require('../services/nginx/versions');
 const { composer1 } = require('../services/composer/versions');
 const { maildev } = require('../services/maildev');
+const { redis50 } = require('../services/redis');
+const { mariadb102 } = require('../services/mariadb/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.2-p1',
@@ -18,15 +20,11 @@ module.exports = ({ templateDir } = {}) => ({
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
         nginx: nginx118({ templateDir }),
-        redis: {
-            version: '5'
-        },
+        redis: redis50(),
         mysql: {
             version: '5.7'
         },
-        mariadb: {
-            version: '10.2'
-        },
+        mariadb: mariadb102(),
         elasticsearch: elasticsearch68(),
         composer: composer1(),
         varnish: varnish66({ templateDir }),