markdown-to-html-cli 4.0.0 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/utils.js +8 -5
- package/lib/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/utils.ts +8 -5
package/lib/utils.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
export function formatConfig(opts) {
|
|
4
|
-
let options = { ...opts
|
|
4
|
+
let options = { ...opts };
|
|
5
|
+
if (!options.document) {
|
|
6
|
+
options.document = { title: opts.title, meta: [], link: [], style: [] };
|
|
7
|
+
}
|
|
5
8
|
const projectPkg = path.resolve(process.cwd(), opts.config || 'package.json');
|
|
6
9
|
let pgkData = {};
|
|
7
10
|
if (fs.existsSync(projectPkg)) {
|
|
@@ -10,19 +13,19 @@ export function formatConfig(opts) {
|
|
|
10
13
|
options.document.title = pgkData.name;
|
|
11
14
|
}
|
|
12
15
|
if (pgkData.repository && !opts['github-corners']) {
|
|
13
|
-
|
|
16
|
+
options['github-corners'] = typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
|
|
14
17
|
}
|
|
15
18
|
if (pgkData['markdown-to-html']) {
|
|
16
19
|
const mth = pgkData['markdown-to-html'];
|
|
17
20
|
const { title, meta, link } = options.document;
|
|
18
|
-
options = { ...options, ...mth, document: { title, meta, link, ...mth.document } };
|
|
21
|
+
options = { ...options, ...mth, document: { ...options.document, title, meta, link, ...mth.document } };
|
|
19
22
|
if (mth['github-corners']) {
|
|
20
|
-
|
|
23
|
+
options['github-corners'] = mth['github-corners'];
|
|
21
24
|
}
|
|
22
25
|
}
|
|
23
26
|
}
|
|
24
27
|
if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
|
|
25
|
-
|
|
28
|
+
options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '');
|
|
26
29
|
}
|
|
27
30
|
if (Array.isArray(options.document.link) && options.favicon) {
|
|
28
31
|
options.document.link.push({ rel: 'icon', href: options.favicon, type: 'image/x-icon' });
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAKxB,MAAM,UAAU,YAAY,CAAC,IAAa;IACxC,IAAI,OAAO,GAAG,EAAE,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "markdown-to-html-cli",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Command line tool generates markdown as html.",
|
|
6
6
|
"homepage": "https://jaywcjlove.github.io/markdown-to-html-cli",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"cli"
|
|
25
25
|
],
|
|
26
26
|
"engines": {
|
|
27
|
-
"node": "
|
|
27
|
+
"node": ">=16"
|
|
28
28
|
},
|
|
29
29
|
"markdown-to-html": {
|
|
30
30
|
"reurls": {
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@types/minimist": "^1.2.3",
|
|
42
42
|
"@uiw/github-corners": "^1.5.15",
|
|
43
43
|
"@wcj/markdown-style": "^1.0.25",
|
|
44
|
-
"@wcj/markdown-to-html": "^3.0.
|
|
44
|
+
"@wcj/markdown-to-html": "^3.0.1",
|
|
45
45
|
"fs-extra": "^11.1.1",
|
|
46
46
|
"glob": "^10.3.10",
|
|
47
47
|
"image2uri": "^2.1.1",
|
package/src/utils.ts
CHANGED
|
@@ -5,7 +5,10 @@ import { type RunArgvs, type MDToHTMLOptions } from './index.js';
|
|
|
5
5
|
export type Options = Omit<RunArgvs, '_'>
|
|
6
6
|
|
|
7
7
|
export function formatConfig(opts: Options) {
|
|
8
|
-
let options = { ...opts
|
|
8
|
+
let options = { ...opts } as MDToHTMLOptions;
|
|
9
|
+
if (!options.document) {
|
|
10
|
+
options.document = { title: opts.title, meta: [], link: [], style: [] }
|
|
11
|
+
}
|
|
9
12
|
const projectPkg = path.resolve(process.cwd(), opts.config || 'package.json');
|
|
10
13
|
let pgkData: any = {};
|
|
11
14
|
if (fs.existsSync(projectPkg)) {
|
|
@@ -14,19 +17,19 @@ export function formatConfig(opts: Options) {
|
|
|
14
17
|
options.document.title = pgkData.name;
|
|
15
18
|
}
|
|
16
19
|
if (pgkData.repository && !opts['github-corners']) {
|
|
17
|
-
|
|
20
|
+
options['github-corners'] = typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
|
|
18
21
|
}
|
|
19
22
|
if (pgkData['markdown-to-html']) {
|
|
20
23
|
const mth = pgkData['markdown-to-html'] as MDToHTMLOptions;
|
|
21
24
|
const { title, meta, link } = options.document;
|
|
22
|
-
options = { ...options, ...mth, document: { title, meta, link, ...mth.document } }
|
|
25
|
+
options = { ...options, ...mth, document: { ...options.document, title, meta, link, ...mth.document } }
|
|
23
26
|
if (mth['github-corners']) {
|
|
24
|
-
|
|
27
|
+
options['github-corners'] = mth['github-corners'];
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
}
|
|
28
31
|
if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
|
|
29
|
-
|
|
32
|
+
options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '')
|
|
30
33
|
}
|
|
31
34
|
if (Array.isArray(options.document.link) && options.favicon) {
|
|
32
35
|
options.document.link.push({ rel: 'icon', href: options.favicon, type: 'image/x-icon' });
|