Merge pull request #44 from cwrc/development

Merge Development into Production

.travis.yml

@@ -5,7 +5,7 @@ cache:
 notifications:
   email: false
 node_js:
-  - '13.9.0'
+  - '14.2.0'
 script:
   - npm run test
 after_success:

jest.config.js

@@ -0,0 +1,22 @@
+module.exports = {
+    collectCoverage: true,
+    collectCoverageFrom: [
+      './src/index.js'
+    ],
+    coverageDirectory: './coverage',
+    coverageThreshold: {
+      global: {
+        branches: 10,
+        functions: 10,
+        lines: 10,
+        statements: 10
+      }
+    },
+    testMatch: [
+      '**/test/**/*.[jt]s?(x)'
+    ],
+    transform: {
+        '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
+        '^.+\\.js$': 'babel-jest'
+    },
+}

package.json

@@ -43,18 +43,20 @@
     "react-dom": "^16.13.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
+    "@babel/core": "^7.9.6",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.9.0",
-    "@babel/preset-env": "^7.9.5",
+    "@babel/plugin-transform-runtime": "^7.9.6",
+    "@babel/preset-env": "^7.9.6",
     "@babel/preset-react": "^7.9.4",
-    "codecov": "^3.6.5",
-    "commitizen": "^4.0.4",
-    "cz-conventional-changelog": "^3.1.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.19.0",
+    "babel-jest": "^26.0.1",
+    "codecov": "^3.7.0",
+    "commitizen": "^4.1.2",
+    "cz-conventional-changelog": "^3.2.0",
+    "eslint": "^7.0.0",
+    "eslint-plugin-react": "^7.20.0",
     "husky": "^4.2.5",
-    "jest": "^25.4.0",
+    "jest": "^26.0.1",
+    "jest-transform-stub": "^2.0.0",
     "less": "^3.11.1",
     "semantic-release": "^17.0.7",
     "travis-deploy-once": "^5.0.11"
@@ -68,23 +70,5 @@
     "hooks": {
       "pre-commit": "npm run test"
     }
-  },
-  "jest": {
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "./src/index.js"
-    ],
-    "coverageDirectory": "./coverage",
-    "coverageThreshold": {
-      "global": {
-        "branches": 10,
-        "functions": 10,
-        "lines": 10,
-        "statements": 10
-      }
-    },
-    "testMatch": [
-      "**/test/**/*.[jt]s?(x)"
-    ]
   }
 }

src/Splash.js

@@ -7,7 +7,7 @@ const Splash = (props) => {
     return (
         <Fragment>
 			<Modal.Body style={{lineHeight: '1.35em', margin: '0px 15px'}}>
-                <PageHeader>Welcome to CWRC-Writer<br/><small>The XML & RDF online editor developed by the <a href="https://cwrc.ca"  rel="noopener noreferrer">Canadian Writing Research Collaboratory</a></small></PageHeader>
+                <PageHeader>Welcome to CWRC-Writer<br/><small>The XML & RDF online editor developed by the <a href="https://cwrc.ca" rel="noopener noreferrer">Canadian Writing Research Collaboratory</a></small></PageHeader>
                 <p>CWRC-Writer provides:</p>
                 <ul>
                     <li>schema-aware document editing, including validation, against web-accessible schemas</li>