Skip to content

Commit 96efa57

Browse files
committed
move wait for varnish task to run after theme setup
1 parent f932ca5 commit 96efa57

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build-packages/magento-scripts/lib/tasks/magento/setup-magento/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const setUrlRewrite = require('./set-url-rewrite');
1010
const increaseAdminSessionLifetime = require('./increase-admin-session-lifetime');
1111
const magentoTask = require('../../../util/magento-task');
1212
const urnHighlighter = require('./urn-highlighter');
13-
const waitingForVarnish = require('./waiting-for-varnish');
1413
const adjustFullPageCache = require('./adjust-full-page-cache');
1514

1615
/**
@@ -50,8 +49,7 @@ const setupMagento = (options = {}) => ({
5049
disable2fa(),
5150
urnHighlighter(),
5251
adjustFullPageCache(),
53-
magentoTask('cache:flush'),
54-
waitingForVarnish()
52+
magentoTask('cache:flush')
5553
], {
5654
concurrent: false,
5755
exitOnError: true,

build-packages/magento-scripts/lib/tasks/start.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const checkForXDGOpen = require('../util/xdg-open-exists');
3232
const { getInstanceMetadata, constants: { WEB_LOCATION_TITLE } } = require('../util/instance-metadata');
3333
const validatePHPInstallation = require('./php/validate-php');
3434
const installSodiumExtension = require('./php/install-sodium');
35+
const waitingForVarnish = require('./magento/setup-magento/waiting-for-varnish');
3536

3637
/**
3738
* @type {() => import('listr2').ListrTask<import('../../typings/context').ListrContext>}
@@ -149,7 +150,8 @@ const finishProjectConfiguration = () => ({
149150
});
150151
}
151152
},
152-
setupThemes()
153+
setupThemes(),
154+
waitingForVarnish()
153155
], {
154156
rendererOptions: {
155157
collapse: false

0 commit comments

Comments
 (0)