@scandipwa/magento-scripts 2.4.10 → 2.4.12-alpha.0

package/index.js

@@ -6,6 +6,7 @@ const logger = require('@scandipwa/scandipwa-dev-utils/logger')
 const semver = require('semver')
 const isInstalledGlobally = require('is-installed-globally')
 const isRunningRoot = require('./lib/util/is-running-root')
+const ensureAgentsMd = require('./lib/util/ensure-agents-md')
 
 if (isRunningRoot()) {
     logger.error('Root privileges detected!')
@@ -27,6 +28,8 @@ If you are experiencing problems with ${logger.style.misc(
     process.exit(1)
 }
 
+ensureAgentsMd()
+
 const commands = [
     require('./lib/commands/link'),
     require('./lib/commands/logs'),
@@ -123,6 +126,14 @@ const newVersionIsAPatch = (latestVersion, currentVersion) => {
     yargs.scriptName('magento-scripts')
     yargs.version(false)
 
+    yargs.option('silent', {
+        alias: 'q',
+        describe:
+            'Suppress all task progress output (Listr silent renderer). Enabled automatically when stdout is not a TTY.',
+        type: 'boolean',
+        default: false
+    })
+
     // Initialize program commands
     commands.forEach((command) => command(yargs))
 

package/lib/commands/cleanup.js

@@ -18,12 +18,16 @@ module.exports = (yargs) => {
             }),
         async (args) => {
             logger.warn('you should not use this command.')
+            const silent = /** @type {boolean} */ (args.silent)
             const tasks = new Listr(cleanup(), {
                 concurrent: false,
                 exitOnError: true,
                 ctx: {
-                    force: args.force
+                    force: args.force,
+                    silent
                 },
+                renderer:
+                    silent || !process.stdout.isTTY ? 'silent' : 'default',
                 rendererOptions: { collapse: false }
             })
 

package/lib/commands/cli.js

@@ -20,7 +20,8 @@ module.exports = (yargs) => {
         'Enter CLI (magento, php, composer).',
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         () => {},
-        async () => {
+        async (args) => {
+            const silent = /** @type {boolean} */ (args.silent)
             const tasks = new Listr(
                 [
                     getMagentoVersionConfig(),
@@ -33,8 +34,11 @@ module.exports = (yargs) => {
                     concurrent: false,
                     exitOnError: true,
                     ctx: {
-                        throwMagentoVersionMissing: true
+                        throwMagentoVersionMissing: true,
+                        silent
                     },
+                    renderer:
+                        silent || !process.stdout.isTTY ? 'silent' : 'default',
                     rendererOptions: { collapse: false, clearOutput: true }
                 }
             )

package/lib/commands/execute.js

@@ -8,6 +8,13 @@ module.exports = (yargs) => {
         'exec <container name> [command...]',
         'Execute command in docker container',
         (yargs) => {
+            yargs.option('non-interactive', {
+                alias: 'n',
+                type: 'boolean',
+                default: false,
+                description:
+                    'Run in non-interactive mode (for AI terminals and scripts)'
+            })
             yargs.usage(`Usage: npm run exec <container name> [command...]
 
 Available containers:
@@ -19,13 +26,20 @@ Available containers:
 - mariadb
 - elasticsearch
 - maildev
-- varnish (if enabled)`)
+- varnish (if enabled)
+
+Options:
+  --non-interactive, -n  Run in non-interactive mode (no TTY required)`)
         },
-        async () => {
-            const [containerName, ...commands] = process.argv.slice(3)
+        async (argv) => {
+            const [containerName, ...commands] = process.argv
+                .slice(3)
+                .filter((arg) => arg !== '--non-interactive' && arg !== '-n')
+
             await executeTask({
                 containerName,
-                commands
+                commands,
+                nonInteractive: !!(argv.nonInteractive || argv.n)
             })
         }
     )

package/lib/commands/import-db.js

@@ -27,12 +27,25 @@ module.exports = (yargs) => {
                 type: 'boolean',
                 default: false
             })
+            yargs.option('non-interactive', {
+                alias: 'y',
+                describe:
+                    'Skip all interactive prompts using sensible defaults',
+                type: 'boolean',
+                default: false
+            })
         },
         async (args) => {
             const tasks = new Listr(importDump(), {
                 exitOnError: true,
                 ctx: args,
                 concurrent: false,
+                renderer:
+                    /** @type {boolean} */ (args.silent) ||
+                    /** @type {boolean} */ (args.nonInteractive) ||
+                    !process.stdout.isTTY
+                        ? 'silent'
+                        : 'default',
                 rendererOptions: {
                     showErrorMessage: false,
                     showTimer: true

package/lib/commands/link.js

@@ -17,12 +17,18 @@ module.exports = (yargs) => {
                 default: false
             }),
         async (args) => {
-            const tasks = new Listr(linkTask(args.themepath), {
-                concurrent: false,
-                exitOnError: true,
-                ctx: { throwMagentoVersionMissing: true },
-                rendererOptions: { collapse: false }
-            })
+            const silent = /** @type {boolean} */ (args.silent)
+            const tasks = new Listr(
+                linkTask(/** @type {string} */ (args.themepath)),
+                {
+                    concurrent: false,
+                    exitOnError: true,
+                    ctx: { throwMagentoVersionMissing: true, silent },
+                    renderer:
+                        silent || !process.stdout.isTTY ? 'silent' : 'default',
+                    rendererOptions: { collapse: false }
+                }
+            )
 
             try {
                 await tasks.run()

package/lib/commands/logs.js

@@ -70,6 +70,7 @@ npm run logs re (will match redis)`)
             })
         },
         async (argv) => {
+            const silent = /** @type {boolean} */ (argv.silent)
             const tasks = new Listr(
                 [
                     checkRequirements(),
@@ -82,7 +83,12 @@ npm run logs re (will match redis)`)
                 {
                     concurrent: false,
                     exitOnError: true,
-                    ctx: { throwMagentoVersionMissing: true },
+                    ctx: {
+                        throwMagentoVersionMissing: true,
+                        silent
+                    },
+                    renderer:
+                        silent || !process.stdout.isTTY ? 'silent' : 'default',
                     rendererOptions: { collapse: false, clearOutput: true }
                 }
             )

package/lib/commands/start.js

@@ -64,9 +64,9 @@ module.exports = (yargs) => {
                     type: 'number',
                     nargs: 1
                 })
-                .option('no-open', {
+                .option('open', {
                     alias: 'n',
-                    describe: 'Do not open browser after command finished',
+                    describe: 'Open browser after command finished',
                     type: 'boolean',
                     default: false
                 })
@@ -109,6 +109,11 @@ module.exports = (yargs) => {
                 exitOnError: true,
                 ctx: args,
                 concurrent: false,
+                renderer:
+                    /** @type {boolean} */ (args.silent) ||
+                    !process.stdout.isTTY
+                        ? 'silent'
+                        : 'default',
                 rendererOptions: {
                     showErrorMessage: false,
                     showTimer: true

package/lib/commands/status.js

@@ -23,6 +23,7 @@ module.exports = (yargs) => {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         () => {},
         async (args) => {
+            const silent = /** @type {boolean} */ (args.silent)
             const tasks = new Listr(
                 [
                     checkRequirements(),
@@ -58,7 +59,9 @@ module.exports = (yargs) => {
                 {
                     concurrent: false,
                     exitOnError: false,
-                    ctx: { throwMagentoVersionMissing: true, ...args },
+                    ctx: { throwMagentoVersionMissing: true, ...args, silent },
+                    renderer:
+                        silent || !process.stdout.isTTY ? 'silent' : 'default',
                     rendererOptions: { collapse: false, clearOutput: false }
                 }
             )

package/lib/commands/stop.js

@@ -10,16 +10,20 @@ module.exports = (yargs) => {
         'Stop the application.',
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         () => {},
-        async () => {
+        async (args) => {
+            const silent = /** @type {boolean} */ (args.silent)
             const tasks = new Listr(stop(), {
                 concurrent: false,
                 exitOnError: true,
-                rendererOptions: {
-                    collapse: false
-                },
                 ctx: {
                     throwMagentoVersionMissing: true,
-                    projectPath: process.cwd()
+                    projectPath: process.cwd(),
+                    silent
+                },
+                renderer:
+                    silent || !process.stdout.isTTY ? 'silent' : 'default',
+                rendererOptions: {
+                    collapse: false
                 }
             })
 

package/lib/config/check-configuration-file.js

@@ -49,13 +49,15 @@ const checkConfigurationFile = () => ({
             }
 
             if (!magentoConfiguration) {
-                const magentoEdition = await task.prompt({
-                    type: 'Select',
-                    message: `Please select Magento edition you want to install.
+                const magentoEdition = ctx.nonInteractive
+                    ? 'Community'
+                    : await task.prompt({
+                          type: 'Select',
+                          message: `Please select Magento edition you want to install.
 
 Note that Enterprise edition requires Magento Enterprise License keys.`,
-                    choices: ['Community', 'Enterprise']
-                })
+                          choices: ['Community', 'Enterprise']
+                      })
 
                 magentoConfiguration = deepmerge(defaultMagentoConfig, {
                     edition: magentoEdition.toLowerCase()

package/lib/config/docker.js

@@ -232,7 +232,8 @@ module.exports = async (ctx, overridenConfiguration, baseConfig) => {
                 name: `${prefix}_php_with_xdebug`,
                 connectCommand: ['/bin/sh'],
                 execCommandEnv: {
-                    XDEBUG_TRIGGER: 'PHPSTORM'
+                    XDEBUG_TRIGGER: 'PHPSTORM',
+                    XDEBUG_SESSION: 'PHPSTORM'
                 },
                 dependsOn: ['mariadb', 'redis', 'elasticsearch'],
                 user:

package/lib/config/get-magento-version-config.js

@@ -48,6 +48,8 @@ const getMagentoVersion = () => ({
                     const { magentoVersion: defaultMagentoVersion } =
                         defaultConfiguration
                     magentoVersion = defaultMagentoVersion
+                } else if (ctx.nonInteractive) {
+                    magentoVersion = defaultConfiguration.magento
                 } else {
                     let promptSkipper = false
                     const timer = async () => {

package/lib/config/services/composer/versions/composer-2.9.js

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

package/lib/config/services/mariadb/versions/index.js

@@ -5,5 +5,6 @@ module.exports = {
     mariadb106: require('./mariadb-10.6'),
     mariadb1011: require('./mariadb-10.11'),
     mariadb114: require('./mariadb-11.4'),
-    mariadb116: require('./mariadb-11.6')
+    mariadb116: require('./mariadb-11.6'),
+    mariadb118: require('./mariadb-11.8')
 }

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

@@ -0,0 +1,11 @@
+/**
+ * @returns {import('../../../../../typings/index').MariaDBConfiguration}
+ */
+const mariadb118 = () => ({
+    image: 'mariadb:11.8',
+    useOptimizerSwitch: true,
+    binFileName: 'mariadb',
+    binAdminFileName: 'mariadb-admin'
+})
+
+module.exports = mariadb118

package/lib/config/services/redis/index.js

@@ -1,5 +1,6 @@
 const valkey80 = require('./valkey-8.0')
 const valkey81 = require('./valkey-8.1')
+const valkey90 = require('./valkey-9.0')
 
 module.exports = {
     redis50: require('./redis-5.0'),
@@ -8,5 +9,6 @@ module.exports = {
     redis70: require('./redis-7.0'),
     redis72: require('./redis-7.2'),
     valkey80,
-    valkey81
+    valkey81,
+    valkey90
 }

package/lib/config/services/redis/valkey-9.0.js

@@ -0,0 +1,8 @@
+/**
+ * @returns {import('../../../../typings/index').ServiceWithImage}
+ */
+const valkey90 = () => ({
+    image: 'valkey/valkey:9.0-alpine'
+})
+
+module.exports = valkey90

package/lib/config/services/varnish/index.js

@@ -7,5 +7,6 @@ module.exports = {
     varnish74: require('./varnish-7-4'),
     varnish75: require('./varnish-7-5'),
     varnish76: require('./varnish-7-6'),
-    varnish77: require('./varnish-7-7')
+    varnish77: require('./varnish-7-7'),
+    varnish80: require('./varnish-8-0')
 }

package/lib/config/services/varnish/varnish-8-0.js

@@ -0,0 +1,15 @@
+const path = require('path')
+
+/**
+ * @param {Object} param0
+ * @param {string} param0.templateDir
+ * @returns {import('../../../../typings/index').VarnishConfiguration}
+ */
+const varnish80 = ({ templateDir }) => ({
+    enabled: false,
+    healthCheck: false,
+    image: 'varnish:8.0',
+    configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
+})
+
+module.exports = varnish80

package/lib/config/versions/magento-2.4.4-p18.js

@@ -0,0 +1,43 @@
+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 { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.4-p18',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: redis72(),
+        // not supported anymore
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        // not supported anymore
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.5-p17.js

@@ -0,0 +1,43 @@
+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 { varnish80 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey81 } = require('../services/redis')
+const { mariadb106 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.5-p17',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey81(),
+        // not supported anymore
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        // not supported anymore
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish80({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -0,0 +1,43 @@
+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 { varnish80 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey81 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch717 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.6-p15',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey81(),
+        // not supported anymore
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        // not supported anymore
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish80({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -0,0 +1,42 @@
+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 { varnish80 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer29 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey81 } = require('../services/redis')
+const { mariadb1011 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch219 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.7-p10',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey81(),
+        // not supported anymore
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch817(),
+        composer: composer29(),
+        varnish: varnish80({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/config/versions/magento-2.4.8-p4.js

@@ -21,7 +21,6 @@ const { opensearch300 } = require('../services/opensearch/versions')
  */
 module.exports = ({ templateDir }) => ({
     magentoVersion: '2.4.8-p4',
-    isDefault: true,
     configuration: {
         php: php83({
             templateDir,

package/lib/config/versions/magento-2.4.8-p5.js

@@ -0,0 +1,42 @@
+const sodium = require('../services/php/extensions/sodium')
+const ftp = require('../services/php/extensions/ftp')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish80 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer29 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql80 } = require('../services/mysql/versions')
+const { opensearch300 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.8-p5',
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql80(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch817(),
+        composer: composer29(),
+        varnish: varnish80({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -0,0 +1,44 @@
+const sodium = require('../services/php/extensions/sodium')
+const ftp = require('../services/php/extensions/ftp')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish80 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx128 } = require('../services/nginx/versions')
+const { composer29 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey90 } = require('../services/redis')
+const { mariadb118 } = require('../services/mariadb/versions')
+const { elasticsearch817 } = require('../services/elasticsearch/versions')
+const { mysql84 } = require('../services/mysql/versions')
+const { opensearch300 } = require('../services/opensearch/versions')
+
+/**
+ * @type {import('../../../typings/common').MagentoVersionConfigurationFunction}
+ */
+module.exports = ({ templateDir }) => ({
+    magentoVersion: '2.4.9',
+    isDefault: true,
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.5-magento-2.4`
+        }),
+        nginx: nginx128({ templateDir }),
+        redis: valkey90(),
+        mysql: mysql84(),
+        mariadb: mariadb118(),
+        // not supported
+        elasticsearch: elasticsearch817(),
+        composer: composer29(),
+        varnish: varnish80({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})