Update marked and remark

background/compilers/marked.js

@@ -7,7 +7,6 @@ md.compilers.marked = (() => {
     gfm: true,
     pedantic: false,
     sanitize: false,
-    smartLists: false,
     smartypants: false,
     langPrefix: 'language-' // prism
   }
@@ -17,7 +16,6 @@ md.compilers.marked = (() => {
     gfm: 'Enable GFM\n(GitHub Flavored Markdown)',
     pedantic: 'Don\'t fix any of the original markdown\nbugs or poor behavior',
     sanitize: 'Ignore any HTML\nthat has been input',
-    smartLists: 'Use smarter list behavior\nthan the original markdown',
     smartypants: 'Use "smart" typographic punctuation\nfor things like quotes and dashes'
   }
 
@@ -25,7 +23,7 @@ md.compilers.marked = (() => {
     defaults,
     description,
     compile: (markdown) =>
-      marked(markdown, state.marked)
+      marked.parse(markdown, state.marked)
   })
 
   return Object.assign(ctor, {defaults, description})

background/compilers/remark.js

@@ -18,7 +18,7 @@ md.compilers.remark = (() => {
     defaults,
     description,
     compile: (markdown) =>
-      remark.unified()
+      remark.remark()
         .use(remark.parse)
         .use(state.remark.gfm ? remark.gfm : undefined)
         .use(state.remark.breaks ? remark.breaks : undefined)
@@ -28,7 +28,7 @@ md.compilers.remark = (() => {
         .use(remark.frontmatter, ['yaml', 'toml'])
         .use(remark.html, state.remark) // sanitize
         .processSync(markdown)
-        .contents
+        .value
   })
 
   return Object.assign(ctor, {defaults, description})

build/README.md

@@ -28,15 +28,15 @@ sh build/package.sh
 | @material/tabs      | ^0.37.1
 | @material/textfield | ^0.37.1
 | emojione            |  2.2.7
-| marked              |  1.2.7
+| marked              |  4.1.1
 | mathjax             |  3.2.2
 | mermaid             |  9.1.6
 | mithril             |  1.1.6
 | prismjs             |  1.22.0
-| remark              | ^13.0.0
-| remark-breaks       | ^2.0.1
-| remark-footnotes    | ^3.0.0
-| remark-frontmatter  | ^3.0.0
-| remark-gfm          | ^1.0.0
-| remark-html         | ^13.0.1
-| remark-slug         | ^6.0.0
+| remark              | ^14.0.2
+| remark-breaks       | ^3.0.2
+| remark-footnotes    | ^4.0.1
+| remark-frontmatter  | ^4.0.1
+| remark-gfm          | ^3.0.1
+| remark-html         | ^15.0.1
+| remark-slug         | ^7.0.1

build/marked/build.sh

@@ -3,4 +3,4 @@
 # set current working directory to directory of the shell script
 cd "$(dirname "$0")"
 
-curl https://cdnjs.cloudflare.com/ajax/libs/marked/1.2.7/marked.min.js --output ../../vendor/marked.min.js
+curl https://cdnjs.cloudflare.com/ajax/libs/marked/4.1.1/marked.min.js --output ../../vendor/marked.min.js

build/remark/build.sh

@@ -7,9 +7,8 @@ cd "$(dirname "$0")"
 npm install
 mkdir -p tmp
 
-# bundle
-npx browserify index.js -s remark > tmp/remark.js
-# minify
+# remark.min.js
+npx rollup --config rollup.js --input remark.mjs --file tmp/remark.js
 npx terser --compress --mangle -- tmp/remark.js > tmp/remark.min.js
 
 # copy

build/remark/index.js

@@ -1,14 +0,0 @@
-
-module.exports = {
-  // remark
-  unified: require('unified'),
-  parse: require('remark-parse'),
-  stringify: require('remark-stringify'),
-  // plugins
-  gfm: require('remark-gfm'),
-  breaks: require('remark-breaks'),
-  html: require('remark-html'),
-  slug: require('remark-slug'),
-  footnotes: require('remark-footnotes'),
-  frontmatter: require('remark-frontmatter'),
-}

build/remark/package.json

@@ -4,16 +4,19 @@
   "description": "Markdown Viewer / Browser Extension",
   "private": true,
   "dependencies": {
-    "remark": "^13.0.0",
-    "remark-breaks": "^2.0.1",
-    "remark-footnotes": "^3.0.0",
-    "remark-frontmatter": "^3.0.0",
-    "remark-gfm": "^1.0.0",
-    "remark-html": "^13.0.1",
-    "remark-slug": "^6.0.0"
+    "remark": "^14.0.2",
+    "remark-breaks": "^3.0.2",
+    "remark-footnotes": "^4.0.1",
+    "remark-frontmatter": "^4.0.1",
+    "remark-gfm": "^3.0.1",
+    "remark-html": "^15.0.1",
+    "remark-slug": "^7.0.1"
   },
   "devDependencies": {
-    "browserify": "^17.0.0",
+    "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "rollup": "^2.35.1",
+    "rollup-plugin-polyfill-node": "^0.11.0",
     "terser": "^5.5.1"
   },
   "engines": {

build/remark/remark.mjs

@@ -0,0 +1,23 @@
+
+import {remark} from 'remark'
+import parse from 'remark-parse'
+import stringify from 'remark-stringify'
+import gfm from 'remark-gfm'
+import breaks from 'remark-breaks'
+import html from 'remark-html'
+import slug from 'remark-slug'
+import footnotes from 'remark-footnotes'
+import frontmatter from 'remark-frontmatter'
+
+
+export {
+  remark,
+  parse,
+  stringify,
+  gfm,
+  breaks,
+  html,
+  slug,
+  footnotes,
+  frontmatter,
+}

build/remark/rollup.js

@@ -0,0 +1,21 @@
+
+var common = require('@rollup/plugin-commonjs')
+var resolve = require('@rollup/plugin-node-resolve')
+var node = require('rollup-plugin-polyfill-node')
+
+
+export default {
+  context: 'window',
+  moduleContext: {id: 'window'},
+
+  plugins: [
+    common(),
+    resolve(),
+    node(),
+  ],
+
+  output: {
+    format: 'iife',
+    name: 'remark',
+  },
+}