@diplodoc/transform 4.76.9 → 4.76.10
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/dist/css/_yfm-only.css.map +1 -1
- package/dist/css/_yfm-only.min.css.map +1 -1
- package/dist/css/base.css.map +1 -1
- package/dist/css/base.min.css.map +1 -1
- package/dist/css/print.css.map +1 -1
- package/dist/css/yfm.css.map +1 -1
- package/dist/css/yfm.min.css.map +1 -1
- package/lib/plugins/links/collect.js +6 -6
- package/lib/plugins/links/collect.js.map +1 -1
- package/lib/plugins/links/index.js +11 -14
- package/lib/plugins/links/index.js.map +1 -1
- package/lib/utils.js +3 -6
- package/lib/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/transform/plugins/links/collect.ts +2 -2
- package/src/transform/plugins/links/index.ts +4 -4
- package/src/transform/utils.ts +3 -3
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/transform/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/transform/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@diplodoc/transform",
|
|
3
|
-
"version": "4.76.
|
|
3
|
+
"version": "4.76.10",
|
|
4
4
|
"description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"markdown",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@diplodoc/cut-extension": "^1.1.3",
|
|
57
57
|
"@diplodoc/file-extension": "^0.2.4",
|
|
58
58
|
"@diplodoc/tabs-extension": "^3.10.2",
|
|
59
|
-
"@diplodoc/utils": "^2.
|
|
59
|
+
"@diplodoc/utils": "^2.3.3",
|
|
60
60
|
"chalk": "^4.1.2",
|
|
61
61
|
"cheerio": "^1.0.0",
|
|
62
62
|
"css": "^3.0.0",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"ts-dedent": "^2.2.0"
|
|
79
79
|
},
|
|
80
80
|
"devDependencies": {
|
|
81
|
-
"@diplodoc/infra": "2.2.
|
|
81
|
+
"@diplodoc/infra": "2.2.1",
|
|
82
82
|
"@types/css": "0.0.34",
|
|
83
83
|
"@types/github-slugger": "^1.3.0",
|
|
84
84
|
"@types/js-yaml": "^4.0.5",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import MarkdownIt from 'markdown-it';
|
|
2
2
|
import {sep} from 'path';
|
|
3
|
-
import
|
|
3
|
+
import {parseHref} from '@diplodoc/utils';
|
|
4
4
|
|
|
5
5
|
import {PAGE_LINK_REGEXP, getHrefTokenAttr, isLocalUrl} from '../../utils';
|
|
6
6
|
import {getSinglePageAnchorId, resolveRelativePath} from '../../utilsFS';
|
|
@@ -62,7 +62,7 @@ const collect = (input: string, options: Options) => {
|
|
|
62
62
|
continue;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
const {pathname, hash} =
|
|
65
|
+
const {pathname, hash} = parseHref(href);
|
|
66
66
|
if (pathname) {
|
|
67
67
|
const isPageFile = PAGE_LINK_REGEXP.test(pathname);
|
|
68
68
|
if (isPageFile) {
|
|
@@ -4,7 +4,7 @@ import type {CacheContext, StateCore} from '../../typings';
|
|
|
4
4
|
import type {MarkdownItPluginCb, MarkdownItPluginOpts} from '../typings';
|
|
5
5
|
import type {MarkdownItIncluded} from '../includes/types';
|
|
6
6
|
|
|
7
|
-
import
|
|
7
|
+
import {formatHref, parseHref} from '@diplodoc/utils';
|
|
8
8
|
import {bold} from 'chalk';
|
|
9
9
|
import path, {isAbsolute, parse, relative, resolve} from 'path';
|
|
10
10
|
|
|
@@ -153,7 +153,7 @@ function processLink(
|
|
|
153
153
|
return;
|
|
154
154
|
}
|
|
155
155
|
|
|
156
|
-
const {pathname, hash} =
|
|
156
|
+
const {pathname, hash} = parseHref(originalHref);
|
|
157
157
|
let file;
|
|
158
158
|
let fileExists;
|
|
159
159
|
let isPageFile;
|
|
@@ -219,8 +219,8 @@ function processLink(
|
|
|
219
219
|
|
|
220
220
|
const patchedHref =
|
|
221
221
|
!isAbsolute(originalHref) && !originalHref.includes('//')
|
|
222
|
-
?
|
|
223
|
-
...
|
|
222
|
+
? formatHref({
|
|
223
|
+
...parseHref(originalHref),
|
|
224
224
|
pathname: getPublicPath(opts, file),
|
|
225
225
|
})
|
|
226
226
|
: originalHref;
|
package/src/transform/utils.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type Token from 'markdown-it/lib/token';
|
|
2
2
|
|
|
3
|
-
import
|
|
3
|
+
import {formatHref, parseHref} from '@diplodoc/utils';
|
|
4
4
|
|
|
5
5
|
export function isLocalUrl(url: string) {
|
|
6
6
|
return !/^(?:[a-z]+:)?\/\//i.test(url);
|
|
@@ -105,8 +105,8 @@ export function getSrcTokenAttr(token: Token) {
|
|
|
105
105
|
export const PAGE_LINK_REGEXP = /\.(md|ya?ml)$/i;
|
|
106
106
|
|
|
107
107
|
export function defaultTransformLink(href: string) {
|
|
108
|
-
const parsed =
|
|
109
|
-
href =
|
|
108
|
+
const parsed = parseHref(href);
|
|
109
|
+
href = formatHref({
|
|
110
110
|
...parsed,
|
|
111
111
|
pathname: parsed.pathname?.replace(PAGE_LINK_REGEXP, '.html'),
|
|
112
112
|
});
|