Up version to v3.9.1

Bump react-router-dom from 6.13.0 to 6.14.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.13-alpine
+FROM node:18-alpine
 RUN apk --no-cache add git
 
 ENV NODE_ENV=docker

changelog.md

@@ -80,6 +80,16 @@ pre {
 ## changelog
 For a full record of development, visit our [Github Page](https://github.com/naturalcrit/homebrewery).
 
+### Friday 28/06/2023 - v3.9.1
+{{taskList
+
+##### G-Ambatte
+
+* [x] Better error pages with more useful information
+
+Fixes issue [#1924](https://github.com/naturalcrit/homebrewery/issues/1924) 
+}}
+
 ### Friday 02/06/2023 - v3.9.0
 {{taskList
 
@@ -101,7 +111,7 @@ Fixes issues [#2092](https://github.com/naturalcrit/homebrewery/issues/2092), [#
 
 Fixes issue [#2790](https://github.com/naturalcrit/homebrewery/issues/2790) 
 
-##### 5e-Clerc
+##### 5e-Cleric
 
 * [x] New {{openSans **PHB → {{fac,book-part-cover}} PART COVER PAGE**  }} snippet for V3!
 
@@ -145,7 +155,7 @@ Fixes issues [#1679](https://github.com/naturalcrit/homebrewery/issues/1679)
 
 * [x] Add local Windows install script via Chocolatey
 
-##### 5e-Clerc
+##### 5e-Cleric
 
 * [x] New {{openSans **TABLES → {{fas,fa-language}} RUNE TABLE**}} snippets for V3. Adds an alphabetic script translation table.
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebrewery",
   "description": "Create authentic looking D&D homebrews using only markdown",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "engines": {
     "node": ">=18.16.x"
   },
@@ -78,10 +78,10 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.22.1",
+    "@babel/core": "^7.22.5",
-    "@babel/plugin-transform-runtime": "^7.22.4",
+    "@babel/plugin-transform-runtime": "^7.22.5",
-    "@babel/preset-env": "^7.22.4",
+    "@babel/preset-env": "^7.22.5",
-    "@babel/preset-react": "^7.22.3",
+    "@babel/preset-react": "^7.22.5",
     "@googleapis/drive": "^5.1.0",
     "body-parser": "^1.20.2",
     "classnames": "^2.3.2",
@@ -97,32 +97,33 @@
     "jwt-simple": "^0.5.6",
     "less": "^3.13.1",
     "lodash": "^4.17.21",
-    "marked": "5.0.4",
+    "marked": "5.1.0",
     "marked-extended-tables": "^1.0.6",
-    "marked-gfm-heading-id": "^3.0.3",
+    "marked-gfm-heading-id": "^3.0.4",
+    "marked-smartypants-lite": "^1.0.0",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.29.4",
-    "mongoose": "^7.2.2",
+    "mongoose": "^7.3.1",
     "nanoid": "3.3.4",
     "nconf": "^0.12.0",
-    "npm": "^9.6.7",
+    "npm": "^9.7.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-frame-component": "^4.1.3",
-    "react-router-dom": "6.11.2",
+    "react-router-dom": "6.14.0",
     "sanitize-filename": "1.6.3",
     "superagent": "^6.1.0",
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.41.0",
+    "eslint": "^8.43.0",
-    "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-jest": "^27.2.2",
     "eslint-plugin-react": "^7.32.2",
     "jest": "^29.5.0",
     "jest-expect-message": "^1.1.3",
     "postcss-less": "^6.0.0",
-    "stylelint": "^15.6.2",
+    "stylelint": "^15.9.0",
-    "stylelint-config-recess-order": "^4.0.0",
+    "stylelint-config-recess-order": "^4.2.0",
     "stylelint-config-recommended": "^12.0.0",
     "stylelint-stylistic": "^0.4.2",
     "supertest": "^6.3.3"

shared/naturalcrit/markdown.js

@@ -2,6 +2,7 @@
 const _ = require('lodash');
 const Marked = require('marked');
 const MarkedExtendedTables = require('marked-extended-tables');
+const { markedSmartypantsLite: MarkedSmartypantsLite } = require('marked-smartypants-lite');
 const { gfmHeadingId: MarkedGFMHeadingId } = require('marked-gfm-heading-id');
 const renderer = new Marked.Renderer();
 
@@ -237,49 +238,10 @@ const definitionLists = {
 	}
 };
 
-const MarkedSmartyPantsLite = ()=>{
-	return {
-		tokenizer : {
-			inlineText(src) {
-				// don't escape inlineText
-				const cap = this.rules.inline.text.exec(src);
-
-				/* istanbul ignore next */
-				if(!cap) {
-					// should never happen
-					return;
-				}
-
-				const text = cap[0]
-					// em-dashes
-					.replace(/---/g, '\u2014')
-					// en-dashes
-					.replace(/--/g, '\u2013')
-					// opening singles
-					.replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
-					// closing singles & apostrophes
-					.replace(/'/g, '\u2019')
-					// opening doubles
-					.replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
-					// closing doubles
-					.replace(/"/g, '\u201d')
-					// ellipses
-					.replace(/\.{3}/g, '\u2026');
-
-				return {
-					type : 'text',
-					raw  : cap[0],
-					text : text
-				};
-			}
-		}
-	};
-};
-
 Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists] });
 Marked.use(mustacheInjectBlock);
 Marked.use({ renderer: renderer, mangle: false });
-Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartyPantsLite());
+Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartypantsLite());
 
 //Fix local links in the Preview iFrame to link inside the frame
 renderer.link = function (href, title, text) {

tests/markdown/basic.test.js

@@ -5,7 +5,7 @@ const Markdown = require('naturalcrit/markdown.js');
 test('Escapes <script> tag', function() {
 	const source = '<script></script>';
 	const rendered = Markdown.render(source);
-	expect(rendered).toMatch('&lt;script&gt;&lt;/script&gt;');
+	expect(rendered).toMatch('<p>&lt;script>&lt;/script&gt;</p>\n');
 });
 
 test('Processes the markdown within an HTML block if its just a class wrapper', function() {