From 46904b9aef331571b19f8c77a7dfdc667613b2f6 Mon Sep 17 00:00:00 2001 From: Dave Copeland Date: Sat, 29 Apr 2017 14:56:57 -0400 Subject: [PATCH] only use dev server in manifest if it's enabled The manifest-test.json will include references to the dev server, even though it's not enabled by default. This means that system-style tests will not bring in the managed assets. --- lib/install/config/webpack/configuration.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/install/config/webpack/configuration.js b/lib/install/config/webpack/configuration.js index c8f8461ab..904af8229 100644 --- a/lib/install/config/webpack/configuration.js +++ b/lib/install/config/webpack/configuration.js @@ -14,7 +14,7 @@ const devServer = safeLoad(readFileSync(join(configPath, 'development.server.yml const ifHasCDN = env.ASSET_HOST !== undefined && env.NODE_ENV === 'production' const devServerUrl = `http://${devServer.host}:${devServer.port}/${paths.entry}/` const publicUrl = ifHasCDN ? `${env.ASSET_HOST}/${paths.entry}/` : `/${paths.entry}/` -const publicPath = env.NODE_ENV !== 'production' ? devServerUrl : publicUrl +const publicPath = env.NODE_ENV !== 'production' && devServer.enabled ? devServerUrl : publicUrl module.exports = { devServer,