Upgrade dependent packages to the latest version

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade to [Marp Core v1.1.0](https://github.com/marp-team/marp-core/releases/v1.1.0) and [Marp CLI v0.17.3](https://github.com/marp-team/marp-cli/releases/v0.17.3) ([#130](https://github.com/marp-team/marp-vscode/pull/130))
+- Upgrade dependent packages to the latest version ([#130](https://github.com/marp-team/marp-vscode/pull/130))
+
 ## v0.12.1 - 2020-02-23
 
 ### Fixed

package.json

@@ -149,8 +149,7 @@
  "private": true,
  "prettier": {
  "semi": false,
- "singleQuote": true,
- "trailingComma": "es5"
+ "singleQuote": true
  },
  "stylelint": {
  "extends": [
@@ -211,9 +210,9 @@
  "@rollup/plugin-commonjs": "^11.0.2",
  "@rollup/plugin-json": "^4.0.2",
  "@rollup/plugin-node-resolve": "^7.1.1",
- "@rollup/plugin-typescript": "^3.0.0",
- "@types/cheerio": "^0.22.16",
- "@types/jest": "^25.1.3",
+ "@rollup/plugin-typescript": "^4.0.0",
+ "@types/cheerio": "^0.22.17",
+ "@types/jest": "^25.1.4",
  "@types/lodash.debounce": "^4.0.6",
  "@types/markdown-it": "^0.0.9",
  "@types/vscode": "~1.36.0",
@@ -228,28 +227,33 @@
  "markdown-it": "^10.0.0",
  "nanoid": "^2.1.11",
  "npm-run-all": "^4.1.5",
- "prettier": "^1.19.1",
+ "prettier": "^2.0.1",
  "rehype-parse": "^6.0.2",
  "remark": "^11.0.2",
  "remark-parse": "^7.0.2",
  "rimraf": "^3.0.2",
- "rollup": "^1.31.1",
- "rollup-plugin-terser": "^5.2.0",
- "stylelint": "^13.2.0",
+ "rollup": "^2.1.0",
+ "rollup-plugin-terser": "^5.3.0",
+ "stylelint": "^13.2.1",
  "stylelint-config-prettier": "^8.0.1",
  "stylelint-config-standard": "^20.0.0",
  "ts-jest": "^25.2.1",
- "tslint": "^6.0.0",
+ "tslint": "^6.1.0",
  "tslint-config-airbnb": "^5.11.2",
  "tslint-config-prettier": "^1.18.0",
- "typescript": "^3.8.2",
+ "typescript": "^3.8.3",
  "unified": "^8.4.2",
  "unist-util-visit": "^2.0.2",
- "yaml": "^1.7.2"
+ "yaml": "^1.8.3"
  },
  "dependencies": {
- "@marp-team/marp-cli": "^0.17.1",
- "@marp-team/marp-core": "^1.0.1",
+ "@marp-team/marp-cli": "^0.17.3",
+ "@marp-team/marp-core": "^1.1.0",
  "axios": "^0.19.2"
+ },
+ "resolutions": {
+ "**/chrome-launcher/mkdirp": "^0.5.3",
+ "**/extract-zip/mkdirp": "^0.5.3",
+ "**/gonzales-pe/minimist": "^1.2.5"
  }
 }

rollup.config.js

@@ -21,7 +21,7 @@ const plugins = [
  json({ preferConst: true }),
  nodeResolve({ mainFields: ['module', 'jsnext:main', 'main'] }),
  commonjs(),
- typescript({ module: 'esnext' }),
+ typescript(),
  !process.env.ROLLUP_WATCH && terser(),
 ]
 

src/__mocks__/lodash.debounce.ts

@@ -1 +1 @@
-module.exports = f => (...args) => f(...args)
+module.exports = (f) => (...args) => f(...args)

src/__mocks__/vscode.ts

@@ -86,7 +86,7 @@ export const env = {
 }
 
 export const languages = {
- createDiagnosticCollection: jest.fn(name => ({
+ createDiagnosticCollection: jest.fn((name) => ({
  name,
  delete: jest.fn(),
  set: jest.fn(),
@@ -118,7 +118,7 @@ export const workspace = {
  getConfiguration: jest.fn((section?: string) => ({
  get: jest.fn(
  (subSection?: string) =>
- currentConf[[section, subSection].filter(s => s).join('.')]
+ currentConf[[section, subSection].filter((s) => s).join('.')]
  ),
  })),
  getWorkspaceFolder: jest.fn(),

src/commands/toggle-marp-preview.test.ts

@@ -66,7 +66,7 @@ describe('#toggle', () => {
  document: { getText: () => text },
  }
 
- textEditorMock.edit = jest.fn(callback => {
+ textEditorMock.edit = jest.fn((callback) => {
  const builder = editBuilder()
  textEditorMock._editBuilders.push(builder)
 

src/commands/toggle-marp-preview.ts

@@ -28,14 +28,14 @@ export const toggle = async (editor: TextEditor) => {
  }
 
  if (targetRange && toggleValue) {
- await editor.edit(e => e.replace(targetRange!, toggleValue!))
+ await editor.edit((e) => e.replace(targetRange!, toggleValue!))
  } else {
- await editor.edit(e =>
+ await editor.edit((e) =>
  e.insert(new Position(line - 1, 0), 'marp: true\n')
  )
  }
  } else {
- await editor.edit(e =>
+ await editor.edit((e) =>
  e.insert(new Position(0, 0), '---\nmarp: true\n---\n\n')
  )
  }

src/diagnostics/deprecated-dollar-prefix.test.ts

@@ -72,9 +72,9 @@ describe('[Diagnostics rule] Deprecated dollar prefix', () => {
 
  const diagnostics = register(document)
  expect(diagnostics).toHaveLength(3)
- expect(diagnostics.every(d => d instanceof Diagnostic)).toBe(true)
- expect(diagnostics.every(d => d.source === 'marp-vscode')).toBe(true)
- expect(diagnostics.every(d => d.code === rule.code)).toBe(true)
+ expect(diagnostics.every((d) => d instanceof Diagnostic)).toBe(true)
+ expect(diagnostics.every((d) => d.source === 'marp-vscode')).toBe(true)
+ expect(diagnostics.every((d) => d.code === rule.code)).toBe(true)
 
  const [$size, $headingDivider, $style] = diagnostics
  expect($size.range).toStrictEqual(
@@ -116,9 +116,9 @@ describe('[Diagnostics rule] Deprecated dollar prefix', () => {
 
  const diagnostics = register(document)
  expect(diagnostics).toHaveLength(4)
- expect(diagnostics.every(d => d instanceof Diagnostic)).toBe(true)
- expect(diagnostics.every(d => d.source === 'marp-vscode')).toBe(true)
- expect(diagnostics.every(d => d.code === rule.code)).toBe(true)
+ expect(diagnostics.every((d) => d instanceof Diagnostic)).toBe(true)
+ expect(diagnostics.every((d) => d.source === 'marp-vscode')).toBe(true)
+ expect(diagnostics.every((d) => d.code === rule.code)).toBe(true)
 
  const [$theme, $size, $style, $headingDivider] = diagnostics
  expect($theme.range).toStrictEqual(

src/diagnostics/deprecated-dollar-prefix.ts

@@ -94,8 +94,8 @@ export class RemoveDollarPrefix implements CodeActionProvider {
  context
  ) =>
  context.diagnostics
- .filter(d => d.source === 'marp-vscode' && d.code === code)
- .map(d => this.createCodeAction(d, doc))
+ .filter((d) => d.source === 'marp-vscode' && d.code === code)
+ .map((d) => this.createCodeAction(d, doc))
 
  private createCodeAction(diag: Diagnostic, doc: TextDocument): CodeAction {
  const act = new CodeAction(

src/diagnostics/index.ts

@@ -39,9 +39,9 @@ export function subscribe(subscriptions: Disposable[]) {
  if (window.activeTextEditor) refresh(window.activeTextEditor.document)
 
  subscriptions.push(
- window.onDidChangeActiveTextEditor(e => e && refresh(e.document)),
- workspace.onDidChangeTextDocument(e => refresh(e.document)),
- workspace.onDidCloseTextDocument(d => collection.delete(d.uri))
+ window.onDidChangeActiveTextEditor((e) => e && refresh(e.document)),
+ workspace.onDidChangeTextDocument((e) => refresh(e.document)),
+ workspace.onDidCloseTextDocument((d) => collection.delete(d.uri))
  )
 }
 

src/extension.test.ts

@@ -121,9 +121,7 @@ describe('#extendMarkdownIt', () => {
 
  it('adds code-line class and data-line attribute to DOM', () => {
  const $ = cheerio.load(
- extension()
- .extendMarkdownIt(new markdownIt())
- .render(markdown)
+ extension().extendMarkdownIt(new markdownIt()).render(markdown)
  )
 
  // SVG slides
@@ -244,7 +242,7 @@ describe('#extendMarkdownIt', () => {
  setConfiguration({ 'markdown.marp.themes': ['../test.css'] })
 
  const markdown = md()
- markdown.normalizeLink = url => path.resolve(baseDir, url)
+ markdown.normalizeLink = (url) => path.resolve(baseDir, url)
 
  await Promise.all(themes.loadStyles(Uri.parse(baseDir)))
  expect(markdown.render(marpMd('<!--theme: example-->'))).not.toContain(

src/extension.ts

@@ -52,14 +52,14 @@ export function extendMarkdownIt(md: any) {
 
  // Load custom themes
  Promise.all(
- themes.loadStyles(baseFolder).map(p =>
+ themes.loadStyles(baseFolder).map((p) =>
  p.then(
- theme => theme.registered,
- e => console.error(e)
+ (theme) => theme.registered,
+ (e) => console.error(e)
  )
  )
- ).then(registered => {
- if (registered.some(f => f === true)) {
+ ).then((registered) => {
+ if (registered.some((f) => f === true)) {
  commands.executeCommand('markdown.preview.refresh')
  }
  })
@@ -119,8 +119,8 @@ export const activate = ({ subscriptions }: ExtensionContext) => {
  toggleMarpPreview
  ),
  themes,
- workspace.onDidChangeConfiguration(e => {
- if (shouldRefreshConfs.some(c => e.affectsConfiguration(c))) {
+ workspace.onDidChangeConfiguration((e) => {
+ if (shouldRefreshConfs.some((c) => e.affectsConfiguration(c))) {
  clearMarpCoreOptionCache()
  commands.executeCommand('markdown.preview.refresh')
  }

src/option.test.ts

@@ -88,7 +88,7 @@ describe('Option', () => {
  expect(themeSet).toHaveLength(1)
  expect((await readFile(themeSet[0])).toString()).toBe(css)
  } finally {
- await Promise.all(vscode.themeFiles.map(w => w.cleanup()))
+ await Promise.all(vscode.themeFiles.map((w) => w.cleanup()))
  }
  })
  })

src/option.ts

@@ -67,9 +67,9 @@ export const marpCoreOptionForCLI = async ({ uri }: TextDocument) => {
  await Promise.all(
  themes
  .loadStyles(baseFolder ? Uri.parse(`file:${baseFolder}`) : undefined)
- .map(promise =>
+ .map((promise) =>
  promise.then(
- async theme => {
+ async (theme) => {
  if (theme.type === ThemeType.File) {
  return { path: theme.path, cleanup: () => Promise.resolve() }
  }
@@ -82,13 +82,13 @@ export const marpCoreOptionForCLI = async ({ uri }: TextDocument) => {
  return { path: tmp, cleanup: () => promisify(unlink)(tmp) }
  }
  },
- e => console.error(e)
+ (e) => console.error(e)
  )
  )
  )
  ).filter((w): w is WorkFile => !!w)
 
- baseOpts.themeSet = themeFiles.map(w => w.path)
+ baseOpts.themeSet = themeFiles.map((w) => w.path)
  baseOpts.vscode.themeFiles = themeFiles
 
  return baseOpts

src/plugins/custom-theme.ts

@@ -2,15 +2,15 @@ export class CustomThemeError extends Error {}
 
 export default function marpVSCodeCustomTheme(instance) {
  const { marpit, parse } = instance
- const registeredThemes = [...marpit.themeSet.themes()].map(t => t.name)
+ const registeredThemes = [...marpit.themeSet.themes()].map((t) => t.name)
  const { addTheme } = marpit.themeSet
 
  // `size` global directive support in Marp Core may override an instance of
  // default themes. Even if default themes were overridden, we should not throw
  // error while parsing Markdown by markdown-it.
  let whileParsing = false
 
- marpit.themeSet.addTheme = theme => {
+ marpit.themeSet.addTheme = (theme) => {
  if (!whileParsing && registeredThemes.includes(theme.name)) {
  throw new CustomThemeError(
  `Custom theme cannot override "${theme.name}" built-in theme.`

src/plugins/line-number.ts

@@ -18,7 +18,7 @@ export default function marpVSCodeLineNumber(md) {
  md.renderer.rules.marpit_inline_svg_open = (tokens, idx, opts, env, self) => {
  const slide = tokens
  .slice(idx + 1)
- .find(t => t.type === 'marpit_slide_open')
+ .find((t) => t.type === 'marpit_slide_open')
 
  if (slide.map?.length) {
  tokens[idx].attrJoin('class', 'code-line')

src/plugins/outline.ts

@@ -1,5 +1,5 @@
 export default function marpVSCodeOutline(instance) {
- instance.core.ruler.push('marp_vscode_outline', state => {
+ instance.core.ruler.push('marp_vscode_outline', (state) => {
  if (state.inlineMode) return
 
  const tokens: any[] = []

src/preview.ts

@@ -13,8 +13,8 @@ export default function preview() {
  const links = document.querySelectorAll(
  'link[rel="stylesheet"]:not([href*="marp-vscode"])'
  )
- styles.forEach(elm => elm.remove())
- links.forEach(elm => elm.remove())
+ styles.forEach((elm) => elm.remove())
+ links.forEach((elm) => elm.remove())
 
  // Run Marp observer
  browser()

src/themes.ts

@@ -30,7 +30,7 @@ export class Themes {
  observedThemes = new Map<string, Theme>()
 
  dispose() {
- this.observedThemes.forEach(theme => {
+ this.observedThemes.forEach((theme) => {
  if (theme.onDidChange) theme.onDidChange.dispose()
  if (theme.onDidDelete) theme.onDidDelete.dispose()
  })
@@ -39,12 +39,14 @@ export class Themes {
 
  getRegisteredStyles(rootDirectory: Uri | undefined): Theme[] {
  return this.getPathsFromConf(rootDirectory)
- .map(p => this.observedThemes.get(p))
- .filter(t => t) as Theme[]
+ .map((p) => this.observedThemes.get(p))
+ .filter((t) => t) as Theme[]
  }
 
  loadStyles(rootDirectory: Uri | undefined): Promise<Theme>[] {
- return this.getPathsFromConf(rootDirectory).map(p => this.registerTheme(p))
+ return this.getPathsFromConf(rootDirectory).map((p) =>
+ this.registerTheme(p)
+ )
  }
 
  private getPathsFromConf(rootDirectory: Uri | undefined): string[] {

tsconfig.json

@@ -2,10 +2,9 @@
  "compilerOptions": {
  "esModuleInterop": true,
  "lib": ["es6", "dom"],
- "module": "commonjs",
+ "module": "esnext",
  "moduleResolution": "node",
  "noImplicitAny": false,
- "outDir": "lib",
  "resolveJsonModule": true,
  "sourceMap": true,
  "strict": true,