diff --git a/libs/scully/package.json b/libs/scully/package.json index aa88cf46e..866ba6868 100644 --- a/libs/scully/package.json +++ b/libs/scully/package.json @@ -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", @@ -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", @@ -64,4 +64,4 @@ "scully-plugin", "plugin" ] -} \ No newline at end of file +} diff --git a/libs/scully/src/lib/fileHanderPlugins/markdown.ts b/libs/scully/src/lib/fileHanderPlugins/markdown.ts index 08006f69b..35af3d280 100644 --- a/libs/scully/src/lib/fileHanderPlugins/markdown.ts +++ b/libs/scully/src/lib/fileHanderPlugins/markdown.ts @@ -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 diff --git a/package-lock.json b/package-lock.json index 1e790cc94..ae41cb25c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "scullyio", - "version": "2.1.4", + "version": "2.1.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "scullyio", - "version": "2.1.4", + "version": "2.1.7", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -84,7 +84,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", @@ -111,7 +111,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", @@ -8602,9 +8602,9 @@ } }, "node_modules/@types/marked": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-3.0.3.tgz", - "integrity": "sha512-ZgAr847Wl68W+B0sWH7F4fDPxTzerLnRuUXjUpp1n4NjGSs8hgPAjAp7NQIXblG34MXTrf5wWkAK8PVJ2LIlVg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.1.tgz", + "integrity": "sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag==", "dev": true }, "node_modules/@types/mime": { @@ -22409,12 +22409,12 @@ } }, "node_modules/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.10", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz", + "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==", "dev": true, "bin": { - "marked": "bin/marked" + "marked": "bin/marked.js" }, "engines": { "node": ">= 12" @@ -41753,9 +41753,9 @@ } }, "@types/marked": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/marked/-/marked-3.0.3.tgz", - "integrity": "sha512-ZgAr847Wl68W+B0sWH7F4fDPxTzerLnRuUXjUpp1n4NjGSs8hgPAjAp7NQIXblG34MXTrf5wWkAK8PVJ2LIlVg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.1.tgz", + "integrity": "sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag==", "dev": true }, "@types/mime": { @@ -52559,9 +52559,9 @@ } }, "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.10", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz", + "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==", "dev": true }, "md5.js": { diff --git a/package.json b/package.json index 5f0cfa09b..4c0cd5aea 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -204,4 +204,4 @@ "git add" ] } -} \ No newline at end of file +} diff --git a/scully.scully-docs.config.ts b/scully.scully-docs.config.ts index acf0016bd..3499bd1ad 100644 --- a/scully.scully-docs.config.ts +++ b/scully.scully-docs.config.ts @@ -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'; diff --git a/tests/jest/src/__tests__/docsThere.spec.ts b/tests/jest/src/__tests__/docsThere.spec.ts index 6e8d2ea39..3ead53a76 100644 --- a/tests/jest/src/__tests__/docsThere.spec.ts +++ b/tests/jest/src/__tests__/docsThere.spec.ts @@ -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';