Merge pull request #135 from scandipwa/2.2.0

2.2.0

Author: ejnshtein

build-packages/magento-scripts-php-extensions/extensions/imagick.js

@@ -0,0 +1,9 @@
+// imagick 3.7.0 is latest release of imagick on peck and supports PHP 5.4.0 and newer
+// requires ImageMagick version 6.5.3-10+
+module.exports = {
+    command: `apk add --no-cache --virtual .build-deps \\$PHPIZE_DEPS \
+    && pecl install imagick 3.7.0 \
+    && docker-php-ext-enable imagick \
+    && apk del -f .build-deps`,
+    dependencies: ['imagemagick-dev', 'libgomp']
+}

build-packages/magento-scripts-php-extensions/index.js

@@ -3,10 +3,12 @@ const pdo_sqlsrv = require('./extensions/pdo_sqlsrv')
 const sqlsrv = require('./extensions/sqlsrv')
 const ioncube = require('./extensions/ioncube')
 const memcached = require('./extensions/memcached')
+const imagick = require('./extensions/imagick')
 
 module.exports = {
     sqlsrv,
     pdo_sqlsrv,
     ioncube,
-    memcached
+    memcached,
+    imagick
 }

build-packages/magento-scripts-php-extensions/package.json

@@ -5,7 +5,7 @@
     "repository": "github:scandipwa/create-magento-app",
     "main": "./index.js",
     "license": "OSL-3.0",
-    "version": "1.0.5",
+    "version": "1.0.6-alpha.0",
     "os": [
         "darwin",
         "linux"

build-packages/magento-scripts/lib/config/docker.js

@@ -10,14 +10,17 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger')
 const defaultMagentoUser = require('../tasks/database/default-magento-user')
 
 /**
- *
  * @param {import('../../typings/context').ListrContext} ctx
  * @param {import('../../typings/context').ListrContext['config']['overridenConfiguration']} overridenConfiguration
  * @param {import('../../typings/context').ListrContext['config']['baseConfig']} baseConfig
  */
 module.exports = async (ctx, overridenConfiguration, baseConfig) => {
-    const { configuration, ssl, host } = overridenConfiguration
-    const { nginx, redis, elasticsearch, mariadb, varnish, maildev } =
+    const {
+        configuration,
+        ssl,
+        storeDomains: { admin: host }
+    } = overridenConfiguration
+    const { nginx, redis, elasticsearch, mariadb, varnish, maildev, newRelic } =
         configuration
 
     const php = getPhpConfig(overridenConfiguration, baseConfig)
@@ -120,6 +123,16 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
      * @param {Record<string, number>} ports
      */
     const getContainers = (ports = {}) => {
+        const composerAuthEnv = process.env.COMPOSER_AUTH
+            ? {
+                  COMPOSER_AUTH: JSON.stringify(
+                      JSON.parse(process.env.COMPOSER_AUTH),
+                      null,
+                      0
+                  )
+              }
+            : {}
+
         /**
          * @type {Record<string, import('../tasks/docker/containers/container-api').ContainerRunOptions & { _?: string, forwardedPorts?: string[], debugImage?: string, remoteImages?: string[], connectCommand?: string[], description?: string }>}
          */
@@ -153,15 +166,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                           ]
                         : []
                 ),
-                env: process.env.COMPOSER_AUTH
-                    ? {
-                          COMPOSER_AUTH: JSON.stringify(
-                              JSON.parse(process.env.COMPOSER_AUTH),
-                              null,
-                              0
-                          )
-                      }
-                    : {},
+                env: deepmerge(composerAuthEnv, php.env || {}),
                 restart: 'on-failure:5',
                 image: `local-cma-project:${prefix}`,
                 debugImage: `local-cma-project:${prefix}.debug`,
@@ -397,6 +402,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
         }
 
         if (ssl && ssl.enabled && isDockerDesktop) {
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
             dockerConfig.sslTerminator.ports.push(
                 `${isIpAddress(host) ? host : '127.0.0.1'}:443:443`
             )
@@ -446,6 +453,16 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
             }
         }
 
+        if (newRelic.enabled) {
+            dockerConfig.newRelicPHPDaemon = {
+                _: 'New Relic PHP daemon',
+                ports: [],
+                name: `${prefix}_newrelic-php-daemon`,
+                network: isDockerDesktop ? network.name : 'host',
+                image: 'newrelic/php-daemon'
+            }
+        }
+
         return dockerConfig
     }
 

build-packages/magento-scripts/lib/config/get-magento-version-config.js

@@ -7,6 +7,10 @@ const longestMagentoName = allVersions
     .map(({ name }) => name)
     .reduce((acc, val) => (val.length > acc ? val.length : acc), 0)
 
+/**
+ * @param {{ name: string }} version
+ * @returns {string}
+ */
 const getMagentoVersionMessage = (version) => {
     const pureMagentoVersion = version.name.replace(/-p[0-9]+$/i, '')
     if (scandipwaMagentoVersionMapping[pureMagentoVersion]) {
@@ -25,7 +29,6 @@ const getMagentoVersionMessage = (version) => {
  * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
  */
 const getMagentoVersion = () => ({
-    // title: 'Loading Magento version',
     task: async (ctx, task) => {
         const {
             throwMagentoVersionMissing = false,

build-packages/magento-scripts/lib/config/php-config.js

@@ -18,7 +18,8 @@ module.exports = (overridenConfiguration, baseConfig) => {
         debugTemplatePath: php.debugTemplate,
         fpmTemplatePath: php.fpmConfigTemplate,
         fpmConfPath: path.join(cacheDir, 'php-fpm.conf'),
-        extensions: php.extensions
+        extensions: php.extensions,
+        env: php.env
     }
 
     return phpConfiguration

build-packages/magento-scripts/lib/config/services/composer/versions/composer-1.js

@@ -2,7 +2,7 @@
  * @returns {import('../../../../../typings/index').ComposerConfiguration}
  */
 const composer1 = () => ({
-    version: '1',
+    version: 'latest-1.x',
     plugins: {
         'hirak/prestissimo': {
             enabled: true

build-packages/magento-scripts/lib/config/services/composer/versions/composer-2.2.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../../typings/index').ComposerConfiguration}
+ */
+const composer22 = () => ({
+    version: 'latest-2.2.x'
+})
+
+module.exports = composer22

build-packages/magento-scripts/lib/config/services/composer/versions/composer-2.js

@@ -2,7 +2,7 @@
  * @returns {import('../../../../../typings/index').ComposerConfiguration}
  */
 const composer2 = () => ({
-    version: '2'
+    version: 'latest-2.x'
 })
 
 module.exports = composer2

build-packages/magento-scripts/lib/config/services/composer/versions/index.js

@@ -1,4 +1,5 @@
 module.exports = {
     composer1: require('./composer-1'),
-    composer2: require('./composer-2')
+    composer2: require('./composer-2'),
+    composer22: require('./composer-2.2')
 }