Clean up webpack config (#5157)

* Make “dev” and “release” more consistent in web pack config

* Consolidate dev and release webpack configs

awx/ui/webpack.config.js

@@ -44,7 +44,8 @@ var vendorPkgs = [
     'reconnectingwebsocket'
 ];
 
-var dev = {
+var baseConfig = function() {
+    return {
         entry: {
             app: './client/src/app.js',
             vendor: vendorPkgs
@@ -63,22 +64,11 @@ var dev = {
                 '_': 'lodash',
                 'CodeMirror': 'codemirror',
                 'jsyaml': 'js-yaml',
-            'jsonlint': 'codemirror.jsonlint',
+                'jsonlint': 'codemirror.jsonlint'
             }),
-        // (chunkName, outfileName)
+            new webpack.optimize.CommonsChunkPlugin('vendor', 'tower.vendor.js')
-        new webpack.optimize.CommonsChunkPlugin('vendor', 'tower.vendor.js'),
-        new webpack.DefinePlugin({ $ENV: JSON.stringify(awx_env) })
         ],
         module: {
-        preLoaders: [{
-            test: /\.js?$/,
-            loader: 'jshint-loader',
-            exclude: ['/(node_modules)/'],
-            include: [path.resolve() + '/client/src/'],
-            jshint: {
-                emitErrors: true
-            }
-        }],
             loaders: [{
                 // disable AMD loading (broken in this lib) and default to CommonJS (not broken)
                 test: /\.angular-tz-extensions.js$/,
@@ -99,60 +89,30 @@ var dev = {
                 'jquery.resize': path.resolve() + '/node_modules/javascript-detect-element-resize/jquery.resize.js',
                 'select2': path.resolve() + '/node_modules/select2/dist/js/select2.full.js'
             }
-    },
+        }
-    devtool: 'inline-source-map',
+    };
-    watch: true,
 };
 
-var release = {
+var dev = baseConfig();
-    entry: {
+
-        app: './client/src/app.js',
+dev.devtool = 'inline-source-map';
-        vendor: vendorPkgs
+dev.watch = true;
-    },
+dev.plugins.push(new webpack.DefinePlugin({ $ENV: JSON.stringify(awx_env) }));
-    output: {
+dev.module.preLoaders = [
-        path: './static/',
+    {
-        filename: 'tower.js'
+        test: /\.js?$/,
-    },
+        loader: 'jshint-loader',
-    plugins: [
+        exclude: ['/(node_modules)/'],
-        // vendor shims:
+        include: [path.resolve() + '/client/src/'],
-        // [{expected_local_var : dependency}, ...]
+        jshint: {
-        new webpack.ProvidePlugin({
+            emitErrors: true
-            $: 'jquery',
-            jQuery: 'jquery',
-            'window.jQuery': 'jquery',
-            _: 'lodash',
-            'CodeMirror': 'codemirror',
-            'jsyaml': 'js-yaml',
-            'jsonlint': 'codemirror.jsonlint'
-        }),
-        new webpack.DefinePlugin({ $ENV: {} }),
-        new webpack.optimize.CommonsChunkPlugin('vendor', 'tower.vendor.js'),
-        new webpack.optimize.UglifyJsPlugin({
-            mangle: false
-        })
-    ],
-    module: {
-        loaders: [{
-            // disable AMD loading (broken in this lib) and default to CommonJS (not broken)
-            test: /\.angular-tz-extensions.js$/,
-            loader: 'imports?define=>false!'
-        }, {
-            // es6 -> es5
-            test: /\.js$/,
-            loader: 'babel-loader',
-            exclude: /(node_modules)/,
-            query: {
-                presets: ['es2015']
-            }
-        }, ]
-    },
-    resolve: {
-        alias: {
-            'codemirror.jsonlint': path.resolve() + '/node_modules/codemirror/addon/lint/json-lint.js',
-            'jquery.resize': path.resolve() + '/node_modules/javascript-detect-element-resize/jquery.resize.js',
-            'select2': path.resolve() + '/node_modules/select2/dist/js/select2.full.js'
         }
     }
-};
+];
+
+var release = baseConfig();
+
+release.plugins.push(new webpack.DefinePlugin({ $ENV: {} }));
+release.plugins.push(new webpack.optimize.UglifyJsPlugin({ mangle: false }));
 
 module.exports = { dev: dev, release: release };