From ccde3bded6b714c385fd3d9e512186ca7019c01b Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sat, 5 Mar 2022 21:39:27 -0500 Subject: Added missing packages --- package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0b7aae2..6f6d802 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "deploy": "cross-env NODE_ENV=production webpack -p", "test": "echo \"Error: no test specified\" && exit 1", "build": "webpack --config webpack.config.js", - "start": "webpack-dev-server --config webpack.config.js" + "start": "webpack serve --config webpack.config.js" }, "repository": { "type": "git", @@ -24,9 +24,11 @@ "@babel/core": "^7.17.5", "@babel/preset-env": "^7.16.11", "babel-loader": "^8.2.3", + "dotenv": "^16.0.0", "eslint": "^8.10.0", "webpack": "^5.69.1", - "webpack-cli": "^4.9.2" + "webpack-cli": "^4.9.2", + "webpack-dev-server": "^4.7.4" }, "dependencies": { "@fingerprintjs/fingerprintjs": "^3.3.3", -- cgit From 88715ee53ab4f58deea9c6f0dd7bbe0ac6d1b03e Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sat, 5 Mar 2022 21:40:08 -0500 Subject: Alphabetized and added webpack config things --- webpack.config.js | 94 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 36 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 2754b21..ae56719 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,45 +1,67 @@ /* eslint-env node */ const path = require('path'); +const dotenv = require('dotenv') +const webpack = require('webpack') + +// this will update the process.env with environment variables in .env file +dotenv.config(); 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' + entry: { + ui: './webAO/ui.js', + client: './webAO/client.js', + master: './webAO/master.js' + }, + devtool: 'source-map', + devServer: { + static: { + directory: path.join(__dirname, 'webAO'), }, - 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 - } - ] - ] - } - } + compress: true, + port: 8080, + }, + mode: 'production', + 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 + } + ] + ] } - ] - }, + } + } + ] + }, + output: { + path: path.resolve(__dirname, 'webAO'), + filename: '[name].b.js' + }, + performance: { + hints: false, + maxEntrypointSize: 512000, + maxAssetSize: 512000 + }, + plugins: [ + new webpack.DefinePlugin({ + 'process.env': JSON.stringify(process.env) + }) + ], - devtool: 'source-map', - mode: 'production' }; \ No newline at end of file -- cgit From fb485e430b6e073f7a89d752c8e2f84f39668803 Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sat, 5 Mar 2022 21:40:19 -0500 Subject: Resolving issues that made running project --- webAO/client.js | 2 +- webAO/master.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index 71aff41..dafd371 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -18,7 +18,7 @@ import chatbox_arr from "./styles/chatbox/chatboxes.js"; import { EventEmitter } from "events"; -import { version } from '../package.json'; +const version = process.env.npm_package_version let client; let viewport; diff --git a/webAO/master.js b/webAO/master.js index ef1e645..afa7b0d 100644 --- a/webAO/master.js +++ b/webAO/master.js @@ -1,5 +1,5 @@ const MASTERSERVER_IP = "master.aceattorneyonline.com:27014"; -import { version } from '../package.json'; +const version = process.env.npm_package_version import Fingerprint2 from 'fingerprintjs2'; import { unescapeChat } from './encoding.js'; -- cgit From af601cc3954e87a39b5ed9ec9e206599109a6690 Mon Sep 17 00:00:00 2001 From: "caleb.mabry.15@cnu.edu" Date: Sat, 5 Mar 2022 21:42:56 -0500 Subject: Updating README to be more user friendly --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa2a4f3..05b5411 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,16 @@ Desktop-only features: - Non-interrupting preanimations In short, webAO is in disrepair. Again. - + Link to the client in this repo: http://web.aceattorneyonline.com/ -Guide to installing it locally: https://docs.google.com/document/d/1X4OjG0tfoTZayqY9MM6fqzL_aGMKFAECg7NSQRYafAU/edit +# Project Setup +- Install [Node JS](https://nodejs.org/en/) + +# Running Locally +`npm install` + +`npm run start` + + + -- cgit