cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 10:58:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3134 from jellyfin/dependabot/npm_and_yarn/marked-4.0.0

Browse Source 
Bump marked from 3.0.8 to 4.0.0
This commit is contained in:
Bill Thornton 2021-11-10 12:53:11 -05:00 committed by GitHub
commit 38591e458e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -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",

2
package.json
View File

@ -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",

2
src/controllers/dashboard/plugins/add/index.js
View File

@ -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';

2
webpack.common.js
View File

@ -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'
}]