@scandipwa/magento-scripts 2.4.12 → 2.4.13

package/.oxlintrc.json

@@ -0,0 +1,32 @@
+{
+    "$schema": "../../node_modules/oxlint/configuration_schema.json",
+    "env": {
+        "node": true,
+        "es2022": true
+    },
+    "globals": {
+        "verbose": "readonly",
+        "NodeJS": "readonly",
+        "BufferEncoding": "readonly"
+    },
+    "categories": {
+        "correctness": "error"
+    },
+    "ignorePatterns": [
+        "**/node_modules/**",
+        "**/lib/config/templates/**",
+        "**/typings/**",
+        "**/*.d.ts"
+    ],
+    "rules": {
+        "no-unused-vars": [
+            "warn",
+            {
+                "argsIgnorePattern": "^_",
+                "caughtErrorsIgnorePattern": "^_",
+                "varsIgnorePattern": "^_"
+            }
+        ],
+        "unicorn/no-useless-fallback-in-spread": "off"
+    }
+}

package/exec.js

@@ -93,7 +93,7 @@ const newVersionIsAPatch = (latestVersion, currentVersion) => {
             process.isOutOfDateVersion = true
             process.isOutOfDateVersionMessage = message
         }
-    } catch (e) {
+    } catch {
         logger.warn(`Package ${logger.style.misc(name)} is not yet published.`)
         logger.log() // add empty line
     }

package/index.js

@@ -115,7 +115,7 @@ const newVersionIsAPatch = (latestVersion, currentVersion) => {
             process.isOutOfDateVersion = true
             process.isOutOfDateVersionMessage = message
         }
-    } catch (e) {
+    } catch {
         logger.warn(`Package ${logger.style.misc(name)} is not yet published.`)
         logger.log() // add empty line
     }

package/lib/config/docker.js

@@ -23,7 +23,7 @@ const rosettaTranslatedContainers =
  */
 const volumeDirectives = (directives) => {
     const directivesResult = Object.entries(directives)
-        .filter(([name, value]) => value === true)
+        .filter(([, value]) => value === true)
         .map(([name]) => name)
         .join(',')
 

package/lib/config/system-config.js

@@ -25,7 +25,7 @@ const getSystemConfig = async ({ validate = true } = {}) => {
         let userSystemConfigParsed
         try {
             userSystemConfigParsed = JSON.parse(userSystemConfig)
-        } catch (e) {
+        } catch {
             throw new KnownError(
                 `System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`
             )
@@ -61,7 +61,7 @@ const getSystemConfigSync = ({ validate = true } = {}) => {
         let userSystemConfigParsed
         try {
             userSystemConfigParsed = JSON.parse(userSystemConfig)
-        } catch (e) {
+        } catch {
             throw new KnownError(
                 `System configuration file is not a valid JSON!\n\nFile location: ${systemConfigPath}`
             )

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

@@ -38,7 +38,8 @@ const readymageSSH = () => ({
                     ...databaseDumpCommandWithOptions,
                     '--no-data',
                     '--result-file=dump-1.sql',
-                    ...[...orderTables, ...customerTables]
+                    ...orderTables,
+                    ...customerTables
                 ].join(' ')
 
                 await ssh.execCommand(secondCommand)

package/lib/tasks/docker/containers/tasks.js

@@ -172,7 +172,7 @@ const startContainers = () => ({
 
         const missingContainers = Object.entries(containers)
             .filter(
-                ([nameWithoutPrefix, { name }]) =>
+                ([, { name }]) =>
                     !containerList.some((c) => c.Names === name)
             )
             .map(([nameWithoutPrefix, containerOptions]) => ({

package/lib/tasks/file-system/create-git-hook-notification.js

@@ -11,7 +11,7 @@ function isExec(p) {
     try {
         fs.accessSync(p, fs.constants.X_OK)
         return true
-    } catch (e) {
+    } catch {
         return false
     }
 }

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

@@ -1,6 +1,9 @@
 const path = require('path')
 const setConfigFile = require('../../util/set-config')
 const UnknownError = require('../../errors/unknown-error')
+const {
+    shouldUseStoreDomainMapping
+} = require('../../util/store-domains')
 
 /**
  * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -35,7 +38,7 @@ const createNginxConfig = () => ({
         }
 
         const useStoreDomainMapping =
-            storeDomains && Object.keys(storeDomains).length > 1
+            shouldUseStoreDomainMapping(storeDomains)
 
         try {
             await setConfigFile({

package/lib/tasks/file-system/create-phpstorm-config/php-docker-settings-config/index.js

@@ -18,14 +18,12 @@ const setupPhpDockerSettingsConfig = () => ({
             )
             const phpDockerSettingsConfigs =
                 phpDockerSettingsConfigContent.project.component
-            const hasChanges = await Promise.all([
-                setupPHPDockerContainerSettingsConfig(
-                    phpDockerSettingsConfigs,
-                    ctx
-                )
-            ])
+            const hasChanges = await setupPHPDockerContainerSettingsConfig(
+                phpDockerSettingsConfigs,
+                ctx
+            )
 
-            if (hasChanges.includes(true)) {
+            if (hasChanges === true) {
                 await buildXmlFile(
                     phpDockerSettingsConfig.path,
                     phpDockerSettingsConfigContent
@@ -41,9 +39,7 @@ const setupPhpDockerSettingsConfig = () => ({
         const phpDockerSettingsConfigs =
             phpDockerSettingsConfigContent.project.component
 
-        await Promise.all([
-            setupPHPDockerContainerSettingsConfig(phpDockerSettingsConfigs, ctx)
-        ])
+        await setupPHPDockerContainerSettingsConfig(phpDockerSettingsConfigs, ctx)
 
         await buildXmlFile(
             phpDockerSettingsConfig.path,

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

@@ -283,7 +283,7 @@ const installMagentoProject = () => ({
             isVendorFolderCorrupted = await getIsVendorFolderCorrupted(
                 baseConfig.magentoDir
             )
-        } catch (e) {
+        } catch {
             // ignore error just in case
         }
 

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

@@ -1,5 +1,8 @@
 const { updateTableValues, databaseQuery } = require('../../../util/database')
 const KnownError = require('../../../errors/known-error')
+const {
+    resolveStoreDomainsForScopes
+} = require('../../../util/store-domains')
 
 /**
  * @param {number} scopeId
@@ -129,25 +132,10 @@ const setBaseUrl = () => ({
             )
         }
 
-        const storeDomainsWithMapping = Object.entries(storeDomains).reduce(
-            (acc, [key, val]) => {
-                const entity = entities.find(
-                    /** @param {{ code: string }} entity */
-                    (entity) => entity.code === key
-                )
-                if (entity) {
-                    return {
-                        ...acc,
-                        [entity.code]: {
-                            scopeId: entity[idField],
-                            domain: val
-                        }
-                    }
-                }
-
-                return acc
-            },
-            {}
+        const storeDomainsWithMapping = resolveStoreDomainsForScopes(
+            storeDomains,
+            entities,
+            idField
         )
 
         // Check for missing store codes when runType is 'store'

package/lib/tasks/magento/setup-magento/waiting-for-varnish.js

@@ -80,7 +80,7 @@ const waitingForVarnish = () => ({
                 } else {
                     break
                 }
-            } catch (e) {
+            } catch {
                 tries++
                 await sleep(200)
             }
@@ -155,7 +155,7 @@ Do you want to try resolving this issue by replacing ${logger.style.file(
                                 connectionFixed = true
                                 break
                             }
-                        } catch (e) {
+                        } catch {
                             await sleep(200)
                         }
                     }

package/lib/tasks/requirements/docker/running-status.js

@@ -94,7 +94,7 @@ const checkDockerStatusMacOS = () => ({
                             } else {
                                 ready = true
                             }
-                        } catch (e) {
+                        } catch {
                             //
                         }
                     }

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

@@ -79,7 +79,7 @@ const checkSearchEngineVersion = () => ({
                                             : 'OpenSearch'
                                     } version ${searchEngineVersion} in container`
                                 }
-                            } catch (e) {
+                            } catch {
                                 subTask.skip()
                             }
                         }

package/lib/tasks/status/index.js

@@ -28,7 +28,7 @@ const isJSON = (str) => {
         if (typeof result === 'object') {
             return true
         }
-    } catch (e) {
+    } catch {
         //
     }
 

package/lib/tasks/theme/build-theme.js

@@ -30,7 +30,7 @@ const buildTheme = ({ themePath }) => ({
                               task.output = t
                           }
                 })
-            } catch (e) {
+            } catch {
                 throw new UnknownError(`We were unable to install theme dependencies in ${themePath} using ${logger.style.code(
                     commandToInstallDependencies
                 )} command!

package/lib/util/analytics.js

@@ -168,7 +168,7 @@ class Analytics {
 
         try {
             this.setClientIdentifier(generateUUID())
-        } catch (e) {
+        } catch {
             this.setClientIdentifier(`${Date.now()}`)
         }
     }
@@ -233,7 +233,7 @@ class Analytics {
             analyticsParameters.session = {
                 ipOverride: await getExternalIpAddress()
             }
-        } catch (e) {
+        } catch {
             // Do nothing
         }
 

package/lib/util/exec-async-command.js

@@ -67,7 +67,7 @@ const execAsyncSpawn = (
                 .split('\n')
                 .map((str) => str.trim())
                 .forEach((str) => {
-                    callback && callback(str)
+                    callback?.(str)
                 })
             if (logOutput) {
                 newData

package/lib/util/ip.js

@@ -39,7 +39,7 @@ const getExternalIpAddress = async () => {
                 ip = response.data
                 break
             }
-        } catch (e) {
+        } catch {
             //
         }
     }

package/lib/util/is-wsl.js

@@ -22,7 +22,7 @@ const getIsWsl = async () => {
         const procVersion = await fs.promises.readFile('/proc/version', 'utf8')
 
         return procVersion.toLowerCase().includes('microsoft')
-    } catch (e) {
+    } catch {
         return false
     }
 }

package/lib/util/path-exists-sync.js

@@ -7,7 +7,7 @@ const fs = require('fs')
 const pathExistsSync = (path) => {
     try {
         fs.accessSync(path, fs.constants.F_OK)
-    } catch (e) {
+    } catch {
         return false
     }
 

package/lib/util/path-exists.js

@@ -8,7 +8,7 @@ const fs = require('fs')
 const pathExists = async (path) => {
     try {
         await fs.promises.access(path, fs.constants.F_OK)
-    } catch (e) {
+    } catch {
         return false
     }
 

package/lib/util/store-domains.js

@@ -0,0 +1,71 @@
+/**
+ * Enable nginx host → store mapping only when multiple stores use distinct domains.
+ * Duplicate hostnames produce invalid nginx map directives.
+ *
+ * @param {Record<string, string> | undefined} storeDomains
+ * @returns {boolean}
+ */
+const shouldUseStoreDomainMapping = (storeDomains) => {
+    if (!storeDomains) {
+        return false
+    }
+
+    const entries = Object.entries(storeDomains)
+
+    if (entries.length <= 1) {
+        return false
+    }
+
+    const domains = entries.map(([, domain]) => domain)
+
+    return new Set(domains).size === domains.length
+}
+
+/**
+ * Map store/website entities to domains from storeDomains, falling back to admin
+ * for scopes not explicitly configured (e.g. website "base" on single-domain setups).
+ *
+ * @param {Record<string, string>} storeDomains
+ * @param {{ code: string }[]} entities
+ * @param {'website_id' | 'store_id'} idField
+ * @returns {Record<string, { scopeId: number, domain: string }>}
+ */
+const resolveStoreDomainsForScopes = (storeDomains, entities, idField) => {
+    const defaultDomain = storeDomains.admin
+
+    /** @type {Record<string, { scopeId: number, domain: string }>} */
+    const mapped = Object.entries(storeDomains).reduce(
+        (acc, [key, val]) => {
+            const entity = entities.find((entity) => entity.code === key)
+
+            if (entity) {
+                return {
+                    ...acc,
+                    [entity.code]: {
+                        scopeId: entity[idField],
+                        domain: val
+                    }
+                }
+            }
+
+            return acc
+        },
+        {}
+    )
+
+    for (const entity of entities) {
+        if (!mapped[entity.code]) {
+            mapped[entity.code] = {
+                scopeId: entity[idField],
+                domain: defaultDomain
+            }
+        }
+    }
+
+    return mapped
+}
+
+module.exports = {
+    shouldUseStoreDomainMapping,
+    resolveStoreDomainsForScopes
+}

package/lib/util/store-domains.test.js

@@ -0,0 +1,52 @@
+const assert = require('assert')
+const {
+    shouldUseStoreDomainMapping,
+    resolveStoreDomainsForScopes
+} = require('./store-domains')
+
+assert.strictEqual(shouldUseStoreDomainMapping(undefined), false)
+assert.strictEqual(shouldUseStoreDomainMapping({ admin: 'localhost' }), false)
+assert.strictEqual(
+    shouldUseStoreDomainMapping({
+        admin: 'shop.local',
+        base: 'shop.local'
+    }),
+    false
+)
+assert.strictEqual(
+    shouldUseStoreDomainMapping({
+        admin: 'admin.local',
+        base: 'shop.local'
+    }),
+    true
+)
+
+const websites = [
+    { website_id: 0, code: 'admin' },
+    { website_id: 1, code: 'base' }
+]
+
+const resolved = resolveStoreDomainsForScopes(
+    { admin: 'jollyes.local' },
+    websites,
+    'website_id'
+)
+
+assert.deepStrictEqual(resolved, {
+    admin: { scopeId: 0, domain: 'jollyes.local' },
+    base: { scopeId: 1, domain: 'jollyes.local' }
+})
+
+assert.deepStrictEqual(
+    resolveStoreDomainsForScopes(
+        { admin: 'jollyes.local', base: 'other.local' },
+        websites,
+        'website_id'
+    ),
+    {
+        admin: { scopeId: 0, domain: 'jollyes.local' },
+        base: { scopeId: 1, domain: 'other.local' }
+    }
+)
+
+console.log('store-domains.test.js: ok')

package/lib/util/systemctl.js

@@ -66,7 +66,7 @@ const systemctlControl = (serviceName, defaultOptions = {}) => ({
                 ...options
             })
             return result.includes('enabled')
-        } catch (e) {
+        } catch {
             return false
         }
     },
@@ -81,7 +81,7 @@ const systemctlControl = (serviceName, defaultOptions = {}) => ({
             })
 
             return result.includes('active (running)')
-        } catch (e) {
+        } catch {
             return false
         }
     },
@@ -101,7 +101,7 @@ const systemctlControl = (serviceName, defaultOptions = {}) => ({
             const result = await execAsyncSpawn(command)
 
             return result === '1'
-        } catch (e) {
+        } catch {
             return false
         }
     }

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.4.12",
+    "version": "2.4.13",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,9 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "6989fd1f8233b1586050ea39a89c1db29334f6cb"
+    "scripts": {
+        "lint": "oxlint",
+        "test:store-domains": "node lib/util/store-domains.test.js"
+    },
+    "gitHead": "a6d5ac78bf24f1ebd5b725248bb775e3e7c3d3ef"
 }

package/.eslintrc

@@ -1,10 +0,0 @@
-{
-    "globals": {
-        "verbose":true,
-        "NodeJS": true,
-        "BufferEncoding": true
-    },
-    "env": {
-        "node": true
-    }
-}