@scandipwa/magento-scripts 2.0.0-alpha.2 → 2.0.0-alpha.5

package/lib/config/docker.js

@@ -273,7 +273,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         };
 
         if (ssl.enabled) {
-            dockerConfig.nginx.ports.push(
+            dockerConfig.sslTerminator.ports.push(
                 `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
             );
         }

package/lib/config/templates/ssl-terminator.template.conf

@@ -12,20 +12,25 @@ upstream app_backend {
 server {
     listen <%= it.hostPort %>;
 <% if (it.config.ssl.enabled) { %>  listen 443 ssl;
-    server_name <%= it.networkToBindTo %>;
 
+    ssl on;
     ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
     ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
     ssl_protocols TLSv1.2;<% } %>
 
-    server_name <% if (it.config.host) { %><%= it.config.host %><% } else { %>_<% } %>;
+     <% if (it.config.host) { %>
+    server_name <%= it.config.host %><% if (it.config.ssl.enabled) { %> <%= it.networkToBindTo %><% } %>;
+    <% } else { %>
+    server_name <% if (it.config.ssl.enabled) { %> <%= it.networkToBindTo %><% } else { %>_<% } %>;
+    <% } %>
 
     location / {
         proxy_buffer_size   128k;
         proxy_buffers   4 256k;
         proxy_busy_buffers_size   256k;
         proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header Host $http_host;
         proxy_http_version 1.1;
         proxy_set_header Connection "";

package/lib/tasks/file-system/create-phpstorm-config/workspace-config/php-workspace-project-configuration-config.js

@@ -31,7 +31,7 @@ const setupPHPWorkspaceProjectConfiguration = async (workspaceConfigs, ctx) => {
         hasChanges = true;
         workspaceConfigs.push({
             [nameKey]: PHP_WORKSPACE_PROJECT_CONFIGURATION_COMPONENT_NAME,
-            [currentInterpreterImage]: currentInterpreterImage,
+            [interpreterNameKey]: currentInterpreterImage,
             include_path: []
         });
     }

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

@@ -4,7 +4,6 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const semver = require('semver');
 const pathExists = require('../../util/path-exists');
 const getJsonfileData = require('../../util/get-jsonfile-data');
-const KnownError = require('../../errors/known-error');
 
 const vendorPath = path.join(process.cwd(), 'vendor');
 const composerJsonPath = path.join(process.cwd(), 'composer.json');
@@ -86,29 +85,80 @@ const enableMagentoComposerPlugins = () => ({
         } = composerJsonData;
         const allowPluginsKeys = Object.keys(allowPlugins);
 
+        const missingPluginsFromAllowPlugins = composerPlugins.filter((plugin) => {
+            const [pluginVendor, pluginName] = plugin.split('/');
+            return !allowPluginsKeys.some((allowedPlugin) => {
+                const [allowedPluginVendor, allowedPluginName] = allowedPlugin.split('/');
+                if (allowedPluginVendor === pluginVendor) {
+                    if (allowedPluginName === '*') {
+                        return true;
+                    }
+
+                    return allowedPluginName === pluginName;
+                }
+
+                return false;
+            });
+        });
+
         if (
             allowPluginsKeys.length === 0
-            || composerPlugins.some((p) => !allowPluginsKeys.includes(p))
+            || missingPluginsFromAllowPlugins.length > 0
         ) {
-            const missingPlugins = composerPlugins.filter((p) => !allowPluginsKeys.includes(p));
+            const missingVendors = missingPluginsFromAllowPlugins.reduce((acc, val) => {
+                const [pluginVendor] = val.split('/');
+
+                if (acc.length === 0) {
+                    return [pluginVendor];
+                }
+
+                if (!acc.includes(pluginVendor)) {
+                    return [...acc, pluginVendor];
+                }
+
+                return acc;
+            }, []);
+
+            const pluginOptions = [
+                {
+                    name: 'all-individual',
+                    message: 'Enable all individually'
+                },
+                {
+                    name: 'manual',
+                    message: 'Configure manually'
+                },
+                {
+                    name: 'skip',
+                    message: 'Skip this step'
+                }
+            ];
+
+            if (missingVendors.length === 1) {
+                pluginOptions.unshift({
+                    name: 'all',
+                    message: `Enable all (${logger.style.code(`"${missingVendors[0]}/*"`)})`
+                });
+            }
+
             const answerForEnablingPlugins = await task.prompt({
                 type: 'Select',
                 message: `Composer 2.2 requires manually allowing composer-plugins to run.
 Magento requires the following plugins to correctly operate:
 
-${missingPlugins.map((p) => logger.style.code(p)).join('\n')}
+${missingPluginsFromAllowPlugins.map((p) => logger.style.code(p)).join('\n')}
 
 Do you want to enable them all or disable some of them?`,
-                choices: ['Enable all', 'Configure manually', 'Skip this step']
+                choices: pluginOptions
             });
 
             switch (answerForEnablingPlugins.toLowerCase()) {
-            case 'enable all': {
+            case 'all': {
                 composerJsonData.config = {
                     ...(composerJsonData.config || {}),
                     'allow-plugins': {
                         ...allowPlugins,
-                        ...missingPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
+                        [`${missingVendors[0]}/*`]: true
                     }
                 };
 
@@ -117,36 +167,41 @@ Do you want to enable them all or disable some of them?`,
                 });
                 break;
             }
-            case 'configure manually': {
+            case 'all-individual': {
+                composerJsonData.config = {
+                    ...(composerJsonData.config || {}),
+                    'allow-plugins': {
+                        ...allowPlugins,
+                        ...missingPluginsFromAllowPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
+                    }
+                };
+
+                await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
+                    encoding: 'utf-8'
+                });
+                break;
+            }
+            case 'manual': {
                 const userEnabledPlugins = await task.prompt({
                     type: 'MultiSelect',
                     message: 'Please pick plugins you want to enable!',
-                    choices: missingPlugins.map((p) => ({ name: p }))
+                    choices: missingPluginsFromAllowPlugins.map((p) => ({ name: p }))
                 });
 
-                const userConfirmation = await task.prompt({
-                    type: 'Confirm',
-                    message: `Please confirm enabling of the following plugins:\n\n${userEnabledPlugins.map((p) => logger.style.code(p)).join('\n')}\n`
-                });
+                const disabledPlugins = composerPlugins.filter((p) => !userEnabledPlugins.includes(p));
 
-                if (userConfirmation) {
-                    const disabledPlugins = composerPlugins.filter((p) => !userEnabledPlugins.includes(p));
-
-                    composerJsonData.config = {
-                        ...(composerJsonData.config || {}),
-                        'allow-plugins': {
-                            ...allowPlugins,
-                            ...disabledPlugins.reduce((acc, val) => ({ ...acc, [val]: false }), {}),
-                            ...userEnabledPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
-                        }
-                    };
+                composerJsonData.config = {
+                    ...(composerJsonData.config || {}),
+                    'allow-plugins': {
+                        ...allowPlugins,
+                        ...disabledPlugins.reduce((acc, val) => ({ ...acc, [val]: false }), {}),
+                        ...userEnabledPlugins.reduce((acc, val) => ({ ...acc, [val]: true }), {})
+                    }
+                };
 
-                    await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
-                        encoding: 'utf-8'
-                    });
-                } else {
-                    throw new KnownError('Please confirm your choice or choose other option.');
-                }
+                await fs.promises.writeFile(composerJsonPath, JSON.stringify(composerJsonData, null, 4), {
+                    encoding: 'utf-8'
+                });
 
                 break;
             }

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

@@ -97,8 +97,9 @@ const createMagentoProject = async (ctx, task, {
         `"${tempDir}"`
     ];
 
-    await runPHPContainerCommand(ctx, `composer ${installCommand.join(' ')} \n
-&& mv ${tempDir}/composer.json ${ctx.config.baseConfig.containerMagentoDir}/composer.json`);
+    await runPHPContainerCommand(ctx, `bash -c 'mkdir ${tempDir} && \
+composer ${installCommand.join(' ')} && \
+mv ${tempDir}/composer.json ${ctx.config.baseConfig.containerMagentoDir}/composer.json'`);
 };
 
 /**

package/lib/tasks/magento/setup-magento/set-base-url.js

@@ -17,7 +17,7 @@ module.exports = () => ({
             databaseConnection
         } = ctx;
         const isNgrok = host.endsWith('ngrok.io');
-        const enableSecureFrontend = ssl.enabled ? '1' : '0';
+        const enableSecureFrontend = (ctx.config.overridenConfiguration.configuration.varnish.enabled && ssl.enabled) ? '1' : '0';
         const location = `${host}${ !isNgrok && ports.sslTerminator !== 80 ? `:${ports.sslTerminator }` : '' }/`;
         const secureLocation = `${host}/`; // SSL will work only on port 443, so you cannot run multiple projects with SSL at the same time.
         const httpUrl = `http://${location}`;

package/lib/tasks/magento/setup-magento/waiting-for-varnish.js

@@ -37,7 +37,9 @@ const getIsHealthCheckRequestBroken = async (ctx) => {
  */
 const waitingForVarnish = () => ({
     title: 'Waiting for Varnish to return code 200',
-    skip: (ctx) => ctx.debug || !ctx.config.overridenConfiguration.configuration.varnish.enabled,
+    skip: (ctx) => ctx.debug
+        || !ctx.config.overridenConfiguration.configuration.varnish.enabled
+        || ctx.config.overridenConfiguration.ssl.enabled,
     task: async (ctx, task) => {
         const pureMagentoVersion = ctx.magentoVersion.match(/^([0-9]+\.[0-9]+\.[0-9]+)/)[1];
 

package/lib/tasks/requirements/docker/index.js

@@ -30,6 +30,7 @@ NOTE: After installation it's recommended to log out and log back in so your gro
     if (automaticallyInstallDocker) {
         return task.newListr([
             installDocker(),
+            checkDockerSocketPermissions(),
             getDockerVersion(),
             {
                 task: (ctx) => {
@@ -80,6 +81,7 @@ Would you like to install it automatically using brew cask or you prefer to inst
     if (confirmationToInstallDocker === 'automatic') {
         return task.newListr([
             installDockerOnMac(),
+            checkDockerSocketPermissions(),
             checkDockerStatus(),
             getDockerVersion(),
             setVersionInContextTask(task)
@@ -122,6 +124,7 @@ const checkDocker = () => ({
         }
 
         return task.newListr([
+            checkDockerSocketPermissions(),
             checkDockerStatus(),
             getDockerVersion(),
             setVersionInContextTask(task)
@@ -134,7 +137,6 @@ const checkDocker = () => ({
  */
 module.exports = () => ({
     task: (ctx, task) => task.newListr([
-        checkDockerSocketPermissions(),
         checkDocker(),
         checkDockerPerformance()
     ], {

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