From 32cd3d7736e1d6525c206e234f94e77a8e5d3c0b Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Thu, 29 Jun 2023 11:53:09 +0200 Subject: [PATCH] Update `micromark` --- dev/lib/directive-container.js | 4 +--- dev/lib/directive-leaf.js | 3 +-- dev/lib/directive-text.js | 3 +-- dev/lib/factory-attributes.js | 3 +-- dev/lib/factory-label.js | 4 +--- dev/lib/factory-name.js | 2 +- dev/lib/html.js | 6 +++--- dev/lib/syntax.js | 2 +- package.json | 14 +++++++------- test/index.js | 4 ++++ 10 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dev/lib/directive-container.js b/dev/lib/directive-container.js index b700917..8fcc320 100644 --- a/dev/lib/directive-container.js +++ b/dev/lib/directive-container.js @@ -9,9 +9,7 @@ import {ok as assert} from 'uvu/assert' import {factorySpace} from 'micromark-factory-space' import {markdownLineEnding} from 'micromark-util-character' -import {codes} from 'micromark-util-symbol/codes.js' -import {constants} from 'micromark-util-symbol/constants.js' -import {types} from 'micromark-util-symbol/types.js' +import {codes, constants, types} from 'micromark-util-symbol' import {factoryAttributes} from './factory-attributes.js' import {factoryLabel} from './factory-label.js' import {factoryName} from './factory-name.js' diff --git a/dev/lib/directive-leaf.js b/dev/lib/directive-leaf.js index 0e374ce..abf3a40 100644 --- a/dev/lib/directive-leaf.js +++ b/dev/lib/directive-leaf.js @@ -8,8 +8,7 @@ import {ok as assert} from 'uvu/assert' import {factorySpace} from 'micromark-factory-space' import {markdownLineEnding} from 'micromark-util-character' -import {codes} from 'micromark-util-symbol/codes.js' -import {types} from 'micromark-util-symbol/types.js' +import {codes, types} from 'micromark-util-symbol' import {factoryAttributes} from './factory-attributes.js' import {factoryLabel} from './factory-label.js' import {factoryName} from './factory-name.js' diff --git a/dev/lib/directive-text.js b/dev/lib/directive-text.js index 10fabfd..7018eab 100644 --- a/dev/lib/directive-text.js +++ b/dev/lib/directive-text.js @@ -7,8 +7,7 @@ */ import {ok as assert} from 'uvu/assert' -import {codes} from 'micromark-util-symbol/codes.js' -import {types} from 'micromark-util-symbol/types.js' +import {codes, types} from 'micromark-util-symbol' import {factoryAttributes} from './factory-attributes.js' import {factoryLabel} from './factory-label.js' import {factoryName} from './factory-name.js' diff --git a/dev/lib/factory-attributes.js b/dev/lib/factory-attributes.js index 60be654..4d7ea7e 100644 --- a/dev/lib/factory-attributes.js +++ b/dev/lib/factory-attributes.js @@ -15,8 +15,7 @@ import { markdownLineEndingOrSpace, markdownSpace } from 'micromark-util-character' -import {codes} from 'micromark-util-symbol/codes.js' -import {types} from 'micromark-util-symbol/types.js' +import {codes, types} from 'micromark-util-symbol' /** * @param {Effects} effects diff --git a/dev/lib/factory-label.js b/dev/lib/factory-label.js index 60d07f8..eac8340 100644 --- a/dev/lib/factory-label.js +++ b/dev/lib/factory-label.js @@ -7,9 +7,7 @@ import {ok as assert} from 'uvu/assert' import {markdownLineEnding} from 'micromark-util-character' -import {codes} from 'micromark-util-symbol/codes.js' -import {constants} from 'micromark-util-symbol/constants.js' -import {types} from 'micromark-util-symbol/types.js' +import {codes, constants, types} from 'micromark-util-symbol' // This is a fork of: // diff --git a/dev/lib/factory-name.js b/dev/lib/factory-name.js index 375b2a7..bab07a4 100644 --- a/dev/lib/factory-name.js +++ b/dev/lib/factory-name.js @@ -6,7 +6,7 @@ */ import {asciiAlpha, asciiAlphanumeric} from 'micromark-util-character' -import {codes} from 'micromark-util-symbol/codes.js' +import {codes} from 'micromark-util-symbol' /** * @this {TokenizeContext} diff --git a/dev/lib/html.js b/dev/lib/html.js index a02bfee..087edab 100644 --- a/dev/lib/html.js +++ b/dev/lib/html.js @@ -66,7 +66,7 @@ export function directiveHtml(options) { return { enter: { directiveContainer() { - return enter.call(this, 'containerDirective') + enter.call(this, 'containerDirective') }, directiveContainerAttributes: enterAttributes, directiveContainerLabel: enterLabel, @@ -75,13 +75,13 @@ export function directiveHtml(options) { }, directiveLeaf() { - return enter.call(this, 'leafDirective') + enter.call(this, 'leafDirective') }, directiveLeafAttributes: enterAttributes, directiveLeafLabel: enterLabel, directiveText() { - return enter.call(this, 'textDirective') + enter.call(this, 'textDirective') }, directiveTextAttributes: enterAttributes, directiveTextLabel: enterLabel diff --git a/dev/lib/syntax.js b/dev/lib/syntax.js index 8eb1eae..1c1843d 100644 --- a/dev/lib/syntax.js +++ b/dev/lib/syntax.js @@ -2,7 +2,7 @@ * @typedef {import('micromark-util-types').Extension} Extension */ -import {codes} from 'micromark-util-symbol/codes.js' +import {codes} from 'micromark-util-symbol' import {directiveContainer} from './directive-container.js' import {directiveLeaf} from './directive-leaf.js' import {directiveText} from './directive-text.js' diff --git a/package.json b/package.json index 586a4fe..0736a91 100644 --- a/package.json +++ b/package.json @@ -39,11 +39,11 @@ "default": "./index.js" }, "dependencies": { - "micromark-factory-space": "^1.0.0", - "micromark-factory-whitespace": "^1.0.0", - "micromark-util-character": "^1.0.0", - "micromark-util-symbol": "^1.0.0", - "micromark-util-types": "^1.0.0", + "micromark-factory-space": "^2.0.0", + "micromark-factory-whitespace": "^2.0.0", + "micromark-util-character": "^2.0.0", + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0", "parse-entities": "^4.0.0", "uvu": "^0.5.0" }, @@ -51,8 +51,8 @@ "@types/node": "^20.0.0", "c8": "^8.0.0", "html-void-elements": "^3.0.0", - "micromark": "^3.0.0", - "micromark-build": "^1.0.0", + "micromark": "^4.0.0", + "micromark-build": "^2.0.0", "prettier": "^2.0.0", "remark-cli": "^11.0.0", "remark-preset-wooorm": "^9.0.0", diff --git a/test/index.js b/test/index.js index e72121a..514b773 100644 --- a/test/index.js +++ b/test/index.js @@ -1701,7 +1701,11 @@ function youtube(d) { /** * @this {CompileContext} + * Context. * @type {Handle} + * Handle. + * @returns {undefined} + * Nothing. */ function h(d) { const content = d.content || d.label