[#233] Setup project for initial deployment

Ido-Barnea · Feb 27, 2024 · 319dc65 · 319dc65
1 parent 56dc699
commit 319dc65
Show file tree

Hide file tree

Showing 71 changed files with 127 additions and 1,360 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -5,6 +5,7 @@
     "prettier"
   ],
   "plugins": ["@typescript-eslint", "prettier"],
+  "files": ["*.ts"],
   "rules": {
     "no-unused-vars": "off",
     "@typescript-eslint/no-unused-vars": [

diff --git a/Procfile b/Procfile
@@ -1 +1 @@
-web: webpack serve --config webpack.config.prod.ts
+web: npm run build && npm run start
diff --git a/development/Constants.ts → core/development/Constants.ts b/development/Constants.ts → core/development/Constants.ts
diff --git a/development/Game.ts → core/development/Game.ts b/development/Game.ts → core/development/Game.ts
diff --git a/development/LogicAdapter.ts → core/development/LogicAdapter.ts b/development/LogicAdapter.ts → core/development/LogicAdapter.ts
diff --git a/development/logic/PieceLogic.ts → core/development/logic/PieceLogic.ts b/development/logic/PieceLogic.ts → core/development/logic/PieceLogic.ts
diff --git a/development/logic/Players.ts → core/development/logic/Players.ts b/development/logic/Players.ts → core/development/logic/Players.ts
diff --git a/development/logic/Utilities.ts → core/development/logic/Utilities.ts b/development/logic/Utilities.ts → core/development/logic/Utilities.ts
diff --git a/development/logic/items/Inventory.ts → core/development/logic/items/Inventory.ts b/development/logic/items/Inventory.ts → core/development/logic/items/Inventory.ts
diff --git a/development/logic/items/Items.test.ts → core/development/logic/items/Items.test.ts b/development/logic/items/Items.test.ts → core/development/logic/items/Items.test.ts
diff --git a/development/logic/items/Items.ts → core/development/logic/items/Items.ts b/development/logic/items/Items.ts → core/development/logic/items/Items.ts
diff --git a/development/logic/items/PiggyBank.ts → core/development/logic/items/PiggyBank.ts b/development/logic/items/PiggyBank.ts → core/development/logic/items/PiggyBank.ts
diff --git a/development/logic/items/Shield.ts → core/development/logic/items/Shield.ts b/development/logic/items/Shield.ts → core/development/logic/items/Shield.ts
diff --git a/development/logic/items/Shop.ts → core/development/logic/items/Shop.ts b/development/logic/items/Shop.ts → core/development/logic/items/Shop.ts
diff --git a/development/logic/items/Trap.ts → core/development/logic/items/Trap.ts b/development/logic/items/Trap.ts → core/development/logic/items/Trap.ts
diff --git a/development/logic/pieces/Bishop.test.ts → core/development/logic/pieces/Bishop.test.ts b/development/logic/pieces/Bishop.test.ts → core/development/logic/pieces/Bishop.test.ts
diff --git a/development/logic/pieces/Bishop.ts → core/development/logic/pieces/Bishop.ts b/development/logic/pieces/Bishop.ts → core/development/logic/pieces/Bishop.ts
diff --git a/development/logic/pieces/DoubleQueen.test.ts → ...elopment/logic/pieces/DoubleQueen.test.ts b/development/logic/pieces/DoubleQueen.test.ts → ...elopment/logic/pieces/DoubleQueen.test.ts
diff --git a/development/logic/pieces/DoubleQueen.ts → core/development/logic/pieces/DoubleQueen.ts b/development/logic/pieces/DoubleQueen.ts → core/development/logic/pieces/DoubleQueen.ts
diff --git a/development/logic/pieces/Golem.test.ts → core/development/logic/pieces/Golem.test.ts b/development/logic/pieces/Golem.test.ts → core/development/logic/pieces/Golem.test.ts
diff --git a/development/logic/pieces/Golem.ts → core/development/logic/pieces/Golem.ts b/development/logic/pieces/Golem.ts → core/development/logic/pieces/Golem.ts
diff --git a/development/logic/pieces/King.test.ts → core/development/logic/pieces/King.test.ts b/development/logic/pieces/King.test.ts → core/development/logic/pieces/King.test.ts
diff --git a/development/logic/pieces/King.ts → core/development/logic/pieces/King.ts b/development/logic/pieces/King.ts → core/development/logic/pieces/King.ts
diff --git a/development/logic/pieces/Knight.test.ts → core/development/logic/pieces/Knight.test.ts b/development/logic/pieces/Knight.test.ts → core/development/logic/pieces/Knight.test.ts
diff --git a/development/logic/pieces/Knight.ts → core/development/logic/pieces/Knight.ts b/development/logic/pieces/Knight.ts → core/development/logic/pieces/Knight.ts
diff --git a/development/logic/pieces/Pawn.test.ts → core/development/logic/pieces/Pawn.test.ts b/development/logic/pieces/Pawn.test.ts → core/development/logic/pieces/Pawn.test.ts
diff --git a/development/logic/pieces/Pawn.ts → core/development/logic/pieces/Pawn.ts b/development/logic/pieces/Pawn.ts → core/development/logic/pieces/Pawn.ts
diff --git a/development/logic/pieces/Piece.ts → core/development/logic/pieces/Piece.ts b/development/logic/pieces/Piece.ts → core/development/logic/pieces/Piece.ts
diff --git a/development/logic/pieces/PiecesUtilities.ts → ...velopment/logic/pieces/PiecesUtilities.ts b/development/logic/pieces/PiecesUtilities.ts → ...velopment/logic/pieces/PiecesUtilities.ts
diff --git a/development/logic/pieces/Queen.test.ts → core/development/logic/pieces/Queen.test.ts b/development/logic/pieces/Queen.test.ts → core/development/logic/pieces/Queen.test.ts
diff --git a/development/logic/pieces/Queen.ts → core/development/logic/pieces/Queen.ts b/development/logic/pieces/Queen.ts → core/development/logic/pieces/Queen.ts
diff --git a/development/logic/pieces/Rook.test.ts → core/development/logic/pieces/Rook.test.ts b/development/logic/pieces/Rook.test.ts → core/development/logic/pieces/Rook.test.ts
diff --git a/development/logic/pieces/Rook.ts → core/development/logic/pieces/Rook.ts b/development/logic/pieces/Rook.ts → core/development/logic/pieces/Rook.ts
diff --git a/development/logic/pieces/Unicorn.test.ts → .../development/logic/pieces/Unicorn.test.ts b/development/logic/pieces/Unicorn.test.ts → .../development/logic/pieces/Unicorn.test.ts
diff --git a/development/logic/pieces/Unicorn.ts → core/development/logic/pieces/Unicorn.ts b/development/logic/pieces/Unicorn.ts → core/development/logic/pieces/Unicorn.ts
diff --git a/development/logic/pieces/UpgradeTree.ts → core/development/logic/pieces/UpgradeTree.ts b/development/logic/pieces/UpgradeTree.ts → core/development/logic/pieces/UpgradeTree.ts
diff --git a/development/logic/rules/BaseRule.ts → core/development/logic/rules/BaseRule.ts b/development/logic/rules/BaseRule.ts → core/development/logic/rules/BaseRule.ts
diff --git a/development/logic/rules/BountyRule.ts → core/development/logic/rules/BountyRule.ts b/development/logic/rules/BountyRule.ts → core/development/logic/rules/BountyRule.ts
diff --git a/development/logic/rules/CoupRule.ts → core/development/logic/rules/CoupRule.ts b/development/logic/rules/CoupRule.ts → core/development/logic/rules/CoupRule.ts
diff --git a/development/logic/rules/EmptyPocketsRule.ts → ...velopment/logic/rules/EmptyPocketsRule.ts b/development/logic/rules/EmptyPocketsRule.ts → ...velopment/logic/rules/EmptyPocketsRule.ts
diff --git a/...pment/logic/rules/ExperienceOnKillRule.ts → ...pment/logic/rules/ExperienceOnKillRule.ts b/...pment/logic/rules/ExperienceOnKillRule.ts → ...pment/logic/rules/ExperienceOnKillRule.ts
diff --git a/development/logic/rules/FirstBloodRule.ts → ...development/logic/rules/FirstBloodRule.ts b/development/logic/rules/FirstBloodRule.ts → ...development/logic/rules/FirstBloodRule.ts
diff --git a/development/logic/rules/FriendlyFireRule.ts → ...velopment/logic/rules/FriendlyFireRule.ts b/development/logic/rules/FriendlyFireRule.ts → ...velopment/logic/rules/FriendlyFireRule.ts
diff --git a/...gic/rules/PiecesCanFallOffTheBoardRule.ts → ...gic/rules/PiecesCanFallOffTheBoardRule.ts b/...gic/rules/PiecesCanFallOffTheBoardRule.ts → ...gic/rules/PiecesCanFallOffTheBoardRule.ts
diff --git a/development/logic/rules/RulesManager.ts → core/development/logic/rules/RulesManager.ts b/development/logic/rules/RulesManager.ts → core/development/logic/rules/RulesManager.ts
diff --git a/...ent/logic/rules/WithAgeComesWisdomRule.ts → ...ent/logic/rules/WithAgeComesWisdomRule.ts b/...ent/logic/rules/WithAgeComesWisdomRule.ts → ...ent/logic/rules/WithAgeComesWisdomRule.ts
diff --git a/development/pages/Room.ts → core/development/pages/Room.ts b/development/pages/Room.ts → core/development/pages/Room.ts
diff --git a/development/ui/Board.ts → core/development/ui/Board.ts b/development/ui/Board.ts → core/development/ui/Board.ts
diff --git a/development/ui/BoardManager.ts → core/development/ui/BoardManager.ts b/development/ui/BoardManager.ts → core/development/ui/BoardManager.ts
diff --git a/development/ui/Events.ts → core/development/ui/Events.ts b/development/ui/Events.ts → core/development/ui/Events.ts
diff --git a/development/ui/InventoriesUI.ts → core/development/ui/InventoriesUI.ts b/development/ui/InventoriesUI.ts → core/development/ui/InventoriesUI.ts
diff --git a/development/ui/Resources.ts → core/development/ui/Resources.ts b/development/ui/Resources.ts → core/development/ui/Resources.ts
diff --git a/development/ui/Screen.ts → core/development/ui/Screen.ts b/development/ui/Screen.ts → core/development/ui/Screen.ts
diff --git a/development/ui/ShopUI.ts → core/development/ui/ShopUI.ts b/development/ui/ShopUI.ts → core/development/ui/ShopUI.ts
diff --git a/development/ui/logs/Log.ts → core/development/ui/logs/Log.ts b/development/ui/logs/Log.ts → core/development/ui/logs/Log.ts
diff --git a/development/ui/logs/Logger.ts → core/development/ui/logs/Logger.ts b/development/ui/logs/Logger.ts → core/development/ui/logs/Logger.ts
diff --git a/styles/base.css → core/styles/base.css b/styles/base.css → core/styles/base.css
diff --git a/styles/components.css → core/styles/components.css b/styles/components.css → core/styles/components.css
diff --git a/styles/layout.css → core/styles/layout.css b/styles/layout.css → core/styles/layout.css
diff --git a/styles/responsive.css → core/styles/responsive.css b/styles/responsive.css → core/styles/responsive.css
diff --git a/styles/states.css → core/styles/states.css b/styles/states.css → core/styles/states.css
diff --git a/styles/themes.css → core/styles/themes.css b/styles/themes.css → core/styles/themes.css
diff --git a/views/404.html → core/views/404.html b/views/404.html → core/views/404.html
diff --git a/views/home.html → core/views/home.html b/views/home.html → core/views/home.html
diff --git a/views/room.html → core/views/room.html b/views/room.html → core/views/room.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,14 +2,21 @@
   "name": "chess-but-better",
   "description": "Chess with an added layer of complexity",
   "scripts": {
-    "start": "webpack serve --config webpack.config.dev.ts",
     "lint": "npx nx run-many --target lint",
     "format": "npx nx format:write",
     "test": "npx nx run-many --target test --all",
-    "build": "webpack --config webpack.config.prod.ts"
+    "dev": "webpack serve --config webpack.config.ts",
+    "build": "webpack --config webpack.config.ts",
+    "start": "node server.js"
   },
   "author": "Ido Barnea",
   "license": "Apache-2.0",
+  "dependencies": {
+    "copy-webpack-plugin": "^12.0.2",
+    "express": "^4.18.2",
+    "html-webpack-plugin": "^5.6.0",
+    "webpack-cli": "^5.1.4"
+  },
   "devDependencies": {
     "@nx/eslint-plugin": "16.10.0",
     "@nx/jest": "^17.2.7",
@@ -18,14 +25,11 @@
     "@nx/workspace": "16.10.0",
     "@types/jest": "^29.5.11",
     "@types/node": "18.7.1",
-    "@types/webpack-dev-server": "^4.7.2",
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
-    "copy-webpack-plugin": "^12.0.2",
     "eslint": "~8.46.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "html-webpack-plugin": "^5.6.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.4.1",
     "nx": "17.2.7",
@@ -35,11 +39,6 @@
     "ts-jest": "^29.1.1",
     "ts-loader": "^9.5.1",
     "ts-node": "10.9.1",
-    "typescript": "~5.1.3",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
-  },
-  "dependencies": {
-    "webpack": "^5.90.3"
+    "typescript": "~5.1.3"
   }
 }
diff --git a/server.js b/server.js
@@ -0,0 +1,23 @@
+const express = require('express');
+const path = require('path');
+
+const app = express();
+const PORT = process.env.PORT || 5000;
+
+app.use(express.static(path.join(__dirname, 'dist')));
+
+app.get('/', (req, res) => {
+  res.sendFile(path.join(__dirname, 'dist', 'views', 'home.html'));
+});
+
+app.get('/room', (req, res) => {
+  res.sendFile(path.join(__dirname, 'dist', 'views', 'room.html'));
+});
+
+app.use((req, res, next) => {
+  res.status(404).sendFile(path.join(__dirname, 'dist', 'views', '404.html'));
+});
+
+app.listen(PORT, () => {
+   console.log(`[Server] Listening on port ${PORT}.`);
+});
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,15 +1,18 @@
 {
   "compilerOptions": {
+    "module": "CommonJS",
     "target": "es2016",
     "experimentalDecorators": true,
     "jsxImportSource": "preact",
-    "module": "commonjs",
-    "rootDir": ".",
+    "rootDir": "./core",
     "sourceMap": true,
-    "outDir": "output",
+    "outDir": "./dist",
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "skipLibCheck": true
-  }
+    "skipLibCheck": true,
+  },
+  "include": [
+    "core/**/*.ts"
+  ]
 }
diff --git a/webpack.config.dev.ts b/webpack.config.dev.ts
diff --git a/webpack.config.prod.ts → webpack.config.ts b/webpack.config.prod.ts → webpack.config.ts
@@ -1,17 +1,12 @@
 import path from 'path';
 import webpack from 'webpack';
-import { Configuration as DevServerConfiguration } from 'webpack-dev-server';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import CopyWebpackPlugin from 'copy-webpack-plugin';
 
-interface CustomConfiguration extends webpack.Configuration {
-  devServer?: DevServerConfiguration;
-}
-
-const config: CustomConfiguration = {
+const config: webpack.Configuration = {
   mode: 'production',
   entry: {
-    room: './development/pages/Room.ts',
+    room: './core/development/pages/Room.ts',
   },
   output: {
     path: path.resolve(__dirname, 'dist'),
@@ -36,42 +31,26 @@ const config: CustomConfiguration = {
   plugins: [
     new HtmlWebpackPlugin({
       filename: 'views/home.html',
-      template: './views/home.html',
+      template: './core/views/home.html',
       chunks: [],
       favicon: './assets/logo.svg',
     }),
     new HtmlWebpackPlugin({
       filename: 'views/room.html',
-      template: './views/room.html',
+      template: './core/views/room.html',
       chunks: ['room'],
       favicon: './assets/logo.svg',
     }),
     new HtmlWebpackPlugin({
       filename: 'views/404.html',
-      template: './views/404.html',
+      template: './core/views/404.html',
       chunks: [],
       favicon: './assets/logo.svg',
     }),
     new CopyWebpackPlugin({
-      patterns: [{ from: 'styles', to: 'styles' }],
+      patterns: [{ from: './core/styles', to: 'styles' }],
     }),
   ],
-  devServer: {
-    static: {
-      directory: path.join(__dirname, 'dist'),
-    },
-    port: 8080,
-    client: {
-      logging: 'none',
-    },
-    historyApiFallback: {
-      rewrites: [
-        { from: /^\/(home)?$/, to: '/views/home.html' },
-        { from: /^\/room$/, to: '/views/room.html' },
-        { from: /./, to: '/views/404.html' },
-      ],
-    },
-  },
 };
 
 export default config;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		web: webpack serve --config webpack.config.prod.ts
		web: npm run build && npm run start