@scandipwa/magento-scripts 2.0.0-alpha.19 → 2.0.0-alpha.20

package/lib/tasks/execute.js

@@ -70,7 +70,7 @@ const executeTask = async (argv) => {
             const result = await executeInContainer({
                 containerName: container.name,
                 commands: argv.commands,
-                isDockerDesktop: ctx.isDockerDesktop
+                user: container.user
             });
 
             return result;

package/lib/tasks/file-system/create-phpstorm-config/exclude-folder-config.js

@@ -26,11 +26,21 @@ const mustBeIncludedPaths = [
 /**
  * Will retrieve project config file path from module.xml
  *
- * @returns {Promise<String>}
+ * @returns {Promise<String | null>}
  */
 const getProjectConfigFilePath = async () => {
     const modulesConfigData = await loadXmlFile(pathToModulesConfig);
-    return modulesConfigData.project.component.modules.module['@_filepath'].replace('$PROJECT_DIR$', process.cwd());
+    const {
+        project: {
+            component: {
+                modules: {
+                    module
+                } = {}
+            } = {}
+        } = {}
+    } = modulesConfigData || {};
+    const filePath = module && module['@_filepath'];
+    return filePath ? filePath.replace('$PROJECT_DIR$', process.cwd()) : null;
 };
 
 const setupDefaultsForExcludedFoldersConfig = (projectConfigData) => {
@@ -138,7 +148,7 @@ const setupExcludedFoldersConfig = () => ({
     task: async (ctx, task) => {
         if (await pathExists(pathToModulesConfig)) {
             const projectFilePath = await getProjectConfigFilePath();
-            if (await pathExists(projectFilePath)) {
+            if (projectFilePath && await pathExists(projectFilePath)) {
                 const projectConfigData = await loadXmlFile(projectFilePath);
                 setupDefaultsForExcludedFoldersConfig(projectConfigData);
                 const hasChanges = setupExcludedFolders(projectConfigData);

package/lib/tasks/theme/retrieve-theme-data.js

@@ -1,3 +1,4 @@
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const path = require('path');
 const KnownError = require('../../errors/known-error');
 const getJsonfileData = require('../../util/get-jsonfile-data');
@@ -11,10 +12,19 @@ const retrieveThemeData = (themePath) => ({
     task: async (ctx) => {
         let absoluteThemePath = path.join(process.cwd(), themePath);
 
+        // validate if theme is located inside magento directory
+        if (!absoluteThemePath.includes(process.cwd())) {
+            throw new KnownError(`You are trying to link the theme from outside of your Magento project!
+
+This is not supported in ${ logger.style.command('magento-scripts') } version 2.
+
+Move your theme inside Magento project!`);
+        }
+
         // check if path not relative
         if (!(await pathExists(path.join(absoluteThemePath, 'composer.json')))) {
             // if composer.json is not found, then it's not correct path
-            // and we need to test if it's alsolute one
+            // and we need to test if it's absolute one
             if (await pathExists(path.join(themePath, 'composer.json'))) {
                 // if so, use it as absolute path
                 absoluteThemePath = themePath;

package/lib/util/config-file-validator.js

@@ -140,7 +140,8 @@ const configurationSchema = Joi.object({
     redis: serviceConfigurationSchema.optional(),
     composer: composerConfigurationSchema.optional(),
     varnish: varnishConfigurationSchema.optional(),
-    sslTerminator: nginxConfigurationSchema.optional()
+    sslTerminator: nginxConfigurationSchema.optional(),
+    maildev: serviceConfigurationSchema.optional()
 });
 
 /**

package/lib/util/execute-in-container.js

@@ -1,17 +1,18 @@
-const os = require('os');
 const { spawn } = require('child_process');
 const { runCommand } = require('../tasks/docker/containers/container-api');
 
 /**
- * @param {{ containerName: string, commands: string[], isDockerDesktop: boolean }} param0
+ * @param {{ containerName: string, commands: string[], user?: string }} param0
  */
-const executeInContainer = ({ containerName, commands, isDockerDesktop }) => {
+const executeInContainer = ({
+    containerName, commands, user
+}) => {
     if (!process.stdin.isTTY) {
         process.stderr.write('This app works only in TTY mode');
         process.exit(1);
     }
 
-    const userArg = ((os.platform() === 'linux' && isDockerDesktop) || !isDockerDesktop) && `--user=${os.userInfo().uid}:${os.userInfo().gid}`;
+    const userArg = user && `--user=${user}`;
 
     spawn('docker', [
         'exec',

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": "2.0.0-alpha.19",
+    "version": "2.0.0-alpha.20",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -54,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "2d7e861d1eaf008fab03679406ff5ee2abedba35"
+    "gitHead": "6c6e5821a2da7ca52685724a56c72770004f3a5a"
 }