Update build

This commit is contained in:
schmelczerandras 2020-10-23 15:16:52 +02:00
parent ffc89e5590
commit 49c410d8ff
6 changed files with 20 additions and 11 deletions

View file

@ -7,7 +7,7 @@ RUN apt update && export DEBIAN_FRONTEND=noninteractive \
RUN git lfs install RUN git lfs install
RUN npm i -g yarn concurrently RUN npm i && npm run init
ENV ZSH_CUSTOM /root/.oh-my-zsh/ ENV ZSH_CUSTOM /root/.oh-my-zsh/
RUN git clone https://github.com/reobin/typewritten.git $ZSH_CUSTOM/themes/typewritten RUN git clone https://github.com/reobin/typewritten.git $ZSH_CUSTOM/themes/typewritten

View file

@ -16,7 +16,7 @@ jobs:
lfs: true lfs: true
- name: Build project - name: Build project
run: | run: |
yarn && yarn run build npm i && npm run init && npm run build
- name: Deploy frontend - name: Deploy frontend
uses: w9jds/firebase-action@master uses: w9jds/firebase-action@master
with: with:

View file

@ -6,7 +6,7 @@
"author": "András Schmelczer <andras@schmelczer.dev> (https://schmelczer.dev/)", "author": "András Schmelczer <andras@schmelczer.dev> (https://schmelczer.dev/)",
"main": "dist/main.js", "main": "dist/main.js",
"bin": { "bin": {
"declared-server": "./dist/main.js" "declared-server": "dist/main.js"
}, },
"scripts": { "scripts": {
"build": "npx webpack --mode production", "build": "npx webpack --mode production",
@ -44,6 +44,7 @@
"prettier": "^2.0.5", "prettier": "^2.0.5",
"raw-loader": "^4.0.1", "raw-loader": "^4.0.1",
"resolve-url-loader": "^3.1.1", "resolve-url-loader": "^3.1.1",
"shared": "file:../shared",
"terser-webpack-plugin": "^2.3.5", "terser-webpack-plugin": "^2.3.5",
"ts-config-webpack-plugin": "^2.0.0", "ts-config-webpack-plugin": "^2.0.0",
"ts-loader": "^8.0.3", "ts-loader": "^8.0.3",

View file

@ -38,8 +38,11 @@
"resolve-url-loader": "^3.1.1", "resolve-url-loader": "^3.1.1",
"scss-config-webpack-plugin": "^2.0.0", "scss-config-webpack-plugin": "^2.0.0",
"sdf-2d": "^0.6.0", "sdf-2d": "^0.6.0",
"shared": "file:../shared",
"socket.io-client": "^2.3.1", "socket.io-client": "^2.3.1",
"source-map-loader": "^1.1.1", "source-map-loader": "^1.1.1",
"style-ext-html-webpack-plugin": "^4.1.2",
"svg-url-loader": "^6.0.0",
"terser-webpack-plugin": "^4.2.2", "terser-webpack-plugin": "^4.2.2",
"ts-config-webpack-plugin": "^2.0.0", "ts-config-webpack-plugin": "^2.0.0",
"typescript": "^4.0.3", "typescript": "^4.0.3",

View file

@ -4,6 +4,8 @@ const ScssConfigWebpackPlugin = require('scss-config-webpack-plugin');
const TsConfigWebpackPlugin = require('ts-config-webpack-plugin'); const TsConfigWebpackPlugin = require('ts-config-webpack-plugin');
const HtmlWebpackInlineSVGPlugin = require('html-webpack-inline-svg-plugin'); const HtmlWebpackInlineSVGPlugin = require('html-webpack-inline-svg-plugin');
const TerserJSPlugin = require('terser-webpack-plugin'); const TerserJSPlugin = require('terser-webpack-plugin');
//const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
//const StyleExtHtmlWebpackPlugin = require('style-ext-html-webpack-plugin');
module.exports = { module.exports = {
devServer: { devServer: {
@ -28,6 +30,8 @@ module.exports = {
}, },
], ],
}), }),
//new StyleExtHtmlWebpackPlugin('main.css'),
//new FaviconsWebpackPlugin('static/logo.svg'),
// SCSS Configuration for .css .module.css and .scss .module.scss files // SCSS Configuration for .css .module.css and .scss .module.scss files
// see https://github.com/namics/webpack-config-plugins/tree/master/packages/scss-config-webpack-plugin/config // see https://github.com/namics/webpack-config-plugins/tree/master/packages/scss-config-webpack-plugin/config
new ScssConfigWebpackPlugin(), new ScssConfigWebpackPlugin(),
@ -54,7 +58,14 @@ module.exports = {
use: ['source-map-loader'], use: ['source-map-loader'],
}, },
{ {
test: /\.(svg|png)$/, test: /\.svg/,
use: {
loader: 'svg-url-loader',
options: {},
},
},
{
test: /\.(png)$/,
use: { use: {
loader: 'file-loader', loader: 'file-loader',
}, },

View file

@ -1,13 +1,6 @@
{ {
"name": "root", "name": "root",
"private": true, "private": true,
"workspaces": {
"packages": [
"frontend",
"shared",
"backend"
]
},
"devDependencies": { "devDependencies": {
"concurrently": "^5.3.0" "concurrently": "^5.3.0"
}, },
@ -15,6 +8,7 @@
"build": "cd shared && npm run build && cd ../frontend && npm run build && cd ../backend && npm run build", "build": "cd shared && npm run build && cd ../frontend && npm run build && cd ../backend && npm run build",
"lint": "eslint './**/src/**/*.{js,ts,json}' --fix", "lint": "eslint './**/src/**/*.{js,ts,json}' --fix",
"frontend": "yarn workspace decla.red-frontend start", "frontend": "yarn workspace decla.red-frontend start",
"init": "cd shared && npm install && cd ../frontend && npm install && cd ../backend && npm install",
"shared": "yarn workspace shared start", "shared": "yarn workspace shared start",
"backend": "yarn workspace declared-server start", "backend": "yarn workspace declared-server start",
"start": "concurrently --kill-others-on-fail \"cd shared && npm start\" \"cd backend && npm start\" \"cd frontend && npm start\"" "start": "concurrently --kill-others-on-fail \"cd shared && npm start\" \"cd backend && npm start\" \"cd frontend && npm start\""