From ea0e9c20a9d5e28afcd8a8cbbbb5d29b318d7a3a Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sat, 5 Mar 2022 22:52:59 -0500 Subject: Added ignore file --- webpack.config.js | 76 +++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 2754b21..33c639f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,43 +3,43 @@ const path = require('path'); module.exports = { - entry: { - ui: './webAO/ui.js', - client: './webAO/client.js', - master: './webAO/master.js' - }, - output: { - path: path.resolve(__dirname, 'webAO'), - filename: '[name].b.js' - }, - module: { - rules: [ - { - test: /\.m?js$/, - exclude: /(node_modules|bower_components)/, - use: { - loader: 'babel-loader', - options: { - presets: [ - [ - '@babel/preset-env', { - useBuiltIns: 'usage', - targets: [ - "defaults", - "Safari > 3", - "Opera > 8", - "Android > 3" - ], - corejs: 3 - } - ] - ] - } - } - } - ] + entry: { + ui: './webAO/ui.js', + client: './webAO/client.js', + master: './webAO/master.js', + }, + output: { + path: path.resolve(__dirname, 'webAO'), + filename: '[name].b.js', + }, + module: { + rules: [ + { + test: /\.m?js$/, + exclude: /(node_modules|bower_components)/, + use: { + loader: 'babel-loader', + options: { + presets: [ + [ + '@babel/preset-env', { + useBuiltIns: 'usage', + targets: [ + 'defaults', + 'Safari > 3', + 'Opera > 8', + 'Android > 3', + ], + corejs: 3, + }, + ], + ], + }, + }, }, + ], + }, - devtool: 'source-map', - mode: 'production' -}; \ No newline at end of file + devtool: 'source-map', + mode: 'production', +}; -- cgit From 28c7c81026abc9829b012c5ea5f707c441d7d1b2 Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sun, 6 Mar 2022 12:23:59 -0500 Subject: Fixing messy merge conflict --- webpack.config.js | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index f692749..0c16db4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -11,12 +11,17 @@ module.exports = { entry: { ui: './webAO/ui.js', client: './webAO/client.js', - master: './webAO/master.js', + master: './webAO/master.js' }, - output: { - path: path.resolve(__dirname, 'webAO'), - filename: '[name].b.js', + devtool: 'source-map', + devServer: { + static: { + directory: path.join(__dirname, 'webAO'), + }, + compress: true, + port: 8080, }, + mode: 'production', module: { rules: [ { @@ -30,19 +35,23 @@ module.exports = { '@babel/preset-env', { useBuiltIns: 'usage', targets: [ - 'defaults', - 'Safari > 3', - 'Opera > 8', - 'Android > 3', + "defaults", + "Safari > 3", + "Opera > 8", + "Android > 3" ], - corejs: 3, - }, - ], - ], - }, - }, - }, - ], + corejs: 3 + } + ] + ] + } + } + } + ] + }, + output: { + path: path.resolve(__dirname, 'webAO'), + filename: '[name].b.js' }, performance: { hints: false, @@ -54,6 +63,5 @@ module.exports = { 'process.env': JSON.stringify(process.env) }) ], - devtool: 'source-map', - mode: 'production', + }; -- cgit From 59c0773e95756aa62027db7a5754e7e986ca2b19 Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sun, 6 Mar 2022 12:24:43 -0500 Subject: Lint fix --- webpack.config.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'webpack.config.js') diff --git a/webpack.config.js b/webpack.config.js index 0c16db4..75a8c0b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,8 +1,8 @@ /* eslint-env node */ const path = require('path'); -const dotenv = require('dotenv') -const webpack = require('webpack') +const dotenv = require('dotenv'); +const webpack = require('webpack'); // this will update the process.env with environment variables in .env file dotenv.config(); @@ -11,7 +11,7 @@ module.exports = { entry: { ui: './webAO/ui.js', client: './webAO/client.js', - master: './webAO/master.js' + master: './webAO/master.js', }, devtool: 'source-map', devServer: { @@ -35,33 +35,33 @@ module.exports = { '@babel/preset-env', { useBuiltIns: 'usage', targets: [ - "defaults", - "Safari > 3", - "Opera > 8", - "Android > 3" + 'defaults', + 'Safari > 3', + 'Opera > 8', + 'Android > 3', ], - corejs: 3 - } - ] - ] - } - } - } - ] + corejs: 3, + }, + ], + ], + }, + }, + }, + ], }, output: { path: path.resolve(__dirname, 'webAO'), - filename: '[name].b.js' + filename: '[name].b.js', }, performance: { hints: false, maxEntrypointSize: 512000, - maxAssetSize: 512000 - }, + maxAssetSize: 512000, + }, plugins: [ new webpack.DefinePlugin({ - 'process.env': JSON.stringify(process.env) - }) + 'process.env': JSON.stringify(process.env), + }), ], }; -- cgit