Skip to content

Commit

Permalink
Bump marked to resolve security advisory (#1526)
Browse files Browse the repository at this point in the history
* fix(scully): upgrade marked version
* fix(scully): upgrade @types/marked
  • Loading branch information
zsofiaflorek authored Jan 18, 2022
1 parent 8425553 commit 57cb383
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
6 changes: 3 additions & 3 deletions libs/scully/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"http-proxy-middleware": "^1.0.6",
"jsdom": "^16.4.0",
"jsonc": "2.0.0",
"marked": "^2.0.0",
"marked": "^4.0.10",
"open": "^7.3.0",
"os": "^0.1.1",
"selfsigned": "^1.10.8",
Expand All @@ -49,7 +49,7 @@
"@types/express": "^4.17.0",
"@types/http-proxy-middleware": "^0.19.3",
"@types/jsdom": "^16.1.0",
"@types/marked": "^0.7.0",
"@types/marked": "^4.0.1",
"@types/node": "^13.13.5",
"@types/ws": "^7.2.1",
"@types/yamljs": "^0.2.30",
Expand All @@ -64,4 +64,4 @@
"scully-plugin",
"plugin"
]
}
}
2 changes: 1 addition & 1 deletion libs/scully/src/lib/fileHanderPlugins/markdown.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { registerPlugin } from '../pluginManagement/pluginRepository';
import { getConfig, setConfig } from '../pluginManagement/pluginConfig';
import marked from 'marked';
import { marked } from 'marked';

// ------------------------------
// Syntax Highlighting
Expand Down
34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"@types/js-yaml": "^4.0.3",
"@types/jsdom": "^16.2.13",
"@types/json5": "^0.0.30",
"@types/marked": "^3.0.1",
"@types/marked": "^4.0.1",
"@types/node": "^14.17.17",
"@types/path-to-regexp": "^1.7.0",
"@types/request": "^2.48.7",
Expand All @@ -177,7 +177,7 @@
"jest-serializer-html": "^7.1.0",
"jsdom": "^17.0.0",
"jsonc": "^2.0.0",
"marked": "^3.0.4",
"marked": "^4.0.10",
"ng-packagr": "12.2.1",
"nodemon": "^2.0.12",
"open": "^8.2.1",
Expand All @@ -204,4 +204,4 @@
"git add"
]
}
}
}
2 changes: 1 addition & 1 deletion scully.scully-docs.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { copyToClipboard } from '@scullyio/scully-plugin-copy-to-clipboard';
import { removeScripts, RemoveScriptsConfig } from '@scullyio/scully-plugin-remove-scripts';
import { renderOnce } from './scully/plugins/render-once';

const marked = require('marked');
const { marked } = require('marked');
import { readFileSync } from 'fs-extra';
import { JSDOM } from 'jsdom';
import { loadRenderer } from './scully/loadRenderer';
Expand Down
4 changes: 2 additions & 2 deletions tests/jest/src/__tests__/docsThere.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { expect } from '@jest/globals';
import { exception } from 'console';
import { DH_CHECK_P_NOT_SAFE_PRIME } from 'constants';
import { readdirSync, readFileSync } from 'fs';
// import marked from 'marked';
const marked = require('marked');
// import { marked } from 'marked';
const { marked } = require('marked');
import { join } from 'path';
import { readPage, readRoutes } from '../test-config.helper';
import got from 'got';
Expand Down

0 comments on commit 57cb383

Please sign in to comment.