From e3247b45542ef0215eb902e8bba68207041b9444 Mon Sep 17 00:00:00 2001 From: Stuart Taylor Date: Sat, 4 Aug 2018 22:43:55 +0100 Subject: [PATCH] fix(scripts): Fix the way webpack is naming the bundles (v3 -> v4 differences) (#17977) --- .gitignore | 2 ++ server/views/layout-news.jade | 2 +- server/views/layout-react.jade | 2 +- webpack.config.js | 7 +++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 12340a047b..60b7fca03f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,8 @@ server/manifests/* !server/manifests/README.md server/resources/pathMigration.json +public/js/client* +public/js/news* public/js/main* public/js/commonFramework* public/js/sandbox* diff --git a/server/views/layout-news.jade b/server/views/layout-news.jade index 43ecc926d5..629e707f8c 100644 --- a/server/views/layout-news.jade +++ b/server/views/layout-news.jade @@ -8,4 +8,4 @@ html(lang='en') include partials/react-stylesheets body #news-app-mount!= markup - script(src=cacheBreaker(rev('/js', 'news-app.js'))) + script(src=cacheBreaker(rev('/js', 'news.js'))) diff --git a/server/views/layout-react.jade b/server/views/layout-react.jade index 321048f96d..7c2b81c29c 100644 --- a/server/views/layout-react.jade +++ b/server/views/layout-react.jade @@ -23,4 +23,4 @@ html(lang='en').full-size fccTheme = null; } })(); - script(src=cacheBreaker(rev('/js', 'client-app.js'))) + script(src=cacheBreaker(rev('/js', 'client.js'))) diff --git a/webpack.config.js b/webpack.config.js index 3c065b0cce..682802b5a3 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -22,10 +22,9 @@ module.exports = { net: 'empty' }, output: { - filename: __DEV__ ? '[name]-app.js' : '[name]-app-[hash].js', - chunkFilename: __DEV__ ? '[name]-chunk.js' : '[name]-chunk-[chunkhash].js', - path: path.join(__dirname, '/public/js/'), - publicPath: '/js' + filename: __DEV__ ? '[name].js' : '[name]-[hash].js', + chunkFilename: __DEV__ ? '[name].js' : '[name]-[chunkhash].js', + path: path.join(__dirname, '/public/js/') }, module: { rules: [