Skip to content

Commit 5cbfac7

Browse files
committed
fix build and change a few lint warnings to errors
1 parent 96d2697 commit 5cbfac7

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.eslintrc

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
"rules": {
55
"indent": [2, 4, {"SwitchCase": 1}],
6-
"quotes": [1, "single"],
6+
"quotes": [2, "single"],
77
"strict": [1, "global"],
88
"global-strict": 0,
99
"brace-style": [2, "1tbs"],
@@ -18,16 +18,16 @@
1818
"no-useless-concat": [1],
1919
"no-useless-constructor": [1],
2020
"array-bracket-spacing": [1, "never"],
21-
"block-spacing": [1, "always"],
21+
"block-spacing": [2, "always"],
2222
"camelcase": [1, { "properties": "never"}],
2323
"comma-dangle": [1],
24-
"space-before-blocks": [1],
24+
"space-before-blocks": [2],
2525
"space-in-parens": [2, "never"],
26-
"space-infix-ops": [1],
27-
"no-multiple-empty-lines": [1],
26+
"space-infix-ops": [2],
27+
"no-multiple-empty-lines": [2],
2828
"eol-last": [2],
2929
"semi": [2],
30-
"keyword-spacing": [1, {"overrides":
30+
"keyword-spacing": [2, {"overrides":
3131
{ "if": { "after": false }, "for": { "after": false }, "while": { "after": false }, "switch": { "after": false }, "catch": { "after": false } } }],
3232
"react/display-name": 1,
3333
"react/jsx-boolean-value": 1,

server/game/cards/characters/04/renlybaratheon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class RenlyBaratheon extends DrawCard {
55
this.reaction({
66
when: {
77
onInsight: (event, challenge, insightTrigger, drawn) => {
8-
if (insightTrigger.controller !== this.controller) {
8+
if(insightTrigger.controller !== this.controller) {
99
return false;
1010
}
1111
this.drawnCard = drawn;

server/game/cards/characters/06/margaerytyrell.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class MargaeryTyrell extends DrawCard {
88
when: {
99
onCharacterKilled: (event, player, card) => {
1010
return card.isUnique() && (card.hasTrait('king') || card.hasTrait('lord')) && card.controller === this.controller;
11-
},
11+
}
1212
},
1313
limit: ability.limit.perRound(1),
1414
handler: () => {
@@ -23,12 +23,14 @@ class MargaeryTyrell extends DrawCard {
2323
if(uniqueCardsByTitle.indexOf(char.cardData.label) >= 0) {
2424
return false;
2525
}
26+
2627
uniqueCardsByTitle.push(char.cardData.label);
2728
return true;
2829
});
2930
var buttons = _.map(selectableCharacters, card => {
3031
return { text: card.cardData.label, method: 'cardSelected', arg: card.uuid, card: card.getSummary(true) };
3132
});
33+
3234
buttons.push({ text: 'Done', method: 'doneSelecting' });
3335
this.game.promptWithMenu(this.controller, this, {
3436
activePrompt: {

server/server.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ const express = require('express');
1414
const path = require('path');
1515
const jwt = require('jsonwebtoken');
1616
const http = require('http');
17-
const webpackDevMiddleware = require("webpack-dev-middleware");
18-
const webpackHotMiddleware = require("webpack-hot-middleware");
19-
const webpack = require("webpack")
17+
const webpackDevMiddleware = require('webpack-dev-middleware');
18+
const webpackHotMiddleware = require('webpack-hot-middleware');
19+
const webpack = require('webpack');
2020
const webpackConfig = require('../webpack.config.js');
2121
const pug = require('pug');
2222

@@ -82,7 +82,7 @@ class Server {
8282
app.use(middleware);
8383
app.use(webpackHotMiddleware(compiler, {
8484
log: false,
85-
path: "/__webpack_hmr",
85+
path: '/__webpack_hmr',
8686
heartbeat: 2000
8787
}));
8888

0 commit comments

Comments
 (0)