@scandipwa/magento-scripts 2.1.3 → 2.2.0-alpha.0

package/lib/config/versions/magento-2.4.6-p3.js

@@ -0,0 +1,39 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php81 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis70 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch85 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p3',
+    isDefault: true,
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch85(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

package/lib/config/versions/magento-2.4.6.js

@@ -1,4 +1,3 @@
-const { defaultMagentoConfig } = require('../magento-config')
 const sodium = require('../services/php/extensions/sodium')
 const {
     magento24PHPExtensionList
@@ -16,13 +15,11 @@ const { elasticsearch84 } = require('../services/elasticsearch/versions')
 const { mysql80 } = require('../services/mysql/versions')
 
 /**
- * @param {Object} param0
- * @param {string} param0.templateDir
- * @returns {import('../../../typings/index').CMAConfiguration & { magentoVersion: string, isDefault?: boolean }}
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.6',
-    isDefault: true,
+    isDefault: false,
     configuration: {
         php: php81({
             templateDir,
@@ -38,10 +35,5 @@ module.exports = ({ templateDir }) => ({
         varnish: varnish71({ templateDir }),
         sslTerminator: sslTerminator({ templateDir }),
         maildev: maildev()
-    },
-    magento: defaultMagentoConfig,
-    host: 'localhost',
-    ssl: {
-        enabled: false
     }
 })

package/lib/config/versions/magento-2.4.7-beta2.js

@@ -0,0 +1,39 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php82 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish73 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx118 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis70 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch87 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-beta2',
+    isDefault: false,
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx118({ templateDir }),
+        redis: redis70(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch87(),
+        composer: composer22(),
+        varnish: varnish73({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev()
+    }
+})

package/lib/tasks/database/import-remote-db/ssh/database-dump-command.js

@@ -2,9 +2,7 @@ const databaseDumpCommandWithOptions = [
     'mysqldump',
     'magento',
     '--skip-lock-tables',
-    '--set-gtid-purged=OFF',
     '--single-transaction=TRUE',
-    '--column-statistics=0',
     '--max_allowed_packet=1GB',
     '--no-tablespaces'
 ]

package/lib/tasks/database/import-remote-db/ssh/readymage.js

@@ -21,36 +21,37 @@ const readymageSSH = () => ({
                 task.output =
                     'Making remote database dump files without customers data...'
 
+                const firstCommand = [
+                    ...databaseDumpCommandWithOptions,
+                    ...[...orderTables, ...customerTables].map(
+                        (table) => `--ignore-table=magento.${table}`
+                    ),
+                    '--result-file=dump-0.sql'
+                ].join(' ')
+
                 /**
                  * create dump without customers and orders
                  */
-                await ssh.execCommand(
-                    [
-                        ...databaseDumpCommandWithOptions,
-                        ...[...orderTables, ...customerTables].map(
-                            (table) => `--ignore-table=magento.${table}`
-                        ),
-                        '--result-file=dump-0.sql'
-                    ].join(' ')
-                )
+                await ssh.execCommand(firstCommand)
 
-                await ssh.execCommand(
-                    [
-                        ...databaseDumpCommandWithOptions,
-                        '--no-data',
-                        '--result-file=dump-1.sql',
-                        ...[...orderTables, ...customerTables]
-                    ].join(' ')
-                )
+                const secondCommand = [
+                    ...databaseDumpCommandWithOptions,
+                    '--no-data',
+                    '--result-file=dump-1.sql',
+                    ...[...orderTables, ...customerTables]
+                ].join(' ')
+
+                await ssh.execCommand(secondCommand)
             } else {
                 task.output =
                     'Making remote database dump file with customers data...'
-                await ssh.execCommand(
-                    [
-                        ...databaseDumpCommandWithOptions,
-                        '--result-file=dump.sql'
-                    ].join(' ')
-                )
+
+                const command = [
+                    ...databaseDumpCommandWithOptions,
+                    '--result-file=dump.sql'
+                ].join(' ')
+
+                await ssh.execCommand(command)
             }
 
             if (!noCompress) {
@@ -73,14 +74,14 @@ const readymageSSH = () => ({
             task.output = 'Downloading dump files...'
             if (noCompress) {
                 await execAsyncSpawn(
-                    `scp ${sshConnectString}:${remotePwd}/dump-0.sql .`
+                    `scp -O ${sshConnectString}:${remotePwd}/dump-0.sql .`
                 )
                 await execAsyncSpawn(
-                    `scp ${sshConnectString}:${remotePwd}/dump-1.sql .`
+                    `scp -O ${sshConnectString}:${remotePwd}/dump-1.sql .`
                 )
             } else {
                 await execAsyncSpawn(
-                    `scp ${sshConnectString}:${remotePwd}/dump.sql.gz .`
+                    `scp -O ${sshConnectString}:${remotePwd}/dump.sql.gz .`
                 )
 
                 task.output = 'Extracting dump files...'
@@ -93,11 +94,11 @@ const readymageSSH = () => ({
             task.output = 'Downloading dump file...'
             if (noCompress) {
                 await execAsyncSpawn(
-                    `scp ${sshConnectString}:${remotePwd}/dump.sql .`
+                    `scp -o StrictHostKeyChecking=no -O ${sshConnectString}:${remotePwd}/dump.sql .`
                 )
             } else {
                 await execAsyncSpawn(
-                    `scp ${sshConnectString}:${remotePwd}/dump.sql.gz .`
+                    `scp -o StrictHostKeyChecking=no -O ${sshConnectString}:${remotePwd}/dump.sql.gz .`
                 )
 
                 task.output = 'Extracting dump file...'

package/lib/tasks/docker/containers/container-api.d.ts

@@ -145,6 +145,11 @@ export interface ContainerRunOptions {
     network?: string
 
     expose?: (string | number)[]
+
+    /**
+     * Memory option [docs](https://docs.docker.com/engine/reference/commandline/run/#memory)
+     */
+    memory?: string
 }
 
 export function run<T>(

package/lib/tasks/docker/containers/container-api.js

@@ -25,7 +25,8 @@ const runCommand = (options) => {
         detach = true,
         rm = false,
         tty = false,
-        user
+        user,
+        memory
     } = options
 
     const detachArg = (detach && '-d') || ''
@@ -59,6 +60,7 @@ const runCommand = (options) => {
         (tmpfs.length > 0 && tmpfs.map((t) => `--tmpfs=${t}`)) || ''
     const userArg = (user && `--user=${user}`) || ''
     const addHostArg = (addHost && `--add-host=${addHost}`) || ''
+    const memoryArg = (memory && `--memory=${memory}`) || ''
 
     const dockerCommand = [
         'docker',
@@ -80,6 +82,7 @@ const runCommand = (options) => {
         tmpfsArg,
         userArg,
         addHostArg,
+        memoryArg,
         image,
         command
     ]

package/lib/tasks/docker/project-image-builder.js

@@ -193,6 +193,27 @@ const buildDockerFileInstructions = async (ctx, { image, tag }) => {
         })
     }
 
+    if (ctx.config.overridenConfiguration.configuration.newRelic.enabled) {
+        const { agentVersion, licenseKey } =
+            ctx.config.overridenConfiguration.configuration.newRelic
+
+        // eslint-disable-next-line max-len
+        dockerFileInstructions.run('apk add --no-cache gcompat')
+            .run(`curl -L https://download.newrelic.com/php_agent/archive/${agentVersion}/newrelic-php5-${agentVersion}-linux.tar.gz | tar -C /tmp -zx \
+&& export NR_INSTALL_USE_CP_NOT_LN=1 \
+&& export NR_INSTALL_SILENT=1 \
+&& /tmp/newrelic-php5-${agentVersion}-linux/newrelic-install install \
+&& rm -rf /tmp/newrelic-php5-* /tmp/nrinstall*`)
+            .run(`sed -i -e "s/REPLACE_WITH_REAL_KEY/${licenseKey}/" \
+-e "s/newrelic.appname[[:space:]]=[[:space:]].*/newrelic.appname=\\"${
+            ctx.config.baseConfig.prefix
+        }\\"/" \
+-e '\\$anewrelic.daemon.address="${
+            ctx.isDockerDesktop ? 'host.docker.internal' : 'localhost'
+        }:31339"' \
+\\$PHP_INI_DIR/conf.d/newrelic.ini`)
+    }
+
     return dockerFileInstructions
 }
 

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

@@ -15,13 +15,16 @@ const createNginxConfig = () => ({
         } = ctx
 
         const {
-            configuration: { nginx }
+            configuration: { nginx },
+            storeDomains
         } = overridenConfiguration
 
         const hostMachine = !isDockerDesktop
             ? '127.0.0.1'
             : 'host.docker.internal'
         const hostPort = !isDockerDesktop ? ports.app : 80
+        const useStoreDomainMapping =
+            storeDomains && Object.keys(storeDomains).length > 1
 
         try {
             await setConfigFile({
@@ -38,7 +41,9 @@ const createNginxConfig = () => ({
                     mageRoot: baseConfig.containerMagentoDir,
                     hostMachine,
                     hostPort,
-                    config: overridenConfiguration
+                    config: overridenConfiguration,
+                    storeDomains,
+                    useStoreDomainMapping
                 }
             })
         } catch (e) {

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

@@ -2,7 +2,6 @@ const path = require('path')
 const fs = require('fs')
 const setConfigFile = require('../../util/set-config')
 const pathExists = require('../../util/path-exists')
-const { isIpAddress } = require('../../util/ip')
 const KnownError = require('../../errors/known-error')
 const UnknownError = require('../../errors/unknown-error')
 
@@ -21,14 +20,19 @@ const createSSLTerminatorConfig = () => ({
 
         const {
             configuration: { sslTerminator },
-            ssl,
-            host
+            ssl
         } = overridenConfiguration
 
-        if (ssl.enabled) {
+        if (ssl.enabled && !ssl.external_provider) {
+            if (!ssl.ssl_certificate) {
+                throw new KnownError('ssl.ssl_certificate is not defined!')
+            }
             if (!(await pathExists(ssl.ssl_certificate))) {
                 throw new KnownError('ssl.ssl_certificate file does not exist!')
             }
+            if (!ssl.ssl_certificate_key) {
+                throw new KnownError('ssl.ssl_certificate_key is not defined!')
+            }
             if (!(await pathExists(ssl.ssl_certificate_key))) {
                 throw new KnownError(
                     'ssl.ssl_certificate_key file does not exist!'
@@ -66,7 +70,6 @@ const createSSLTerminatorConfig = () => ({
             )
         }
 
-        const networkToBindTo = isIpAddress(host) ? host : '127.0.0.1'
         const hostMachine = !isDockerDesktop
             ? '127.0.0.1'
             : 'host.docker.internal'
@@ -87,7 +90,6 @@ const createSSLTerminatorConfig = () => ({
                     hostMachine,
                     hostPort,
                     config: overridenConfiguration,
-                    networkToBindTo,
                     debug
                 }
             })
@@ -111,7 +113,7 @@ const createSSLTerminatorConfig = () => ({
                 ),
                 overwrite: true,
                 templateArgs: {
-                    isNgrok: host.endsWith('ngrok.io')
+                    sslEnabled: ssl.enabled
                 }
             })
         } catch (e) {

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

@@ -1,5 +1,6 @@
 const path = require('path')
 const fs = require('fs')
+const semver = require('semver')
 const logger = require('@scandipwa/scandipwa-dev-utils/logger')
 const runComposerCommand = require('../../util/run-composer')
 const matchFilesystem = require('../../util/match-filesystem')
@@ -12,6 +13,8 @@ const { runPHPContainerCommand } = require('../php/php-container')
 const magentoProductEnterpriseEdition = 'magento/product-enterprise-edition'
 const magentoProductCommunityEdition = 'magento/product-community-edition'
 
+const magentoRootUpdatePlugin = 'magento/composer-root-update-plugin'
+
 /**
  * @param {import('../../../typings/context').ListrContext} ctx
  * @param {import('listr2').ListrTaskWrapper<import('../../../typings/context').ListrContext, any>} task
@@ -61,15 +64,15 @@ const adjustComposerJson = async (
         )
     }
 
+    const isPHP7 = semver.satisfies(ctx.phpVersion, '^7.x.x')
+    const rootUpdatePluginVersion = isPHP7 ? '^1' : '^2'
+
     // if composer-root-update-plugin is not installed in composer, install it.
-    if (
-        composerData &&
-        !composerData.require['magento/composer-root-update-plugin']
-    ) {
-        task.output = 'Installing magento/composer-root-update-plugin!'
+    if (composerData && !composerData.require[magentoRootUpdatePlugin]) {
+        task.output = `Installing ${magentoRootUpdatePlugin}:${rootUpdatePluginVersion}!`
         await runComposerCommand(
             ctx,
-            'require magento/composer-root-update-plugin:^1',
+            `require ${magentoRootUpdatePlugin}:${rootUpdatePluginVersion}`,
             {
                 callback: !ctx.verbose
                     ? undefined
@@ -195,7 +198,7 @@ const installMagentoProject = () => ({
         }
 
         task.title = `Installing Magento ${magentoPackageVersion}`
-        task.output = 'Creating Magento project'
+        task.output = `Creating Magento ${magentoPackageVersion} project`
 
         if (!(await pathExists(path.join(process.cwd(), 'composer.json')))) {
             await createMagentoProject(ctx, task, {

package/lib/tasks/magento/setup-magento/configure-elasticsearch.js

@@ -92,7 +92,7 @@ const installElasticSearch8Module = () => ({
     task: async (ctx, task) => {
         await runComposerCommand(
             ctx,
-            `require ${magentoModuleElasticSearch8} --with-all-dependencies`,
+            `require ${magentoModuleElasticSearch8} --update-with-all-dependencies`,
             {
                 callback: !ctx.verbose
                     ? undefined

package/lib/tasks/magento/setup-magento/index-products.js

@@ -1,10 +1,50 @@
 const magentoTask = require('../../../util/magento-task')
+// const runMagentoCommand = require('../../../util/run-magento')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const indexProducts = () => ({
-    task: (ctx, task) => task.newListr(magentoTask('index:reindex')),
+    title: 'Index Products',
+    task: async (ctx, task) => {
+        const { databaseConnection } = ctx
+        /** @type {{ indexer_id: string, status: string }[][]} */
+        const data = await databaseConnection.query(
+            `select indexer_id,status from indexer_state;`
+        )
+
+        if (data.length === 0) {
+            task.skip('No indexers found')
+            return
+        }
+
+        const invalidIndexers = data[0].filter(
+            ({ status }) => status !== 'valid'
+        )
+
+        const doYouWantToSkipIndexingPart = await task.prompt({
+            type: 'Select',
+            message: `Do you want to index the products? (There are ${invalidIndexers.length} invalid indexers, total indexers: ${data[0].length})\n`,
+            choices: [
+                {
+                    name: 'index',
+                    message: 'Yes, index them please'
+                },
+                {
+                    name: 'skip',
+                    message:
+                        'Skip, do not index them. I will do it later myself'
+                }
+            ]
+        })
+
+        if (doYouWantToSkipIndexingPart === 'skip') {
+            task.skip()
+            return
+        }
+
+        return task.newListr(magentoTask('index:reindex'))
+    },
     retry: 2
 })
 

package/lib/tasks/magento/setup-magento/index.js

@@ -48,7 +48,10 @@ const setupMagento = (options = {}) => ({
                                 increaseAdminSessionLifetime()
                             ],
                             {
-                                concurrent: true
+                                concurrent: true,
+                                rendererOptions: {
+                                    collapse: false
+                                }
                             }
                         )
                 },

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

@@ -1,34 +1,96 @@
-const { updateTableValues } = require('../../../util/database')
+const { updateTableValues, databaseQuery } = require('../../../util/database')
+const KnownError = require('../../../errors/known-error')
 
 /**
+ * @param {number} scopeId
+ * @param {string} code
+ * @param {string} host
  * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
-module.exports = () => ({
-    title: 'Setting baseurl and secure baseurl',
+const setBaseUrlForScope = (scopeId, code, host) => ({
+    title: `store code ${code} at ${host}`,
     task: async (ctx, task) => {
         const {
             ports,
             config: {
-                overridenConfiguration: { host, ssl }
-            },
-            databaseConnection
+                overridenConfiguration: { ssl }
+            }
         } = ctx
-        const isNgrok = host.endsWith('ngrok.io')
-        const enableSecureFrontend = isNgrok || ssl.enabled ? '1' : '0'
+
+        if (host.startsWith('http://') || host.startsWith('https://')) {
+            throw new KnownError(
+                `Host ${host} should not contain protocol, only domain name. Check your configuration in cma.js!`
+            )
+        }
+
         const location = `${host}${
-            !isNgrok && ports.sslTerminator !== 80
-                ? `:${ports.sslTerminator}`
-                : ''
+            ssl.enabled || 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}`
         const httpsUrl = `https://${secureLocation}`
+        const table = 'core_config_data'
+        const values = [
+            {
+                path: 'web/unsecure/base_url',
+                value: httpUrl
+            },
+            {
+                path: 'web/unsecure/base_link_url',
+                value: httpUrl
+            },
+            {
+                path: 'web/secure/base_url',
+                value: httpsUrl
+            },
+            {
+                path: 'web/secure/base_link_url',
+                value: httpsUrl
+            }
+        ]
+
+        task.title = `store ${code} at ${ssl.enabled ? httpsUrl : httpUrl}`
+
+        await Promise.all(
+            values.map(async ({ path, value }) => {
+                await databaseQuery(
+                    {
+                        table,
+                        where: [
+                            ['scope_id', '=', scopeId],
+                            ['path', '=', path]
+                        ],
+                        data: {
+                            value
+                        }
+                    },
+                    ctx
+                )
+            })
+        )
+    }
+})
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const setBaseUrl = () => ({
+    title: 'Setting base url for stores',
+    task: async (ctx, task) => {
+        const {
+            config: {
+                overridenConfiguration: { ssl, storeDomains }
+            },
+            databaseConnection
+        } = ctx
+
+        const enableSecureFrontend = ssl.enabled ? '1' : '0'
 
         await updateTableValues(
             'core_config_data',
             [
-                { path: 'web/unsecure/base_url', value: httpUrl },
-                { path: 'web/secure/base_url', value: httpsUrl },
                 {
                     path: 'web/secure/use_in_frontend',
                     value: enableSecureFrontend
@@ -45,5 +107,51 @@ module.exports = () => ({
             ],
             { databaseConnection, task }
         )
+
+        /** @type {{ website_id: number, code: string }[][]}} */
+        const [storeWebsites] = await databaseConnection.query(
+            `select * from store_website;`
+        )
+
+        if (!storeWebsites || storeWebsites.length === 0) {
+            throw new KnownError(
+                `No store websites found in database, store_website table is empty or does not exist`
+            )
+        }
+
+        const storeDomainsWithMapping = Object.entries(storeDomains).reduce(
+            (acc, [key, val]) => {
+                const storeWebsite = storeWebsites.find(
+                    ({ code }) => code === key
+                )
+                if (storeWebsite) {
+                    return {
+                        ...acc,
+                        [storeWebsite.code]: {
+                            websiteId: storeWebsite.website_id,
+                            domain: val
+                        }
+                    }
+                }
+
+                return acc
+            },
+            {}
+        )
+
+        return task.newListr(
+            Object.entries(storeDomainsWithMapping).map(
+                ([storeCode, { websiteId, domain }]) =>
+                    setBaseUrlForScope(websiteId, storeCode, domain)
+            ),
+            {
+                concurrent: true,
+                rendererOptions: {
+                    collapse: false
+                }
+            }
+        )
     }
 })
+
+module.exports = setBaseUrl