move wait for varnish task to run after theme setup

scandipwa · Jul 8, 2022 · 96efa57 · 96efa57
1 parent f932ca5
commit 96efa57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build-packages/magento-scripts/lib/tasks/magento/setup-magento/index.js b/build-packages/magento-scripts/lib/tasks/magento/setup-magento/index.js
@@ -10,7 +10,6 @@ const setUrlRewrite = require('./set-url-rewrite');
 const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime');
 const magentoTask = require('../../../util/magento-task');
 const urnHighlighter = require('./urn-highlighter');
-const waitingForVarnish = require('./waiting-for-varnish');
 const adjustFullPageCache = require('./adjust-full-page-cache');
 
 /**
@@ -50,8 +49,7 @@ const setupMagento = (options = {}) => ({
             disable2fa(),
             urnHighlighter(),
             adjustFullPageCache(),
-            magentoTask('cache:flush'),
-            waitingForVarnish()
+            magentoTask('cache:flush')
         ], {
             concurrent: false,
             exitOnError: true,

diff --git a/build-packages/magento-scripts/lib/tasks/start.js b/build-packages/magento-scripts/lib/tasks/start.js
@@ -32,6 +32,7 @@ const checkForXDGOpen = require('../util/xdg-open-exists');
 const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
 const validatePHPInstallation = require('./php/validate-php');
 const installSodiumExtension = require('./php/install-sodium');
+const waitingForVarnish = require('./magento/setup-magento/waiting-for-varnish');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -149,7 +150,8 @@ const finishProjectConfiguration = () => ({
                 });
             }
         },
-        setupThemes()
+        setupThemes(),
+        waitingForVarnish()
     ], {
         rendererOptions: {
             collapse: false