From 021cac655cf341865a402f05a04df606d59306a7 Mon Sep 17 00:00:00 2001 From: schmelczerandras Date: Tue, 20 Oct 2020 09:24:00 +0200 Subject: [PATCH] Fix built assets --- Dockerfile | 2 +- backend/package.json | 6 +++--- frontend/src/index.ts | 4 ++++ frontend/webpack.config.js | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a1d9b6..4d4d16f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN yarn && yarn run build FROM node:14.13.0-alpine3.10 COPY backend/package.json . -RUN npm install --production +RUN yarn COPY --from=build backend/dist/main.js main.js diff --git a/backend/package.json b/backend/package.json index 2a22a29..5f7f17b 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "declared-server", - "version": "0.0.2", + "version": "0.0.3", "description": "Game server for decla.red", "keywords": [], "author": "AndrĂ¡s Schmelczer (https://schmelczer.dev/)", @@ -20,7 +20,7 @@ "minimist": "^1.2.5", "socket.io": "^2.3.0", "uws": "^10.148.1", - "webpack-node-externals": "^2.5.2" + "gl-matrix": "^3.3.0" }, "devDependencies": { "@types/minimist": "^1.2.0", @@ -40,8 +40,8 @@ "eslint-plugin-unused-imports": "^0.1.3", "file-loader": "^6.1.0", "ts-loader": "^8.0.3", - "gl-matrix": "^3.3.0", "nodemon": "^2.0.4", + "webpack-node-externals": "^2.5.2", "prettier": "^2.0.5", "raw-loader": "^4.0.1", "resolve-url-loader": "^3.1.1", diff --git a/frontend/src/index.ts b/frontend/src/index.ts index 6961c9b..932350e 100644 --- a/frontend/src/index.ts +++ b/frontend/src/index.ts @@ -18,6 +18,10 @@ import { handleFullScreen } from './scripts/handle-full-screen'; import { Game } from './scripts/game'; import { PlayerCharacterView } from './scripts/objects/player-character-view'; +import '../static/settings.svg'; +import '../static/minimize.svg'; +import '../static/maximize.svg'; + glMatrix.setMatrixArrayType(Array); overrideDeserialization(CharacterBase, CharacterView); diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index ed9e7b2..b314135 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -65,7 +65,7 @@ module.exports = (env, argv) => ({ }), new CleanWebpackPlugin({ protectWebpackAssets: false, - cleanAfterEveryBuildPatterns: ['*.js', '*.css'], + cleanAfterEveryBuildPatterns: ['*', '!index.html', '!static*'], }), ], module: {