diff --git a/package-lock.json b/package-lock.json index 086af67f2d..8dd4a6b71a 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 03160e98b9..af1d41b132 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", diff --git a/src/controllers/dashboard/plugins/add/index.js b/src/controllers/dashboard/plugins/add/index.js index aa6862fb4e..1039771a0d 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'; diff --git a/webpack.common.js b/webpack.common.js index 0e34331e58..77b714a0ed 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' }]