Merge branch 'master' into tooomm-patch-7

Author: tooomm

.github/workflows/tests.yml

@@ -20,7 +20,6 @@ jobs:
       fail-fast: false
       matrix:
         node_version:
-          - 12
           - lts/*
           - current
 
@@ -39,6 +38,11 @@ jobs:
           node-version: ${{ matrix.node_version }}
           cache: npm
 
+      # See https://github.com/npm/cli/issues/2610
+      - name: Workaround for Node 14
+        if: matrix.node_version == '14'
+        run: sed -i 's/git+ssh/git+https/g' package-lock.json
+
       - name: Install
         run: npm clean-install
 

.nvmrc

@@ -1 +1 @@
-v12
+16.15.1

Dockerfile

@@ -15,7 +15,7 @@ RUN chown dr4ftuser -R .
 USER dr4ftuser
 
 # Install the dependencies
-RUN npm install
+RUN npm ci
 
 # Publish the port 1337
 EXPOSE 1337

README.md

@@ -64,9 +64,9 @@ It supports all their features, and many more.
 
 ### Native
 
-1) Install [Node.js](https://nodejs.org/en/download/) >= 12.0.0
+1) Install [Node.js](https://nodejs.org/en/download/) >= 16.0.0. Alternatively, install [nvm](https://github.com/nvm-sh/nvm) and then run `nvm use` in this repo, which will install the correct Node version for this repo as defined in the `.nvmrc` file.
 2) Run<br>
-`$ npm install`<br>
+`$ npm ci`<br>
 `$ npm run build`<br>
 `$ npm start`
 3) Visit [http://localhost:1337](http://localhost:1337)
@@ -131,7 +131,7 @@ Breakpoints for the frontend should be set in your browser console.
 
 Be a part of this project! You can run the test using the following.
 
-1. Install dependencies from package.json by running `npm install`
+1. Install dependencies from package.json by running `npm ci`
 2. Run the test via `npm test`
 3. Make some fun new modules!
 

backend/import/xml/parser.js

@@ -81,7 +81,7 @@ function parse(content) {
       pt = "",
       side = "a",
       type = "" } = root.version === "3" ? c : c.prop;
-    const [power, toughness] = pt.split("/");
+    const [power, toughness] = String(pt).split("/");
     const fixedColors = getTrueColors(root.version, color, colors);
     const fixedType = getTrueType(type);
     const fixedManaCost = addManaCostBrackets(String(manacost));

config/app.js

@@ -1,4 +1,4 @@
-const joi = require("@hapi/joi");
+const joi = require("joi");
 
 const envVarsSchema = joi.object({
   PORT: joi.number()

config/logger.js

@@ -1,4 +1,4 @@
-const joi = require("@hapi/joi");
+const joi = require("joi");
 
 const envVarsSchema = joi.object({
   LOGGER_LEVEL: joi.string()

frontend/src/lobby/Lobby.jsx

@@ -25,7 +25,7 @@ export default class Lobby extends Component {
           <Header/>
           <GamesPanel roomInfo={roomInfo}/>
           <FileUpload />
-          <NewsPanel motd={STRINGS.PAGE_SECTIONS.MOTD}/>
+          {STRINGS.PAGE_SECTIONS.MOTD && <NewsPanel motd={STRINGS.PAGE_SECTIONS.MOTD}/>}
           {STRINGS.BRANDING.PAYPAL}
           {STRINGS.PAGE_SECTIONS.FOOTER}
           <Version version={serverVersion} MTGJSONVersion={mtgJsonVersion} boosterRulesVersion={boosterRulesVersion}/>

frontend/src/lobby/Version.jsx

@@ -13,21 +13,20 @@ const Version = ({version, MTGJSONVersion, boosterRulesVersion}) => {
   return (
     <div className="Version">
       <div>
-        dr4ft version: {" "}
+        <a href="https://github.com/dr4fters/dr4ft">dr4ft</a> {" "}
         <a href={`https://github.com/dr4fters/dr4ft/${getLink(version)}`} className='code'>
           <code>{version}</code>
         </a> <span className='date'>({BUILD_DATE})</span>
       </div>
 
       <div>
-        Card data: <a href="https://www.mtgjson.com">MTGJSON</a> {" "}
+        <a href="https://www.mtgjson.com">MTGJSON</a> {" "}
         <a href={`https://mtgjson.com/changelog/mtgjson-v5/#_${MTGJSONVersion.version.replace(/\./g, "-")}`} className='code'>
           <code>v{MTGJSONVersion.version}</code>
         </a> <span className='date'>({MTGJSONVersion.date})</span>
       </div>
 
       <div>
-        Booster rules: {" "}
         <a href={"https://github.com/taw/magic-sealed-data"}>Magic Sealed Data</a> {" "}
         <a href={`https://github.com/taw/magic-sealed-data/commit/${boosterRulesVersion}`} className='code'>
           <code>{boosterRulesVersion.substring(0, 7)}</code>