From d0a1d0ef4878ed4bca4e8ce45f3665ca87fcc3d6 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Mon, 10 Jul 2023 09:16:51 +0900 Subject: [PATCH 1/6] Expose lazy-imported highlightjs to Marp instance --- src/marp.ts | 17 ++++++++++++++--- test/marp.ts | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/marp.ts b/src/marp.ts index a3c62ce5..4ff239c1 100644 --- a/src/marp.ts +++ b/src/marp.ts @@ -1,5 +1,5 @@ import { Marpit, Options, ThemeSetPackOptions } from '@marp-team/marpit' -import highlightjs from 'highlight.js' +import type { HLJSApi } from 'highlight.js' import postcss, { AcceptedPlugin } from 'postcss' import defaultTheme from '../themes/default.scss' import gaiaTheme from '../themes/gaia.scss' @@ -33,6 +33,8 @@ export interface MarpOptions extends Options { export class Marp extends Marpit { readonly options!: Required + private _highlightjs: HLJSApi | undefined + static readonly html = { br: [] } constructor(opts: MarpOptions = {}) { @@ -90,10 +92,19 @@ export class Marp extends Marpit { .use(slugPlugin.markdown) } + get highlightjs(): HLJSApi { + if (!this._highlightjs) { + this._highlightjs = + // eslint-disable-next-line @typescript-eslint/no-var-requires + (require('highlight.js') as typeof import('highlight.js')).default + } + return this._highlightjs + } + // eslint-disable-next-line @typescript-eslint/no-unused-vars highlighter(code: string, lang: string, attrs: string): string { - if (lang && highlightjs.getLanguage(lang)) { - return highlightjs.highlight(code, { + if (lang && this.highlightjs.getLanguage(lang)) { + return this.highlightjs.highlight(code, { language: lang, ignoreIllegals: true, }).value diff --git a/test/marp.ts b/test/marp.ts index 604959fa..9acacb3d 100644 --- a/test/marp.ts +++ b/test/marp.ts @@ -1103,6 +1103,23 @@ function matchwo(a,b) expect(instance.markdown.render('```\ntest\n```')).toContain('CUSTOM')) }) + describe('with customized highlightjs instance', () => { + const instance = marp() + + instance.highlightjs.registerAliases('marp-test', { + languageName: 'javascript', + }) + + const $ = load( + instance.markdown.render('```marp-test\nconst a = 1;\n```') + ) + + it('highlights code with customized highlightjs', () => { + expect($('code.language-marp-test')).toHaveLength(1) + expect($('code .hljs-keyword')).toHaveLength(1) + }) + }) + describe('with overriden #highlighter', () => { const instance = marp() From a530e6d6e37ff37389c3d30de365f7448b51f89d Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Tue, 11 Jul 2023 23:38:21 +0900 Subject: [PATCH 2/6] Don't use require('highlight.js') To avoid pollution to global highlight.js instance. --- src/highlightjs.ts | 386 +++++++++++++++++++++++++++++++++++++++++++++ src/marp.ts | 7 +- test/marp.ts | 35 ++++ 3 files changed, 424 insertions(+), 4 deletions(-) create mode 100644 src/highlightjs.ts diff --git a/src/highlightjs.ts b/src/highlightjs.ts new file mode 100644 index 00000000..ee73d563 --- /dev/null +++ b/src/highlightjs.ts @@ -0,0 +1,386 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ +import hljsCore from 'highlight.js/lib/core' + +export const generateHighlightJSInstance = () => { + // Create a new instance to avoid polluation to global highlight.js module by users. + const hljs = hljsCore.newInstance() + + // Ported from highlight.js/lib/index.js + hljs.registerLanguage('1c', require('highlight.js/lib/languages/1c')) + hljs.registerLanguage('abnf', require('highlight.js/lib/languages/abnf')) + hljs.registerLanguage( + 'accesslog', + require('highlight.js/lib/languages/accesslog') + ) + hljs.registerLanguage( + 'actionscript', + require('highlight.js/lib/languages/actionscript') + ) + hljs.registerLanguage('ada', require('highlight.js/lib/languages/ada')) + hljs.registerLanguage( + 'angelscript', + require('highlight.js/lib/languages/angelscript') + ) + hljs.registerLanguage('apache', require('highlight.js/lib/languages/apache')) + hljs.registerLanguage( + 'applescript', + require('highlight.js/lib/languages/applescript') + ) + hljs.registerLanguage('arcade', require('highlight.js/lib/languages/arcade')) + hljs.registerLanguage( + 'arduino', + require('highlight.js/lib/languages/arduino') + ) + hljs.registerLanguage('armasm', require('highlight.js/lib/languages/armasm')) + hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml')) + hljs.registerLanguage( + 'asciidoc', + require('highlight.js/lib/languages/asciidoc') + ) + hljs.registerLanguage( + 'aspectj', + require('highlight.js/lib/languages/aspectj') + ) + hljs.registerLanguage( + 'autohotkey', + require('highlight.js/lib/languages/autohotkey') + ) + hljs.registerLanguage('autoit', require('highlight.js/lib/languages/autoit')) + hljs.registerLanguage('avrasm', require('highlight.js/lib/languages/avrasm')) + hljs.registerLanguage('awk', require('highlight.js/lib/languages/awk')) + hljs.registerLanguage('axapta', require('highlight.js/lib/languages/axapta')) + hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash')) + hljs.registerLanguage('basic', require('highlight.js/lib/languages/basic')) + hljs.registerLanguage('bnf', require('highlight.js/lib/languages/bnf')) + hljs.registerLanguage( + 'brainfuck', + require('highlight.js/lib/languages/brainfuck') + ) + hljs.registerLanguage('c', require('highlight.js/lib/languages/c')) + hljs.registerLanguage('cal', require('highlight.js/lib/languages/cal')) + hljs.registerLanguage( + 'capnproto', + require('highlight.js/lib/languages/capnproto') + ) + hljs.registerLanguage('ceylon', require('highlight.js/lib/languages/ceylon')) + hljs.registerLanguage('clean', require('highlight.js/lib/languages/clean')) + hljs.registerLanguage( + 'clojure', + require('highlight.js/lib/languages/clojure') + ) + hljs.registerLanguage( + 'clojure-repl', + require('highlight.js/lib/languages/clojure-repl') + ) + hljs.registerLanguage('cmake', require('highlight.js/lib/languages/cmake')) + hljs.registerLanguage( + 'coffeescript', + require('highlight.js/lib/languages/coffeescript') + ) + hljs.registerLanguage('coq', require('highlight.js/lib/languages/coq')) + hljs.registerLanguage('cos', require('highlight.js/lib/languages/cos')) + hljs.registerLanguage('cpp', require('highlight.js/lib/languages/cpp')) + hljs.registerLanguage('crmsh', require('highlight.js/lib/languages/crmsh')) + hljs.registerLanguage( + 'crystal', + require('highlight.js/lib/languages/crystal') + ) + hljs.registerLanguage('csharp', require('highlight.js/lib/languages/csharp')) + hljs.registerLanguage('csp', require('highlight.js/lib/languages/csp')) + hljs.registerLanguage('css', require('highlight.js/lib/languages/css')) + hljs.registerLanguage('d', require('highlight.js/lib/languages/d')) + hljs.registerLanguage( + 'markdown', + require('highlight.js/lib/languages/markdown') + ) + hljs.registerLanguage('dart', require('highlight.js/lib/languages/dart')) + hljs.registerLanguage('delphi', require('highlight.js/lib/languages/delphi')) + hljs.registerLanguage('diff', require('highlight.js/lib/languages/diff')) + hljs.registerLanguage('django', require('highlight.js/lib/languages/django')) + hljs.registerLanguage('dns', require('highlight.js/lib/languages/dns')) + hljs.registerLanguage( + 'dockerfile', + require('highlight.js/lib/languages/dockerfile') + ) + hljs.registerLanguage('dos', require('highlight.js/lib/languages/dos')) + hljs.registerLanguage( + 'dsconfig', + require('highlight.js/lib/languages/dsconfig') + ) + hljs.registerLanguage('dts', require('highlight.js/lib/languages/dts')) + hljs.registerLanguage('dust', require('highlight.js/lib/languages/dust')) + hljs.registerLanguage('ebnf', require('highlight.js/lib/languages/ebnf')) + hljs.registerLanguage('elixir', require('highlight.js/lib/languages/elixir')) + hljs.registerLanguage('elm', require('highlight.js/lib/languages/elm')) + hljs.registerLanguage('ruby', require('highlight.js/lib/languages/ruby')) + hljs.registerLanguage('erb', require('highlight.js/lib/languages/erb')) + hljs.registerLanguage( + 'erlang-repl', + require('highlight.js/lib/languages/erlang-repl') + ) + hljs.registerLanguage('erlang', require('highlight.js/lib/languages/erlang')) + hljs.registerLanguage('excel', require('highlight.js/lib/languages/excel')) + hljs.registerLanguage('fix', require('highlight.js/lib/languages/fix')) + hljs.registerLanguage('flix', require('highlight.js/lib/languages/flix')) + hljs.registerLanguage( + 'fortran', + require('highlight.js/lib/languages/fortran') + ) + hljs.registerLanguage('fsharp', require('highlight.js/lib/languages/fsharp')) + hljs.registerLanguage('gams', require('highlight.js/lib/languages/gams')) + hljs.registerLanguage('gauss', require('highlight.js/lib/languages/gauss')) + hljs.registerLanguage('gcode', require('highlight.js/lib/languages/gcode')) + hljs.registerLanguage( + 'gherkin', + require('highlight.js/lib/languages/gherkin') + ) + hljs.registerLanguage('glsl', require('highlight.js/lib/languages/glsl')) + hljs.registerLanguage('gml', require('highlight.js/lib/languages/gml')) + hljs.registerLanguage('go', require('highlight.js/lib/languages/go')) + hljs.registerLanguage('golo', require('highlight.js/lib/languages/golo')) + hljs.registerLanguage('gradle', require('highlight.js/lib/languages/gradle')) + hljs.registerLanguage( + 'graphql', + require('highlight.js/lib/languages/graphql') + ) + hljs.registerLanguage('groovy', require('highlight.js/lib/languages/groovy')) + hljs.registerLanguage('haml', require('highlight.js/lib/languages/haml')) + hljs.registerLanguage( + 'handlebars', + require('highlight.js/lib/languages/handlebars') + ) + hljs.registerLanguage( + 'haskell', + require('highlight.js/lib/languages/haskell') + ) + hljs.registerLanguage('haxe', require('highlight.js/lib/languages/haxe')) + hljs.registerLanguage('hsp', require('highlight.js/lib/languages/hsp')) + hljs.registerLanguage('http', require('highlight.js/lib/languages/http')) + hljs.registerLanguage('hy', require('highlight.js/lib/languages/hy')) + hljs.registerLanguage( + 'inform7', + require('highlight.js/lib/languages/inform7') + ) + hljs.registerLanguage('ini', require('highlight.js/lib/languages/ini')) + hljs.registerLanguage('irpf90', require('highlight.js/lib/languages/irpf90')) + hljs.registerLanguage('isbl', require('highlight.js/lib/languages/isbl')) + hljs.registerLanguage('java', require('highlight.js/lib/languages/java')) + hljs.registerLanguage( + 'javascript', + require('highlight.js/lib/languages/javascript') + ) + hljs.registerLanguage( + 'jboss-cli', + require('highlight.js/lib/languages/jboss-cli') + ) + hljs.registerLanguage('json', require('highlight.js/lib/languages/json')) + hljs.registerLanguage('julia', require('highlight.js/lib/languages/julia')) + hljs.registerLanguage( + 'julia-repl', + require('highlight.js/lib/languages/julia-repl') + ) + hljs.registerLanguage('kotlin', require('highlight.js/lib/languages/kotlin')) + hljs.registerLanguage('lasso', require('highlight.js/lib/languages/lasso')) + hljs.registerLanguage('latex', require('highlight.js/lib/languages/latex')) + hljs.registerLanguage('ldif', require('highlight.js/lib/languages/ldif')) + hljs.registerLanguage('leaf', require('highlight.js/lib/languages/leaf')) + hljs.registerLanguage('less', require('highlight.js/lib/languages/less')) + hljs.registerLanguage('lisp', require('highlight.js/lib/languages/lisp')) + hljs.registerLanguage( + 'livecodeserver', + require('highlight.js/lib/languages/livecodeserver') + ) + hljs.registerLanguage( + 'livescript', + require('highlight.js/lib/languages/livescript') + ) + hljs.registerLanguage('llvm', require('highlight.js/lib/languages/llvm')) + hljs.registerLanguage('lsl', require('highlight.js/lib/languages/lsl')) + hljs.registerLanguage('lua', require('highlight.js/lib/languages/lua')) + hljs.registerLanguage( + 'makefile', + require('highlight.js/lib/languages/makefile') + ) + hljs.registerLanguage( + 'mathematica', + require('highlight.js/lib/languages/mathematica') + ) + hljs.registerLanguage('matlab', require('highlight.js/lib/languages/matlab')) + hljs.registerLanguage('maxima', require('highlight.js/lib/languages/maxima')) + hljs.registerLanguage('mel', require('highlight.js/lib/languages/mel')) + hljs.registerLanguage( + 'mercury', + require('highlight.js/lib/languages/mercury') + ) + hljs.registerLanguage( + 'mipsasm', + require('highlight.js/lib/languages/mipsasm') + ) + hljs.registerLanguage('mizar', require('highlight.js/lib/languages/mizar')) + hljs.registerLanguage('perl', require('highlight.js/lib/languages/perl')) + hljs.registerLanguage( + 'mojolicious', + require('highlight.js/lib/languages/mojolicious') + ) + hljs.registerLanguage('monkey', require('highlight.js/lib/languages/monkey')) + hljs.registerLanguage( + 'moonscript', + require('highlight.js/lib/languages/moonscript') + ) + hljs.registerLanguage('n1ql', require('highlight.js/lib/languages/n1ql')) + hljs.registerLanguage( + 'nestedtext', + require('highlight.js/lib/languages/nestedtext') + ) + hljs.registerLanguage('nginx', require('highlight.js/lib/languages/nginx')) + hljs.registerLanguage('nim', require('highlight.js/lib/languages/nim')) + hljs.registerLanguage('nix', require('highlight.js/lib/languages/nix')) + hljs.registerLanguage( + 'node-repl', + require('highlight.js/lib/languages/node-repl') + ) + hljs.registerLanguage('nsis', require('highlight.js/lib/languages/nsis')) + hljs.registerLanguage( + 'objectivec', + require('highlight.js/lib/languages/objectivec') + ) + hljs.registerLanguage('ocaml', require('highlight.js/lib/languages/ocaml')) + hljs.registerLanguage( + 'openscad', + require('highlight.js/lib/languages/openscad') + ) + hljs.registerLanguage( + 'oxygene', + require('highlight.js/lib/languages/oxygene') + ) + hljs.registerLanguage( + 'parser3', + require('highlight.js/lib/languages/parser3') + ) + hljs.registerLanguage('pf', require('highlight.js/lib/languages/pf')) + hljs.registerLanguage('pgsql', require('highlight.js/lib/languages/pgsql')) + hljs.registerLanguage('php', require('highlight.js/lib/languages/php')) + hljs.registerLanguage( + 'php-template', + require('highlight.js/lib/languages/php-template') + ) + hljs.registerLanguage( + 'plaintext', + require('highlight.js/lib/languages/plaintext') + ) + hljs.registerLanguage('pony', require('highlight.js/lib/languages/pony')) + hljs.registerLanguage( + 'powershell', + require('highlight.js/lib/languages/powershell') + ) + hljs.registerLanguage( + 'processing', + require('highlight.js/lib/languages/processing') + ) + hljs.registerLanguage( + 'profile', + require('highlight.js/lib/languages/profile') + ) + hljs.registerLanguage('prolog', require('highlight.js/lib/languages/prolog')) + hljs.registerLanguage( + 'properties', + require('highlight.js/lib/languages/properties') + ) + hljs.registerLanguage( + 'protobuf', + require('highlight.js/lib/languages/protobuf') + ) + hljs.registerLanguage('puppet', require('highlight.js/lib/languages/puppet')) + hljs.registerLanguage( + 'purebasic', + require('highlight.js/lib/languages/purebasic') + ) + hljs.registerLanguage('python', require('highlight.js/lib/languages/python')) + hljs.registerLanguage( + 'python-repl', + require('highlight.js/lib/languages/python-repl') + ) + hljs.registerLanguage('q', require('highlight.js/lib/languages/q')) + hljs.registerLanguage('qml', require('highlight.js/lib/languages/qml')) + hljs.registerLanguage('r', require('highlight.js/lib/languages/r')) + hljs.registerLanguage( + 'reasonml', + require('highlight.js/lib/languages/reasonml') + ) + hljs.registerLanguage('rib', require('highlight.js/lib/languages/rib')) + hljs.registerLanguage( + 'roboconf', + require('highlight.js/lib/languages/roboconf') + ) + hljs.registerLanguage( + 'routeros', + require('highlight.js/lib/languages/routeros') + ) + hljs.registerLanguage('rsl', require('highlight.js/lib/languages/rsl')) + hljs.registerLanguage( + 'ruleslanguage', + require('highlight.js/lib/languages/ruleslanguage') + ) + hljs.registerLanguage('rust', require('highlight.js/lib/languages/rust')) + hljs.registerLanguage('sas', require('highlight.js/lib/languages/sas')) + hljs.registerLanguage('scala', require('highlight.js/lib/languages/scala')) + hljs.registerLanguage('scheme', require('highlight.js/lib/languages/scheme')) + hljs.registerLanguage('scilab', require('highlight.js/lib/languages/scilab')) + hljs.registerLanguage('scss', require('highlight.js/lib/languages/scss')) + hljs.registerLanguage('shell', require('highlight.js/lib/languages/shell')) + hljs.registerLanguage('smali', require('highlight.js/lib/languages/smali')) + hljs.registerLanguage( + 'smalltalk', + require('highlight.js/lib/languages/smalltalk') + ) + hljs.registerLanguage('sml', require('highlight.js/lib/languages/sml')) + hljs.registerLanguage('sqf', require('highlight.js/lib/languages/sqf')) + hljs.registerLanguage('sql', require('highlight.js/lib/languages/sql')) + hljs.registerLanguage('stan', require('highlight.js/lib/languages/stan')) + hljs.registerLanguage('stata', require('highlight.js/lib/languages/stata')) + hljs.registerLanguage('step21', require('highlight.js/lib/languages/step21')) + hljs.registerLanguage('stylus', require('highlight.js/lib/languages/stylus')) + hljs.registerLanguage( + 'subunit', + require('highlight.js/lib/languages/subunit') + ) + hljs.registerLanguage('swift', require('highlight.js/lib/languages/swift')) + hljs.registerLanguage( + 'taggerscript', + require('highlight.js/lib/languages/taggerscript') + ) + hljs.registerLanguage('yaml', require('highlight.js/lib/languages/yaml')) + hljs.registerLanguage('tap', require('highlight.js/lib/languages/tap')) + hljs.registerLanguage('tcl', require('highlight.js/lib/languages/tcl')) + hljs.registerLanguage('thrift', require('highlight.js/lib/languages/thrift')) + hljs.registerLanguage('tp', require('highlight.js/lib/languages/tp')) + hljs.registerLanguage('twig', require('highlight.js/lib/languages/twig')) + hljs.registerLanguage( + 'typescript', + require('highlight.js/lib/languages/typescript') + ) + hljs.registerLanguage('vala', require('highlight.js/lib/languages/vala')) + hljs.registerLanguage('vbnet', require('highlight.js/lib/languages/vbnet')) + hljs.registerLanguage( + 'vbscript', + require('highlight.js/lib/languages/vbscript') + ) + hljs.registerLanguage( + 'vbscript-html', + require('highlight.js/lib/languages/vbscript-html') + ) + hljs.registerLanguage( + 'verilog', + require('highlight.js/lib/languages/verilog') + ) + hljs.registerLanguage('vhdl', require('highlight.js/lib/languages/vhdl')) + hljs.registerLanguage('vim', require('highlight.js/lib/languages/vim')) + hljs.registerLanguage('wasm', require('highlight.js/lib/languages/wasm')) + hljs.registerLanguage('wren', require('highlight.js/lib/languages/wren')) + hljs.registerLanguage('x86asm', require('highlight.js/lib/languages/x86asm')) + hljs.registerLanguage('xl', require('highlight.js/lib/languages/xl')) + hljs.registerLanguage('xquery', require('highlight.js/lib/languages/xquery')) + hljs.registerLanguage('zephir', require('highlight.js/lib/languages/zephir')) + + return hljs +} diff --git a/src/marp.ts b/src/marp.ts index 4ff239c1..66046163 100644 --- a/src/marp.ts +++ b/src/marp.ts @@ -7,6 +7,7 @@ import uncoverTheme from '../themes/uncover.scss' import * as autoScalingPlugin from './auto-scaling' import * as customElements from './custom-elements' import * as emojiPlugin from './emoji/emoji' +import { generateHighlightJSInstance } from './highlightjs' import * as htmlPlugin from './html/html' import * as mathPlugin from './math/math' import minifyPlugins from './prebundles/postcss-minify-plugins' @@ -92,11 +93,9 @@ export class Marp extends Marpit { .use(slugPlugin.markdown) } - get highlightjs(): HLJSApi { + get highlightjs() { if (!this._highlightjs) { - this._highlightjs = - // eslint-disable-next-line @typescript-eslint/no-var-requires - (require('highlight.js') as typeof import('highlight.js')).default + this._highlightjs = generateHighlightJSInstance() } return this._highlightjs } diff --git a/test/marp.ts b/test/marp.ts index 9acacb3d..63178846 100644 --- a/test/marp.ts +++ b/test/marp.ts @@ -1,5 +1,6 @@ import { Marpit } from '@marp-team/marpit' import { load, CheerioOptions } from 'cheerio' +import highlightjs from 'highlight.js' import postcss, { Rule } from 'postcss' import { elements } from '../src/custom-elements/definitions' import { EmojiOptions } from '../src/emoji/emoji' @@ -1137,4 +1138,38 @@ function matchwo(a,b) expect($('code .customized')).toHaveLength(1)) }) }) + + describe('get #highlightjs', () => { + it('returns highlight.js instance', () => { + const instance = marp() + + expect(instance.highlightjs.highlight).toBeInstanceOf(Function) + expect(instance.highlightjs.versionString).toMatchInlineSnapshot( + `"11.8.0"` + ) + }) + + it('has registered all highlight languages as same as highlight.js module', () => { + const instance = marp() + + const moduleLanguages = highlightjs.listLanguages() + const languages = instance.highlightjs.listLanguages() + + expect(languages).toHaveLength(moduleLanguages.length) + moduleLanguages.forEach((lang) => expect(languages).toContain(lang)) + }) + + it('does not pollute global highlight.js instance even if extended an instance of highlight.js resolved by #highlightjs', () => { + const instance = marp() + + instance.highlightjs.registerAliases('marp-test', { + languageName: 'javascript', + }) + + expect(instance.highlightjs.getLanguage('marp-test')?.name).toBe( + 'JavaScript' + ) + expect(highlightjs.getLanguage('marp-test')?.name).toBeUndefined() + }) + }) }) From 61af4ccb0fac311f209b9043a2ee62ed972c909b Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Tue, 18 Jul 2023 00:17:53 +0900 Subject: [PATCH 3/6] Remove @marp-team/marp-cli from devDependencies --- marp.config.js | 12 -- marp.config.mjs | 15 ++ package.json | 3 +- yarn.lock | 465 ++---------------------------------------------- 4 files changed, 29 insertions(+), 466 deletions(-) delete mode 100644 marp.config.js create mode 100644 marp.config.mjs diff --git a/marp.config.js b/marp.config.js deleted file mode 100644 index af0ca534..00000000 --- a/marp.config.js +++ /dev/null @@ -1,12 +0,0 @@ -const path = require('path') -const engine = path.join(__dirname, './lib/marp.js') - -module.exports = { - engine, - server: true, - inputDir: path.join(__dirname, './sandbox'), - html: true, - options: { - minifyCSS: false, - }, -} diff --git a/marp.config.mjs b/marp.config.mjs new file mode 100644 index 00000000..6bdd5d5b --- /dev/null +++ b/marp.config.mjs @@ -0,0 +1,15 @@ +import path from 'node:path' +import { Marp } from './lib/marp.js' + +export default { + engine: Marp, + server: true, + inputDir: path.join( + path.dirname(new URL(import.meta.url).pathname), + './sandbox' + ), + html: true, + options: { + minifyCSS: false, + }, +} diff --git a/package.json b/package.json index 94c42d31..5e396572 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,9 @@ }, "nodemonConfig": { "watch": "./lib", - "exec": "./node_modules/.bin/marp" + "exec": "npx @marp-team/marp-cli@latest -y" }, "devDependencies": { - "@marp-team/marp-cli": "^2.5.0", "@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-commonjs": "^25.0.0", "@rollup/plugin-json": "^6.0.0", diff --git a/yarn.lock b/yarn.lock index 123f8dec..fcf4756a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -635,45 +635,12 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@marp-team/marp-cli@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@marp-team/marp-cli/-/marp-cli-2.5.0.tgz#e587bbcd9671ae77a0be8f8fa77d651a5770d7e4" - integrity sha512-0ikYCJev6egtP4oLkNQjzKj2/2y5Wmd+nVC718aDXi6+fstX0reKshlESNOFSa1dc0Yo+GO1VQh39uIr1XG5Eg== - dependencies: - "@marp-team/marp-core" "^3.6.0" - "@marp-team/marpit" "^2.4.2" - chokidar "^3.5.3" - cosmiconfig "^8.1.3" - import-from "^4.0.0" - is-wsl "^2.2.0" - puppeteer-core "19.9.0" - remove "^0.1.5" - serve-index "^1.9.1" - tmp "^0.2.1" - v8-compile-cache "^2.3.0" - ws "^8.13.0" - yargs "^17.7.1" - -"@marp-team/marp-core@^3.6.0": - version "3.7.0" - resolved "https://registry.yarnpkg.com/@marp-team/marp-core/-/marp-core-3.7.0.tgz#13346a3526c00021841ff19b354ec383f2a1cd08" - integrity sha512-Bz7r1djHZtBGep2fA8Wb9mgQgy8NtKRq43jQCtCUD1pHoorHs+vGB6icDvo8LCy8eWAlPVJBkdQkc7ywMzj2jw== - dependencies: - "@marp-team/marpit" "^2.5.0" - "@marp-team/marpit-svg-polyfill" "^2.1.0" - highlight.js "^11.8.0" - katex "^0.16.7" - mathjax-full "^3.2.2" - postcss "^8.4.21" - postcss-selector-parser "^6.0.13" - xss "^1.0.14" - "@marp-team/marpit-svg-polyfill@^2.1.0": version "2.1.0" resolved "https://registry.yarnpkg.com/@marp-team/marpit-svg-polyfill/-/marpit-svg-polyfill-2.1.0.tgz#40e7ce3a2aa7496748541cc7053e6779d2f866ac" integrity sha512-VqCoAKwv1HJdzZp36dDPxznz2JZgRjkVSSPHpCzk72G2N753F0HPKXjevdjxmzN6gir9bUGBgMD1SguWJIi11A== -"@marp-team/marpit@^2.4.2", "@marp-team/marpit@^2.5.0": +"@marp-team/marpit@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@marp-team/marpit/-/marpit-2.5.0.tgz#a3e393815b2d831aba04787ea1d67d4e5ca20bbc" integrity sha512-VHxBJR4M371u8GmACtacGjcQY3i7wYSUrMmnpp+ic0a0TBIozgbCCaRHZ8mWd0Bn4CYMpl3bKjZoq6x6Lk75fw== @@ -712,20 +679,6 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@puppeteer/browsers@0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-0.4.1.tgz#fae81939adb743420cc2466f3aa37481f7081712" - integrity sha512-4IICvy1McAkT/HyNZHIs7sp8ngBX1dmO0TPQ+FWq9ATQMqI8p+Ulm5A3kS2wYDh5HDHHkYrrETOu6rlj64VuTw== - dependencies: - debug "4.3.4" - extract-zip "2.0.1" - https-proxy-agent "5.0.1" - progress "2.0.3" - proxy-from-env "1.1.0" - tar-fs "2.1.1" - unbzip2-stream "1.4.3" - yargs "17.7.1" - "@rollup/plugin-alias@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.0.0.tgz#70f3d504bd17d8922e35c6b61c08b40a6ec25af2" @@ -1000,13 +953,6 @@ dependencies: "@types/yargs-parser" "*" -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== - dependencies: - "@types/node" "*" - "@typescript-eslint/eslint-plugin@^5.59.9": version "5.59.9" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.9.tgz#2604cfaf2b306e120044f901e20c8ed926debf15" @@ -1101,14 +1047,6 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - acorn-globals@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" @@ -1366,30 +1304,11 @@ balanced-match@^2.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" @@ -1441,24 +1360,11 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== - buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer@^5.2.1, buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - builtin-modules@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" @@ -1511,13 +1417,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001489: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001497.tgz#0e5387b98e7dbf9c4f743fb16e92cbf0ca780714" integrity sha512-I4/duVK4wL6rAK/aKZl3HXB4g+lIZvaT4VLAn2rCgJ38jVLb0lv2Xug6QuqmxXFVRJMF74SPPWPJ/1Sdm3vCzw== -"chainsaw@>=0.0.7 <0.1": - version "0.0.9" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.0.9.tgz#11a05102d1c4c785b6d0415d336d5a3a1612913e" - integrity sha512-nG8PYH+/4xB+8zkV4G844EtfvZ5tTiLFoX3dZ4nhF4t3OCKIb9UvaFyNmeZO2zOSmRWzBoTD+napN6hiL+EgcA== - dependencies: - traverse ">=0.3.0 <0.4" - chalk@^2.0.0, chalk@^2.4.1: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" @@ -1565,7 +1464,7 @@ cheerio@^1.0.0-rc.12: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2, chokidar@^3.5.3: +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -1580,18 +1479,6 @@ cheerio@^1.0.0-rc.12: optionalDependencies: fsevents "~2.3.2" -chownr@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" - integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== - -chromium-bidi@0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.6.tgz#a082151834083ed002624f12fa35e748817b2ee5" - integrity sha512-TQOkWRaLI/IWvoP8XC+7jO4uHTIiAUiklXU1T0qszlUFEai9LgKXIBXy3pOS3EnQZ3bQtMbKUPkug0fTAEHCSw== - dependencies: - mitt "3.0.0" - ci-info@^3.2.0: version "3.8.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" @@ -1712,7 +1599,7 @@ convert-source-map@^2.0.0: resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== -cosmiconfig@^8.1.3, cosmiconfig@^8.2.0: +cosmiconfig@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== @@ -1722,13 +1609,6 @@ cosmiconfig@^8.1.3, cosmiconfig@^8.2.0: parse-json "^5.0.0" path-type "^4.0.0" -cross-fetch@3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== - dependencies: - node-fetch "2.6.7" - cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1969,14 +1849,7 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -2036,21 +1909,11 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - detect-newline@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== -devtools-protocol@0.0.1107588: - version "0.0.1107588" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz#f8cac707840b97cc30b029359341bcbbb0ad8ffa" - integrity sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg== - diff-sequences@^29.4.3: version "29.4.3" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2" @@ -2169,13 +2032,6 @@ emoji-regex@^9.2.2: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== -end-of-stream@^1.1.0, end-of-stream@^1.4.1: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -2268,11 +2124,6 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -2509,17 +2360,6 @@ expect@^29.0.0, expect@^29.5.0: jest-message-util "^29.5.0" jest-util "^29.5.0" -extract-zip@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -2565,13 +2405,6 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -2644,11 +2477,6 @@ fraction.js@^4.2.0: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== - fs-extra@^8.0.1: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -2720,13 +2548,6 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - get-stream@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" @@ -2918,13 +2739,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -"hashish@>=0.0.2 <0.1": - version "0.0.4" - resolved "https://registry.yarnpkg.com/hashish/-/hashish-0.0.4.tgz#6d60bc6ffaf711b6afd60e426d077988014e6554" - integrity sha512-xyD4XgslstNAs72ENaoFvgMwtv8xhiDtC2AtzCG+8yF7W/Knxxm9BX+e2s25mm+HxMKh0rBmXVOEGF3zNImXvA== - dependencies: - traverse ">=0.2.4" - highlight.js@^11.8.0: version "11.8.0" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.8.0.tgz#966518ea83257bae2e7c9a48596231856555bb65" @@ -2969,16 +2783,6 @@ htmlparser2@^8.0.1: domutils "^3.0.1" entities "^4.4.0" -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - http-proxy-agent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" @@ -2988,7 +2792,7 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -https-proxy-agent@5.0.1, https-proxy-agent@^5.0.1: +https-proxy-agent@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -3018,11 +2822,6 @@ icss-utils@^5.0.0: resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - ignore-by-default@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" @@ -3060,11 +2859,6 @@ import-from@^3.0.0: dependencies: resolve-from "^5.0.0" -import-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2" - integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ== - import-lazy@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" @@ -3096,16 +2890,11 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.3, inherits@^2.0.4: +inherits@2: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - ini@^1.3.5: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" @@ -3187,11 +2976,6 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-docker@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -3315,13 +3099,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4159,7 +3936,7 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.34: +mime-types@^2.1.12: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -4228,21 +4005,11 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81" integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w== -mitt@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd" - integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ== - mj-context-menu@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/mj-context-menu/-/mj-context-menu-0.6.1.tgz#a043c5282bf7e1cf3821de07b13525ca6f85aa69" integrity sha512-7NO5s6n10TIV96d4g2uDpG7ZDpIhMh0QNfGdJw/W47JswFcosz457wqz/b5sAKvl12sxINGFCn80NZHKwxQEXA== -mkdirp-classic@^0.5.2: - version "0.5.3" - resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" - integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== - mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" @@ -4253,11 +4020,6 @@ mkdirp@^3.0.1: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -4283,23 +4045,11 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -4431,7 +4181,7 @@ object.values@^1.1.6: define-properties "^1.1.4" es-abstract "^1.20.4" -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== @@ -4562,11 +4312,6 @@ parse5@^7.0.0, parse5@^7.1.1: dependencies: entities "^4.4.0" -parseurl@~1.3.2: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -4612,11 +4357,6 @@ path-type@^4.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -5173,11 +4913,6 @@ pretty-format@^29.0.0, pretty-format@^29.5.0: ansi-styles "^5.0.0" react-is "^18.0.0" -progress@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - promise.series@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd" @@ -5191,11 +4926,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -proxy-from-env@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" @@ -5206,36 +4936,11 @@ pstree.remy@^1.1.8: resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a" integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w== -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - punycode@^2.1.0, punycode@^2.1.1: version "2.3.0" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -puppeteer-core@19.9.0: - version "19.9.0" - resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.9.0.tgz#b4fdf6a7ce6b595a7a45ed6436d07cdde688433e" - integrity sha512-IJYfCE0oFpi5dTvNFqOwo8Dey6zzx7hANy7z6K2bjpCux9oPOSOIubq40awNhaHlfi8soYtgU4qabnzMXB7xBQ== - dependencies: - "@puppeteer/browsers" "0.4.1" - chromium-bidi "0.4.6" - cross-fetch "3.1.5" - debug "4.3.4" - devtools-protocol "0.0.1107588" - extract-zip "2.0.1" - https-proxy-agent "5.0.1" - proxy-from-env "1.1.0" - tar-fs "2.1.1" - unbzip2-stream "1.4.3" - ws "8.13.0" - pure-rand@^6.0.0: version "6.0.2" resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306" @@ -5296,15 +5001,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" - integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -5329,13 +5025,6 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.2.0" functions-have-names "^1.2.3" -remove@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/remove/-/remove-0.1.5.tgz#095ffd827d65c9f41ad97d33e416a75811079955" - integrity sha512-AJMA9oWvJzdTjwIGwSQZsjGQiRx73YTmiOWmfCp1fpLa/D4n7jKcpoA+CZiVLJqKcEKUuh1Suq80c5wF+L/qVQ== - dependencies: - seq ">= 0.3.5" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -5387,7 +5076,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -5448,7 +5137,7 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@^5.1.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -5526,14 +5215,6 @@ semver@~7.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -"seq@>= 0.3.5": - version "0.3.5" - resolved "https://registry.yarnpkg.com/seq/-/seq-0.3.5.tgz#ae02af3a424793d8ccbf212d69174e0c54dffe38" - integrity sha512-sisY2Ln1fj43KBkRtXkesnRHYNdswIkIibvNe/0UKm2GZxjMbqmccpiatoKr/k2qX5VKiLU8xm+tz/74LAho4g== - dependencies: - chainsaw ">=0.0.7 <0.1" - hashish ">=0.0.2 <0.1" - serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" @@ -5541,24 +5222,6 @@ serialize-javascript@^6.0.1: dependencies: randombytes "^2.1.0" -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -5728,11 +5391,6 @@ stack-utils@^2.0.3: dependencies: escape-string-regexp "^2.0.0" -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - string-hash@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" @@ -5800,13 +5458,6 @@ string.prototype.trimstart@^1.0.6: define-properties "^1.1.4" es-abstract "^1.20.4" -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -6046,27 +5697,6 @@ table@^6.8.1: string-width "^4.2.3" strip-ansi "^6.0.1" -tar-fs@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - -tar-stream@^2.1.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - terser@^5.17.4: version "5.17.7" resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.7.tgz#2a8b134826fe179b711969fd9d9a0c2479b2a8c3" @@ -6091,18 +5721,6 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -through@^2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -6144,21 +5762,6 @@ tr46@^3.0.0: dependencies: punycode "^2.1.1" -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - -traverse@>=0.2.4: - version "0.6.7" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz#46961cd2d57dd8706c36664acde06a248f1173fe" - integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg== - -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ== - trim-newlines@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" @@ -6283,14 +5886,6 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -unbzip2-stream@1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" - integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== - dependencies: - buffer "^5.2.1" - through "^2.3.8" - undefsafe@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c" @@ -6329,7 +5924,7 @@ url-parse@^1.5.3: querystringify "^2.1.1" requires-port "^1.0.0" -util-deprecate@^1.0.1, util-deprecate@^1.0.2: +util-deprecate@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== @@ -6375,11 +5970,6 @@ walker@^1.0.8: dependencies: makeerror "1.0.12" -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - webidl-conversions@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" @@ -6405,14 +5995,6 @@ whatwg-url@^11.0.0: tr46 "^3.0.0" webidl-conversions "^7.0.0" -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -6499,7 +6081,7 @@ write-file-atomic@^5.0.1: imurmurhash "^0.1.4" signal-exit "^4.0.1" -ws@8.13.0, ws@^8.11.0, ws@^8.13.0: +ws@^8.11.0: version "8.13.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== @@ -6569,20 +6151,7 @@ yargs-parser@^21.0.1, yargs-parser@^21.1.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@17.7.1: - version "17.7.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -yargs@^17.3.1, yargs@^17.7.1: +yargs@^17.3.1: version "17.7.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== @@ -6595,14 +6164,6 @@ yargs@^17.3.1, yargs@^17.7.1: y18n "^5.0.5" yargs-parser "^21.1.1" -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From ffaa99176a2342196a6c1b2b3df6767977e491eb Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 2 Aug 2023 02:36:52 +0900 Subject: [PATCH 4/6] Apply Prettier formatting --- src/highlightjs.ts | 122 ++++++++++++++++++++++----------------------- test/marp.ts | 6 +-- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/highlightjs.ts b/src/highlightjs.ts index ee73d563..6da0818d 100644 --- a/src/highlightjs.ts +++ b/src/highlightjs.ts @@ -10,40 +10,40 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('abnf', require('highlight.js/lib/languages/abnf')) hljs.registerLanguage( 'accesslog', - require('highlight.js/lib/languages/accesslog') + require('highlight.js/lib/languages/accesslog'), ) hljs.registerLanguage( 'actionscript', - require('highlight.js/lib/languages/actionscript') + require('highlight.js/lib/languages/actionscript'), ) hljs.registerLanguage('ada', require('highlight.js/lib/languages/ada')) hljs.registerLanguage( 'angelscript', - require('highlight.js/lib/languages/angelscript') + require('highlight.js/lib/languages/angelscript'), ) hljs.registerLanguage('apache', require('highlight.js/lib/languages/apache')) hljs.registerLanguage( 'applescript', - require('highlight.js/lib/languages/applescript') + require('highlight.js/lib/languages/applescript'), ) hljs.registerLanguage('arcade', require('highlight.js/lib/languages/arcade')) hljs.registerLanguage( 'arduino', - require('highlight.js/lib/languages/arduino') + require('highlight.js/lib/languages/arduino'), ) hljs.registerLanguage('armasm', require('highlight.js/lib/languages/armasm')) hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml')) hljs.registerLanguage( 'asciidoc', - require('highlight.js/lib/languages/asciidoc') + require('highlight.js/lib/languages/asciidoc'), ) hljs.registerLanguage( 'aspectj', - require('highlight.js/lib/languages/aspectj') + require('highlight.js/lib/languages/aspectj'), ) hljs.registerLanguage( 'autohotkey', - require('highlight.js/lib/languages/autohotkey') + require('highlight.js/lib/languages/autohotkey'), ) hljs.registerLanguage('autoit', require('highlight.js/lib/languages/autoit')) hljs.registerLanguage('avrasm', require('highlight.js/lib/languages/avrasm')) @@ -54,28 +54,28 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('bnf', require('highlight.js/lib/languages/bnf')) hljs.registerLanguage( 'brainfuck', - require('highlight.js/lib/languages/brainfuck') + require('highlight.js/lib/languages/brainfuck'), ) hljs.registerLanguage('c', require('highlight.js/lib/languages/c')) hljs.registerLanguage('cal', require('highlight.js/lib/languages/cal')) hljs.registerLanguage( 'capnproto', - require('highlight.js/lib/languages/capnproto') + require('highlight.js/lib/languages/capnproto'), ) hljs.registerLanguage('ceylon', require('highlight.js/lib/languages/ceylon')) hljs.registerLanguage('clean', require('highlight.js/lib/languages/clean')) hljs.registerLanguage( 'clojure', - require('highlight.js/lib/languages/clojure') + require('highlight.js/lib/languages/clojure'), ) hljs.registerLanguage( 'clojure-repl', - require('highlight.js/lib/languages/clojure-repl') + require('highlight.js/lib/languages/clojure-repl'), ) hljs.registerLanguage('cmake', require('highlight.js/lib/languages/cmake')) hljs.registerLanguage( 'coffeescript', - require('highlight.js/lib/languages/coffeescript') + require('highlight.js/lib/languages/coffeescript'), ) hljs.registerLanguage('coq', require('highlight.js/lib/languages/coq')) hljs.registerLanguage('cos', require('highlight.js/lib/languages/cos')) @@ -83,7 +83,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('crmsh', require('highlight.js/lib/languages/crmsh')) hljs.registerLanguage( 'crystal', - require('highlight.js/lib/languages/crystal') + require('highlight.js/lib/languages/crystal'), ) hljs.registerLanguage('csharp', require('highlight.js/lib/languages/csharp')) hljs.registerLanguage('csp', require('highlight.js/lib/languages/csp')) @@ -91,7 +91,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('d', require('highlight.js/lib/languages/d')) hljs.registerLanguage( 'markdown', - require('highlight.js/lib/languages/markdown') + require('highlight.js/lib/languages/markdown'), ) hljs.registerLanguage('dart', require('highlight.js/lib/languages/dart')) hljs.registerLanguage('delphi', require('highlight.js/lib/languages/delphi')) @@ -100,12 +100,12 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('dns', require('highlight.js/lib/languages/dns')) hljs.registerLanguage( 'dockerfile', - require('highlight.js/lib/languages/dockerfile') + require('highlight.js/lib/languages/dockerfile'), ) hljs.registerLanguage('dos', require('highlight.js/lib/languages/dos')) hljs.registerLanguage( 'dsconfig', - require('highlight.js/lib/languages/dsconfig') + require('highlight.js/lib/languages/dsconfig'), ) hljs.registerLanguage('dts', require('highlight.js/lib/languages/dts')) hljs.registerLanguage('dust', require('highlight.js/lib/languages/dust')) @@ -116,7 +116,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('erb', require('highlight.js/lib/languages/erb')) hljs.registerLanguage( 'erlang-repl', - require('highlight.js/lib/languages/erlang-repl') + require('highlight.js/lib/languages/erlang-repl'), ) hljs.registerLanguage('erlang', require('highlight.js/lib/languages/erlang')) hljs.registerLanguage('excel', require('highlight.js/lib/languages/excel')) @@ -124,7 +124,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('flix', require('highlight.js/lib/languages/flix')) hljs.registerLanguage( 'fortran', - require('highlight.js/lib/languages/fortran') + require('highlight.js/lib/languages/fortran'), ) hljs.registerLanguage('fsharp', require('highlight.js/lib/languages/fsharp')) hljs.registerLanguage('gams', require('highlight.js/lib/languages/gams')) @@ -132,7 +132,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('gcode', require('highlight.js/lib/languages/gcode')) hljs.registerLanguage( 'gherkin', - require('highlight.js/lib/languages/gherkin') + require('highlight.js/lib/languages/gherkin'), ) hljs.registerLanguage('glsl', require('highlight.js/lib/languages/glsl')) hljs.registerLanguage('gml', require('highlight.js/lib/languages/gml')) @@ -141,17 +141,17 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('gradle', require('highlight.js/lib/languages/gradle')) hljs.registerLanguage( 'graphql', - require('highlight.js/lib/languages/graphql') + require('highlight.js/lib/languages/graphql'), ) hljs.registerLanguage('groovy', require('highlight.js/lib/languages/groovy')) hljs.registerLanguage('haml', require('highlight.js/lib/languages/haml')) hljs.registerLanguage( 'handlebars', - require('highlight.js/lib/languages/handlebars') + require('highlight.js/lib/languages/handlebars'), ) hljs.registerLanguage( 'haskell', - require('highlight.js/lib/languages/haskell') + require('highlight.js/lib/languages/haskell'), ) hljs.registerLanguage('haxe', require('highlight.js/lib/languages/haxe')) hljs.registerLanguage('hsp', require('highlight.js/lib/languages/hsp')) @@ -159,7 +159,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('hy', require('highlight.js/lib/languages/hy')) hljs.registerLanguage( 'inform7', - require('highlight.js/lib/languages/inform7') + require('highlight.js/lib/languages/inform7'), ) hljs.registerLanguage('ini', require('highlight.js/lib/languages/ini')) hljs.registerLanguage('irpf90', require('highlight.js/lib/languages/irpf90')) @@ -167,17 +167,17 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('java', require('highlight.js/lib/languages/java')) hljs.registerLanguage( 'javascript', - require('highlight.js/lib/languages/javascript') + require('highlight.js/lib/languages/javascript'), ) hljs.registerLanguage( 'jboss-cli', - require('highlight.js/lib/languages/jboss-cli') + require('highlight.js/lib/languages/jboss-cli'), ) hljs.registerLanguage('json', require('highlight.js/lib/languages/json')) hljs.registerLanguage('julia', require('highlight.js/lib/languages/julia')) hljs.registerLanguage( 'julia-repl', - require('highlight.js/lib/languages/julia-repl') + require('highlight.js/lib/languages/julia-repl'), ) hljs.registerLanguage('kotlin', require('highlight.js/lib/languages/kotlin')) hljs.registerLanguage('lasso', require('highlight.js/lib/languages/lasso')) @@ -188,138 +188,138 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('lisp', require('highlight.js/lib/languages/lisp')) hljs.registerLanguage( 'livecodeserver', - require('highlight.js/lib/languages/livecodeserver') + require('highlight.js/lib/languages/livecodeserver'), ) hljs.registerLanguage( 'livescript', - require('highlight.js/lib/languages/livescript') + require('highlight.js/lib/languages/livescript'), ) hljs.registerLanguage('llvm', require('highlight.js/lib/languages/llvm')) hljs.registerLanguage('lsl', require('highlight.js/lib/languages/lsl')) hljs.registerLanguage('lua', require('highlight.js/lib/languages/lua')) hljs.registerLanguage( 'makefile', - require('highlight.js/lib/languages/makefile') + require('highlight.js/lib/languages/makefile'), ) hljs.registerLanguage( 'mathematica', - require('highlight.js/lib/languages/mathematica') + require('highlight.js/lib/languages/mathematica'), ) hljs.registerLanguage('matlab', require('highlight.js/lib/languages/matlab')) hljs.registerLanguage('maxima', require('highlight.js/lib/languages/maxima')) hljs.registerLanguage('mel', require('highlight.js/lib/languages/mel')) hljs.registerLanguage( 'mercury', - require('highlight.js/lib/languages/mercury') + require('highlight.js/lib/languages/mercury'), ) hljs.registerLanguage( 'mipsasm', - require('highlight.js/lib/languages/mipsasm') + require('highlight.js/lib/languages/mipsasm'), ) hljs.registerLanguage('mizar', require('highlight.js/lib/languages/mizar')) hljs.registerLanguage('perl', require('highlight.js/lib/languages/perl')) hljs.registerLanguage( 'mojolicious', - require('highlight.js/lib/languages/mojolicious') + require('highlight.js/lib/languages/mojolicious'), ) hljs.registerLanguage('monkey', require('highlight.js/lib/languages/monkey')) hljs.registerLanguage( 'moonscript', - require('highlight.js/lib/languages/moonscript') + require('highlight.js/lib/languages/moonscript'), ) hljs.registerLanguage('n1ql', require('highlight.js/lib/languages/n1ql')) hljs.registerLanguage( 'nestedtext', - require('highlight.js/lib/languages/nestedtext') + require('highlight.js/lib/languages/nestedtext'), ) hljs.registerLanguage('nginx', require('highlight.js/lib/languages/nginx')) hljs.registerLanguage('nim', require('highlight.js/lib/languages/nim')) hljs.registerLanguage('nix', require('highlight.js/lib/languages/nix')) hljs.registerLanguage( 'node-repl', - require('highlight.js/lib/languages/node-repl') + require('highlight.js/lib/languages/node-repl'), ) hljs.registerLanguage('nsis', require('highlight.js/lib/languages/nsis')) hljs.registerLanguage( 'objectivec', - require('highlight.js/lib/languages/objectivec') + require('highlight.js/lib/languages/objectivec'), ) hljs.registerLanguage('ocaml', require('highlight.js/lib/languages/ocaml')) hljs.registerLanguage( 'openscad', - require('highlight.js/lib/languages/openscad') + require('highlight.js/lib/languages/openscad'), ) hljs.registerLanguage( 'oxygene', - require('highlight.js/lib/languages/oxygene') + require('highlight.js/lib/languages/oxygene'), ) hljs.registerLanguage( 'parser3', - require('highlight.js/lib/languages/parser3') + require('highlight.js/lib/languages/parser3'), ) hljs.registerLanguage('pf', require('highlight.js/lib/languages/pf')) hljs.registerLanguage('pgsql', require('highlight.js/lib/languages/pgsql')) hljs.registerLanguage('php', require('highlight.js/lib/languages/php')) hljs.registerLanguage( 'php-template', - require('highlight.js/lib/languages/php-template') + require('highlight.js/lib/languages/php-template'), ) hljs.registerLanguage( 'plaintext', - require('highlight.js/lib/languages/plaintext') + require('highlight.js/lib/languages/plaintext'), ) hljs.registerLanguage('pony', require('highlight.js/lib/languages/pony')) hljs.registerLanguage( 'powershell', - require('highlight.js/lib/languages/powershell') + require('highlight.js/lib/languages/powershell'), ) hljs.registerLanguage( 'processing', - require('highlight.js/lib/languages/processing') + require('highlight.js/lib/languages/processing'), ) hljs.registerLanguage( 'profile', - require('highlight.js/lib/languages/profile') + require('highlight.js/lib/languages/profile'), ) hljs.registerLanguage('prolog', require('highlight.js/lib/languages/prolog')) hljs.registerLanguage( 'properties', - require('highlight.js/lib/languages/properties') + require('highlight.js/lib/languages/properties'), ) hljs.registerLanguage( 'protobuf', - require('highlight.js/lib/languages/protobuf') + require('highlight.js/lib/languages/protobuf'), ) hljs.registerLanguage('puppet', require('highlight.js/lib/languages/puppet')) hljs.registerLanguage( 'purebasic', - require('highlight.js/lib/languages/purebasic') + require('highlight.js/lib/languages/purebasic'), ) hljs.registerLanguage('python', require('highlight.js/lib/languages/python')) hljs.registerLanguage( 'python-repl', - require('highlight.js/lib/languages/python-repl') + require('highlight.js/lib/languages/python-repl'), ) hljs.registerLanguage('q', require('highlight.js/lib/languages/q')) hljs.registerLanguage('qml', require('highlight.js/lib/languages/qml')) hljs.registerLanguage('r', require('highlight.js/lib/languages/r')) hljs.registerLanguage( 'reasonml', - require('highlight.js/lib/languages/reasonml') + require('highlight.js/lib/languages/reasonml'), ) hljs.registerLanguage('rib', require('highlight.js/lib/languages/rib')) hljs.registerLanguage( 'roboconf', - require('highlight.js/lib/languages/roboconf') + require('highlight.js/lib/languages/roboconf'), ) hljs.registerLanguage( 'routeros', - require('highlight.js/lib/languages/routeros') + require('highlight.js/lib/languages/routeros'), ) hljs.registerLanguage('rsl', require('highlight.js/lib/languages/rsl')) hljs.registerLanguage( 'ruleslanguage', - require('highlight.js/lib/languages/ruleslanguage') + require('highlight.js/lib/languages/ruleslanguage'), ) hljs.registerLanguage('rust', require('highlight.js/lib/languages/rust')) hljs.registerLanguage('sas', require('highlight.js/lib/languages/sas')) @@ -331,7 +331,7 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('smali', require('highlight.js/lib/languages/smali')) hljs.registerLanguage( 'smalltalk', - require('highlight.js/lib/languages/smalltalk') + require('highlight.js/lib/languages/smalltalk'), ) hljs.registerLanguage('sml', require('highlight.js/lib/languages/sml')) hljs.registerLanguage('sqf', require('highlight.js/lib/languages/sqf')) @@ -342,12 +342,12 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('stylus', require('highlight.js/lib/languages/stylus')) hljs.registerLanguage( 'subunit', - require('highlight.js/lib/languages/subunit') + require('highlight.js/lib/languages/subunit'), ) hljs.registerLanguage('swift', require('highlight.js/lib/languages/swift')) hljs.registerLanguage( 'taggerscript', - require('highlight.js/lib/languages/taggerscript') + require('highlight.js/lib/languages/taggerscript'), ) hljs.registerLanguage('yaml', require('highlight.js/lib/languages/yaml')) hljs.registerLanguage('tap', require('highlight.js/lib/languages/tap')) @@ -357,21 +357,21 @@ export const generateHighlightJSInstance = () => { hljs.registerLanguage('twig', require('highlight.js/lib/languages/twig')) hljs.registerLanguage( 'typescript', - require('highlight.js/lib/languages/typescript') + require('highlight.js/lib/languages/typescript'), ) hljs.registerLanguage('vala', require('highlight.js/lib/languages/vala')) hljs.registerLanguage('vbnet', require('highlight.js/lib/languages/vbnet')) hljs.registerLanguage( 'vbscript', - require('highlight.js/lib/languages/vbscript') + require('highlight.js/lib/languages/vbscript'), ) hljs.registerLanguage( 'vbscript-html', - require('highlight.js/lib/languages/vbscript-html') + require('highlight.js/lib/languages/vbscript-html'), ) hljs.registerLanguage( 'verilog', - require('highlight.js/lib/languages/verilog') + require('highlight.js/lib/languages/verilog'), ) hljs.registerLanguage('vhdl', require('highlight.js/lib/languages/vhdl')) hljs.registerLanguage('vim', require('highlight.js/lib/languages/vim')) diff --git a/test/marp.ts b/test/marp.ts index 2d1dde78..5dab6f19 100644 --- a/test/marp.ts +++ b/test/marp.ts @@ -1112,7 +1112,7 @@ function matchwo(a,b) }) const $ = load( - instance.markdown.render('```marp-test\nconst a = 1;\n```') + instance.markdown.render('```marp-test\nconst a = 1;\n```'), ) it('highlights code with customized highlightjs', () => { @@ -1145,7 +1145,7 @@ function matchwo(a,b) expect(instance.highlightjs.highlight).toBeInstanceOf(Function) expect(instance.highlightjs.versionString).toMatchInlineSnapshot( - `"11.8.0"` + `"11.8.0"`, ) }) @@ -1167,7 +1167,7 @@ function matchwo(a,b) }) expect(instance.highlightjs.getLanguage('marp-test')?.name).toBe( - 'JavaScript' + 'JavaScript', ) expect(highlightjs.getLanguage('marp-test')?.name).toBeUndefined() }) From 931bd41dd1dffba0a96c154a1e17c451e7442697 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 2 Aug 2023 02:43:15 +0900 Subject: [PATCH 5/6] Fix ESLint --- marp.config.mjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/marp.config.mjs b/marp.config.mjs index cd21e819..27aee53b 100644 --- a/marp.config.mjs +++ b/marp.config.mjs @@ -1,8 +1,7 @@ import path from 'node:path' -import { Marp } from './lib/marp.js' export default { - engine: Marp, + engine: './lib/marp.js', server: true, inputDir: path.join( path.dirname(new URL(import.meta.url).pathname), From 80a7c82ef97daa59cae6430b07c8e11b8686ef07 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 2 Aug 2023 02:47:21 +0900 Subject: [PATCH 6/6] [ci skip] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ab2d78f..983711c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,13 @@ ## [Unreleased] +### Added + +- `highlightjs` getter, to access the generated highlight.js instance per Marp Core instances ([#350](https://github.com/marp-team/marp-core/pull/350)) + ### Changed +- Marp Core instance is no longer using the shared highlight.js instance ([#350](https://github.com/marp-team/marp-core/pull/350)) - Upgrade Node.js and dependent packages to the latest version ([#351](https://github.com/marp-team/marp-core/pull/351)) ## v3.7.0 - 2023-06-09