@scandipwa/magento-scripts 2.0.4 → 2.0.5

package/lib/config/docker.js

@@ -46,10 +46,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             name: `${prefix}_maildev-data`
         },
         composer_cache: {
-            name: 'composer_cache-data',
-            opt: {
-                mode: 'z'
-            }
+            name: 'composer_cache-data'
         }
     }
 

package/lib/config/services/mariadb/versions/mariadb-10.2.js

@@ -1,8 +1,9 @@
 /**
- * @returns {import('../../../../../typings/index').ServiceWithImage}
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
  */
 const mariadb102 = () => ({
-    image: 'mariadb:10.2'
+    image: 'mariadb:10.2',
+    useOptimizerSwitch: false
 })
 
 module.exports = mariadb102

package/lib/config/services/mariadb/versions/mariadb-10.3.js

@@ -1,8 +1,9 @@
 /**
- * @returns {import('../../../../../typings/index').ServiceWithImage}
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
  */
 const mariadb103 = () => ({
-    image: 'mariadb:10.3'
+    image: 'mariadb:10.3',
+    useOptimizerSwitch: false
 })
 
 module.exports = mariadb103

package/lib/config/services/mariadb/versions/mariadb-10.4.js

@@ -1,8 +1,9 @@
 /**
- * @returns {import('../../../../../typings/index').ServiceWithImage}
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
  */
 const mariadb104 = () => ({
-    image: 'mariadb:10.4'
+    image: 'mariadb:10.4',
+    useOptimizerSwitch: true
 })
 
 module.exports = mariadb104

package/lib/config/templates/mariadb.template.cnf

@@ -187,7 +187,13 @@ key_buffer              = 16M
 [mariadb]
 skip-host-cache
 skip-name-resolve
+<% if (it.config.useOptimizerSwitch) { %>
+<% if (typeof it.config.useOptimizerSwitch === 'string') { %>
+optimizer_switch='<%= it.config.useOptimizerSwitch %>'
+<% } else { %>
 optimizer_switch='rowid_filter=off'
+<% } %>
+<% } %>
 optimizer_use_condition_selectivity=1
 
 !includedir /etc/mysql/conf.d/

package/lib/tasks/file-system/create-mariadb-config.js

@@ -18,7 +18,14 @@ const createMariaDBConfig = () => ({
                     ctx.config.baseConfig.templateDir,
                     'mariadb.template.cnf'
                 ),
-                overwrite: true
+                overwrite: true,
+                templateArgs: {
+                    config: {
+                        useOptimizerSwitch:
+                            ctx.config.overridenConfiguration.configuration
+                                .mariadb.useOptimizerSwitch
+                    }
+                }
             })
         } catch (e) {
             throw new UnknownError(

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

@@ -17,7 +17,6 @@ const dockerSettingsJsonPath = path.join(
  */
 const checkDockerPerformance = () => ({
     title: 'Checking Docker Performance',
-
     skip: async (ctx) =>
         ctx.platform !== 'darwin' ||
         (ctx.platform === 'darwin' &&

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

@@ -15,7 +15,8 @@ const getDockerVersion = () => ({
             ctx.dockerClientData = dockerVersion.Client
             ctx.dockerVersion = dockerVersion.Server.Version
             ctx.isDockerDesktop =
-                dockerVersion.Server.Platform.Name.includes('Desktop')
+                dockerVersion.Server.Platform.Name.includes('Desktop') ||
+                dockerVersion.Client.Os === 'darwin'
         } else {
             throw new UnknownError(
                 `Got unexpected result during Docker version retrieval!\n\n${dockerVersion}`

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

@@ -108,6 +108,16 @@ const serviceConfigurationSchema = Joi.object({
     image: Joi.string().optional()
 })
 
+/**
+ * @type {Joi.ObjectSchema<import('../../typings').MariaDBConfiguration>}
+ */
+const mariadbConfigurationSchema = Joi.object({
+    image: Joi.string().optional(),
+    useOptimizerSwitch: Joi.alternatives()
+        .try(Joi.string(), Joi.boolean())
+        .optional()
+})
+
 /**
  * @type {Joi.ObjectSchema<import('../../typings').ElasticSearchConfiguration>}
  */
@@ -145,7 +155,7 @@ const composerConfigurationSchema = Joi.object({
 const configurationSchema = Joi.object({
     php: phpConfigurationSchema.optional(),
     nginx: nginxConfigurationSchema.optional(),
-    mariadb: serviceConfigurationSchema.optional(),
+    mariadb: mariadbConfigurationSchema.optional(),
     elasticsearch: elasticsearchConfigurationSchema.optional(),
     redis: serviceConfigurationSchema.optional(),
     composer: composerConfigurationSchema.optional(),

package/lib/util/open-browser.js

@@ -1,12 +1,14 @@
 const { execAsync } = require('./exec-async')
 
+// eslint-disable-next-line no-control-regex
+const consoleStyleReplacer = /[\u001b]\[\S+?m/g
 /**
  * @param {string} url
  */
 const openBrowser = async (url) => {
     const start = process.platform === 'darwin' ? 'open' : 'xdg-open'
 
-    await execAsync(`${start} ${url}`)
+    await execAsync(`${start} ${url.replace(consoleStyleReplacer, '')}`)
 }
 
 module.exports = openBrowser

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.4",
+    "version": "2.0.5",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -58,5 +58,5 @@
     "devDependencies": {
         "@types/yargs": "^17.0.13"
     },
-    "gitHead": "0938871489021e7a165a42b24d45775107a32870"
+    "gitHead": "d12aab28f4ee25c341951dd1df962aa84ddf2782"
 }

package/typings/index.d.ts

@@ -16,6 +16,15 @@ export interface ServiceWithImage {
     image: string
 }
 
+export interface MariaDBConfiguration extends ServiceWithImage {
+    /**
+     * Use MariaDB [optimizer-switch](https://mariadb.com/kb/en/optimizer-switch/) configuration.
+     *
+     * Allows to be boolean or custom value that will be set in the template
+     */
+    useOptimizerSwitch?: boolean | string
+}
+
 export interface SSLTerminatorConfiguration extends ServiceWithImage {
     /**
      * Configuration file location
@@ -230,7 +239,7 @@ export interface CMAConfiguration {
         /**
          * MariaDB configuration
          */
-        mariadb: ServiceWithImage
+        mariadb: MariaDBConfiguration
 
         /**
          * ElasticSearch configuration