Merge pull request #142 from marp-team/marpit-1.5

Upgrade Marpit to v1.5.0

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Changed
 
+- Upgrade Marpit to [v1.5.0](https://github.com/marp-team/marpit/releases/v1.5.0) ([#142](https://github.com/marp-team/marp-core/pull/142))
 - Update community health files ([#133](https://github.com/marp-team/marp-core/pull/133))
 - Upgrade Node and dependent packages to the latest version ([#138](https://github.com/marp-team/marp-core/pull/138))
 

package.json

@@ -94,8 +94,8 @@
     "typescript": "^3.7.3"
   },
   "dependencies": {
-    "@marp-team/marpit": "^1.4.2",
-    "@marp-team/marpit-svg-polyfill": "^1.1.1",
+    "@marp-team/marpit": "^1.5.0",
+    "@marp-team/marpit-svg-polyfill": "^1.2.0",
     "emoji-regex": "^8.0.0",
     "highlight.js": "^9.17.1",
     "katex": "^0.11.1",

src/emoji/emoji.ts

@@ -1,4 +1,4 @@
-import marpitPlugin from '@marp-team/marpit/lib/markdown/marpit_plugin'
+import marpitPlugin from '@marp-team/marpit/plugin'
 import emojiRegex from 'emoji-regex'
 import markdownItEmoji from 'markdown-it-emoji'
 import twemoji from 'twemoji'

src/fitting/fitting.ts

@@ -1,4 +1,4 @@
-import marpitPlugin from '@marp-team/marpit/lib/markdown/marpit_plugin'
+import marpitPlugin from '@marp-team/marpit/plugin'
 import fittingCSS from './fitting.scss'
 import Marp from '../marp'
 import { attr, code, math, svgContentAttr, svgContentWrapAttr } from './data'

src/marp.ts

@@ -1,4 +1,4 @@
-import { Marpit, MarpitOptions, ThemeSetPackOptions } from '@marp-team/marpit'
+import { Marpit, Options, ThemeSetPackOptions } from '@marp-team/marpit'
 import highlightjs from 'highlight.js'
 import postcss from 'postcss'
 import postcssMinifyParams from 'postcss-minify-params'
@@ -16,7 +16,7 @@ import defaultTheme from '../themes/default.scss'
 import gaiaTheme from '../themes/gaia.scss'
 import uncoverTheme from '../themes/uncover.scss'
 
-export interface MarpOptions extends MarpitOptions {
+export interface MarpOptions extends Options {
   emoji?: emojiPlugin.EmojiOptions
   html?:
     | boolean

src/math/math.ts

@@ -1,4 +1,4 @@
-import marpitPlugin from '@marp-team/marpit/lib/markdown/marpit_plugin'
+import marpitPlugin from '@marp-team/marpit/plugin'
 import katex from 'katex'
 import katexScss from './katex.scss'
 

src/size/size.ts

@@ -1,4 +1,4 @@
-import marpitPlugin from '@marp-team/marpit/lib/markdown/marpit_plugin'
+import marpitPlugin from '@marp-team/marpit/plugin'
 import { Theme } from '@marp-team/marpit'
 import { Marp } from '../marp'
 

src/typings.d.ts

@@ -3,13 +3,6 @@ declare module '*.scss' {
   export default scss
 }
 
-declare module '@marp-team/marpit/lib/markdown/marpit_plugin' {
-  const marpitPlugin: <F extends (md: any, ...args: any[]) => void>(
-    func: F
-  ) => F
-  export default marpitPlugin
-}
-
 declare module 'katex/package.json' {
   export const version: string
 }

yarn.lock

@@ -312,22 +312,22 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@marp-team/marpit-svg-polyfill@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@marp-team/marpit-svg-polyfill/-/marpit-svg-polyfill-1.1.1.tgz#b0b999243b9fd4d09ab3160260c1748683eef4ab"
-  integrity sha512-OC9ORNDHvnp2mTOSsB7ZnrD1Seuzz1j9lznWxoxoFu+V+8RkGhxjLxHXlPrcBqF2wbId99aSEaYuKZthPWsE0g==
+"@marp-team/marpit-svg-polyfill@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@marp-team/marpit-svg-polyfill/-/marpit-svg-polyfill-1.2.0.tgz#3a6046e4222b6db7fc009a7d3a9ffef5cc8e60bd"
+  integrity sha512-UodxNSTmuFlLAoKs32V/IWF2GEdhFS/JmqJPXEAHHb1R2EYH1VVQceZ46IaX//Up0qiBfgFRbP6EVOXD52RZrw==
 
-"@marp-team/marpit@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@marp-team/marpit/-/marpit-1.4.2.tgz#ee5b3be4046ca1fd303ac92210e3124233c41e58"
-  integrity sha512-Lm30WLOqCcB6SwICz3IfEDHYUQG15TtEw8tyVUPMbX/PQhXvkVieLjF3zWQymwJIBQ7+STD0VuMKkbeo6Hpj0A==
+"@marp-team/marpit@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@marp-team/marpit/-/marpit-1.5.0.tgz#29e5c63e640f2628040fee57bf8ffb3d273105eb"
+  integrity sha512-J2NThr5oJh0VVHfz1teX1eXnuu1duSF65DK8TfCD2r70KDJmcTwBGYVdUpfqTo3t21QFA2DZv6zjSrgEtnN1IA==
   dependencies:
     color-string "^1.5.3"
     js-yaml "^3.13.0"
     lodash.kebabcase "^4.1.1"
     markdown-it "^10.0.0"
     markdown-it-front-matter "^0.1.2"
-    postcss "^7.0.21"
+    postcss "^7.0.26"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -5023,6 +5023,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^7.0.26:
+  version "7.0.26"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.26.tgz#5ed615cfcab35ba9bbb82414a4fa88ea10429587"
+  integrity sha512-IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"