@scandipwa/magento-scripts 1.14.1-alpha.6 → 1.14.1-alpha.9

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

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

package/lib/util/instance-metadata.js

@@ -38,7 +38,7 @@ const getInstanceMetadata = (ctx) => {
     if (isNgrok) {
         frontend.push({
             title: WEB_LOCAL_LOCATION_TITLE,
-            text: `${ssl.enabled ? 'https' : 'http'}://localhost${ssl.enabled || ports.app === 80 ? '' : `:${ports.app}`}/`
+            text: `${ssl.enabled ? 'https' : 'http'}://localhost${ssl.enabled || ports.sslTerminator === 80 ? '' : `:${ports.sslTerminator}`}/`
         });
         frontend.push({
             title: WEB_LOCATION_TITLE,
@@ -47,7 +47,7 @@ const getInstanceMetadata = (ctx) => {
     } else {
         frontend.push({
             title: WEB_LOCATION_TITLE,
-            text: `${ssl.enabled ? 'https' : 'http'}://${host}${ssl.enabled || ports.app === 80 ? '' : `:${ports.app}`}/`
+            text: `${ssl.enabled ? 'https' : 'http'}://${host}${ssl.enabled || ports.sslTerminator === 80 ? '' : `:${ports.sslTerminator}`}/`
         });
     }
 

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.14.1-alpha.6",
+    "version": "1.14.1-alpha.9",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -51,5 +51,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "c9e9f8369d2ef70bb16d0a29d29134909ef70884"
+    "gitHead": "cf3f08226674ad5c6b6b03db93785dd9acf48025"
 }

package/typings/context.d.ts

@@ -16,6 +16,7 @@ export interface ListrContext {
     }
     arch: 'arm64' | 'x64'
     isArm: boolean
+    isWsl: boolean
     platform?: NodeJS.Platform
     platformVersion?: string
     /**
@@ -52,7 +53,7 @@ export interface ListrContext {
                     o: string
                 }
             }>
-            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch', {
+            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch' | 'varnish', {
                 _: string
                 ports: string[]
                 healthCheck: {

package/typings/index.d.ts

@@ -10,7 +10,14 @@ export interface ServiceWithVersion {
     version: string
 }
 
-// export inter/
+export interface SSLTerminatorConfiguration extends ServiceWithVersion {
+    /**
+     * Configuration file location
+     *
+     * @example ./my-ssl-terminator-config.conf
+     */
+    configTemplate: string
+}
 
 export interface NginxConfiguration extends ServiceWithVersion {
     /**
@@ -194,6 +201,11 @@ export interface CMAConfiguration {
          * Varnish configuration
          */
         varnish: VarnishConfiguration
+
+        /**
+         * SSL Terminator configuration
+         */
+        sslTerminator: SSLTerminatorConfiguration
     }
     /**
      * Magento configuration