@scandipwa/magento-scripts 2.0.0-alpha.21 → 2.0.0-alpha.23

package/lib/config/docker.js

@@ -181,7 +181,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                  * Mount volumes directly on linux
                  */
                 mountVolumes: [
-                    `${ !isDockerDesktop ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
+                    `${ !isDockerDesktop ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`,
+                    `${ path.join(cacheDir, 'ssl-terminator', 'fastcgi_params') }:/etc/nginx/fastcgi_params`
                 ],
                 restart: 'on-failure:5',
                 network: isDockerDesktop ? network.name : 'host',

package/lib/config/templates/nginx.fastcgi_params.template

@@ -0,0 +1,29 @@
+
+fastcgi_param  QUERY_STRING       $query_string;
+fastcgi_param  REQUEST_METHOD     $request_method;
+fastcgi_param  CONTENT_TYPE       $content_type;
+fastcgi_param  CONTENT_LENGTH     $content_length;
+
+fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
+fastcgi_param  REQUEST_URI        $request_uri;
+fastcgi_param  DOCUMENT_URI       $document_uri;
+fastcgi_param  DOCUMENT_ROOT      $document_root;
+fastcgi_param  SERVER_PROTOCOL    $server_protocol;
+fastcgi_param  REQUEST_SCHEME     $scheme;
+<% if (it.isNgrok) { %>
+fastcgi_param  HTTPS              on;
+<% } else { %>
+fastcgi_param  HTTPS              $https if_not_empty;
+<% } %>
+
+fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
+fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
+
+fastcgi_param  REMOTE_ADDR        $remote_addr;
+fastcgi_param  REMOTE_PORT        $remote_port;
+fastcgi_param  SERVER_ADDR        $server_addr;
+fastcgi_param  SERVER_PORT        $server_port;
+fastcgi_param  SERVER_NAME        $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param  REDIRECT_STATUS    200;

package/lib/tasks/file-system/create-ssl-terminator-config.js

@@ -87,7 +87,25 @@ const createSSLTerminatorConfig = () => ({
                 }
             });
         } catch (e) {
-            throw new UnknownError(`Unexpected error accrued during ssl terminator config creation\n\n${e}`);
+            throw new UnknownError(`Unexpected error appeared during ssl terminator config creation\n\n${e}`);
+        }
+
+        // fixes ngrok error "ngrok.io redirected you too many times"
+        try {
+            await setConfigFile({
+                configPathname: path.join(
+                    baseConfig.cacheDir,
+                    'ssl-terminator',
+                    'fastcgi_params'
+                ),
+                template: path.join(baseConfig.templateDir, 'nginx.fastcgi_params.template'),
+                overwrite: true,
+                templateArgs: {
+                    isNgrok: host.endsWith('ngrok.io')
+                }
+            });
+        } catch (e) {
+            throw new UnknownError(`Unexpected error appeared during ssl terminator fastcgi_params config creation\n\n${e}`);
         }
     }
 });

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 = (ctx.config.overridenConfiguration.configuration.varnish.enabled && ssl.enabled) ? '1' : '0';
+        const enableSecureFrontend = (isNgrok || 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}`;
@@ -28,6 +28,7 @@ module.exports = () => ({
             { path: 'web/secure/base_url', value: httpsUrl },
             { path: 'web/secure/use_in_frontend', value: enableSecureFrontend },
             { path: 'web/secure/use_in_adminhtml', value: enableSecureFrontend },
+            { path: 'web/secure/enable_upgrade_insecure', value: enableSecureFrontend },
             { path: 'web/cookie/cookie_domain', value: null }
         ], { databaseConnection, task });
     }

package/lib/tasks/php/update-env-php.js

@@ -52,7 +52,6 @@ const updateEnvPHP = () => ({
                     || persistedQueryConfig.redis.host === hostMachine)
                 ) {
                     SETUP_PQ = '';
-                    return;
                 }
             }
         }

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.21",
+    "version": "2.0.0-alpha.23",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -54,5 +54,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "eebb5c8ce3b1d60cef1bb723028b1392b4869bb9"
+    "gitHead": "9a079bfe17ed5e03d1e302d1b7841b7187da9228"
 }