@scandipwa/magento-scripts 1.13.3 → 1.13.4

package/lib/commands/start.js

@@ -132,7 +132,10 @@ module.exports = (yargs) => {
 
                 block.log();
 
-                logger.note(`MySQL credentials, containers status and project information available in ${logger.style.code('npm run status')} command.`);
+                logger.note(
+                    `MySQL credentials, containers status and project information available in ${logger.style.code('npm run status')} command.
+      To access Magento CLI, Composer and PHP for this project use ${logger.style.code('npm run cli')} command.`
+                );
                 logger.log('');
 
                 if (!analytics) {

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

@@ -81,7 +81,7 @@ const enableMagentoComposerPlugins = () => ({
         const {
             config: {
                 'allow-plugins': allowPlugins = {}
-            }
+            } = {}
         } = composerJsonData;
         const allowPluginsKeys = Object.keys(allowPlugins);
 
@@ -110,7 +110,7 @@ Do you want to enable them all or disable some of them?`,
 
                 if (userConfirmation) {
                     composerJsonData.config = {
-                        ...composerJsonData.config,
+                        ...(composerJsonData.config || {}),
                         'allow-plugins': {
                             ...allowPlugins,
                             ...missingPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
@@ -141,7 +141,7 @@ Do you want to enable them all or disable some of them?`,
                     const disabledPlugins = composerPlugins.filter((p) => !userEnabledPlugins.includes(p));
 
                     composerJsonData.config = {
-                        ...composerJsonData.config,
+                        ...(composerJsonData.config || {}),
                         'allow-plugins': {
                             ...allowPlugins,
                             ...disabledPlugins.reduce((acc, val) => ({ ...acc, [val]: false }), {}),

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

@@ -2,11 +2,14 @@ const semver = require('semver');
 const runMagentoCommand = require('../../../util/run-magento');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ * @type {({ isDbEmpty }: { isDbEmpty: boolean }) => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
-const installMagento = () => ({
-    title: 'Installing magento...',
+const installMagento = ({ isDbEmpty = false } = {}) => ({
+    title: 'Installing magento',
     task: async (ctx, task) => {
+        if (isDbEmpty) {
+            task.output = 'No Magento is installed in DB!\nInstalling...';
+        }
         const {
             magentoVersion,
             config: {

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

@@ -24,16 +24,14 @@ const migrateDatabase = (options = {}) => ({
         `);
 
         if (tableCount === 0) {
-            task.output = 'No Magento is installed in DB!\nInstalling...';
-
             if (options.onlyInstallMagento) {
                 return task.newListr(
-                    installMagento()
+                    installMagento({ isDbEmpty: true })
                 );
             }
 
             return task.newListr([
-                installMagento(),
+                installMagento({ isDbEmpty: true }),
                 setupPersistedQuery(),
                 upgradeMagento(),
                 magentoTask('cache:enable'),

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

@@ -7,6 +7,7 @@ const sleep = require('../../util/sleep');
  */
 const connectToMySQL = () => ({
     title: 'Connecting to MySQL server...',
+    skip: (ctx) => ctx.skipSetup,
     task: async (ctx, task) => {
         const { config: { docker }, ports } = ctx;
         const { mysql: { env, name } } = docker.getContainers();

package/lib/tasks/start.js

@@ -27,6 +27,8 @@ const pkg = require('../../package.json');
 const checkConfigurationFile = require('../config/check-configuration-file');
 const convertLegacyVolumes = require('./docker/convert-legacy-volumes');
 const enableMagentoComposerPlugins = require('./magento/enable-magento-composer-plugins');
+const getIsWsl = require('../util/is-wsl');
+const checkForXDGOpen = require('../util/xdg-open-exists');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -172,7 +174,21 @@ const start = () => ({
             finishProjectConfiguration(),
             {
                 title: 'Opening browser',
-                skip: (ctx) => ctx.noOpen,
+                skip: async (ctx) => {
+                    if (ctx.noOpen) {
+                        return true;
+                    }
+
+                    if (await getIsWsl()) {
+                        const canOpenBrowser = await checkForXDGOpen();
+
+                        if (!canOpenBrowser) {
+                            return 'Cannot open the browser, xdg-open is not available.';
+                        }
+                    }
+
+                    return false;
+                },
                 task: ({ ports, config: { overridenConfiguration: { host, ssl } } }) => {
                     openBrowser(`${ssl.enabled ? 'https' : 'http'}://${host}${ssl.enabled || ports.app === 80 ? '' : `:${ports.app}`}/`);
                 },

package/lib/util/open-browser.js

@@ -2,7 +2,8 @@ const { execAsync } = require('./exec-async-command');
 
 const openBrowser = async (url) => {
     const start = process.platform === 'darwin' ? 'open' : 'xdg-open';
-    await execAsync(`${start } ${ url}`);
+
+    await execAsync(`${ start } ${ url }`);
 };
 
 module.exports = openBrowser;

package/lib/util/xdg-open-exists.js

@@ -0,0 +1,27 @@
+const fs = require('fs');
+const pathExists = require('./path-exists');
+
+const checkForXDGOpen = async () => {
+    const pathParts = process.env.PATH.split(':');
+
+    const results = await Promise.all(
+        pathParts.map(
+            async (pathPart) => {
+                if (!await pathExists(pathPart)) {
+                    return false;
+                }
+
+                const files = await fs.promises.readdir(pathPart, {
+                    encoding: 'utf-8',
+                    withFileTypes: true
+                });
+
+                return files.some((file) => file.isFile() && file.name === 'xdg-open');
+            }
+        )
+    );
+
+    return results.includes(true);
+};
+
+module.exports = checkForXDGOpen;

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.3",
+    "version": "1.13.4",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -42,5 +42,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "b03f5e0d8d7899f8d217b5eda38e7daabc63dccd"
+    "gitHead": "fa0d2c77e7d3a8c639cbebeef05b1322b20895f4"
 }