From d428eb3efee55299c3542a0f9966dfbb3a7a4302 Mon Sep 17 00:00:00 2001 From: Alexander Bass Date: Fri, 24 Jun 2022 14:42:39 -0400 Subject: [PATCH] Now Rollup scripts into one (somewhat large ;) ) file --- build.sh | 9 +++++++-- client/{www => }/scripts/display/draw.js | 1 - client/{www => }/scripts/display/html.js | 0 client/{www => }/scripts/display/tileRenderer.js | 2 +- client/{www => }/scripts/env.js | 0 client/{www => }/scripts/game/game.js | 0 client/scripts/index.js | 4 ++++ .../scripts/interface/common/illegalaction.js | 0 .../{www => }/scripts/interface/game/connection.js | 0 client/{www => }/scripts/interface/game/mouse.js | 2 +- .../{www => }/scripts/interface/mainmenu/create.js | 12 ++++++------ client/{www => }/scripts/interface/mainmenu/menu.js | 4 ++-- .../{www => }/scripts/interface/mainmenu/picker.js | 0 client/{www => }/scripts/interface/scene.js | 0 client/{www => }/scripts/net/netcode.js | 12 ++++++------ client/{www => }/scripts/net/status.js | 2 +- client/{www => }/scripts/util.js | 0 client/www/game.html | 2 +- client/www/scripts/script.js | 4 ---- package-lock.json | 6 ++++-- package.json | 2 +- rollup.config.js | 9 +++++++++ 22 files changed, 43 insertions(+), 28 deletions(-) rename client/{www => }/scripts/display/draw.js (94%) rename client/{www => }/scripts/display/html.js (100%) rename client/{www => }/scripts/display/tileRenderer.js (95%) rename client/{www => }/scripts/env.js (100%) rename client/{www => }/scripts/game/game.js (100%) create mode 100644 client/scripts/index.js rename client/{www => }/scripts/interface/common/illegalaction.js (100%) rename client/{www => }/scripts/interface/game/connection.js (100%) rename client/{www => }/scripts/interface/game/mouse.js (95%) rename client/{www => }/scripts/interface/mainmenu/create.js (91%) rename client/{www => }/scripts/interface/mainmenu/menu.js (89%) rename client/{www => }/scripts/interface/mainmenu/picker.js (100%) rename client/{www => }/scripts/interface/scene.js (100%) rename client/{www => }/scripts/net/netcode.js (77%) rename client/{www => }/scripts/net/status.js (80%) rename client/{www => }/scripts/util.js (100%) delete mode 100644 client/www/scripts/script.js create mode 100644 rollup.config.js diff --git a/build.sh b/build.sh index ab12409..8206608 100644 --- a/build.sh +++ b/build.sh @@ -1,10 +1,15 @@ rm -rf dist mkdir -p dist/server mkdir -p dist/www/ +echo "Compiling SCSS......." scss client/scss/main.scss dist/www/style.css -cp -r client/www/* dist/www rm -rf .sass-cache +echo "Moving Static Webpage object to www......" +cp -r client/www/* dist/www +echo "Rolling up ES6 Modules into bundle......" +npx rollup -c +echo "Compiling TypeScript" npx tsc echo "Starting server......." -echo "~-+/\________________/==o=O=o==\________________/\+-~" +echo "$(tput setaf 3)~-+/\________________/==o=O=o==\________________/\+-~$(tput setaf 8)" node dist/server/main.js diff --git a/client/www/scripts/display/draw.js b/client/scripts/display/draw.js similarity index 94% rename from client/www/scripts/display/draw.js rename to client/scripts/display/draw.js index b2ad826..1a3b4dd 100644 --- a/client/www/scripts/display/draw.js +++ b/client/scripts/display/draw.js @@ -1,5 +1,4 @@ import {tileArray} from './tileRenderer.js'; -import { cursor } from '../interface/game/mouse.js' import { ctx} from './html.js'; import { game } from '../game/game.js' diff --git a/client/www/scripts/display/html.js b/client/scripts/display/html.js similarity index 100% rename from client/www/scripts/display/html.js rename to client/scripts/display/html.js diff --git a/client/www/scripts/display/tileRenderer.js b/client/scripts/display/tileRenderer.js similarity index 95% rename from client/www/scripts/display/tileRenderer.js rename to client/scripts/display/tileRenderer.js index cb1f0eb..04a61a2 100644 --- a/client/www/scripts/display/tileRenderer.js +++ b/client/scripts/display/tileRenderer.js @@ -1,4 +1,4 @@ -import {game} from "/scripts/game/game.js" +import {game} from "../game/game.js" export const tileArray = loadSprites('/img/mine.png', game.tileSize); var counter = 0; diff --git a/client/www/scripts/env.js b/client/scripts/env.js similarity index 100% rename from client/www/scripts/env.js rename to client/scripts/env.js diff --git a/client/www/scripts/game/game.js b/client/scripts/game/game.js similarity index 100% rename from client/www/scripts/game/game.js rename to client/scripts/game/game.js diff --git a/client/scripts/index.js b/client/scripts/index.js new file mode 100644 index 0000000..189954c --- /dev/null +++ b/client/scripts/index.js @@ -0,0 +1,4 @@ +import './display/draw.js'; +import './game/game.js' +import './interface/mainmenu/menu.js' +import './net/netcode.js' diff --git a/client/www/scripts/interface/common/illegalaction.js b/client/scripts/interface/common/illegalaction.js similarity index 100% rename from client/www/scripts/interface/common/illegalaction.js rename to client/scripts/interface/common/illegalaction.js diff --git a/client/www/scripts/interface/game/connection.js b/client/scripts/interface/game/connection.js similarity index 100% rename from client/www/scripts/interface/game/connection.js rename to client/scripts/interface/game/connection.js diff --git a/client/www/scripts/interface/game/mouse.js b/client/scripts/interface/game/mouse.js similarity index 95% rename from client/www/scripts/interface/game/mouse.js rename to client/scripts/interface/game/mouse.js index 12b8c4c..ea4696e 100644 --- a/client/www/scripts/interface/game/mouse.js +++ b/client/scripts/interface/game/mouse.js @@ -1,5 +1,5 @@ import {game} from "../../game/game.js"; -import { clickCanvas } from "/scripts/net/netcode.js"; +import { clickCanvas } from "../../net/netcode.js"; import { canvas } from "../../display/html.js" class Cursor { diff --git a/client/www/scripts/interface/mainmenu/create.js b/client/scripts/interface/mainmenu/create.js similarity index 91% rename from client/www/scripts/interface/mainmenu/create.js rename to client/scripts/interface/mainmenu/create.js index 7322e7d..f349182 100644 --- a/client/www/scripts/interface/mainmenu/create.js +++ b/client/scripts/interface/mainmenu/create.js @@ -1,10 +1,10 @@ -import {joinGame, createGame} from "/scripts/net/netcode.js" -import { changeScene } from "/scripts/interface/scene.js" +import {joinGame, createGame} from "../../net/netcode.js" +import { changeScene } from "../scene.js" import {Picker} from "./picker.js" -import {tileArray, menuArray} from "/scripts/display/tileRenderer.js" -import * as util from "/scripts/util.js" -import {ID} from "/scripts/util.js" -import * as status from "/scripts/net/status.js" +import {tileArray, menuArray} from "../../display/tileRenderer.js" +import * as util from "../../util.js" +import {ID} from "../../util.js" +import * as status from "../../net/status.js" var menuPicker, colorPicker; diff --git a/client/www/scripts/interface/mainmenu/menu.js b/client/scripts/interface/mainmenu/menu.js similarity index 89% rename from client/www/scripts/interface/mainmenu/menu.js rename to client/scripts/interface/mainmenu/menu.js index 2ac67c3..93efecc 100644 --- a/client/www/scripts/interface/mainmenu/menu.js +++ b/client/scripts/interface/mainmenu/menu.js @@ -1,6 +1,6 @@ import * as status from "../../net/status.js" -import {joinGame, createGame} from "/scripts/net/netcode.js" -import { changeScene } from "/scripts/interface/scene.js" +// import {joinGame, createGame} from "../../net/netcode.js" +import { changeScene } from "../scene.js" import * as createMenu from "./create.js" function ID(id) { diff --git a/client/www/scripts/interface/mainmenu/picker.js b/client/scripts/interface/mainmenu/picker.js similarity index 100% rename from client/www/scripts/interface/mainmenu/picker.js rename to client/scripts/interface/mainmenu/picker.js diff --git a/client/www/scripts/interface/scene.js b/client/scripts/interface/scene.js similarity index 100% rename from client/www/scripts/interface/scene.js rename to client/scripts/interface/scene.js diff --git a/client/www/scripts/net/netcode.js b/client/scripts/net/netcode.js similarity index 77% rename from client/www/scripts/net/netcode.js rename to client/scripts/net/netcode.js index e2b66e4..e93e283 100644 --- a/client/www/scripts/net/netcode.js +++ b/client/scripts/net/netcode.js @@ -1,9 +1,9 @@ -import * as env from "/scripts/env.js" -import * as status from "/scripts/net/status.js" -import {game} from "/scripts/game/game.js" -import {render} from "/scripts/display/draw.js" -import { changeScene } from "/scripts/interface/scene.js" -import { illegalAction } from "/scripts/interface/common/illegalaction.js" +import * as env from "../env.js" +import * as status from "./status.js" +import {game} from "../game/game.js" +import {render} from "../display/draw.js" +import { changeScene } from "../interface/scene.js" +import { illegalAction } from "../interface/common/illegalaction.js" export var socket = io.connect(env.IP_ADDRESS); diff --git a/client/www/scripts/net/status.js b/client/scripts/net/status.js similarity index 80% rename from client/www/scripts/net/status.js rename to client/scripts/net/status.js index 341066b..21e150f 100644 --- a/client/www/scripts/net/status.js +++ b/client/scripts/net/status.js @@ -1,4 +1,4 @@ -import {updateConnectionStatus} from "/scripts/interface/game/connection.js" +import {updateConnectionStatus} from "../interface/game/connection.js" var SERVER_CONNECTION = "disconnected" diff --git a/client/www/scripts/util.js b/client/scripts/util.js similarity index 100% rename from client/www/scripts/util.js rename to client/scripts/util.js diff --git a/client/www/game.html b/client/www/game.html index 738c5bd..3afd104 100644 --- a/client/www/game.html +++ b/client/www/game.html @@ -5,7 +5,7 @@ - + diff --git a/client/www/scripts/script.js b/client/www/scripts/script.js deleted file mode 100644 index 6dfa1c1..0000000 --- a/client/www/scripts/script.js +++ /dev/null @@ -1,4 +0,0 @@ -import '/scripts/display/draw.js'; -import '/scripts/game/game.js' -import '/scripts/interface/mainmenu/menu.js' -import "/scripts/net/netcode.js" diff --git a/package-lock.json b/package-lock.json index 4ebcbe8..53a5cde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "UNLICENSED", "dependencies": { "express": "^4.18.1", - "rollup": "^2.75.7", "sass": "^1.52.3", "socket.io": "^4.5.0", "ts-node": "^10.8.1", @@ -19,7 +18,8 @@ "devDependencies": { "@tsconfig/node16": "^1.0.3", "@types/express": "^4.17.13", - "@types/node": "^18.0.0" + "@types/node": "^18.0.0", + "rollup": "^2.75.7" } }, "node_modules/@cspotcode/source-map-support": { @@ -906,6 +906,7 @@ "version": "2.75.7", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==", + "dev": true, "bin": { "rollup": "dist/bin/rollup" }, @@ -1924,6 +1925,7 @@ "version": "2.75.7", "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==", + "dev": true, "requires": { "fsevents": "~2.3.2" } diff --git a/package.json b/package.json index 4b58905..5c7b0cb 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "license": "UNLICENSED", "dependencies": { "express": "^4.18.1", - "rollup": "^2.75.7", "sass": "^1.52.3", "socket.io": "^4.5.0", "ts-node": "^10.8.1", @@ -24,6 +23,7 @@ }, "devDependencies": { "@tsconfig/node16": "^1.0.3", + "rollup": "^2.75.7", "@types/express": "^4.17.13", "@types/node": "^18.0.0" } diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 0000000..ec03d28 --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,9 @@ +export default { + input: 'client/scripts/index.js', + output: [ + { + file: 'dist/www/index.js', + format: 'iife' + } + ] +};