@scandipwa/magento-scripts 1.13.4 → 1.13.5-alpha.0

package/lib/config/dependencies-for-platforms.js

@@ -15,7 +15,8 @@ const dependenciesForPlatforms = {
             'libxml2',
             'openssl@1.1'
         ],
-        installCommand: (deps) => `brew install ${deps}`
+        installCommand: (deps) => `brew install ${deps}`,
+        packageManager: 'brew'
     },
     'Arch Linux': {
         dependencies: [
@@ -35,7 +36,8 @@ const dependenciesForPlatforms = {
             'perl',
             'libsodium'
         ],
-        installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`
+        installCommand: (deps) => `sudo pacman -S ${deps} --noconfirm`,
+        packageManager: 'pacman'
     },
     Fedora: {
         dependencies: [
@@ -51,7 +53,8 @@ const dependenciesForPlatforms = {
             'libtool-ltdl-devel',
             'oniguruma-devel'
         ],
-        installCommand: (deps) => `sudo yum install ${deps} -y`
+        installCommand: (deps) => `sudo yum install ${deps} -y`,
+        packageManager: 'yum'
     },
     CentOS: {
         dependencies: [
@@ -67,7 +70,8 @@ const dependenciesForPlatforms = {
             'libtool-ltdl-devel',
             'oniguruma-devel'
         ],
-        installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`
+        installCommand: (deps) => `sudo yum install --enablerepo=PowerTools ${deps} -y`,
+        packageManager: 'yum'
     },
     Ubuntu: {
         dependencies: [
@@ -95,7 +99,8 @@ const dependenciesForPlatforms = {
             'autoconf',
             'cmake'
         ],
-        installCommand: (deps) => `sudo apt-get install ${deps} -y`
+        installCommand: (deps) => `sudo apt install ${deps} -y`,
+        packageManager: 'apt'
     }
 };
 

package/lib/tasks/link.js

@@ -6,6 +6,7 @@ const linkTheme = require('./theme/link-theme');
 const { startServices } = require('./docker');
 const { startPhpFpm } = require('./php-fpm');
 const checkConfigurationFile = require('../config/check-configuration-file');
+const { connectToMySQL } = require('./mysql');
 
 /**
  * @type {(theme: string) => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -18,6 +19,7 @@ const linkTask = (themePath) => ({
         getCachedPorts(),
         startServices(),
         startPhpFpm(),
+        connectToMySQL(),
         retrieveThemeData(themePath),
         linkTheme()
     ])

package/lib/tasks/magento/setup-magento/disable-page-builder.js

@@ -0,0 +1,11 @@
+const magentoTask = require('../../../util/magento-task');
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
+ */
+const disablePageBuilder = () => ({
+    title: 'Disabling page builder in Magento',
+    task: (ctx, task) => task.newListr(magentoTask('config:set cms/pagebuilder/enabled 0'))
+});
+
+module.exports = disablePageBuilder;

package/lib/tasks/php/compile.js

@@ -1,4 +1,4 @@
-const osPlatform = require('../../util/os-platform');
+const systeminformation = require('systeminformation');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const { execAsyncSpawn } = require('../../util/exec-async-command');
 const compileOptions = require('./compile-options');
@@ -11,8 +11,8 @@ const compile = () => ({
     task: async ({ config: { php } }, task) => {
         const platformCompileOptions = compileOptions[process.platform];
         if (process.platform === 'linux') {
-            const { dist } = await osPlatform();
-            if (['Fedora', 'Manjaro'].some((distro) => dist.includes(distro))) {
+            const { distro } = await systeminformation.osInfo();
+            if (['Fedora', 'Manjaro'].some((d) => distro.includes(d))) {
                 platformCompileOptions.extraOptions.push('--with-libdir=lib64');
             }
         }

package/lib/tasks/requirements/dependency/index.js

@@ -1,19 +1,18 @@
-const osPlatform = require('../../../util/os-platform');
 const archDependenciesCheck = require('./arch');
 const fedoraDependenciesCheck = require('./fedora');
 const centosDependenciesCheck = require('./centos');
 const ubuntuDependenciesCheck = require('./ubuntu');
 const macDependenciesCheck = require('./mac');
+const osPlatform = require('../../../util/os-platform');
 
 const dependencyCheck = async () => {
     if (process.platform === 'darwin') {
         return macDependenciesCheck();
     }
 
-    const { dist } = await osPlatform();
-    switch (dist) {
-    case 'Arch Linux':
-    case 'Manjaro Linux': {
+    const distro = await osPlatform();
+    switch (distro) {
+    case 'Arch Linux': {
         return archDependenciesCheck();
     }
     case 'Fedora': {
@@ -22,7 +21,6 @@ const dependencyCheck = async () => {
     case 'CentOS': {
         return centosDependenciesCheck();
     }
-    case 'Linux Mint':
     case 'Ubuntu': {
         return ubuntuDependenciesCheck();
     }

package/lib/tasks/requirements/docker/install.js

@@ -16,10 +16,9 @@ const postInstallSteps = [
 const installDocker = () => ({
     title: 'Installing Docker',
     task: async (ctx, task) => {
-        const { dist } = await osPlatform();
-        switch (dist) {
-        case 'Arch Linux':
-        case 'Manjaro Linux': {
+        const distro = await osPlatform();
+        switch (distro) {
+        case 'Arch Linux': {
             return task.newListr([
                 installDependenciesTask({
                     platform: 'Arch Linux',
@@ -39,7 +38,6 @@ const installDocker = () => ({
                 executeSudoCommand('sudo systemctl enable docker')
             ]);
         }
-        case 'Linux Mint':
         case 'Ubuntu': {
             return task.newListr([
                 execCommandTask('curl -fsSL https://get.docker.com -o get-docker.sh'),
@@ -51,7 +49,7 @@ const installDocker = () => ({
         }
         default: {
             throw new Error(`Docker is not installed!
-Your distro ${dist} is not supported by automatic installation.`);
+Your distro ${distro} is not supported by automatic installation.`);
         }
         }
     }

package/lib/tasks/requirements/docker/version.js

@@ -1,23 +1,16 @@
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
-const safeRegexExtract = require('../../../util/safe-regex-extract');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const getDockerVersion = () => ({
     task: async (ctx) => {
-        const { result, code } = await execAsyncSpawn('docker -v', {
+        const { result, code } = await execAsyncSpawn('docker version --format {{.Server.Version}}', {
             withCode: true
         });
 
         if (code === 0) {
-            const dockerVersion = safeRegexExtract({
-                string: result,
-                regex: /docker version ([\d.]+)/i,
-                onNoMatch: () => {
-                    throw new Error(`No docker version found in docker version output!\n\n${result}`);
-                }
-            });
+            const dockerVersion = result.split('').filter((c) => /[\d.]/i.test(c)).join('') || result;
 
             ctx.dockerVersion = dockerVersion;
         }

package/lib/tasks/requirements/phpbrew/install.js

@@ -1,10 +1,10 @@
 const os = require('os');
 const path = require('path');
 const fs = require('fs');
-const osPlatform = require('../../../util/os-platform');
 const { execAsyncSpawn } = require('../../../util/exec-async-command');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const installDependenciesTask = require('../../../util/install-dependencies-task');
+const osPlatform = require('../../../util/os-platform');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
@@ -20,10 +20,9 @@ const installPHPBrewDependencies = () => ({
                 })
             );
         }
-        const { dist } = await osPlatform();
-        switch (dist) {
-        case 'Arch Linux':
-        case 'Manjaro Linux': {
+        const distro = await osPlatform();
+        switch (distro) {
+        case 'Arch Linux': {
             return task.newListr(
                 installDependenciesTask({
                     platform: 'Arch Linux',
@@ -47,7 +46,6 @@ const installPHPBrewDependencies = () => ({
                 })
             );
         }
-        case 'Linux Mint':
         case 'Ubuntu': {
             return task.newListr(
                 installDependenciesTask({

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

@@ -1,10 +1,12 @@
 const symlinkTheme = require('./symlink-theme');
 const installTheme = require('./install-theme');
 const disablePageCache = require('../magento/setup-magento/disable-page-cache');
+const disablePageBuilder = require('../magento/setup-magento/disable-page-builder');
 const buildTheme = require('./build-theme');
 const upgradeMagento = require('../magento/setup-magento/upgrade-magento');
 const setupPersistedQuery = require('./setup-persisted-query');
 const updateEnvPHP = require('../php/update-env-php');
+const semver = require('semver');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -12,7 +14,28 @@ const updateEnvPHP = require('../php/update-env-php');
 const linkTheme = () => ({
     title: 'Linking theme',
     task: async (ctx, task) => {
-        const { absoluteThemePath, themePath, composerData } = ctx;
+        const {
+            config: { overridenConfiguration },
+            absoluteThemePath,
+            themePath,
+            composerData,
+            mysqlConnection
+        } = ctx;
+        const {
+            magento: { edition: magentoEdition },
+            magentoVersion
+        } = overridenConfiguration;
+
+        const isEnterprise = magentoEdition === 'enterprise';
+        const isPageBuilderInstalled = isEnterprise && semver.satisfies(semver.coerce(magentoVersion), '^2.4');
+        const [queryResult] = await mysqlConnection.query(`
+                SELECT value AS isPagebuilderEnabled
+                FROM core_config_data
+                WHERE path = 'cms/pagebuilder/enabled'
+            `);
+
+        const [{ isPagebuilderEnabled = 1 }] = queryResult.length ? queryResult : [{}];
+
         /**
          * @type {import('../../../typings/theme').Theme}
          */
@@ -31,6 +54,7 @@ const linkTheme = () => ({
             setupPersistedQuery(),
             upgradeMagento(),
             disablePageCache(),
+            ...(isPageBuilderInstalled && Number(isPagebuilderEnabled) ? [disablePageBuilder()] : []),
             buildTheme(theme)
         ]);
     },

package/lib/util/os-platform.js

@@ -1,9 +1,51 @@
-const getos = require('getos');
+const fs = require('fs');
+const systeminformation = require('systeminformation');
+const pathExists = require('./path-exists');
+const dependenciesForPlatforms = require('../config/dependencies-for-platforms');
 
+const packageManagers = Object.entries(dependenciesForPlatforms).map((d) => ({
+    platform: d[0],
+    packageManager: d[1].packageManager
+}));
 /**
  *
- * @returns {Promise<import('getos').OS>}
+ * @returns {Promise<keyof typeof dependenciesForPlatforms>}
  */
-const osPlatform = () => new Promise((resolve, reject) => getos((err, os) => (err ? reject(err) : resolve(os))));
+const osPlatform = async () => {
+    const binPaths = process.env.PATH.split(':');
+
+    const platforms = await Promise.all(binPaths.map(async (binPath) => {
+        if (!await pathExists(binPath)) {
+            return null;
+        }
+        const bins = await fs.promises.readdir(binPath);
+
+        for (const bin of bins) {
+            const possiblePlatforms = packageManagers.filter((p) => p.packageManager === bin);
+
+            if (possiblePlatforms.length > 0) {
+                if (possiblePlatforms.length > 1) {
+                    const { distro } = await systeminformation.osInfo();
+
+                    const foundDistro = possiblePlatforms.find((p) => p.platform.toLowerCase().includes(distro.toLowerCase()));
+
+                    if (foundDistro) {
+                        return foundDistro.platform;
+                    }
+
+                    return possiblePlatforms[0].platform;
+                }
+
+                return possiblePlatforms[0].platform;
+            }
+        }
+
+        return null;
+    }));
+
+    const filteredPlatforms = platforms.filter(Boolean);
+
+    return filteredPlatforms.shift();
+};
 
 module.exports = osPlatform;

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": "1.13.4",
+    "version": "1.13.5-alpha.0",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -23,24 +23,23 @@
     ],
     "dependencies": {
         "@scandipwa/scandipwa-dev-utils": "0.1.12",
-        "conf": "10.0.3",
+        "conf": "10.1.1",
         "enquirer": "2.3.6",
         "eta": "1.12.3",
-        "getos": "3.2.1",
         "hjson": "^3.2.2",
         "is-installed-globally": "0.4.0",
-        "joi": "17.4.2",
-        "listr2": "3.13.0",
+        "joi": "17.6.0",
+        "listr2": "4.0.5",
         "macos-version": "5.2.1",
         "merge-files": "0.1.2",
         "mysql2": "2.3.2",
         "node-ssh": "12.0.0",
         "semver": "7.3.5",
-        "systeminformation": "5.9.8",
-        "yargs": "17.2.1"
+        "systeminformation": "5.11.7",
+        "yargs": "17.3.1"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "fa0d2c77e7d3a8c639cbebeef05b1322b20895f4"
+    "gitHead": "d441da5928b8f8cf0fb6034ffe09ce186a0370d6"
 }