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

package/lib/tasks/docker/{network.js → network/tasks.js}

@@ -1,21 +1,26 @@
 const logger = require('@scandipwa/scandipwa-dev-utils/logger');
-const KnownError = require('../../errors/known-error');
-const { execAsyncSpawn } = require('../../util/exec-async-command');
+const KnownError = require('../../../errors/known-error');
+const UnknownError = require('../../../errors/unknown-error');
+const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const networkApi = require('./network-api');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const createNetwork = () => ({
     title: 'Deploying Docker network',
     task: async ({ config: { docker } }, task) => {
-        const networkList = (await execAsyncSpawn("docker network ls --format '{{.Name}}'")).split('\n');
+        const networkList = await networkApi.ls({ formatToJSON: true });
 
-        if (networkList.includes(docker.network.name)) {
+        if (networkList.some((network) => network.Name === docker.network.name)) {
             task.skip();
             return;
         }
         try {
-            await execAsyncSpawn(`docker network create --driver=bridge ${ docker.network.name }`);
+            await networkApi.create({
+                network: docker.network.name,
+                driver: 'bridge'
+            });
         } catch (e) {
             if (e.includes('could not find an available, non-overlapping IPv4 address pool')) {
                 const pruneNetworks = await task.prompt({
@@ -34,19 +39,21 @@ Do you want remove all custom networks not used by at least one container?`
 You need to delete unused networks yourself.
 Use command ${logger.style.command('docker network prune')}`);
             }
+
+            throw new UnknownError(`Unable to create network!\n\n${e}`);
         }
     }
 });
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const removeNetwork = () => ({
     title: 'Removing Docker network',
     task: async ({ config: { docker } }, task) => {
-        const networkList = (await execAsyncSpawn("docker network ls --format '{{.Name}}'")).split('\n');
+        const networkList = await networkApi.ls({ formatToJSON: true });
 
-        if (!networkList.includes(docker.network.name)) {
+        if (!networkList.some((network) => network.Name === docker.network.name)) {
             task.skip();
             return;
         }
@@ -56,7 +63,7 @@ const removeNetwork = () => ({
 });
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const pruneNetworks = () => ({
     title: 'Removing custom networks not used by at least one container',

package/lib/tasks/docker/project-image-builder.js

@@ -0,0 +1,167 @@
+const { DockerFileBuilder } = require('../../util/dockerfile-builder');
+const semver = require('semver');
+const { execAsyncSpawn } = require('../../util/exec-async-command');
+const KnownError = require('../../errors/known-error');
+const { runContainerImage } = require('../../util/run-container-image');
+
+/**
+ * Get enabled extensions list with versions
+ * @param {string} imageWithTag
+ * @returns {Promise<{[key: string]: string}}>}
+ */
+const getEnabledExtensionsFromImage = async (imageWithTag) => {
+    const output = await runContainerImage(
+        imageWithTag,
+        // eslint-disable-next-line quotes
+        `php -r 'foreach (get_loaded_extensions() as $extension) echo "$extension:" . phpversion($extension) . "\n";'`
+    );
+
+    return output
+        .split('\n')
+        .map((m) => {
+            // eslint-disable-next-line no-unused-vars
+            const [_, moduleName, moduleVersion] = m.match(/(.+):(.+)/i);
+
+            return [moduleName, moduleVersion];
+        })
+        .reduce((acc, [name, version]) => ({ ...acc, [name]: version }), {});
+};
+
+const addExtensionToBuilder = (builder, ctx) => ([extensionName, extensionInstructions]) => {
+    const { command, ...extensionInstructionsWithoutCommand } = extensionInstructions;
+    let runCommand = '';
+    if (typeof command === 'string') {
+        runCommand += ` ${command}`;
+    } else if (typeof command === 'function') {
+        runCommand += ` ${command({ ...extensionInstructionsWithoutCommand, ctx })}`;
+    } else {
+        runCommand += ` docker-php-ext-install ${extensionInstructionsWithoutCommand.name}`;
+    }
+    builder
+        .comment(`extension ${extensionName} installation command`)
+        .run(runCommand.trim());
+};
+
+/**
+ * @param {import('../../../typings/context').ListrContext} ctx
+ * @param {{ image: string, tag: string}} param1
+ */
+const buildDockerFileInstructions = async (ctx, { image, tag }) => {
+    const { composer } = ctx.config.overridenConfiguration.configuration;
+    const existingPHPExtensions = await getEnabledExtensionsFromImage(`${image}:${tag}`);
+
+    const missingExtensions = Object.entries(
+        ctx.config.overridenConfiguration.configuration.php.extensions
+    ).filter(
+        ([extensionName, extensionInstructions]) => !Object.entries(existingPHPExtensions)
+            .map(([n, i]) => [n.toLowerCase(), i])
+            .some(
+                ([n]) => extensionName === n || (
+                    extensionInstructions.alternativeName && extensionInstructions.alternativeName.map(
+                        (s) => s.toLowerCase()
+                    ).includes(n)
+                )
+            )
+    ).filter(([extensionName]) => extensionName.toLowerCase() !== 'xdebug');
+
+    const dockerFileInstructions = new DockerFileBuilder()
+        .comment('project image')
+        .from({ image, tag });
+
+    // install bash and patch in image
+    dockerFileInstructions
+        .run('apk add --no-cache bash patch');
+
+    if (missingExtensions.length > 0) {
+        const allDependencies = missingExtensions.map(
+            ([_extensionName, extensionInstructions]) => (extensionInstructions.dependencies || [])
+        )
+            .reduce((acc, val) => acc.concat(val.filter((ex) => !acc.includes(ex))), []);
+
+        dockerFileInstructions.run(`apk add --no-cache ${allDependencies.join(' ')}`);
+        missingExtensions.forEach(addExtensionToBuilder(dockerFileInstructions, ctx));
+    }
+
+    const composerVersion = /^\d$/.test(composer.version)
+        ? `latest-${composer.version}.x`
+        : composer.version;
+
+    dockerFileInstructions
+        .comment('download composer')
+        .run(`curl https://getcomposer.org/download/${composerVersion}/composer.phar --output composer`)
+        .comment('make composer executable')
+        .run('chmod +x ./composer')
+        .comment('move composer to bin directory')
+        .run('mv composer /usr/local/bin/composer');
+
+    if (semver.satisfies(composer.version, '^1')) {
+        dockerFileInstructions
+            .comment('install prestissimo composer plugin')
+            .run('composer global require hirak/prestissimo');
+    }
+
+    dockerFileInstructions
+        .workDir(ctx.config.baseConfig.containerMagentoDir);
+
+    return dockerFileInstructions;
+};
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const buildProjectImage = () => ({
+    title: 'Building Project Image',
+    task: async (ctx, task) => {
+        const containers = ctx.config.docker.getContainers(ctx.ports);
+        const [image, tag = 'latest'] = ctx.config.overridenConfiguration.configuration.php.baseImage.split(':');
+        const dockerFileInstructions = await buildDockerFileInstructions(ctx, { image, tag });
+
+        try {
+            await execAsyncSpawn(`docker build -t ${containers.php.image} -<<EOF
+${dockerFileInstructions.build()}
+EOF`, {
+                callback: (r) => {
+                    task.output = r;
+                }
+            });
+        } catch (e) {
+            throw new KnownError(`Unexpected error during project image building!\n\n${e}`);
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const buildDebugProjectImage = () => ({
+    title: 'Building Debug Project Image',
+    task: async (ctx, task) => {
+        const containers = ctx.config.docker.getContainers(ctx.ports);
+        const [image, tag = 'latest'] = ctx.config.overridenConfiguration.configuration.php.debugImage.split(':');
+        const dockerFileInstructions = await buildDockerFileInstructions(ctx, { image, tag });
+
+        try {
+            await execAsyncSpawn(`docker build -t ${containers.php.debugImage} -<<EOF
+${dockerFileInstructions.build()}
+EOF`, {
+                callback: (r) => {
+                    task.output = r;
+                }
+            });
+        } catch (e) {
+            throw new KnownError(`Unexpected error during debug project image building!\n\n${e}`);
+        }
+    },
+    options: {
+        bottomBar: 10
+    }
+});
+
+module.exports = {
+    buildProjectImage,
+    buildDebugProjectImage,
+    getEnabledExtensionsFromImage
+};

package/lib/tasks/docker/volume/index.js

@@ -0,0 +1,8 @@
+const volumeApi = require('./volume-api');
+const { createVolumes, removeVolumes } = require('./tasks');
+
+module.exports = {
+    createVolumes,
+    removeVolumes,
+    volumeApi
+};

package/lib/tasks/docker/{volumes.js → volume/tasks.js}

@@ -1,21 +1,8 @@
-const { execAsyncSpawn } = require('../../util/exec-async-command');
-
-const create = ({
-    driver,
-    opts = {},
-    name
-}) => {
-    let command = `docker volume create ${ Object.entries(opts).map(([name, value]) => `--opt ${name}=${value}`).join(' ') } `;
-
-    if (driver) {
-        command += `--driver ${ driver }`;
-    }
-
-    return execAsyncSpawn(`${ command } ${ name }`);
-};
+const { execAsyncSpawn } = require('../../../util/exec-async-command');
+const { create } = require('./volume-api');
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const createVolumes = () => ({
     title: 'Creating volumes',
@@ -36,7 +23,7 @@ const createVolumes = () => ({
 });
 
 /**
- * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
  */
 const removeVolumes = () => ({
     title: 'Removing volumes',
@@ -58,6 +45,5 @@ const removeVolumes = () => ({
 
 module.exports = {
     createVolumes,
-    removeVolumes,
-    createVolume: create
+    removeVolumes
 };

package/lib/tasks/docker/volume/volume-api.d.ts

@@ -0,0 +1,39 @@
+import { ExecAsyncSpawnOptions } from '../../../util/exec-async-command';
+
+export interface VolumeLsOptions<T extends boolean = false> {
+    filter?: string | string[]
+    format?: string
+    formatToJSON?: T
+    quiet?: boolean
+}
+
+export interface VolumeLsResult {
+    Driver: string
+    Labels: string
+    Links: string
+    MountPoint: string
+    Name: string
+    Scope: string
+    Size: string
+}
+
+export function ls(
+    options?: VolumeLsOptions,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<string>
+export function ls(
+    options?: VolumeLsOptions<true>,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<VolumeLsResult[]>
+
+export interface VolumeCreateOptions {
+    driver?: string
+    label?: string
+    name: string
+    opt?: Record<string, string>
+}
+
+export function create(
+    options?: VolumeCreateOptions,
+    execOptions?: ExecAsyncSpawnOptions<false>
+): Promise<string>

package/lib/tasks/docker/volume/volume-api.js

@@ -0,0 +1,66 @@
+const { execAsyncSpawn } = require('../../../util/exec-async-command');
+
+/**
+ * @param {import('./volume-api').VolumeCreateOptions} options
+ * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
+ */
+const create = async (options, execOptions = {}) => {
+    const {
+        driver,
+        label,
+        opt,
+        name
+    } = options;
+
+    const driverArg = driver && `--driver=${driver}`;
+    const labelArg = label && `--label=${label}`;
+    const optArg = opt && Object.entries(opt).map(([name, value]) => `--opt ${name}='${value}'`).join(' ');
+
+    const args = [
+        driverArg,
+        labelArg,
+        optArg,
+        name
+    ].filter(Boolean).join(' ');
+
+    return execAsyncSpawn(`docker volume create ${args}`, execOptions);
+};
+
+/**
+ * @param {import('./volume-api').VolumeLsOptions} options
+ * @param {import('../../../util/exec-async-command').ExecAsyncSpawnOptions} execOptions
+ */
+const ls = async (options, execOptions = {}) => {
+    const {
+        filter,
+        format,
+        formatToJSON = false,
+        quiet
+    } = options;
+
+    const formatArg = !formatToJSON && format
+        ? `--format=${format}`
+        : formatToJSON && '--format=\'{{json .}}\'';
+    const filterArg = filter && typeof filter === 'string'
+        ? `--filter=${filter}`
+        : filter && Array.isArray(filter) && filter.every((f) => typeof f === 'string') && filter.map((f) => `--filter=${f}`).join(' ');
+    const quietArg = quiet && '--quiet';
+
+    const args = [
+        filterArg,
+        formatArg,
+        quietArg
+    ].filter(Boolean).join(' ');
+
+    if (formatToJSON) {
+        const result = await execAsyncSpawn(`docker volume ls ${args}`, execOptions);
+        return JSON.parse(`[${result.split('\n').join(', ')}]`);
+    }
+
+    return execAsyncSpawn(`docker volume ls ${args}`, execOptions);
+};
+
+module.exports = {
+    create,
+    ls
+};

package/lib/tasks/execute.js

@@ -0,0 +1,97 @@
+const { Listr } = require('listr2');
+const logger = require('@scandipwa/scandipwa-dev-utils/logger');
+const { checkRequirements } = require('./requirements');
+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 { executeInContainer, runInContainer } = require('../util/execute-in-container');
+const { containerApi } = require('./docker/containers');
+const KnownError = require('../errors/known-error');
+
+/**
+ *
+ * @param {{ containername: string, commands?: string[] }} argv
+ * @returns
+ */
+const executeTask = async (argv) => {
+    const tasks = new Listr([
+        checkRequirements(),
+        getMagentoVersionConfig(),
+        checkConfigurationFile(),
+        getProjectConfiguration(),
+        getCachedPorts()
+    ], {
+        concurrent: false,
+        exitOnError: true,
+        ctx: { throwMagentoVersionMissing: true },
+        rendererOptions: { collapse: false, clearOutput: true }
+    });
+
+    let ctx;
+    try {
+        ctx = await tasks.run();
+    } catch (e) {
+        logger.error(e.message || e);
+        process.exit(1);
+    }
+    const containers = ctx.config.docker.getContainers(ctx.ports);
+    const services = Object.keys(containers);
+
+    if (services.includes(argv.containername) || services.some((service) => service.includes(argv.containername))) {
+        /**
+         * @type {import('./docker/containers/container-api').ContainerRunOptions}
+         */
+        const container = containers[argv.containername]
+            ? containers[argv.containername]
+            : Object.entries(containers).find(([key]) => key.includes(argv.containername))[1];
+
+        if (argv.commands.length === 0) {
+        // if we have default connect command then use it
+            if (container.connectCommand) {
+            // eslint-disable-next-line no-param-reassign
+                argv.commands = container.connectCommand;
+            } else {
+            // otherwise fall back to bash (if it exists inside container)
+                argv.commands.push('bash');
+            }
+        }
+
+        const containerList = await containerApi.ls({
+            formatToJSON: true,
+            all: true,
+            filter: `name=${container.name}`
+        });
+
+        if (containerList.length > 0) {
+            logger.logN(`Executing container ${logger.style.misc(container._)} (command: ${logger.style.command(argv.commands.join(' '))})`);
+            const result = await executeInContainer({
+                containerName: container.name,
+                commands: argv.commands
+            });
+
+            return result;
+        }
+
+        if (container.name.endsWith('php')) {
+            logger.logN(`Starting container ${logger.style.misc(container._)} with command: ${logger.style.command(argv.commands.join(' '))}`);
+            const result = await runInContainer(
+                {
+                    ...container,
+                    name: `${container.name}_exec-${Date.now()}`
+                },
+                argv.commands
+            );
+
+            return result;
+        }
+
+        throw new KnownError(`Container ${container.name} is not running!`);
+    }
+
+    logger.error(`No container found "${argv.containername}"`);
+};
+
+module.exports = {
+    executeTask
+};

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

@@ -0,0 +1,23 @@
+const path = require('path');
+const UnknownError = require('../../errors/unknown-error');
+const setConfigFile = require('../../util/set-config');
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createMariaDBConfig = () => ({
+    title: 'Setting MariaDB config',
+    task: async (ctx) => {
+        try {
+            await setConfigFile({
+                configPathname: path.join(ctx.config.baseConfig.cacheDir, 'mariadb.cnf'),
+                template: path.join(ctx.config.baseConfig.templateDir, 'mariadb.template.cnf'),
+                overwrite: true
+            });
+        } catch (e) {
+            throw new UnknownError(`Unexpected error accrued during php-fpm config creation\n\n${e}`);
+        }
+    }
+});
+
+module.exports = createMariaDBConfig;

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

@@ -1,4 +1,3 @@
-const os = require('os');
 const path = require('path');
 const setConfigFile = require('../../util/set-config');
 const UnknownError = require('../../errors/unknown-error');
@@ -24,7 +23,7 @@ const createNginxConfig = () => ({
             }
         } = overridenConfiguration;
 
-        const isLinux = os.platform() === 'linux';
+        const isLinux = ctx.platform === 'linux';
         const isNativeLinux = isLinux && !isWsl;
         const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
         const hostPort = isNativeLinux ? ports.app : 80;
@@ -41,7 +40,7 @@ const createNginxConfig = () => ({
                 overwrite: true,
                 templateArgs: {
                     ports,
-                    mageRoot: baseConfig.magentoDir,
+                    mageRoot: baseConfig.containerMagentoDir,
                     hostMachine,
                     hostPort,
                     config: overridenConfiguration

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

@@ -1,24 +1,39 @@
 const semver = require('semver');
 const UnknownError = require('../../errors/unknown-error');
 const setConfigFile = require('../../util/set-config');
+const { getEnabledExtensionsFromImage } = require('../docker/project-image-builder');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
  */
 const createPhpConfig = () => ({
     title: 'Setting PHP config',
-    task: async ({ config: { php, baseConfig, overridenConfiguration: { configuration } }, debug, ports }) => {
-        const isXDebug2 = semver.satisfies(configuration.php.extensions.xdebug.version, '2');
+    task: async (ctx) => {
+        const {
+            config: {
+                php,
+                baseConfig
+            },
+            debug
+        } = ctx;
+        const containers = ctx.config.docker.getContainers(ctx.ports);
+        const phpExtensions = await getEnabledExtensionsFromImage(containers.php.debugImage);
+        const isXDebug2 = semver.satisfies(phpExtensions.xdebug, '2');
+
+        const isLinux = ctx.platform === 'linux';
+        const isNativeLinux = isLinux && !ctx.isWsl;
+        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
+
         try {
             await setConfigFile({
                 configPathname: php.iniPath,
                 template: php.iniTemplatePath,
                 overwrite: true,
                 templateArgs: {
-                    ports,
                     debug,
-                    mageRoot: baseConfig.magentoDir,
-                    isXDebug2
+                    mageRoot: baseConfig.containerMagentoDir,
+                    isXDebug2,
+                    hostMachine
                 }
             });
         } catch (e) {

package/lib/tasks/file-system/create-php-fpm-config.js

@@ -1,4 +1,3 @@
-const path = require('path');
 const UnknownError = require('../../errors/unknown-error');
 const setConfigFile = require('../../util/set-config');
 
@@ -7,14 +6,19 @@ const setConfigFile = require('../../util/set-config');
  */
 const createPhpFpmConfig = () => ({
     title: 'Setting php-fpm config',
-    task: async ({ ports, config: { php, baseConfig } }) => {
+    task: async (ctx) => {
+        const { config: { php } } = ctx;
+        const isLinux = ctx.platform === 'linux';
+        const isNativeLinux = isLinux && !ctx.isWsl;
+        const port = isNativeLinux ? ctx.ports.fpm : 9000;
+
         try {
             await setConfigFile({
                 configPathname: php.fpmConfPath,
-                template: path.join(baseConfig.templateDir, 'php-fpm.template.conf'),
+                template: php.fpmTemplatePath,
                 overwrite: true,
                 templateArgs: {
-                    ports
+                    port
                 }
             });
         } catch (e) {