@scandipwa/magento-scripts 1.13.0-alpha.0 → 1.13.2

package/lib/tasks/magento/setup-magento/adjust-magento-configuration.js

@@ -1,8 +1,11 @@
+const { isTableExists } = require('../../../util/database');
+
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const adjustMagentoConfiguration = () => ({
     title: 'Adjusting Magento Database Configuration',
+    skip: async (ctx) => !(await isTableExists('magento', 'core_config_data', ctx)),
     task: async (ctx) => {
         const { mysqlConnection } = ctx;
 

package/lib/tasks/magento/setup-magento/configure-elasticsearch.js

@@ -1,10 +1,11 @@
-const { updateTableValues } = require('../../../util/database');
+const { updateTableValues, isTableExists } = require('../../../util/database');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 module.exports = () => ({
     title: 'Configuring elasticsearch',
+    skip: async (ctx) => !(await isTableExists('magento', 'core_config_data', ctx)),
     task: async ({ ports, mysqlConnection }, task) => {
         await updateTableValues('core_config_data', [
             { path: 'catalog/search/engine', value: 'elasticsearch7' },

package/lib/tasks/magento/setup-magento/delete-admin-users.js

@@ -1,8 +1,11 @@
+const { isTableExists } = require('../../../util/database');
+
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const deleteAdminUsers = () => ({
     title: 'Deleting old admin users',
+    skip: async (ctx) => !(await isTableExists('magento', 'admin_user', ctx)),
     task: async (ctx) => {
         const { mysqlConnection } = ctx;
         await mysqlConnection.query(`

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

@@ -18,7 +18,7 @@ const migrateDatabase = (options = {}) => ({
         } = ctx;
 
         const [[{ tableCount }]] = await mysqlConnection.query(`
-            SELECT count (*) AS tableCount
+            SELECT count(*) AS tableCount
             FROM INFORMATION_SCHEMA.TABLES
             WHERE TABLE_SCHEMA = 'magento';
         `);

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

@@ -27,7 +27,7 @@ Please wait, this will take some time and do not restart the MySQL container unt
             }
             try {
                 const connection = await mysql.createConnection({
-                    host: 'localhost',
+                    host: '127.0.0.1',
                     port: ports.mysql,
                     user: env.MYSQL_USER,
                     password: env.MYSQL_PASSWORD,

package/lib/tasks/mysql/dump-theme-config.js

@@ -1,21 +1,13 @@
+const { isTableExists } = require('../../util/database');
+
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const dumpThemeConfig = () => ({
     title: 'Dumping themes and theme configuration',
-    task: async (ctx) => {
+    task: async (ctx, task) => {
         const { mysqlConnection } = ctx;
-
-        /**
-         * @type {{ tableCount: number }[][]}
-         */
-        const [[{ tableCount }]] = await mysqlConnection.query(`
-            SELECT count (*) AS tableCount
-            FROM INFORMATION_SCHEMA.TABLES
-            WHERE TABLE_SCHEMA = 'magento';
-        `);
-
-        if (tableCount !== 0) {
+        if (await isTableExists('magento', 'theme', ctx)) {
             const [themes] = await mysqlConnection.query('select * from theme;');
             if (themes.length === 0) {
                 ctx.themeDump = {
@@ -24,15 +16,19 @@ const dumpThemeConfig = () => ({
                 };
             }
 
-            const [themeIdConfig] = await mysqlConnection.query('select * from core_config_data where path = \'design/theme/theme_id\';');
-            if (themeIdConfig.length !== 0) {
-                ctx.themeDump = {
-                    themes,
-                    themeIdConfig: themeIdConfig[0]
-                };
+            if (await isTableExists('magento', 'core_config_data', ctx)) {
+                const [themeIdConfig] = await mysqlConnection.query('select * from core_config_data where path = \'design/theme/theme_id\';');
+                if (themeIdConfig.length !== 0) {
+                    ctx.themeDump = {
+                        themes,
+                        themeIdConfig: themeIdConfig[0]
+                    };
 
-                return;
+                    return;
+                }
             }
+        } else {
+            task.skip();
         }
 
         ctx.themeDump = {

package/lib/tasks/requirements/php-version.js

@@ -10,19 +10,41 @@ const compileOptions = require('../php/compile-options');
 const latestStablePHP74 = '7.4.27';
 const phpbrewPHPName = `php-${latestStablePHP74}-phpbrew`;
 
+const compileOptionsForPhp = {
+    linux: {
+        ...compileOptions.linux,
+        variants: [
+            '+default'
+        ],
+        extraOptions: []
+    },
+    darwin: {
+        ...compileOptions.darwin,
+        variants: [
+            '+default',
+            '+openssl=$(brew --prefix openssl@1.1)'
+        ],
+        extraOptions: []
+    }
+};
+
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const installPHPForPHPBrew = () => ({
     title: `Installing PHP ${latestStablePHP74} for PHPBrew...`,
     task: async (ctx, task) => {
-        const platformCompileOptions = compileOptions[process.platform];
+        const platformCompileOptions = compileOptionsForPhp[process.platform];
 
         if (!await pathExists(path.join(phpbrewConfig.phpPath, `${phpbrewPHPName}`, 'bin'))) {
+            const commandEnv = Object.entries(platformCompileOptions.env || {}).map(([key, value]) => `${key}="${value}"`).join(' ');
+
+            // eslint-disable-next-line max-len
+            const compileCommand = `${commandEnv ? `${commandEnv} && ` : ''}phpbrew install -j ${platformCompileOptions.cpuCount} ${latestStablePHP74} as ${phpbrewPHPName} ${platformCompileOptions.variants.join(' ')}`;
+
             try {
                 await execAsyncSpawn(
-                    // eslint-disable-next-line max-len
-                    `phpbrew install -j ${platformCompileOptions.cpuCount} ${latestStablePHP74} as ${phpbrewPHPName}`,
+                    compileCommand,
                     {
                         callback: (t) => {
                             task.output = t;
@@ -77,16 +99,11 @@ const checkPHPVersion = () => ({
     task: async (ctx, task) => {
         const phpVersionResponse = await execAsyncSpawn('php --version');
 
-        const phpVersionResponseResult = phpVersionResponse.match(/^PHP\s(\d\.\d\.\d)/i);
+        const phpVersionResponseResult = phpVersionResponse.match(/PHP\s(\d\.\d\.\d)/i);
 
-        if (phpVersionResponseResult.length > 0) {
+        if (phpVersionResponseResult && phpVersionResponseResult.length > 0) {
             const phpVersion = phpVersionResponseResult[1];
 
-            if (semver.satisfies(phpVersion, '<=7.2.x')) {
-                throw new Error(`Your installed PHP version ${phpVersion} is not supported by PHPBrew.
-Please install PHP 7.3 and newer to operate!`);
-            }
-
             if (semver.satisfies(phpVersion, '>=8.1.x')) {
                 const userConfirmation = await task.prompt({
                     type: 'Confirm',

package/lib/util/database.js

@@ -2,7 +2,7 @@
  * Update table in **magento** database
  * @param {String} table Table name
  * @param {{path: string, value: string}[]} values
- * @param {Object} param1
+ * @param {import('../../typings/context').ListrContext} param1
  */
 const updateTableValues = async (table, values, { mysqlConnection, task }) => {
     const [rows] = await mysqlConnection.query(`
@@ -58,6 +58,25 @@ const updateTableValues = async (table, values, { mysqlConnection, task }) => {
     }
 };
 
+/**
+* @param {String} database
+* @param {String} tableName
+* @param {import('../../typings/context').ListrContext} param2
+*/
+const isTableExists = async (database, tableName, { mysqlConnection }) => {
+    /**
+    * @type {{ tableCount: number }[][]}
+    */
+    const [[{ tableCount }]] = await mysqlConnection.query(`
+   SELECT count(*) as tableCount
+   FROM information_schema.TABLES
+   WHERE (TABLE_SCHEMA = ?) AND (TABLE_NAME = ?);
+`, [database, tableName]);
+
+    return tableCount > 0;
+};
+
 module.exports = {
-    updateTableValues
+    updateTableValues,
+    isTableExists
 };

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.13.0-alpha.0",
+    "version": "1.13.2",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -42,5 +42,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "3ffe27c403baaf3b0db8b108d6a2c2107b4e38cf"
+    "gitHead": "358a4bdd57aa7b87431915e27a9f063f93f7c644"
 }

package/typings/context.d.ts

@@ -1,3 +1,5 @@
+import mysql2 from 'mysql2';
+
 import { CMAConfiguration, PHPExtensions } from './index';
 
 export interface ListrContext {
@@ -85,4 +87,5 @@ export interface ListrContext {
         analytics: boolean
         useNonOverlappingPorts: boolean
     }
+    mysqlConnection: mysql2.Connection
 }