@scandipwa/magento-scripts 1.14.0 → 1.14.1-alpha.10

package/lib/util/systemctl.js

@@ -0,0 +1,46 @@
+const { execAsyncSpawn } = require('./exec-async-command');
+
+/**
+ * @param {String} cmd
+ * @param {String} serviceName
+ * @param {{ now: boolean }} options
+ */
+const run = (cmd, serviceName, options = {}) => execAsyncSpawn(
+    `systemctl ${ cmd }${ serviceName ? ` ${ serviceName }` : '' }${ options.now ? ' --now' : ''}`,
+    {
+        withCode: true
+    }
+);
+
+const daemonReload = () => run('daemon-reload');
+
+const systemctlControl = (serviceName) => ({
+    disable: () => run('disable', serviceName),
+    enable: () => run('enable', serviceName),
+    enableAndStart: () => run('enable', serviceName, { now: true }),
+    restart: () => run('restart', serviceName),
+    start: () => run('start', serviceName),
+    stop: () => run('stop', serviceName),
+    isEnabled: async () => {
+        try {
+            const { result } = await run('is-enabled', serviceName);
+            return result.includes('enabled');
+        } catch (e) {
+            return false;
+        }
+    },
+    isRunning: async () => {
+        try {
+            const { result } = await run('status', serviceName);
+
+            return result.includes('active (running)');
+        } catch (e) {
+            return false;
+        }
+    }
+});
+
+module.exports = {
+    systemctlControl,
+    daemonReload
+};

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.14.0",
+    "version": "1.14.1-alpha.10",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -41,5 +41,15 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "60c7a2bacde24256dcb2d17128e41c0b371987a7"
+    "keywords": [
+        "magento",
+        "docker",
+        "php",
+        "nginx",
+        "redis",
+        "elasticsearch",
+        "mysql",
+        "scandipwa"
+    ],
+    "gitHead": "7d4d0843836447fa9ae49ad9927aa9eb2e92ca98"
 }

package/typings/context.d.ts

@@ -12,9 +12,12 @@ export interface ListrContext {
         mysql: number
         redis: number
         elasticsearch: number
+        varnish: number
+        sslTerminator: number
     }
     arch: 'arm64' | 'x64'
     isArm: boolean
+    isWsl: boolean
     platform?: NodeJS.Platform
     platformVersion?: string
     /**
@@ -51,7 +54,7 @@ export interface ListrContext {
                     o: string
                 }
             }>
-            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch', {
+            getContainers(): Record<'nginx' | 'redis' | 'mysql' | 'elasticsearch' | 'varnish', {
                 _: string
                 ports: string[]
                 healthCheck: {
@@ -88,4 +91,5 @@ export interface ListrContext {
         useNonOverlappingPorts: boolean
     }
     mysqlConnection: mysql2.Connection
+    isSetupUpgradeNeeded?: boolean
 }

package/typings/index.d.ts

@@ -10,7 +10,14 @@ export interface ServiceWithVersion {
     version: string
 }
 
-// export inter/
+export interface SSLTerminatorConfiguration extends ServiceWithVersion {
+    /**
+     * Configuration file location
+     *
+     * @example ./my-ssl-terminator-config.conf
+     */
+    configTemplate: string
+}
 
 export interface NginxConfiguration extends ServiceWithVersion {
     /**
@@ -21,6 +28,20 @@ export interface NginxConfiguration extends ServiceWithVersion {
     configTemplate: string
 }
 
+export interface VarnishConfiguration extends ServiceWithVersion {
+    /**
+     * Enable or disable Varnish in the project
+     */
+    enabled: boolean
+
+    /**
+     * Configuration file location
+     *
+     * @example ./my-varnish-config.vcl
+     */
+    configTemplate: string
+}
+
 export interface PHPExtension extends Record<string, unknown> {
     version?: string
     /**
@@ -175,6 +196,16 @@ export interface CMAConfiguration {
          * Composer configuration
          */
         composer: ServiceWithVersion
+
+        /**
+         * Varnish configuration
+         */
+        varnish: VarnishConfiguration
+
+        /**
+         * SSL Terminator configuration
+         */
+        sslTerminator: SSLTerminatorConfiguration
     }
     /**
      * Magento configuration

package/lib/tasks/magento/setup-magento/adjust-magento-configuration.js

@@ -1,27 +0,0 @@
-const { isTableExists } = require('../../../util/database');
-
-/**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
- */
-const adjustMagentoConfiguration = () => ({
-    title: 'Adjusting Magento Database Configuration',
-    skip: async (ctx) => !(await isTableExists('magento', 'core_config_data', ctx)),
-    task: async (ctx) => {
-        const { mysqlConnection } = ctx;
-
-        // delete varnish configuration if exists
-        await mysqlConnection.query(`
-            DELETE FROM core_config_data WHERE path LIKE '%varnish%';
-        `);
-
-        // update cache policy to not use varnish
-        // 0 - magento cache, 2 - varnish cache
-        await mysqlConnection.query(`
-            UPDATE core_config_data
-            SET value = ?
-            WHERE path = ?;
-        `, ['0', 'system/full_page_cache/caching_application']);
-    }
-});
-
-module.exports = adjustMagentoConfiguration;

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

@@ -1,11 +0,0 @@
-const magentoTask = require('../../../util/magento-task');
-
-/**
- * @type {() => import('listr2').ListrTask<import('../../../../typings/context').ListrContext>}
- */
-const disablePageCache = () => ({
-    title: 'Disabling full_page cache in Magento',
-    task: (ctx, task) => task.newListr(magentoTask('cache:disable full_page'))
-});
-
-module.exports = disablePageCache;