0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 20:42:43 +00:00

Merge branch 'master' into pr/2417

This commit is contained in:
Trevor Buckner
2023-06-12 22:26:10 -04:00
4 changed files with 17616 additions and 17649 deletions

View File

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

35237
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -78,10 +78,10 @@
]
},
"dependencies": {
"@babel/core": "^7.22.1",
"@babel/plugin-transform-runtime": "^7.22.4",
"@babel/preset-env": "^7.22.4",
"@babel/preset-react": "^7.22.3",
"@babel/core": "^7.22.5",
"@babel/plugin-transform-runtime": "^7.22.5",
"@babel/preset-env": "^7.22.5",
"@babel/preset-react": "^7.22.5",
"@googleapis/drive": "^5.1.0",
"body-parser": "^1.20.2",
"classnames": "^2.3.2",
@@ -97,32 +97,32 @@
"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",
"markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4",
"mongoose": "^7.2.2",
"mongoose": "^7.2.3",
"nanoid": "3.3.4",
"nconf": "^0.12.0",
"npm": "^9.6.7",
"npm": "^9.7.1",
"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.12.1",
"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.42.0",
"eslint-plugin-jest": "^27.2.1",
"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-config-recess-order": "^4.0.0",
"stylelint": "^15.7.0",
"stylelint-config-recess-order": "^4.2.0",
"stylelint-config-recommended": "^12.0.0",
"stylelint-stylistic": "^0.4.2",
"supertest": "^6.3.3"

View File

@@ -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() {