From da77de41ef2f904a2e30ecf528e7e97205000447 Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Fri, 30 Jul 2021 12:49:13 +0200 Subject: [PATCH] Use ESM --- package.json | 4 +- packages/rehype-cli/cli.js | 13 +- packages/rehype-cli/package.json | 10 +- packages/rehype-parse/errors.js | 278 +++++++++++++++++++++++++ packages/rehype-parse/errors.json | 253 ---------------------- packages/rehype-parse/index.js | 18 +- packages/rehype-parse/package.json | 9 +- packages/rehype-stringify/index.js | 8 +- packages/rehype-stringify/package.json | 9 +- packages/rehype/index.js | 10 +- packages/rehype/package.json | 9 +- script/parse-error.js | 21 +- script/regenerate-fixtures.js | 10 +- test/api.js | 22 +- test/cli.js | 8 +- test/index.js | 6 +- test/parse-error.js | 16 +- 17 files changed, 362 insertions(+), 342 deletions(-) create mode 100644 packages/rehype-parse/errors.js delete mode 100644 packages/rehype-parse/errors.json diff --git a/package.json b/package.json index 97c80d3f..c90ab967 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "type": "opencollective", "url": "https://opencollective.com/unified" }, + "type": "module", "devDependencies": { "bail": "^1.0.0", "c8": "^7.0.0", @@ -42,8 +43,9 @@ }, "xo": { "prettier": true, - "esnext": false, "rules": { + "no-var": "off", + "prefer-arrow-callback": "off", "unicorn/no-array-callback-reference": "off", "unicorn/prefer-number-properties": "off", "unicorn/prefer-optional-catch-binding": "off", diff --git a/packages/rehype-cli/cli.js b/packages/rehype-cli/cli.js index 96153fd0..396619bc 100755 --- a/packages/rehype-cli/cli.js +++ b/packages/rehype-cli/cli.js @@ -1,13 +1,14 @@ #!/usr/bin/env node -'use strict' +import start from 'unified-args' +import {rehype} from 'rehype' +import {createRequire} from 'module' +const require = createRequire(import.meta.url) -var start = require('unified-args') -var processor = require('rehype') -var proc = require('rehype/package.json') -var cli = require('./package.json') +const proc = require('rehype/package.json') +const cli = require('./package.json') start({ - processor: processor, + processor: rehype, name: proc.name, description: cli.description, version: [ diff --git a/packages/rehype-cli/package.json b/packages/rehype-cli/package.json index 8bf60b91..f7a31608 100644 --- a/packages/rehype-cli/package.json +++ b/packages/rehype-cli/package.json @@ -10,10 +10,6 @@ "cli", "bin" ], - "dependencies": { - "rehype": "^11.0.0", - "unified-args": "^8.0.0" - }, "repository": "https://github.com/rehypejs/rehype/tree/main/packages/rehype-cli", "bugs": "https://github.com/rehypejs/rehype/issues", "funding": { @@ -24,12 +20,18 @@ "contributors": [ "Titus Wormer (https://wooorm.com)" ], + "type": "module", + "main": "cli.js", "bin": { "rehype": "cli.js" }, "files": [ "cli.js" ], + "dependencies": { + "rehype": "^11.0.0", + "unified-args": "^8.0.0" + }, "scripts": {}, "xo": false } diff --git a/packages/rehype-parse/errors.js b/packages/rehype-parse/errors.js new file mode 100644 index 00000000..5c777395 --- /dev/null +++ b/packages/rehype-parse/errors.js @@ -0,0 +1,278 @@ +export const errors = { + abandonedHeadElementChild: { + reason: 'Unexpected metadata element after head', + description: + 'Unexpected element after head. Expected the element before ``', + url: false + }, + abruptClosingOfEmptyComment: { + reason: 'Unexpected abruptly closed empty comment', + description: 'Unexpected `>` or `->`. Expected `-->` to close comments' + }, + abruptDoctypePublicIdentifier: { + reason: 'Unexpected abruptly closed public identifier', + description: + 'Unexpected `>`. Expected a closing `"` or `\'` after the public identifier' + }, + abruptDoctypeSystemIdentifier: { + reason: 'Unexpected abruptly closed system identifier', + description: + 'Unexpected `>`. Expected a closing `"` or `\'` after the identifier identifier' + }, + absenceOfDigitsInNumericCharacterReference: { + reason: 'Unexpected non-digit at start of numeric character reference', + description: + 'Unexpected `%c`. Expected `[0-9]` for decimal references or `[0-9a-fA-F]` for hexadecimal references' + }, + cdataInHtmlContent: { + reason: 'Unexpected CDATA section in HTML', + description: + 'Unexpected `` in ``', + description: + 'Unexpected text character `%c`. Only use text in `