diff --git a/packages/jsdoc-doclet/lib/doclet-store.js b/packages/jsdoc-doclet/lib/doclet-store.js index 9044f1e5..934211f8 100644 --- a/packages/jsdoc-doclet/lib/doclet-store.js +++ b/packages/jsdoc-doclet/lib/doclet-store.js @@ -37,7 +37,7 @@ function diffArrays(value, previousValue = []) { } function getSourcePath({ meta }) { - return meta.path ? join(meta.path, meta.filename) : meta.filename; + return meta?.path ? join(meta.path, meta.filename) : meta?.filename; } function removeFromSet(targetMap, key, value) { diff --git a/packages/jsdoc-doclet/lib/package.js b/packages/jsdoc-doclet/lib/package.js index 99774136..4ce90d09 100644 --- a/packages/jsdoc-doclet/lib/package.js +++ b/packages/jsdoc-doclet/lib/package.js @@ -255,4 +255,12 @@ export class Package { this.version = packageInfo.version; } } + + isGlobal() { + return false; + } + + isVisible() { + return true; + } } diff --git a/packages/jsdoc-template-legacy/package-lock.json b/packages/jsdoc-template-legacy/package-lock.json index 91ca5b7f..936ae539 100644 --- a/packages/jsdoc-template-legacy/package-lock.json +++ b/packages/jsdoc-template-legacy/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.4", "license": "Apache-2.0", "dependencies": { - "@fontsource/open-sans": "^5.0.14", + "@fontsource-variable/open-sans": "^5.0.15", "@jsdoc/core": "^0.5.4", "@jsdoc/salty": "^0.2.5", "@jsdoc/tag": "^0.2.4", @@ -68,10 +68,10 @@ "node": ">=6.0.0" } }, - "node_modules/@fontsource/open-sans": { - "version": "5.0.14", - "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.0.14.tgz", - "integrity": "sha512-r9dEDCrZsBfjd2WREzffY1j7Y5gbyfOU1ybChTXjKdOCRAtTVpxO1ZJ5UyVkotXGSIWNt2hedlfyshWSQ6p5kQ==" + "node_modules/@fontsource-variable/open-sans": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/@fontsource-variable/open-sans/-/open-sans-5.0.15.tgz", + "integrity": "sha512-5TLyJ+NtdzMbqU332oW+3xD5qd/6YJgxxbLIjYD/Iqg6eQzRVNEx+KIttKrUeT8OTojR65Y1eCfbFXokdNwwnw==" }, "node_modules/@jsdoc/ast": { "version": "0.2.4", diff --git a/packages/jsdoc-template-legacy/package.json b/packages/jsdoc-template-legacy/package.json index 12384984..34e89a49 100644 --- a/packages/jsdoc-template-legacy/package.json +++ b/packages/jsdoc-template-legacy/package.json @@ -13,7 +13,7 @@ "access": "public" }, "dependencies": { - "@fontsource/open-sans": "^5.0.14", + "@fontsource-variable/open-sans": "^5.0.15", "@jsdoc/core": "^0.5.4", "@jsdoc/salty": "^0.2.5", "@jsdoc/tag": "^0.2.4", diff --git a/packages/jsdoc-template-legacy/publish.js b/packages/jsdoc-template-legacy/publish.js index 77a33204..861134d0 100644 --- a/packages/jsdoc-template-legacy/publish.js +++ b/packages/jsdoc-template-legacy/publish.js @@ -16,6 +16,7 @@ import fs from 'node:fs'; import { createRequire } from 'node:module'; import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import salty from '@jsdoc/salty'; import { fs as jsdocFs, log } from '@jsdoc/util'; @@ -32,7 +33,9 @@ const { sync: glob } = fastGlob; const { resolve } = createRequire(import.meta.url); const { taffy } = salty; -const FONT_CSS_FILES = ['variable.css', 'variable-italic.css']; +const __dirname = path.dirname(fileURLToPath(import.meta.url)); + +const FONT_CSS_FILES = ['standard.css', 'standard-italic.css']; const PRETTIFIER_CSS_FILES = ['tomorrow.min.css']; const PRETTIFIER_SCRIPT_FILES = ['lang-css.js', 'prettify.js']; @@ -72,7 +75,7 @@ function needsSignature({ kind, type, meta }) { needsSig = true; } // typedefs that contain functions get a signature, too - else if (kind === 'typedef' && type && type.names && type.names.length) { + else if (kind === 'typedef' && type?.names?.length) { for (let i = 0, l = type.names.length; i < l; i++) { if (type.names[i].toLowerCase() === 'function') { needsSig = true; @@ -82,13 +85,7 @@ function needsSignature({ kind, type, meta }) { } // and namespaces that are functions get a signature (but finding them is a // bit messy) - else if ( - kind === 'namespace' && - meta && - meta.code && - meta.code.type && - meta.code.type.match(/[Ff]unction/) - ) { + else if (kind === 'namespace' && meta?.code?.type?.match(/[Ff]unction/)) { needsSig = true; } @@ -425,7 +422,7 @@ function sourceToDestination(parentDir, sourcePath, destDir) { @param {TAFFY} taffyData See . @param {object} opts */ -export function publish(taffyData, dependencies) { +export function publish(docletStore, dependencies) { let classes; let config; let externals; @@ -451,13 +448,12 @@ export function publish(taffyData, dependencies) { let templatePath; let userStaticFileOutputDir; - data = taffyData; opts = dependencies.get('options'); config = dependencies.get('config'); templateConfig = config.templates || {}; templateConfig.default = templateConfig.default || {}; outdir = path.normalize(opts.destination); - templatePath = path.normalize(path.dirname(opts.template)); + templatePath = __dirname; view = new Template(path.join(templatePath, 'tmpl')); // claim some special filenames in advance, so the All-Powerful Overseer of Filename Uniqueness @@ -473,7 +469,7 @@ export function publish(taffyData, dependencies) { ? path.resolve(templateConfig.default.layoutFile) : 'layout.tmpl'; - data = helper.prune(data, dependencies); + data = taffy(Array.from(docletStore.doclets)); data.sort('longname, version, since'); helper.addEventListeners(data); @@ -536,25 +532,26 @@ export function publish(taffyData, dependencies) { }); // copy the fonts used by the template to outdir - staticFiles = lsSync(path.join(resolve('@fontsource/open-sans'), '..', 'files')); + staticFiles = lsSync(path.join(resolve('@fontsource-variable/open-sans'), '..', 'files')); staticFiles.forEach((fileName) => { const toPath = path.join(outdir, 'fonts', path.basename(fileName)); + const name = path.parse(fileName).name; - if (path.parse(fileName).name.includes('variable-wghtOnly')) { + if (name.includes('standard-normal') || name.includes('standard-italic')) { mkdirpSync(path.dirname(toPath)); fs.copyFileSync(fileName, toPath); } }); // copy the font CSS to outdir - staticFiles = path.join(resolve('@fontsource/open-sans'), '..'); + staticFiles = path.join(resolve('@fontsource-variable/open-sans'), '..'); FONT_CSS_FILES.forEach((fileName) => { const fromPath = path.join(staticFiles, fileName); - const toPath = path.join(outdir, 'styles', fileName.replace('variable', 'open-sans')); + const toPath = path.join(outdir, 'styles', fileName.replace('standard', 'open-sans')); let source = fs.readFileSync(fromPath, 'utf8'); - source = source.replace(/url\('\.\/files/g, "url('../fonts"); + source = source.replace(/url\(\.\/files/g, 'url(../fonts'); mkdirpSync(path.dirname(toPath)); fs.writeFileSync(toPath, source); }); diff --git a/packages/jsdoc-template-legacy/static/styles/jsdoc-default.css b/packages/jsdoc-template-legacy/static/styles/jsdoc-default.css index 0293db6a..f08b947f 100644 --- a/packages/jsdoc-template-legacy/static/styles/jsdoc-default.css +++ b/packages/jsdoc-template-legacy/static/styles/jsdoc-default.css @@ -23,7 +23,7 @@ html { } body { - font-family: 'Open SansVariable', sans-serif; + font-family: 'Open Sans Variable', sans-serif; line-height: 1.5; color: #4d4e53; background-color: white; @@ -146,7 +146,7 @@ h4 { } h1 { - font-family: 'Open SansVariable', sans-serif; + font-family: 'Open Sans Variable', sans-serif; font-size: 48px; font-weight: 300; letter-spacing: -2px; diff --git a/packages/jsdoc/cli.js b/packages/jsdoc/cli.js index 5149c365..7d22eda4 100644 --- a/packages/jsdoc/cli.js +++ b/packages/jsdoc/cli.js @@ -22,7 +22,6 @@ import Engine from '@jsdoc/cli'; import { config, Dependencies, plugins } from '@jsdoc/core'; import { augment, Package, resolveBorrows } from '@jsdoc/doclet'; import { createParser, handlers } from '@jsdoc/parse'; -import salty from '@jsdoc/salty'; import { Dictionary } from '@jsdoc/tag'; import { EventBus, log } from '@jsdoc/util'; import fastGlob from 'fast-glob'; @@ -33,7 +32,6 @@ import stripJsonComments from 'strip-json-comments'; import test from './test/index.js'; const { sync: glob } = fastGlob; -const { taffy } = salty; /** * Helper methods for running JSDoc on the command line. @@ -325,7 +323,7 @@ export default (() => { // If there is no package.json, just create an empty package packageDocs = new Package(props.packageJson); packageDocs.files = env.sourceFiles || []; - docletStore.doclets.add(packageDocs); + docletStore.add(packageDocs); log.debug('Adding inherited symbols, mixins, and interface implementations...'); augment.augmentAll(docletStore); @@ -333,8 +331,7 @@ export default (() => { resolveBorrows(docletStore); log.debug('Post-processing complete.'); - // TODO: remove - props.docs = Array.from(docletStore.allDoclets); + props.docs = docletStore; if (props.parser.listenerCount('processingComplete')) { props.parser.fireProcessingComplete(Array.from(docletStore.doclets)); @@ -356,8 +353,7 @@ export default (() => { }; cli.dumpParseResults = () => { - // TODO: update - console.log(JSON.stringify(props.docs, null, 4)); + console.log(JSON.stringify(Array.from(props.docs.allDoclets), null, 2)); return cli; }; @@ -367,7 +363,7 @@ export default (() => { const options = dependencies.get('options'); let template; - options.template = options.template || path.join(__dirname, 'templates', 'default'); + options.template = options.template || '@jsdoc/template-legacy'; try { template = await import(options.template); @@ -380,7 +376,7 @@ export default (() => { let publishPromise; log.info('Generating output files...'); - publishPromise = template.publish(taffy(props.docs), dependencies); + publishPromise = template.publish(props.docs, dependencies); return Promise.resolve(publishPromise); } else { diff --git a/packages/jsdoc/package-lock.json b/packages/jsdoc/package-lock.json index af61e872..a0b0b26b 100644 --- a/packages/jsdoc/package-lock.json +++ b/packages/jsdoc/package-lock.json @@ -13,8 +13,8 @@ "@jsdoc/core": "^0.5.4", "@jsdoc/doclet": "^0.2.4", "@jsdoc/parse": "^0.3.4", - "@jsdoc/salty": "^0.2.5", "@jsdoc/tag": "^0.2.4", + "@jsdoc/template-legacy": "^0.1.4", "@jsdoc/util": "^0.3.0", "lodash": "^4.17.21", "strip-bom": "^5.0.0", @@ -190,6 +190,11 @@ "node": ">=6.0.0" } }, + "node_modules/@fontsource/open-sans": { + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-5.0.14.tgz", + "integrity": "sha512-r9dEDCrZsBfjd2WREzffY1j7Y5gbyfOU1ybChTXjKdOCRAtTVpxO1ZJ5UyVkotXGSIWNt2hedlfyshWSQ6p5kQ==" + }, "node_modules/@jsdoc/ast": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/@jsdoc/ast/-/ast-0.2.4.tgz", @@ -288,6 +293,26 @@ "node": ">=v18.12.0" } }, + "node_modules/@jsdoc/template-legacy": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@jsdoc/template-legacy/-/template-legacy-0.1.4.tgz", + "integrity": "sha512-75146HG3hNwUdRYH73cdp6cB8M4DLC7pPIZfd6Bidh5YceARVH6j4Eo1gmOM2BaeLCP4LnOc4AXlEtAFRSZQ0g==", + "dependencies": { + "@fontsource/open-sans": "^5.0.12", + "@jsdoc/core": "^0.5.4", + "@jsdoc/salty": "^0.2.5", + "@jsdoc/tag": "^0.2.4", + "@jsdoc/util": "^0.3.0", + "catharsis": "^0.9.0", + "code-prettify": "^0.1.0", + "color-themes-for-google-code-prettify": "^2.0.4", + "common-path-prefix": "^3.0.0", + "fast-glob": "^3.3.1", + "lodash": "^4.17.21", + "markdown-it": "^13.0.1", + "markdown-it-anchor": "^8.6.7" + } + }, "node_modules/@jsdoc/util": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@jsdoc/util/-/util-0.3.0.tgz", @@ -301,6 +326,38 @@ "node": ">=v18.12.0" } }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/@sindresorhus/is": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", @@ -312,6 +369,28 @@ "url": "https://github.com/sindresorhus/is?sponsor=1" } }, + "node_modules/@types/linkify-it": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.3.tgz", + "integrity": "sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g==", + "peer": true + }, + "node_modules/@types/markdown-it": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-13.0.2.tgz", + "integrity": "sha512-Tla7hH9oeXHOlJyBFdoqV61xWE9FZf/y2g+gFVwQ2vE1/eBzjUno5JCd3Hdb5oATve5OF6xNjZ/4VIZhVVx+hA==", + "peer": true, + "dependencies": { + "@types/linkify-it": "*", + "@types/mdurl": "*" + } + }, + "node_modules/@types/mdurl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.3.tgz", + "integrity": "sha512-T5k6kTXak79gwmIOaDF2UUQXFbnBE0zBUzF20pz7wDYu0RQMzWg+Ml/Pz50214NsFHBITkoi5VtdjFZnJ2ijjA==", + "peer": true + }, "node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -333,6 +412,17 @@ "resolved": "https://registry.npmjs.org/bottlejs/-/bottlejs-2.0.1.tgz", "integrity": "sha512-50T0bzqeAqZ+//kgjdDxNu7UP8Je04isNPyHPwwOOPoeZmtVESkuF9nwkWEqSEd9Sw1yJ1oaoHBAMxe/wG4Zzg==" }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/callsites": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-4.1.0.tgz", @@ -376,6 +466,11 @@ "node": ">=0.8.0" } }, + "node_modules/code-prettify": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz", + "integrity": "sha512-tNOWwXoF3ycqtvLCGPLYds2hKekmZfsPWinbRcLk6BBHBaSf+v+HJOvfg33VfVzYzvQ6zmVq+WO88oKweiJSQg==" + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -389,6 +484,14 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" }, + "node_modules/color-themes-for-google-code-prettify": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/color-themes-for-google-code-prettify/-/color-themes-for-google-code-prettify-2.0.4.tgz", + "integrity": "sha512-4iwgVWCPDR1hVy/Og+ubHXu2FRZGqyUkdTWEb0oR/ZoBgbebQBl1xaebJh2wNo9vy+mKYANDDP5B1gQOC2mGvQ==", + "engines": { + "node": ">=5.9.0" + } + }, "node_modules/common-path-prefix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", @@ -433,6 +536,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/entities": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz", + "integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -452,6 +566,51 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/fast-glob": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fastq": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/graceful-fs": { "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", @@ -485,6 +644,33 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -519,6 +705,14 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, + "node_modules/linkify-it": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz", + "integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==", + "dependencies": { + "uc.micro": "^1.0.1" + } + }, "node_modules/lodash": { "version": "4.17.21", "license": "MIT" @@ -528,6 +722,55 @@ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" }, + "node_modules/markdown-it": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz", + "integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==", + "dependencies": { + "argparse": "^2.0.1", + "entities": "~3.0.1", + "linkify-it": "^4.0.1", + "mdurl": "^1.0.1", + "uc.micro": "^1.0.5" + }, + "bin": { + "markdown-it": "bin/markdown-it.js" + } + }, + "node_modules/markdown-it-anchor": { + "version": "8.6.7", + "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", + "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", + "peerDependencies": { + "@types/markdown-it": "*", + "markdown-it": "*" + } + }, + "node_modules/mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/ow": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ow/-/ow-1.1.1.tgz", @@ -590,6 +833,36 @@ "node": ">=8" } }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -598,6 +871,37 @@ "node": ">=4" } }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, "node_modules/strip-bom": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-5.0.0.tgz", @@ -631,6 +935,17 @@ "node": ">=4" } }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, "node_modules/type-fest": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", @@ -642,6 +957,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" + }, "node_modules/vali-date": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", diff --git a/packages/jsdoc/package.json b/packages/jsdoc/package.json index 68aea3ca..304fb5c4 100644 --- a/packages/jsdoc/package.json +++ b/packages/jsdoc/package.json @@ -18,8 +18,8 @@ "@jsdoc/core": "^0.5.4", "@jsdoc/doclet": "^0.2.4", "@jsdoc/parse": "^0.3.4", - "@jsdoc/salty": "^0.2.5", "@jsdoc/tag": "^0.2.4", + "@jsdoc/template-legacy": "^0.1.4", "@jsdoc/util": "^0.3.0", "lodash": "^4.17.21", "strip-bom": "^5.0.0",