@scandipwa/magento-scripts 2.3.2 → 2.3.4-alpha.0

package/lib/config/docker.js

@@ -365,6 +365,7 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 env:
                     searchengine === 'elasticsearch'
                         ? deepmerge(
+                              defaultEsEnv,
                               {
                                   // https://www.elastic.co/guide/en/elasticsearch/reference/master/ml-settings.html
                                   'xpack.ml.enabled': ['sse4.2', 'sse4_2'].some(
@@ -372,9 +373,9 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                                           cpuSupportedFlags.includes(sse42Flag)
                                   )
                               },
-                              elasticsearch.env || defaultEsEnv
+                              elasticsearch.env || {}
                           )
-                        : deepmerge({}, opensearch.env || defaultOsEnv),
+                        : deepmerge(defaultOsEnv, opensearch.env || {}),
                 network: network.name,
                 image: `${
                     searchengine === 'elasticsearch'

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

@@ -1,5 +1,5 @@
 const os = require('os')
-const { NodeSSH } = require('node-ssh')
+const { NodeSSH } = require('node-ssh-no-cpu-features')
 const pathExists = require('../../../../util/path-exists')
 const regularSSHServer = require('./regular-server')
 const readymageSSH = require('./readymage')

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

@@ -4,7 +4,7 @@ const { execAsyncSpawn } = require('../../../../util/exec-async-command')
 const databaseDumpCommandWithOptions = require('./database-dump-command')
 
 /**
- * @returns {import('listr2').ListrTask<import('../../../../../typings/context').ListrContext & { ssh: import('node-ssh').NodeSSH }>}
+ * @returns {import('listr2').ListrTask<import('../../../../../typings/context').ListrContext & { ssh: import('node-ssh-no-cpu-features').NodeSSH }>}
  */
 const readymageSSH = () => ({
     task: async (ctx, task) => {

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

@@ -4,7 +4,7 @@ const { execAsyncSpawn } = require('../../../../util/exec-async-command')
 const databaseDumpCommandWithOptions = require('./database-dump-command')
 const KnownError = require('../../../../errors/known-error')
 /**
- * @returns {import('listr2').ListrTask<import('../../../../../typings/context').ListrContext & { ssh: import('node-ssh').NodeSSH }>}
+ * @returns {import('listr2').ListrTask<import('../../../../../typings/context').ListrContext & { ssh: import('node-ssh-no-cpu-features').NodeSSH }>}
  */
 const regularSSHServer = () => ({
     task: async (ctx, task) => {

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

@@ -45,15 +45,10 @@ const addExtensionToBuilder =
         let runCommand = ''
         if (typeof command === 'string') {
             runCommand += ` ${command}`
-        } else if (command instanceof Promise) {
+        } else if (typeof command === 'function') {
             runCommand += ` ${await Promise.resolve(
                 command({ ...extensionInstructionsWithoutCommand, ctx })
             )}`
-        } else if (typeof command === 'function') {
-            runCommand += ` ${command({
-                ...extensionInstructionsWithoutCommand,
-                ctx
-            })}`
         } else {
             runCommand += ` docker-php-ext-install ${
                 extensionInstructionsWithoutCommand.name || extensionName
@@ -146,14 +141,17 @@ const buildDockerFileInstructions = async (ctx, { image, tag }) => {
             composer.plugins
         )) {
             if (pluginOptions.enabled) {
+                const pluginVersion = pluginOptions.version
                 dockerFileInstructions
-                    .comment(`install ${pluginName} composer global package`)
+                    .comment(
+                        `install ${pluginName}${
+                            pluginVersion ? ` (version ${pluginVersion})` : ''
+                        } composer global package`
+                    )
 
                     .run(
                         `composer global require ${pluginName}${
-                            pluginOptions.options
-                                ? ` ${pluginOptions.options}`
-                                : ''
+                            pluginVersion ? `:${pluginVersion}` : ''
                         }${
                             pluginOptions.options
                                 ? ` ${pluginOptions.options}`

package/lib/tasks/requirements/elasticsearch-version.js

@@ -1,3 +1,4 @@
+const { getPort } = require('../../config/port-config')
 const UnknownError = require('../../errors/unknown-error')
 const { containerApi } = require('../docker/containers')
 
@@ -11,19 +12,40 @@ const checkElasticSearchVersion = () => ({
             ctx.config.overridenConfiguration.configuration
         const { ports } = ctx
 
+        const { elasticsearch: elasticSearchContainer } =
+            ctx.config.docker.getContainers(ports)
+
         let elasticSearchVersionResponse
 
-        try {
-            elasticSearchVersionResponse = await containerApi.run({
-                ...elasticsearch,
-                command: 'elasticsearch --version',
-                detach: false,
-                rm: true,
-                ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
-                memory: '512mb'
-            })
-        } catch (e) {
-            elasticSearchVersionResponse = e.message
+        const elasticSearchContainerRunning = await containerApi.ls({
+            filter: `name=${elasticSearchContainer.name}`,
+            formatToJSON: true
+        })
+
+        if (
+            elasticSearchContainerRunning.length !== 0 &&
+            elasticSearchContainerRunning[0].State === 'running'
+        ) {
+            elasticSearchVersionResponse = await containerApi.exec(
+                'elasticsearch --version',
+                elasticSearchContainer.name
+            )
+        } else {
+            try {
+                const availableElasticSearchPort = await getPort(
+                    ports.elasticsearch
+                )
+                elasticSearchVersionResponse = await containerApi.run({
+                    ...elasticsearch,
+                    command: 'elasticsearch --version',
+                    detach: false,
+                    rm: true,
+                    ports: [`127.0.0.1:${availableElasticSearchPort}:9200`],
+                    memory: '512mb'
+                })
+            } catch (e) {
+                elasticSearchVersionResponse = e.message
+            }
         }
 
         const elasticSearchVersionResponseResult =

package/lib/tasks/requirements/opensearch-version.js

@@ -1,3 +1,4 @@
+const { getPort } = require('../../config/port-config')
 const UnknownError = require('../../errors/unknown-error')
 const { containerApi } = require('../docker/containers')
 
@@ -10,19 +11,40 @@ const checkOpenSearchVersion = () => ({
         const { opensearch } = ctx.config.overridenConfiguration.configuration
         const { ports } = ctx
 
+        const { elasticsearch: openSearchContainer } =
+            ctx.config.docker.getContainers(ports)
+
         let openSearchVersionResponse
 
-        try {
-            openSearchVersionResponse = await containerApi.run({
-                ...opensearch,
-                command: 'opensearch --version',
-                detach: false,
-                rm: true,
-                ports: [`127.0.0.1:${ports.elasticsearch}:9200`],
-                memory: '512mb'
-            })
-        } catch (e) {
-            openSearchVersionResponse = e.message
+        const openSearchContainerRunning = await containerApi.ls({
+            filter: `name=${openSearchContainer.name}`,
+            formatToJSON: true
+        })
+
+        if (
+            openSearchContainerRunning.length !== 0 &&
+            openSearchContainerRunning[0].State === 'running'
+        ) {
+            openSearchVersionResponse = await containerApi.exec(
+                'opensearch --version',
+                openSearchContainer.name
+            )
+        } else {
+            try {
+                const availableOpenSearchPort = await getPort(
+                    ports.elasticsearch
+                )
+                openSearchVersionResponse = await containerApi.run({
+                    ...opensearch,
+                    command: 'opensearch --version',
+                    detach: false,
+                    rm: true,
+                    ports: [`127.0.0.1:${availableOpenSearchPort}:9200`],
+                    memory: '512mb'
+                })
+            } catch (e) {
+                openSearchVersionResponse = e.message
+            }
         }
 
         const openSearchVersionResponseResult = openSearchVersionResponse.match(

package/lib/tasks/status/index.js

@@ -105,12 +105,17 @@ const prettyStatus = async (ctx) => {
         if (
             container.status &&
             container.status.State &&
-            container.status.State.Health
+            container.status.State.Health &&
+            container.status.State.Status === 'running'
         ) {
             containerStatus = `✓ ${logger.style.file(
                 container.status.State.Health.Status
             )} and ${logger.style.file('running')}`
-        } else if (container.status && container.status.State) {
+        } else if (
+            container.status &&
+            container.status.State &&
+            container.status.State.Status !== 'exited'
+        ) {
             containerStatus = logger.style.file(container.status.State.Status)
         } else {
             containerStatus = '✖ Not running'

package/lib/util/set-config.js

@@ -1,8 +1,10 @@
-const eta = require('eta')
+const { Eta } = require('eta')
 const fs = require('fs')
 const path = require('path')
 const pathExists = require('./path-exists')
 
+const eta = new Eta()
+
 /**
  * @param {{ configPathname: string, template: string, overwrite?: boolean, templateArgs?: Record<string, unknown> }} param0
  */
@@ -19,7 +21,7 @@ const setConfigFile = async ({
     }
 
     const configTemplate = await fs.promises.readFile(template, 'utf-8')
-    const compliedConfig = await eta.render(configTemplate, {
+    const compliedConfig = await eta.renderStringAsync(configTemplate, {
         date: new Date().toUTCString(),
         ...templateArgs
     })

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.3.2",
+    "version": "2.3.4-alpha.0",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -23,24 +23,24 @@
         "arm64"
     ],
     "dependencies": {
-        "@scandipwa/scandipwa-dev-utils": "0.1.16",
-        "@tilework/mosaic-dev-utils": "^0.2.3",
-        "conf": "10.1.2",
-        "enquirer": "2.3.6",
-        "eta": "1.12.3",
-        "fast-xml-parser": "^4.0.9",
+        "@scandipwa/scandipwa-dev-utils": "0.1.17",
+        "@tilework/mosaic-dev-utils": "^0.2.4",
+        "conf": "10.2.0",
+        "enquirer": "2.4.1",
+        "eta": "3.4.0",
+        "fast-xml-parser": "^4.4.0",
         "hjson": "^3.2.2",
         "is-installed-globally": "0.4.0",
-        "joi": "17.6.0",
+        "joi": "17.13.3",
         "listr2": "4.0.5",
         "macos-version": "5.2.1",
         "merge-files": "0.1.2",
-        "mysql2": "2.3.3",
-        "node-ssh": "12.0.5",
-        "semver": "7.3.7",
+        "mysql2": "3.10.3",
+        "node-ssh-no-cpu-features": "^2.0.0",
+        "semver": "7.6.3",
         "smol-request": "^2.1.2",
-        "systeminformation": "5.12.1",
-        "yargs": "17.5.1"
+        "systeminformation": "5.22.11",
+        "yargs": "17.7.2"
     },
     "publishConfig": {
         "access": "public"
@@ -56,8 +56,8 @@
         "scandipwa"
     ],
     "devDependencies": {
-        "@types/node": "^20.10.4",
-        "@types/yargs": "^17.0.13"
+        "@types/node": "^20.14.11",
+        "@types/yargs": "^17.0.32"
     },
-    "gitHead": "da589ac8f9aa56f6489c7b12d69e4cddaa617f36"
+    "gitHead": "dc6b868bdfd7c4d063a8e755f050c77b5265cab9"
 }

package/typings/context.d.ts

@@ -91,7 +91,7 @@ export interface ListrContext {
                     }
                 }
             >
-            getContainers(ports?: Record<string, number>): Record<string,
+            getContainers(ports?: ListrContext['ports']): Record<'php' | 'sslTerminator' | 'nginx' | 'redis' | 'mariadb' | 'elasticsearch' | 'maildev' | 'varnish',
                 {
                     _: string
                     ports: string[]