@scandipwa/magento-scripts 1.16.0 → 1.16.1

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

@@ -27,41 +27,47 @@ const installMagento = ({ isDbEmpty = false } = {}) => ({
             mysqlConnection
         } = ctx;
 
-        const response = await mysqlConnection.query(
-            'select * from admin_user where username=\'admin\';'
+        const [tableResponse] = await mysqlConnection.query(
+            'SELECT * FROM information_schema.tables WHERE table_schema = \'magento\' AND table_name = \'admin_user\' LIMIT 1;'
         );
 
-        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`
-                    }
-                ]
-            });
+        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;');
+                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 0;');
 
-            if (confirmDeleteAdminUsers === 'delete-all') {
-                await mysqlConnection.query(`
+                if (confirmDeleteAdminUsers === 'delete-all') {
+                    await mysqlConnection.query(`
                     TRUNCATE TABLE admin_user;
                 `);
-            } else {
-                await mysqlConnection.query(`
+                } else {
+                    await mysqlConnection.query(`
                     DELETE FROM admin_user WHERE username='admin';
                 `);
-            }
+                }
 
-            await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
+                await mysqlConnection.query('SET FOREIGN_KEY_CHECKS = 1;');
+            }
         }
 
         const { mysql: { env } } = docker.getContainers(ports);

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