From 74838aaeff458e0b058bbe72e0d475b17ecb7a06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 15:40:20 +0000 Subject: [PATCH 1/3] Bump marked from 3.0.8 to 4.0.0 Bumps [marked](https://github.com/markedjs/marked) from 3.0.8 to 4.0.0. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json) - [Commits](https://github.com/markedjs/marked/compare/v3.0.8...v4.0.0) --- updated-dependencies: - dependency-name: marked dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 086af67f2..8dd4a6b71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8177,9 +8177,9 @@ "dev": true }, "marked": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz", - "integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.0.tgz", + "integrity": "sha512-K3C1JvtiXuXVLoxDQEJP4NMLBuThlTkthgUOCzqLghIpHfis1DIZZfPI3o4UgfFpQ0d+JvTql2h+szR9jQ1p1w==" }, "marks-pane": { "version": "1.0.9", diff --git a/package.json b/package.json index 03160e98b..af1d41b13 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "libarchive.js": "^1.3.0", "libass-wasm": "git+https://github.com/jellyfin/JavascriptSubtitlesOctopus.git#4.0.0-jf-4", "lodash-es": "^4.17.21", - "marked": "^3.0.8", + "marked": "^4.0.0", "material-design-icons-iconfont": "^6.1.1", "native-promise-only": "^0.8.0-a", "page": "^1.11.6", From d4e9270897e07f6ec9242f3233efb2b8760d9b6d Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Wed, 10 Nov 2021 00:09:56 -0500 Subject: [PATCH 2/3] Fix marked import --- src/controllers/dashboard/plugins/add/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/dashboard/plugins/add/index.js b/src/controllers/dashboard/plugins/add/index.js index aa6862fb4..1039771a0 100644 --- a/src/controllers/dashboard/plugins/add/index.js +++ b/src/controllers/dashboard/plugins/add/index.js @@ -1,5 +1,5 @@ import 'jquery'; -import marked from 'marked'; +import { marked } from 'marked'; import DOMPurify from 'dompurify'; import loading from '../../../../components/loading/loading'; import globalize from '../../../../scripts/globalize'; From 7cc6d3c1ab3e50ff530ffc2ee608d33078e0d9d6 Mon Sep 17 00:00:00 2001 From: Bill Thornton Date: Wed, 10 Nov 2021 10:19:45 -0500 Subject: [PATCH 3/3] Add marked to transpiling --- webpack.common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.common.js b/webpack.common.js index 0e34331e5..77b714a0e 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -96,7 +96,7 @@ module.exports = { }, { test: /\.(js|jsx)$/, - exclude: /node_modules[\\/](?!@uupaa[\\/]dynamic-import-polyfill|blurhash|date-fns|epubjs|flv.js|libarchive.js)/, + exclude: /node_modules[\\/](?!@uupaa[\\/]dynamic-import-polyfill|blurhash|date-fns|epubjs|flv.js|libarchive.js|marked)/, use: [{ loader: 'babel-loader' }]