@scandipwa/magento-scripts 1.16.1 → 2.0.0-alpha.0

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

@@ -2,7 +2,7 @@ const os = require('os');
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
 const { spawn } = require('child_process');
 const { getArchSync } = require('./arch');
-const compileOptions = require('../tasks/php/compile-options');
+const UnknownError = require('../errors/unknown-error');
 
 const execAsyncSpawn = (command, {
     callback = () => {},
@@ -31,13 +31,7 @@ const execAsyncSpawn = (command, {
             'arch',
             // eslint-disable-next-line max-len
             ['-x86_64', 'bash', '-c', command],
-            {
-                ...spawnOptions,
-                env: {
-                    ...process.env,
-                    PATH: compileOptions.darwin.env.PATH
-                }
-            }
+            spawnOptions
         );
     } else {
         childProcess = spawn(
@@ -79,7 +73,7 @@ const execAsyncSpawn = (command, {
                 return;
             }
             if (code > 0) {
-                reject(result);
+                reject(new UnknownError(result));
             } else {
                 resolve(result);
             }

package/lib/util/macos-version.js

@@ -0,0 +1,20 @@
+const semver = require('semver');
+const macosVersion = require('macos-version');
+const { execAsyncSpawn } = require('./exec-async-command');
+
+const getMacOSVersion = async () => {
+    const { code, result } = await execAsyncSpawn('sw_vers -productVersion',
+        {
+            withCode: true
+        });
+
+    if (code !== 0) {
+        return macosVersion();
+    }
+
+    return semver.coerce(result).version;
+};
+
+module.exports = {
+    getMacOSVersion
+};

package/lib/util/magento-task.js

@@ -8,13 +8,12 @@ const runMagentoCommand = require('./run-magento');
  */
 const magentoTask = (command, options = {}) => ({
     title: `Running command 'magento ${command}'`,
-    task: async ({ magentoVersion, verbose }, task) => {
+    task: async (ctx, task) => {
         try {
-            await runMagentoCommand(command, {
-                callback: !verbose ? undefined : (t) => {
+            await runMagentoCommand(ctx, command, {
+                callback: !ctx.verbose ? undefined : (t) => {
                     task.output = t;
                 },
-                magentoVersion,
                 throwNonZeroCode: true
             });
         } catch (e) {

package/lib/util/nginx-logs-parser.js

@@ -0,0 +1,122 @@
+/* eslint-disable no-bitwise */
+/* eslint-disable max-len */
+class NginxParser {
+    constructor(format) {
+        this.directives = {};
+
+        const prefix = format.match(/^[^$]*/);
+        if (prefix) {
+            format = this.escape(prefix[0]) + format.slice(prefix[0].length);
+        }
+
+        this.parser = format;
+
+        const directive = /\$([a-z_]+)(.)?([^$]+)?/g;
+        let match;
+        let regex;
+        let boundary;
+        let i = 1;
+
+        // eslint-disable-next-line no-cond-assign
+        while ((match = directive.exec(format))) {
+            this.directives[match[1]] = i++;
+            if (match[2]) {
+                boundary = this.escape(match[2]);
+                regex = `([^${ boundary }]*?)${ boundary}`;
+                if (match[3]) {
+                    regex += this.escape(match[3]);
+                }
+            } else {
+                regex = '(.+)$';
+            }
+            this.parser = this.parser.replace(match[0], regex);
+        }
+
+        this.parser = new RegExp(this.parser);
+    }
+
+    /**
+     * Parse a log line.
+     *
+     * @param {String} line
+     * @returns {Record<'msec' | 'time_iso8601' | 'remote_addr' | 'query_string' | 'http_x_forwarded_for' | 'http_user_agent' | 'http_referer' | 'time_local' | 'request' | 'status' | 'request_time' | 'request_length' | 'pipe' | 'connection' | 'bytes_sent' | 'body_bytes_sent' | 'date' | 'timestamp' | 'ip' | 'ip_str', string>}
+     */
+    parseLine(line) {
+        const match = line.match(this.parser);
+        if (!match) {
+            return;
+        }
+
+        const row = {
+            msec: null,
+            time_iso8601: null,
+            remote_addr: null,
+            query_string: null,
+            http_x_forwarded_for: null,
+            http_user_agent: null,
+            http_referer: null,
+            time_local: null,
+            request: null,
+            status: null,
+            request_time: null,
+            request_length: null,
+            pipe: null,
+            connection: null,
+            bytes_sent: null,
+            body_bytes_sent: null,
+
+            date: null,
+            timestamp: null,
+            ip: null,
+            ip_str: null
+        };
+
+        // eslint-disable-next-line guard-for-in
+        for (const key in this.directives) {
+            row[key] = match[this.directives[key]];
+            if (row[key] === '-') {
+                row[key] = null;
+            }
+        }
+
+        // Parse the timestamp
+        if (row.time_iso8601) {
+            row.date = new Date(row.time_iso8601);
+        } else if (row.msec) {
+            row.date = new Date(Number(row.msec.replace('.', '')));
+        }
+        if (row.date) {
+            row.timestamp = row.date.getTime();
+        }
+
+        // Parse the user's IP
+        if (row.http_x_forwarded_for) {
+            row.ip_str = row.http_x_forwarded_for;
+        } else if (row.remote_addr) {
+            row.ip_str = row.remote_addr;
+        }
+        if (row.ip_str) {
+            const ip = row.ip_str.split('.', 4);
+            row.ip = Number(ip[0]) * (2 << 23)
+                + Number(ip[1]) * (2 << 15)
+                + Number(ip[2]) * (2 << 7)
+                + Number(ip[3]);
+        }
+
+        return row;
+    }
+
+    /**
+     * Escape regular expression tokens.
+     *
+     * @param {String} str
+     * @return {String}
+     */
+    escape(str) {
+        return str.replace(new RegExp('[.*+?|()\\[\\]{}]', 'g'), '\\$&');
+    }
+}
+
+module.exports = {
+    NginxParser
+};

package/lib/util/php-task.js

@@ -1,4 +1,4 @@
-const runPhpCode = require('./run-php');
+const { runPHPContainerCommand } = require('../tasks/php/php-container');
 
 /**
  * @param {String} command
@@ -7,14 +7,11 @@ const runPhpCode = require('./run-php');
  */
 const phpTask = (command, options = {}) => ({
     title: !options.noTitle ? `Running command 'php ${command}` : undefined,
-    task: (ctx, task) => runPhpCode(command, {
+    task: (ctx, task) => runPHPContainerCommand(ctx, command, {
         callback: (t) => {
             task.output = t;
         },
-        throwNonZeroCode: true,
-        magentoVersion: ctx.magentoVersion,
-        env: options.env,
-        useRosettaOnMac: ctx.arch === 'arm64' && ctx.platform === 'darwin'
+        throwNonZeroCode: true
     })
 });
 

package/lib/util/prefix.js

@@ -22,7 +22,7 @@ const getPrefix = (fName = folderName) => {
     }
 
     if (projectInGlobalConfig && projectInGlobalConfig.prefix) {
-        return `${fName}-${projectInGlobalConfig.prefix}`;
+        return `${fName}.${projectInGlobalConfig.prefix}`;
     }
 
     return fName;

package/lib/util/run-composer.js

@@ -1,28 +1,20 @@
-const { execAsyncSpawn } = require('./exec-async-command');
-const { getConfigFromMagentoVersion, defaultConfiguration } = require('../config');
 const UnknownError = require('../errors/unknown-error');
+const { runPHPContainerCommand } = require('../tasks/php/php-container');
 /**
  * Execute composer command
+ * @param {import('../../typings/context').ListrContext} ctx
  * @param {String} command composer command
  * @param {Object} options
  * @param {Boolean} options.throwNonZeroCode Throw if command return non 0 code.
  * @param {String} options.magentoVersion Magento version for config
  */
-const runComposerCommand = async (command, options = {}) => {
+const runComposerCommand = async (ctx, command, options = {}) => {
     const {
-        throwNonZeroCode = true,
-        magentoVersion = defaultConfiguration.name
+        throwNonZeroCode = true
     } = options;
-    const {
-        php,
-        composer,
-        baseConfig: { magentoDir }
-    } = await getConfigFromMagentoVersion(magentoVersion);
-    const { code, result } = await execAsyncSpawn(`${php.binPath} -c ${php.iniPath} ${composer.binPath} ${command}`, {
+    const { code, result } = await runPHPContainerCommand(ctx, `composer ${command}`, {
         ...options,
-        cwd: magentoDir,
-        withCode: true,
-        useRosetta2: true
+        withCode: true
     });
 
     if (throwNonZeroCode && code !== 0) {

package/lib/util/run-container-image.js

@@ -0,0 +1,17 @@
+const { execAsyncSpawn } = require('./exec-async-command');
+
+const runContainerImage = async (imageWithTag, command) => execAsyncSpawn(`docker run --rm ${imageWithTag} ${command}`);
+
+/**
+ * @param {string} imageWithTag
+ * @param {string} command
+ * @returns {import('listr2').ListrTask<import('../../typings/context').ListrContext>}
+ */
+const runContainerImageTask = (imageWithTag, command) => ({
+    task: () => runContainerImage(imageWithTag, command)
+});
+
+module.exports = {
+    runContainerImage,
+    runContainerImageTask
+};

package/lib/util/run-magento.js

@@ -1,8 +1,9 @@
-const { execAsyncSpawn } = require('./exec-async-command');
-const { getConfigFromMagentoVersion, defaultConfiguration, magento } = require('../config');
 const UnknownError = require('../errors/unknown-error');
+const { runPHPContainerCommand } = require('../tasks/php/php-container');
 /**
  * Execute magento command
+ *
+ * @param {import('../../typings/context').ListrContext} ctx
  * @param {String} command magento command
  * @param {Object} options
  * @param {Boolean} options.logOutput Log output to console using logger
@@ -10,20 +11,11 @@ const UnknownError = require('../errors/unknown-error');
  * @param {String} options.cwd
  * @param {() => {}} options.callback
  * @param {Boolean} options.throwNonZeroCode Throw if command return non 0 code.
- * @param {String} options.magentoVersion Magento version for config
  */
-const runMagentoCommand = async (command, options = {}) => {
-    const {
-        throwNonZeroCode = true,
-        magentoVersion = defaultConfiguration.name
-    } = options;
-    const {
-        php,
-        baseConfig: { magentoDir }
-    } = await getConfigFromMagentoVersion(magentoVersion);
-    const { code, result } = await execAsyncSpawn(`${php.binPath} -c ${php.iniPath} ${magento.binPath} ${command}`, {
+const runMagentoCommand = async (ctx, command, options = {}) => {
+    const { throwNonZeroCode = true } = options;
+    const { code, result } = await runPHPContainerCommand(ctx, `bin/magento ${command}`, {
         ...options,
-        cwd: magentoDir,
         withCode: true
     });
 

package/lib/util/run-php.js

@@ -1,34 +1,23 @@
-const { execAsyncSpawn } = require('./exec-async-command');
-const { getConfigFromMagentoVersion, defaultConfiguration } = require('../config');
 const UnknownError = require('../errors/unknown-error');
+const { runPHPContainerCommand } = require('../tasks/php/php-container');
 /**
  * Execute PHP code
- * @param {String} command magento command
+ * @param {import('../../typings/context').ListrContext} ctx
+ * @param {String} command php command
  * @param {Object} options
  * @param {Boolean} options.logOutput Log output to console using logger
  * @param {Boolean} options.withCode
  * @param {String} options.cwd
  * @param {() => {}} options.callback
  * @param {Boolean} options.throwNonZeroCode Throw if command return non 0 code.
- * @param {String} options.magentoVersion Magento version for config
  * @param {Record<string, string>} options.env Environment variables
  * @param {Boolean} options.useRosettaOnMac Use Rosetta 2 on MacOS
  */
-const runPhpCode = async (command, options = {}) => {
+const runPhpCode = async (ctx, command, options = {}) => {
     const {
-        throwNonZeroCode = true,
-        magentoVersion = defaultConfiguration.magentoVersion
+        throwNonZeroCode = true
     } = options;
-    const { php } = await getConfigFromMagentoVersion(magentoVersion);
-    let spawnCommand = `${php.binPath} -c ${php.iniPath} ${command}`;
-    if (options.env && Object.keys(options.env).length > 0) {
-        const env = Object.entries(options.env).map(([key, value]) => `${key}=${value}`).join(' ');
-        spawnCommand = `${env} ${spawnCommand}`;
-    }
-    if (options.useRosettaOnMac) {
-        spawnCommand = `arch -x86_64 bash -c '${spawnCommand}'`;
-    }
-    const { code, result } = await execAsyncSpawn(spawnCommand, {
+    const { code, result } = await runPHPContainerCommand(ctx, `php ${command}`, {
         ...options,
         withCode: true
     });

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.16.1",
+    "version": "2.0.0-alpha.0",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -23,22 +23,22 @@
     ],
     "dependencies": {
         "@scandipwa/scandipwa-dev-utils": "0.1.13",
-        "conf": "10.1.1",
+        "conf": "10.1.2",
         "enquirer": "2.3.6",
         "eta": "1.12.3",
-        "fast-xml-parser": "^4.0.7",
+        "fast-xml-parser": "^4.0.9",
         "hjson": "^3.2.2",
         "is-installed-globally": "0.4.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",
+        "mysql2": "2.3.3",
+        "node-ssh": "12.0.5",
+        "semver": "7.3.7",
         "smol-request": "^2.1.2",
-        "systeminformation": "5.11.7",
-        "yargs": "17.3.1"
+        "systeminformation": "5.12.1",
+        "yargs": "17.5.1"
     },
     "publishConfig": {
         "access": "public"
@@ -53,5 +53,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "ced1b75c1b448ef198a658edf010f53179aaaeb0"
+    "gitHead": "a63454a3015891e4ebe5a7e84a0c88989a1d0edc"
 }

package/typings/context.d.ts

@@ -31,12 +31,8 @@ export interface ListrContext {
     edition?: 'community' | 'enterprise'
     config: {
         php: {
-            binPath: string
-            iniPath: string
             iniTemplatePath: string
-            fpmBinPath: string
             fpmConfPath: string
-            fpmPidFilePath: string
             extensions: PHPExtensions
             version: string
         }
@@ -57,7 +53,7 @@ export interface ListrContext {
                     o: string
                 }
             }>
-            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch' | 'varnish', {
+            getContainers(): Record<'php' | 'sslTerminator' | 'nginx' | 'redis' | 'mysql' | 'elasticsearch' | 'varnish', {
                 _: string
                 ports: string[]
                 healthCheck: {
@@ -70,10 +66,7 @@ export interface ListrContext {
                 securityOptions: string[]
                 network: string
                 image: string
-                imageDetails: {
-                    name: string
-                    tag: string
-                }
+                debugImage?: string
                 name: string
                 command: string
                 connectCommand: string[]
@@ -84,6 +77,7 @@ export interface ListrContext {
             magentoDir: string
             templateDir: string
             cacheDir: string
+            containerMagentoDir: string
         }
         overridenConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>
         userConfiguration: Omit<CMAConfiguration, 'prefix' | 'useNonOverlappingPorts'>

package/typings/index.d.ts

@@ -1,5 +1,3 @@
-import { ListrTaskWrapper } from 'listr2';
-
 import { ListrContext } from './context';
 
 /* eslint-disable no-use-before-define */
@@ -42,80 +40,56 @@ export interface VarnishConfiguration extends ServiceWithVersion {
     configTemplate: string
 }
 
-export interface PHPExtension extends Record<string, unknown> {
-    version?: string
+export interface PHPExtensionInstallationInstruction {
     /**
-     * Name of the extension loaded to PHP.
-     *
-     * @example `libsodium` extension is using `sodium` extensionName because it is loaded into PHP as `sodium` extension
-     * and dynamic library that it requires called `sodium`
+     * Alternative name for extension
      *
-     * ```
-     * {
-     *  php: {
-     *      extensions: {
-     *          libsodium: {
-     *              extensionName: 'sodium'
-     *          }
-     *      }
-     *  }
-     * }
+     * @example ```js
+     * alternativeName: ['Zend OPcache']
      * ```
      */
-    linuxOptions?: string
-    macosOptions?: string
-    extensionName?: string
-    hooks?: {
-        preEnable?: (config: CMAConfiguration['configuration']) => Promise<void> | void
-        postEnable?: (config: CMAConfiguration['configuration']) => Promise<void> | void
-        preDisable?: (config: CMAConfiguration['configuration']) => Promise<void> | void
-        postDisable?: (config: CMAConfiguration['configuration']) => Promise<void> | void
-        preInstall?: (config: CMAConfiguration['configuration']) => Promise<void> | void
-        postInstall?: (config: CMAConfiguration['configuration']) => Promise<void> | void
-    }
+    alternativeName?: string[]
     /**
-     * Allow to define custom logic to install extension
+     * Command to install extension
+     *
+     * @example ```bash
+     * docker-php-ext-install bcmath
+     * ```
+     * @example ```bash
+     * pecl install xdebug && docker-php-ext-enable xdebug
+     * ```
      */
-    install?: (
-        ctx: ListrContext,
-        task: ListrTaskWrapper<ListrContext, any>
-    ) => Promise<void> | void
+    command: (arg0: (Omit<PHPExtensionInstallationInstruction, 'command'> & { ctx: ListrContext})) => string | string
 
     /**
-     * Allow to define custom logic to enable an extension
+     * System dependencies required by the extension
+     *
+     * @example ```js
+     * dependencies: ['icu-dev']
+     * ```
      */
-    enable?: (
-        ctx: ListrContext,
-        task: ListrTaskWrapper<ListrContext, any>
-    ) => Promise<void> | void
+    dependencies?: string[]
 
     /**
-     * Allow to define custom logic to disable an extension
+     * Extension version (if supported)
      */
-    disable?: (
-        ctx: ListrContext,
-        task: ListrTaskWrapper<ListrContext, any>
-    ) => Promise<void> | void
+    version?: string
 }
 
 export interface PHPExtensions {
-    gd: PHPExtension
-    intl: PHPExtension
-    zlib: PHPExtension
-    openssl: PHPExtension
-    sockets: PHPExtension
-    simpleXML: PHPExtension
-    xdebug: PHPExtension
-    fileinfo: PHPExtension
-    libsodium: PHPExtension
-    [key: string]: PHPExtension
+    [key: string]: PHPExtensionInstallationInstruction
 }
 
 export interface PHPConfiguration {
     /**
-     * PHP version
+     * Base image with tag
      */
-    version: string
+    baseImage?: string
+
+    /**
+     * Image with XDebug enabled
+     */
+    debugImage?: string
 
     /**
      * Configuration file template location
@@ -124,10 +98,17 @@ export interface PHPConfiguration {
      */
     configTemplate: string
 
+    /**
+     * PHP-FPM configuration file template location
+     *
+     * @example ./my-php-fpm-template.conf
+     */
+    fpmConfigTemplate: string
+
     /**
      * Extensions for PHP
      */
-    extensions: PHPExtensions & Record<string, PHPExtension>
+    extensions: PHPExtensions
 
     /**
      * Disabled extension list

package/lib/config/composer.js

@@ -1,11 +0,0 @@
-const path = require('path');
-
-module.exports = ({ composer }, config) => {
-    const { cacheDir } = config;
-
-    return {
-        dirPath: path.join(cacheDir, 'composer'),
-        binPath: path.join(cacheDir, 'composer', 'composer.phar'),
-        version: composer.version
-    };
-};

package/lib/config/php/extensions/libsodium.js

@@ -1,36 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const pathExists = require('../../../util/path-exists');
-const UnknownError = require('../../../errors/unknown-error');
-const phpbrewConfig = require('../../phpbrew');
-
-/**
- * @type {import('../../../../typings/index').PHPExtension}
- */
-module.exports = {
-    extensionName: 'sodium',
-    hooks: {
-        postInstall: async ({ php }) => {
-            const sodiumDynamicLibraryPath = path.join(
-                phpbrewConfig.phpPath,
-                `php-${php.version}`,
-                'var',
-                'db',
-                'libsodium.ini'
-            );
-
-            if (!await pathExists(sodiumDynamicLibraryPath)) {
-                throw new UnknownError(`libsodium dynamic library file configuration not found: ${sodiumDynamicLibraryPath}`);
-            }
-            const fileContent = await fs.promises.readFile(sodiumDynamicLibraryPath, 'utf-8');
-
-            if (/^extension=libsodium\.so$/.test(fileContent.trim())) {
-                await fs.promises.writeFile(
-                    sodiumDynamicLibraryPath,
-                    'extension=sodium.so\n',
-                    'utf-8'
-                );
-            }
-        }
-    }
-};

package/lib/config/php/releases/php-7.2.js

@@ -1,25 +0,0 @@
-const path = require('path');
-const { xdebug } = require('../extensions');
-
-const php72 = ({ templateDir, additionalExtensions = {} }) => ({
-    version: '7.2.34',
-    configTemplate: path.join(templateDir || '', 'php.template.ini'),
-    extensions: {
-        gd: {
-            macosOptions: '--with-zlib-dir=$(brew --prefix zlib) --with-freetype-dir=$(brew --prefix freetype)'
-        },
-        intl: {},
-        zlib: {},
-        openssl: {},
-        sockets: {},
-        SimpleXML: {},
-        xdebug,
-        apcu: {},
-        opcache: {
-            extensionName: 'Zend OPcache'
-        },
-        ...additionalExtensions
-    }
-});
-
-module.exports = php72;