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

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/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/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,47 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
                 docker,
                 magentoConfiguration
             },
-            ports
+            ports,
+            mysqlConnection
         } = ctx;
+
+        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/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

@@ -120,8 +120,8 @@ const configureProject = () => ({
         installPrestissimo(),
         installMagentoProject(),
         enableMagentoComposerPlugins(),
-        startServices(),
         startPhpFpm(),
+        startServices(),
         connectToMySQL()
     ])
 });

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