@scandipwa/magento-scripts 2.4.4 → 2.4.5

package/lib/config/scandipwa-versions.js

@@ -12,7 +12,7 @@ const scandipwaMagentoVersionMapping = {
     '2.4.3': '5.0.4 - 5.2.7',
     '2.4.4': '5.3.0 - 5.3.6',
     '2.4.6': '6.2.0 - 6.3.0',
-    '2.4.7': '6.4.0+'
+    '2.4.7': '6.4.0'
 }
 
 module.exports = scandipwaMagentoVersionMapping

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

@@ -3,11 +3,15 @@ const opensearch13 = require('./opensearch-1.3')
 const opensearch25 = require('./opensearch-2.5')
 const opensearch212 = require('./opensearch-2.12')
 const opensearch219 = require('./opensearch-2.19')
+const opensearch300 = require('./opensearch-3.0')
+const opensearch310 = require('./opensearch-3.1')
 
 module.exports = {
     opensearch12,
     opensearch13,
     opensearch25,
     opensearch212,
-    opensearch219
+    opensearch219,
+    opensearch300,
+    opensearch310
 }

package/lib/config/services/opensearch/versions/opensearch-3.0.js

@@ -0,0 +1,14 @@
+const defaultEnv = require('../default-os-env')
+
+/**
+ * @returns {import('../../../../../typings/index').OpenSearchSearchConfiguration}
+ */
+const opensearch300 = () => ({
+    image: 'opensearchproject/opensearch:3.0.0',
+    env: {
+        ...defaultEnv,
+        'indices.id_field_data.enabled': true
+    }
+})
+
+module.exports = opensearch300

package/lib/config/services/opensearch/versions/opensearch-3.1.js

@@ -0,0 +1,14 @@
+const defaultEnv = require('../default-os-env')
+
+/**
+ * @returns {import('../../../../../typings/index').OpenSearchSearchConfiguration}
+ */
+const opensearch310 = () => ({
+    image: 'opensearchproject/opensearch:3.1.0',
+    env: {
+        ...defaultEnv,
+        'indices.id_field_data.enabled': true
+    }
+})
+
+module.exports = opensearch310

package/lib/config/templates/git-postcheckout-hook.template

@@ -0,0 +1,66 @@
+OLD_REF="$1"
+NEW_REF="$2"
+IS_BRANCH_CHECKOUT="$3"
+
+# Only act on branch checkouts (not path checkouts)
+if [ "$IS_BRANCH_CHECKOUT" != "1" ]; then
+  exit 0
+fi
+
+# If git is not available, do nothing
+if ! command -v git >/dev/null 2>&1; then
+  exit 0
+fi
+
+# If old ref is empty (unborn) or same as new, skip
+if [ -z "$OLD_REF" ] || [ "$OLD_REF" = "$NEW_REF" ] || echo "$OLD_REF" | grep -q '^0\{40\}$'; then
+  exit 0
+fi
+
+# Determine if any composer files changed anywhere in the repo between refs
+ALL_CHANGED=$(git diff --name-only "$OLD_REF" "$NEW_REF" 2>/dev/null || true)
+CHANGED_FILES=$(printf "%s\n" "$ALL_CHANGED" | grep -E '(^|/)(composer\.json|composer\.lock)$' || true)
+
+if [ -z "$CHANGED_FILES" ]; then
+  exit 0
+fi
+
+# Extract the first directory name from changed composer files
+CHANGED_DIR=$(basename "$(git rev-parse --show-toplevel)")
+
+# Get branch names from refs
+OLD_BRANCH=$(git name-rev --name-only "$OLD_REF" 2>/dev/null | sed 's/^remotes\///' || echo "$OLD_REF")
+NEW_BRANCH=$(git name-rev --name-only "$NEW_REF" 2>/dev/null | sed 's/^remotes\///' || echo "$NEW_REF")
+
+MESSAGE_TITLE="Composer dependencies changed"
+MESSAGE_BODY="Changes detected in: $CHANGED_DIR\nBranch: $OLD_BRANCH → $NEW_BRANCH\n\nPlease run composer install or npm run start"
+
+# Cross-platform desktop notification with multiple fallbacks
+send_notification() {
+  local title="$1"
+  local body="$2"
+
+  # Try Linux notify-send first
+  if command -v notify-send >/dev/null 2>&1; then
+    notify-send -u normal -t 8000 "$title" "$body"
+    return 0
+  fi
+
+  # Try macOS terminal-notifier
+  if command -v terminal-notifier >/dev/null 2>&1; then
+    terminal-notifier -title "$title" -message "$body" -timeout 8
+    return 0
+  fi
+
+  # Try macOS osascript (AppleScript) as fallback
+  if command -v osascript >/dev/null 2>&1; then
+    osascript -e "display notification \"$body\" with title \"$title\""
+    return 0
+  fi
+
+  # Final fallback to stdout
+  echo "$title"
+  echo "$body"
+}
+
+send_notification "$MESSAGE_TITLE" "$MESSAGE_BODY"

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

@@ -0,0 +1,40 @@
+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 { nginx126 } = 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.5-p14',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb106(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

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

@@ -0,0 +1,40 @@
+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 { nginx126 } = require('../services/nginx/versions')
+const { composer22 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = 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-p12',
+    configuration: {
+        php: php81({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.1-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch717(),
+        composer: composer22(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219()
+    }
+})

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

@@ -0,0 +1,41 @@
+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 { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { redis72 } = 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-p7',
+    configuration: {
+        php: php82({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.2-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: redis72(),
+        mysql: mysql80(),
+        mariadb: mariadb1011(),
+        elasticsearch: elasticsearch817(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch219(),
+        searchengine: 'opensearch'
+    }
+})

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

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

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

@@ -0,0 +1,43 @@
+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 { varnish76 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = 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-p2',
+    isDefault: true,
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium, ftp },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql80(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch817(),
+        composer: composer28(),
+        varnish: varnish76({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

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

@@ -0,0 +1,41 @@
+const sodium = require('../services/php/extensions/sodium')
+const {
+    magento24PHPExtensionList
+} = require('../magento/required-php-extensions')
+const { php83 } = require('../services/php/versions')
+const { sslTerminator } = require('../services/ssl-terminator')
+const { varnish77 } = require('../services/varnish')
+const { repo } = require('../services/php/base-repo')
+const { nginx126 } = require('../services/nginx/versions')
+const { composer28 } = require('../services/composer/versions')
+const { maildev } = require('../services/maildev')
+const { valkey80 } = require('../services/redis')
+const { mariadb114 } = require('../services/mariadb/versions')
+const { elasticsearch87 } = 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-alpha2',
+    configuration: {
+        php: php83({
+            templateDir,
+            extensions: { ...magento24PHPExtensionList, sodium },
+            baseImage: `${repo}:php-8.3-magento-2.4`
+        }),
+        nginx: nginx126({ templateDir }),
+        redis: valkey80(),
+        mysql: mysql84(),
+        mariadb: mariadb114(),
+        elasticsearch: elasticsearch87(),
+        composer: composer28(),
+        varnish: varnish77({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir }),
+        maildev: maildev(),
+        opensearch: opensearch300(),
+        searchengine: 'opensearch'
+    }
+})

package/lib/tasks/execute.js

@@ -5,6 +5,7 @@ const getMagentoVersionConfig = require('../config/get-magento-version-config')
 const checkConfigurationFile = require('../config/check-configuration-file')
 const getProjectConfiguration = require('../config/get-project-configuration')
 const { getCachedPorts } = require('../config/get-port-config')
+const checkPHPVersion = require('./requirements/php-version')
 const {
     executeInContainer,
     runInContainer
@@ -28,6 +29,7 @@ const executeTask = async (argv) => {
             getProjectConfiguration(),
             getCachedPorts(),
             dockerNetwork.tasks.createNetwork(),
+            checkPHPVersion(),
             prepareFileSystem()
         ],
         {

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

@@ -0,0 +1,58 @@
+const path = require('path')
+const fs = require('fs')
+const UnknownError = require('../../errors/unknown-error')
+const setConfigFile = require('../../util/set-config')
+const { execAsyncSpawn } = require('../../util/exec-async-command')
+
+/**
+ * @returns {import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createGitHookNotification = () => ({
+    title: 'Setting git hook notification',
+    task: async (ctx) => {
+        const gitHookTemplatePath = path.join(
+            ctx.config.baseConfig.templateDir,
+            'git-postcheckout-hook.template'
+        )
+
+        const gitRoot = await execAsyncSpawn('git rev-parse --show-toplevel')
+
+        let currentGitHookPath = await execAsyncSpawn(
+            `git config --get core.hooksPath`
+        )
+
+        if (!currentGitHookPath.trim()) {
+            await execAsyncSpawn(`git config core.hooksPath .git/hooks`)
+
+            currentGitHookPath = '.git/hooks'
+        }
+
+        const gitHookPath = path.join(
+            gitRoot,
+            currentGitHookPath,
+            'post-checkout'
+        )
+
+        try {
+            await setConfigFile({
+                configPathname: gitHookPath,
+                template: gitHookTemplatePath,
+                overwrite: false
+            })
+        } catch (e) {
+            throw new UnknownError(
+                `Unexpected error accrued during git hook notification creation\n\n${e}`
+            )
+        }
+
+        // check if gitHookPath is executable
+        const isExecutable = await fs.promises.stat(gitHookPath)
+        if (isExecutable.mode & 0o111) {
+            return
+        }
+
+        await execAsyncSpawn(`chmod +x ${gitHookPath}`)
+    }
+})
+
+module.exports = createGitHookNotification

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

@@ -10,7 +10,7 @@ const createNginxConfig = () => ({
     task: async (ctx) => {
         const {
             ports,
-            config: { overridenConfiguration, baseConfig, docker },
+            config: { overridenConfiguration, baseConfig },
             isDockerDesktop
         } = ctx
 
@@ -28,17 +28,9 @@ const createNginxConfig = () => ({
         }
 
         if (isDockerDesktop) {
-            // const containers = docker.getContainers(ports)
-
-            // networkSettings.phpNetwork = containers.php.name
-            // networkSettings.phpWithXdebugNetwork = containers.phpWithXdebug.name
-
             networkSettings.phpNetwork = 'host.docker.internal'
             networkSettings.phpWithXdebugNetwork = 'host.docker.internal'
 
-            // networkSettings.fpmPort = 9000
-            // networkSettings.fpmXdebugPort = 9000
-
             networkSettings.hostPort = 80
         }
 

package/lib/tasks/file-system/index.js

@@ -1,3 +1,4 @@
+const createGitHookNotification = require('./create-git-hook-notification')
 const createMariaDBConfig = require('./create-mariadb-config')
 const createNginxConfig = require('./create-nginx-config')
 const createPhpConfig = require('./create-php-config')
@@ -26,7 +27,8 @@ const prepareFileSystem = () => ({
                 createPhpStormConfig(),
                 createVSCodeConfig(),
                 createVarnishConfig(),
-                createMariaDBConfig()
+                createMariaDBConfig(),
+                createGitHookNotification()
             ],
             {
                 concurrent: true

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

@@ -134,12 +134,10 @@ Change magento edition in config file or manually reinstall correct magento edit
 
 /**
  * @param {import('../../../typings/context').ListrContext} ctx
- * @param {import('listr2').ListrTaskWrapper<import('../../../typings/context').ListrContext, any>} task
- * @param {{ magentoProject: string, magentoPackageVersion: string }} param2
+ * @param {{ magentoProject: string, magentoPackageVersion: string }} param1
  */
 const createMagentoProject = async (
     ctx,
-    task,
     { magentoProject, magentoPackageVersion }
 ) => {
     const tempDir = `/tmp/magento-tmpdir-${Date.now()}`
@@ -178,26 +176,69 @@ const getIsVendorFolderCorrupted = async (magentoDir) => {
         return true
     }
     /**
-     * @type {{ packages: { name: string }[] } | null}
+     * @type {{ packages: { name: string }[], ['packages-dev']: { name: string }[] } | null}
      */
     const composerLockData = await getJsonFileData(composerLockFile)
     if (!composerLockData || !composerLockData.packages) {
         return true
     }
-    const { packages } = composerLockData
-    const packagesNames = packages.map((pkg) => pkg.name)
+    const { packages, 'packages-dev': packagesDev } = composerLockData
+    const packagesNames = packages
+        .filter((pkg) => pkg.type !== 'metapackage')
+        .map((pkg) => pkg.name)
+    const packagesDevNames = packagesDev
+        .filter((pkg) => pkg.type !== 'metapackage')
+        .map((pkg) => pkg.name)
 
-    const hasCorruptPackages = await Promise.all(
-        packagesNames.map(async (pkg) => {
-            const vendorPackage = path.join(vendorDir, pkg)
-            const composerJson = path.join(vendorPackage, 'composer.json')
-            if (!(await pathExists(composerJson))) {
-                return true
-            }
-        })
-    )
+    const missingPackages = (
+        await Promise.all(
+            packagesNames.map(async (pkg) => {
+                const vendorPackage = path.join(vendorDir, pkg)
+                return [pkg, await pathExists(vendorPackage)]
+            })
+        )
+    ).filter(([_, result]) => result === false)
+
+    if (missingPackages.length > 0) {
+        return true
+    }
 
-    return hasCorruptPackages.every((result) => result === true)
+    const vendorPackages = await fs.promises.readdir(vendorDir, {
+        withFileTypes: true
+    })
+
+    const extraPackages = (
+        await Promise.all(
+            vendorPackages
+                .filter((pkg) => pkg.isDirectory())
+                .flatMap(async (pkg) => {
+                    const vendorPackage = path.join(vendorDir, pkg.name)
+                    const vendorPackages = await fs.promises.readdir(
+                        vendorPackage,
+                        {
+                            withFileTypes: true
+                        }
+                    )
+                    return vendorPackages
+                        .filter((subPkg) => subPkg.isDirectory())
+                        .map((subPkg) => [
+                            `${pkg.name}/${subPkg.name}`,
+                            packagesNames.includes(
+                                `${pkg.name}/${subPkg.name}`
+                            ) ||
+                                packagesDevNames.includes(
+                                    `${pkg.name}/${subPkg.name}`
+                                )
+                        ])
+                })
+        )
+    ).filter((pkg) => pkg.some(([_, result]) => result === false))
+
+    if (extraPackages.length > 0) {
+        return true
+    }
+
+    return false
 }
 
 /**
@@ -237,9 +278,14 @@ const installMagentoProject = () => ({
             'composer.lock': true
         })
 
-        const isVendorFolderCorrupted = await getIsVendorFolderCorrupted(
-            baseConfig.magentoDir
-        )
+        let isVendorFolderCorrupted = false
+        try {
+            isVendorFolderCorrupted = await getIsVendorFolderCorrupted(
+                baseConfig.magentoDir
+            )
+        } catch (e) {
+            // ignore error just in case
+        }
 
         if (isFsMatching && !isVendorFolderCorrupted) {
             ctx.magentoFirstInstall = false
@@ -254,7 +300,7 @@ const installMagentoProject = () => ({
             if (
                 !(await pathExists(path.join(process.cwd(), 'composer.json')))
             ) {
-                await createMagentoProject(ctx, task, {
+                await createMagentoProject(ctx, {
                     magentoProject,
                     magentoPackageVersion
                 })

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.4",
+    "version": "2.4.5",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -59,5 +59,5 @@
         "@types/node": "^20.14.11",
         "@types/yargs": "^17.0.32"
     },
-    "gitHead": "402e8489c3ac99d30524da475da1931048a399b0"
+    "gitHead": "1251d345bd3105a6ce83dd6041c05dad345ba9b7"
 }