@scandipwa/magento-scripts 1.16.0-alpha.4 → 1.17.0

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

@@ -68,7 +68,7 @@ const dependenciesForPlatforms = {
             'oniguruma-devel',
             'libxml2-devel',
             'bzip2-devel',
-            'curl-devel',
+            'libcurl-devel',
             'libxslt-devel',
             'autoconf',
             'php'

package/lib/config/php/releases/php-7.2.js

@@ -8,7 +8,6 @@ const php72 = ({ templateDir, additionalExtensions = {} }) => ({
         gd: {
             macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
         },
-        intl: {},
         zlib: {},
         openssl: {},
         sockets: {},

package/lib/config/php/releases/php-7.3.js

@@ -8,7 +8,6 @@ const php73 = ({ templateDir, additionalExtensions = {} }) => ({
         gd: {
             macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
         },
-        intl: {},
         zlib: {},
         openssl: {},
         sockets: {},

package/lib/config/php/releases/php-7.4.js

@@ -6,7 +6,6 @@ const php74 = ({ templateDir, additionalExtensions = {} } = {}) => ({
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     extensions: {
         gd: {},
-        intl: {},
         zlib: {},
         openssl: {},
         sockets: {},

package/lib/config/php/releases/php-8.1.js

@@ -6,7 +6,6 @@ const php81 = ({ templateDir, additionalExtensions = {} } = {}) => ({
     configTemplate: path.join(templateDir || '', 'php.template.ini'),
     extensions: {
         gd: {},
-        intl: {},
         zlib: {},
         openssl: {},
         sockets: {},

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

@@ -0,0 +1,38 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { php72 } = require('../php/releases');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.3.2-p1',
+    configuration: {
+        php: php72({ templateDir }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '5'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: {
+            version: '6.8.16'
+        },
+        composer: {
+            version: '1'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,38 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { php73 } = require('../php/releases');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.3.4-p1',
+    configuration: {
+        php: php73({ templateDir }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '5'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: {
+            version: '6.8.16'
+        },
+        composer: {
+            version: '1'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,38 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { php74 } = require('../php/releases');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.3.7-p4',
+    configuration: {
+        php: php74({ templateDir }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6'
+        },
+        mysql: {
+            version: '5.7'
+        },
+        mariadb: {
+            version: '10.2'
+        },
+        elasticsearch: {
+            version: '7.9.3'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,46 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { libsodium } = require('../php/extensions');
+const { php74 } = require('../php/releases');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish66 } = require('../varnish/varnish-6-6');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.3-p3',
+    isDefault: true,
+    configuration: {
+        php: php74({
+            templateDir,
+            additionalExtensions: {
+                libsodium,
+                fileinfo: {}
+            }
+        }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.12.1'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,39 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { php81 } = require('../php/releases');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish70 } = require('../varnish/varnish-7-0');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.4-p1',
+    isDefault: true,
+    configuration: {
+        php: php81({ templateDir }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

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

@@ -0,0 +1,39 @@
+const path = require('path');
+const { defaultMagentoConfig } = require('../magento-config');
+const { php81 } = require('../php/releases');
+const { sslTerminator } = require('../ssl-terminator');
+const { varnish70 } = require('../varnish/varnish-7-0');
+
+module.exports = ({ templateDir } = {}) => ({
+    magentoVersion: '2.4.5',
+    isDefault: true,
+    configuration: {
+        php: php81({ templateDir }),
+        nginx: {
+            version: '1.18.0',
+            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
+        },
+        redis: {
+            version: '6.0'
+        },
+        mysql: {
+            version: '8.0'
+        },
+        mariadb: {
+            version: '10.4'
+        },
+        elasticsearch: {
+            version: '7.16.3'
+        },
+        composer: {
+            version: '2'
+        },
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
+    },
+    magento: defaultMagentoConfig,
+    host: 'localhost',
+    ssl: {
+        enabled: false
+    }
+});

package/lib/tasks/cache/create-cache-folder.js

@@ -15,7 +15,9 @@ const createCacheFolder = () => ({
 
         task.title = 'Creating cache folder';
 
-        await fs.promises.mkdir(baseConfig.cacheDir);
+        await fs.promises.mkdir(baseConfig.cacheDir, {
+            recursive: true
+        });
     }
 });
 

package/lib/tasks/composer/install-prestissimo.js

@@ -46,6 +46,10 @@ Would you like to disable it in your project?`,
                                     name: 'disable',
                                     message: 'Disable it, thanks'
                                 },
+                                {
+                                    name: 'remove',
+                                    message: `Remove ${prestissimoPluginName} from your system`
+                                },
                                 {
                                     name: 'skip',
                                     message: 'Skip this step'
@@ -56,6 +60,17 @@ Would you like to disable it in your project?`,
                         if (disableConfirmation === 'disable') {
                             localComposerJsonData.config['allow-plugins'][prestissimoPluginName] = false;
                             await fs.promises.writeFile(localComposerJsonPath, JSON.stringify(localComposerJsonData, null, 4), 'utf-8');
+
+                            return;
+                        }
+
+                        if (disableConfirmation === 'remove') {
+                            await runComposerCommand(`global remove ${prestissimoPluginName}`, {
+                                throwNonZeroCode: false,
+                                magentoVersion
+                            });
+
+                            return;
                         }
                     }
                 }

package/lib/tasks/magento/enable-magento-composer-plugins.js

@@ -4,7 +4,6 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const semver = require('semver');
 const pathExists = require('../../util/path-exists');
 const getJsonfileData = require('../../util/get-jsonfile-data');
-const KnownError = require('../../errors/known-error');
 
 const vendorPath = path.join(process.cwd(), 'vendor');
 const composerJsonPath = path.join(process.cwd(), 'composer.json');
@@ -86,29 +85,80 @@ const enableMagentoComposerPlugins = () => ({
         } = composerJsonData;
         const allowPluginsKeys = Object.keys(allowPlugins);
 
+        const missingPluginsFromAllowPlugins = composerPlugins.filter((plugin) => {
+            const [pluginVendor, pluginName] = plugin.split('/');
+            return !allowPluginsKeys.some((allowedPlugin) => {
+                const [allowedPluginVendor, allowedPluginName] = allowedPlugin.split('/');
+                if (allowedPluginVendor === pluginVendor) {
+                    if (allowedPluginName === '*') {
+                        return true;
+                    }
+
+                    return allowedPluginName === pluginName;
+                }
+
+                return false;
+            });
+        });
+
         if (
             allowPluginsKeys.length === 0
-            || composerPlugins.some((p) => !allowPluginsKeys.includes(p))
+            || missingPluginsFromAllowPlugins.length > 0
         ) {
-            const missingPlugins = composerPlugins.filter((p) => !allowPluginsKeys.includes(p));
+            const missingVendors = missingPluginsFromAllowPlugins.reduce((acc, val) => {
+                const [pluginVendor] = val.split('/');
+
+                if (acc.length === 0) {
+                    return [pluginVendor];
+                }
+
+                if (!acc.includes(pluginVendor)) {
+                    return [...acc, pluginVendor];
+                }
+
+                return acc;
+            }, []);
+
+            const pluginOptions = [
+                {
+                    name: 'all-individual',
+                    message: 'Enable all individually'
+                },
+                {
+                    name: 'manual',
+                    message: 'Configure manually'
+                },
+                {
+                    name: 'skip',
+                    message: 'Skip this step'
+                }
+            ];
+
+            if (missingVendors.length === 1) {
+                pluginOptions.unshift({
+                    name: 'all',
+                    message: `Enable all (${logger.style.code(`"${missingVendors[0]}/*"`)})`
+                });
+            }
+
             const answerForEnablingPlugins = await task.prompt({
                 type: 'Select',
                 message: `Composer 2.2 requires manually allowing composer-plugins to run.
 Magento requires the following plugins to correctly operate:
 
-${missingPlugins.map((p) => logger.style.code(p)).join('\n')}
+${missingPluginsFromAllowPlugins.map((p) => logger.style.code(p)).join('\n')}
 
 Do you want to enable them all or disable some of them?`,
-                choices: ['Enable all', 'Configure manually', 'Skip this step']
+                choices: pluginOptions
             });
 
             switch (answerForEnablingPlugins.toLowerCase()) {
-            case 'enable all': {
+            case 'all': {
                 composerJsonData.config = {
                     ...(composerJsonData.config || {}),
                     'allow-plugins': {
                         ...allowPlugins,
-                        ...missingPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
+                        [`${missingVendors[0]}/*`]: true
                     }
                 };
 
@@ -117,36 +167,41 @@ Do you want to enable them all or disable some of them?`,
                 });
                 break;
             }
-            case 'configure manually': {
+            case 'all-individual': {
+                composerJsonData.config = {
+                    ...(composerJsonData.config || {}),
+                    'allow-plugins': {
+                        ...allowPlugins,
+                        ...missingPluginsFromAllowPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
+                    }
+                };
+
+                await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
+                    encoding: 'utf-8'
+                });
+                break;
+            }
+            case 'manual': {
                 const userEnabledPlugins = await task.prompt({
                     type: 'MultiSelect',
                     message: 'Please pick plugins you want to enable!',
-                    choices: missingPlugins.map((p) => ({ name: p }))
+                    choices: missingPluginsFromAllowPlugins.map((p) => ({ name: p }))
                 });
 
-                const userConfirmation = await task.prompt({
-                    type: 'Confirm',
-                    message: `Please confirm enabling of the following plugins:\n\n${userEnabledPlugins.map((p) => logger.style.code(p)).join('\n')}\n`
-                });
+                const disabledPlugins = composerPlugins.filter((p) => !userEnabledPlugins.includes(p));
 
-                if (userConfirmation) {
-                    const disabledPlugins = composerPlugins.filter((p) => !userEnabledPlugins.includes(p));
-
-                    composerJsonData.config = {
-                        ...(composerJsonData.config || {}),
-                        'allow-plugins': {
-                            ...allowPlugins,
-                            ...disabledPlugins.reduce((acc, val) => ({ ...acc, [val]: false }), {}),
-                            ...userEnabledPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
-                        }
-                    };
+                composerJsonData.config = {
+                    ...(composerJsonData.config || {}),
+                    'allow-plugins': {
+                        ...allowPlugins,
+                        ...disabledPlugins.reduce((acc, val) => ({ ...acc, [val]: false }), {}),
+                        ...userEnabledPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
+                    }
+                };
 
-                    await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
-                        encoding: 'utf-8'
-                    });
-                } else {
-                    throw new KnownError('Please confirm your choice or choose other option.');
-                }
+                await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
+                    encoding: 'utf-8'
+                });
 
                 break;
             }

package/lib/tasks/magento/install-magento-project.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs');
 const os = require('os');
 const runComposerCommand = require('../../util/run-composer');
 const matchFilesystem = require('../../util/match-filesystem');
@@ -128,7 +129,7 @@ const createMagentoProject = async ({
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const installMagentoProject = () => ({
-    title: 'Installing Magento',
+    title: 'Installing Magento Project',
     task: async (ctx, task) => {
         const { magentoVersion, config: { baseConfig, overridenConfiguration }, verbose } = ctx;
         const {
@@ -180,6 +181,12 @@ const installMagentoProject = () => ({
                 verbose
             });
         }
+
+        if (!await pathExists(path.join(process.cwd(), 'app', 'etc'))) {
+            await fs.promises.mkdir(path.join(process.cwd(), 'app', 'etc'), {
+                recursive: true
+            });
+        }
         try {
             await runComposerCommand('install',
                 {

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

@@ -10,7 +10,6 @@ const setUrlRewrite = require('./set-url-rewrite');
 const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime');
 const magentoTask = require('../../../util/magento-task');
 const urnHighlighter = require('./urn-highlighter');
-const waitingForVarnish = require('./waiting-for-varnish');
 const adjustFullPageCache = require('./adjust-full-page-cache');
 
 /**
@@ -50,8 +49,7 @@ const setupMagento = (options = {}) => ({
             disable2fa(),
             urnHighlighter(),
             adjustFullPageCache(),
-            magentoTask('cache:flush'),
-            waitingForVarnish()
+            magentoTask('cache:flush')
         ], {
             concurrent: false,
             exitOnError: true,

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

@@ -12,7 +12,7 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const installMagento = ({ isDbEmpty = false } = {}) => ({
-    title: 'Installing magento',
+    title: 'Installing Magento in Database',
     task: async (ctx, task) => {
         if (isDbEmpty) {
             task.output = 'No Magento is installed in DB!\nInstalling...';
@@ -23,8 +23,53 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 docker,
                 magentoConfiguration
             },
-            ports
+            ports,
+            mysqlConnection
         } = ctx;
+
+        const [tableResponse] = await mysqlConnection.query(
+            'SELECT * FROM information_schema.tables WHERE table_schema = \'magento\' AND table_name = \'admin_user\' LIMIT 1;'
+        );
+
+        if (tableResponse.length > 0) {
+            const response = await mysqlConnection.query(
+                'select * from admin_user where username=\'admin\';'
+            );
+
+            const usersWithUsernameAdmin = response && response.length > 0 && response[0];
+
+            if (usersWithUsernameAdmin && usersWithUsernameAdmin.length > 0) {
+                const confirmDeleteAdminUsers = await task.prompt({
+                    type: 'Select',
+                    message: `In order to install Magento in database you will need to delete admin user with username ${logger.style.command('admin')}`,
+                    choices: [
+                        {
+                            name: 'delete-all',
+                            message: `Delete all admin users (${logger.style.code('Recommended')})`
+                        },
+                        {
+                            name: 'delete-only-admin',
+                            message: `Delete only admin user with ${logger.style.command('admin')} username`
+                        }
+                    ]
+                });
+
+                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 0;');
+
+                if (confirmDeleteAdminUsers === 'delete-all') {
+                    await mysqlConnection.query(`
+                    TRUNCATE TABLE admin_user;
+                `);
+                } else {
+                    await mysqlConnection.query(`
+                    DELETE FROM admin_user WHERE username='admin';
+                `);
+                }
+
+                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
+            }
+        }
+
         const { mysql: { env } } = docker.getContainers(ports);
         const envPhpData = await envPhpToJson(process.cwd(), {
             magentoVersion: ctx.magentoVersion

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

@@ -82,13 +82,15 @@ const migrateDatabase = (options = {}) => ({
         case 1: {
             if (options.onlyInstallMagento) {
                 ctx.isSetupUpgradeNeeded = false;
-                return task.newListr(
-                    installMagentoProject()
-                );
+                return task.newListr([
+                    installMagentoProject(),
+                    installMagento()
+                ]);
             }
 
             return task.newListr([
                 installMagentoProject(),
+                installMagento(),
                 updateEnvPHP(),
                 varnishConfigSetup(),
                 configureElasticsearch(),

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

@@ -6,7 +6,7 @@ const getIsWsl = require('../../../util/is-wsl');
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const varnishConfigSetup = () => ({
-    title: 'Varnish setup',
+    title: 'Varnish Database setup',
     task: async (ctx, task) => {
         const {
             config: {

package/lib/tasks/mysql/connect-to-mysql.js

@@ -78,6 +78,17 @@ const gettingMySQLConnection = () => ({
     }
 });
 
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const terminatingExistingConnection = () => ({
+    title: 'Terminating existing MySQL connection',
+    skip: (ctx) => !ctx.mysqlConnection,
+    task: (ctx) => {
+        ctx.mysqlConnection.destroy();
+    }
+});
+
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
@@ -87,6 +98,7 @@ const connectToMySQL = () => ({
     task: (ctx, task) => task.newListr([
         waitForMySQLInitialization(),
         createMagentoDatabase(),
+        terminatingExistingConnection(),
         gettingMySQLConnection()
     ], {
         concurrent: false,

package/lib/tasks/mysql/import-dump-to-mysql.js

@@ -2,23 +2,100 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const KnownError = require('../../errors/known-error');
 const UnknownError = require('../../errors/unknown-error');
-const { execAsyncSpawn } = require('../../util/exec-async-command');
+const { execAsyncSpawn, execCommandTask } = require('../../util/exec-async-command');
 const pathExists = require('../../util/path-exists');
+const connectToMySQL = require('./connect-to-mysql');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
-const importDumpToMySQL = () => ({
-    title: 'Importing Database Dump To MySQL',
+const copyDatabaseDumpIntoContainer = () => ({
+    title: 'Copying database dump into container',
     task: async (ctx, task) => {
-        if (!await pathExists(ctx.importDb)) {
-            throw new KnownError(`Dump file at ${ctx.importDb} does not exist. Please provide correct relative path to the file`);
-        }
+        const { config: { docker }, ports } = ctx;
+        const { mysql } = docker.getContainers(ports);
 
+        return task.newListr(
+            execCommandTask(`docker cp ${ctx.importDb} ${mysql.name}:/dump.sql`, {
+                logOutput: true
+            })
+        );
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const runSetGlobalLogBinTrustFunctionCreatorsCommand = () => ({
+    task: async (ctx, task) => {
         const { config: { docker }, ports } = ctx;
+        const { mysql } = docker.getContainers(ports);
 
+        return task.newListr(
+            execCommandTask(`docker exec ${mysql.name} bash -c 'mysql -uroot -p${mysql.env.MYSQL_ROOT_PASSWORD} -e "SET GLOBAL log_bin_trust_function_creators = 1;"'`)
+        );
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const deleteDatabaseBeforeImportingDumpPrompt = () => ({
+    title: 'Deleting magento database before importing dump',
+    task: async (ctx, task) => {
+        const deleteDatabaseMagentoChoice = await task.prompt({
+            type: 'Select',
+            message: `Before importing database dump, would you like to delete existing database?
+
+It is possible that dump might interfere with existing data in database.
+
+Note that you will lose your existing database!`,
+            choices: [
+                {
+                    name: 'delete',
+                    message: 'YES I AM SURE I WANT TO DELETE magento DATABASE!'
+                },
+                {
+                    name: 'skip',
+                    message: 'Skip this step'
+                }
+            ]
+        });
+
+        if (deleteDatabaseMagentoChoice === 'delete') {
+            await ctx.mysqlConnection.query('DROP DATABASE IF EXISTS magento;');
+            await ctx.mysqlConnection.query('CREATE DATABASE magento;');
+            return;
+        }
+        task.skip();
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const executeImportDumpSQL = () => ({
+    task: async (ctx, task) => {
+        const { config: { docker }, ports } = ctx;
         const { mysql } = docker.getContainers(ports);
 
+        const userCredentialsForMySQLCLI = await task.prompt({
+            type: 'Select',
+            message: 'Which user do you want to use to import db in MySQL client?',
+            choices: [
+                {
+                    name: `--user=root --password=${mysql.env.MYSQL_ROOT_PASSWORD}`,
+                    message: `root (${logger.style.command('Probably safest option')})`
+                },
+                {
+                    name: `--user=${mysql.env.MYSQL_USER} --password=${mysql.env.MYSQL_PASSWORD}`,
+                    message: `${mysql.env.MYSQL_USER}`
+                }
+            ]
+        });
+
+        const importCommand = `docker exec ${mysql.name} bash -c "mysql ${userCredentialsForMySQLCLI} magento < ./dump.sql"`;
+
         const startImportTime = Date.now();
         const tickInterval = setInterval(() => {
             task.title = `Importing Database Dump To MySQL, ${Math.floor((Date.now() - startImportTime) / 1000)}s in progress...`;
@@ -26,18 +103,7 @@ const importDumpToMySQL = () => ({
 
         try {
             await execAsyncSpawn(
-                `docker cp ${ctx.importDb} ${mysql.name}:/dump.sql`
-            );
-
-            await execAsyncSpawn(
-                `docker exec ${mysql.name} bash -c 'mysql -uroot -p${mysql.env.MYSQL_ROOT_PASSWORD} -e "SET GLOBAL log_bin_trust_function_creators = 1;"'`
-            );
-
-            /**
-             * Using `mysql` instead of `mysqlimport` because `mysqlimport` has permission issues during import
-             */
-            await execAsyncSpawn(
-                `docker exec ${mysql.name} bash -c "mysql -umagento -pmagento magento < ./dump.sql"`,
+                importCommand,
                 {
                     callback: (t) => {
                         task.output = t;
@@ -54,15 +120,42 @@ You can try replacing all occurrences of ${logger.style.misc('utf8mb4_0900_ai_ci
             }
 
             throw new UnknownError(`Unexpected error during dump import.\n\n${e}`);
+        } finally {
+            clearInterval(tickInterval);
         }
-
-        clearInterval(tickInterval);
-
-        task.title = 'Database imported!';
     },
     options: {
         bottomBar: 10
     }
 });
 
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const importDumpToMySQL = () => ({
+    title: 'Importing Database Dump To MySQL',
+    task: async (ctx, task) => {
+        if (!await pathExists(ctx.importDb)) {
+            throw new KnownError(`Dump file at ${ctx.importDb} does not exist. Please provide correct relative path to the file`);
+        }
+
+        return task.newListr([
+            copyDatabaseDumpIntoContainer(),
+            deleteDatabaseBeforeImportingDumpPrompt(),
+            runSetGlobalLogBinTrustFunctionCreatorsCommand(),
+            executeImportDumpSQL(),
+            connectToMySQL(),
+            {
+                task: () => {
+                    task.title = 'Database imported!';
+                }
+            }
+        ], {
+            rendererOptions: {
+                collapse: false
+            }
+        });
+    }
+});
+
 module.exports = importDumpToMySQL;

package/lib/tasks/requirements/index.js

@@ -12,10 +12,10 @@ const checkRosetta = require('./rosetta');
 const checkRequirements = () => ({
     title: 'Checking requirements',
     task: (ctx, task) => task.newListr([
-        // checking if user is on supported platform
-        checkPlatform(),
         // check if rosetta 2 is installed or not on m1 macs
         checkRosetta(),
+        // checking if user is on supported platform
+        checkPlatform(),
         // check the Docker installation
         checkDocker(),
         // check for Node.js version

package/lib/tasks/start.js

@@ -32,6 +32,7 @@ const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
 const validatePHPInstallation = require('./php/validate-php');
 const installSodiumExtension = require('./php/install-sodium');
+const waitingForVarnish = require('./magento/setup-magento/waiting-for-varnish');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -120,8 +121,8 @@ const configureProject = () => ({
         installPrestissimo(),
         installMagentoProject(),
         enableMagentoComposerPlugins(),
-        startServices(),
         startPhpFpm(),
+        startServices(),
         connectToMySQL()
     ])
 });
@@ -149,7 +150,8 @@ const finishProjectConfiguration = () => ({
                 });
             }
         },
-        setupThemes()
+        setupThemes(),
+        waitingForVarnish()
     ], {
         rendererOptions: {
             collapse: false

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.16.0-alpha.4",
+    "version": "1.17.0",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "987f793ba2d0bb3bcabea54d3b996a5204222738"
+    "gitHead": "0698c02d64c2570c0f546e6c99747232242e7123"
 }