Fix the URLs of SSR-ed images by configuring the server file-loader, too

Automattic · Sep 26, 2019 · e01cd6e · e01cd6e
1 parent e2c7c66
commit e01cd6e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/webpack.config.js b/webpack.config.js
@@ -157,9 +157,9 @@ const cssChunkFilename = cssNameFromFilename( outputChunkFilename );
 const fileLoader = FileConfig.loader(
 	// The server bundler express middleware server assets from the hard-coded publicPath `/calypso/evergreen/`.
 	// This is required so that running calypso via `npm start` doesn't break.
-	isDevelopment && ! isDesktop
+	isDevelopment
 		? {
-				outputPath: 'images/',
+				outputPath: 'images',
 				publicPath: '/calypso/evergreen/images/',
 		  }
 		: {

diff --git a/webpack.config.node.js b/webpack.config.node.js
@@ -8,6 +8,7 @@
  * External dependencies
  */
 const path = require( 'path' );
+// eslint-disable-next-line import/no-extraneous-dependencies
 const webpack = require( 'webpack' );
 const _ = require( 'lodash' );
 
@@ -26,8 +27,9 @@ const FileConfig = require( '@automattic/calypso-build/webpack/file-loader' );
  * Internal variables
  */
 const isDevelopment = bundleEnv === 'development';
+
 const fileLoader = FileConfig.loader( {
-	publicPath: '/calypso/images/',
+	publicPath: isDevelopment ? '/calypso/evergreen/images/' : '/calypso/images/',
 	emitFile: false, // On the server side, don't actually copy files
 } );