From 2765367308f8c996e6bbf4d36f77cc62e29e706e Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Wed, 13 Feb 2019 09:14:11 -0500 Subject: [PATCH] load migrations page in dev environment --- awx/ui/build/webpack.base.js | 12 +++++++++++- awx/ui/build/webpack.production.js | 10 ---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/awx/ui/build/webpack.base.js b/awx/ui/build/webpack.base.js index e0e0eb383b..f1e5ac8e0b 100644 --- a/awx/ui/build/webpack.base.js +++ b/awx/ui/build/webpack.base.js @@ -27,6 +27,8 @@ const APP_ENTRY = path.join(SRC_PATH, 'app.js'); const VENDOR_ENTRY = path.join(SRC_PATH, 'vendor.js'); const INDEX_ENTRY = path.join(CLIENT_PATH, 'index.template.ejs'); const INDEX_OUTPUT = path.join(UI_PATH, 'templates/ui/index.html'); +const INSTALL_RUNNING_ENTRY = path.join(CLIENT_PATH, 'installing.template.ejs'); +const INSTALL_RUNNING_OUTPUT = path.join(UI_PATH, 'templates/ui/installing.html'); const THEME_ENTRY = path.join(LIB_PATH, 'theme', 'index.less'); const OUTPUT = 'js/[name].[chunkhash].js'; const CHUNKS = ['vendor', 'app']; @@ -193,7 +195,15 @@ const base = { inject: false, chunks: CHUNKS, chunksSortMode: chunk => (chunk.names[0] === 'vendor' ? -1 : 1) - }) + }), + new HtmlWebpackPlugin({ + alwaysWriteToDisk: true, + template: INSTALL_RUNNING_ENTRY, + filename: INSTALL_RUNNING_OUTPUT, + inject: false, + chunks: CHUNKS, + chunksSortMode: chunk => (chunk.names[0] === 'vendor' ? -1 : 1) + }), ], resolve: { alias: { diff --git a/awx/ui/build/webpack.production.js b/awx/ui/build/webpack.production.js index 04ff1cd29b..4f57e23cc3 100644 --- a/awx/ui/build/webpack.production.js +++ b/awx/ui/build/webpack.production.js @@ -9,8 +9,6 @@ const base = require('./webpack.base'); const CLIENT_PATH = path.resolve(__dirname, '../client'); const UI_PATH = path.resolve(__dirname, '..'); -const INSTALL_RUNNING_ENTRY = path.join(CLIENT_PATH, 'installing.template.ejs'); -const INSTALL_RUNNING_OUTPUT = path.join(UI_PATH, 'templates/ui/installing.html'); const CHUNKS = ['vendor', 'app']; const production = { @@ -19,14 +17,6 @@ const production = { compress: true, mangle: false }), - new HtmlWebpackPlugin({ - alwaysWriteToDisk: true, - template: INSTALL_RUNNING_ENTRY, - filename: INSTALL_RUNNING_OUTPUT, - inject: false, - chunks: CHUNKS, - chunksSortMode: chunk => (chunk.names[0] === 'vendor' ? -1 : 1) - }), new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify('production')