@opensumi/ide-markdown 3.8.3-next-1747189218.0 → 3.8.3-next-1747194730.0
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/browser/markdown-widget.d.ts +2 -2
- package/lib/browser/markdown-widget.d.ts.map +1 -1
- package/lib/browser/markdown-widget.js.map +1 -1
- package/lib/browser/markdown.service.d.ts +3 -4
- package/lib/browser/markdown.service.d.ts.map +1 -1
- package/lib/browser/markdown.service.js +14 -8
- package/lib/browser/markdown.service.js.map +1 -1
- package/lib/common/index.d.ts +8 -3
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/markdown-widget.tsx +2 -2
- package/src/browser/markdown.service.ts +16 -11
- package/src/common/index.ts +9 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { IMarkedOptions } from '@opensumi/ide-components/lib/utils';
|
|
3
2
|
import { URI } from '@opensumi/ide-core-browser';
|
|
3
|
+
import { MarkdownOptions } from '../common';
|
|
4
4
|
export declare const Markdown: ({ content, options, onLoaded, onLinkClick, }: {
|
|
5
5
|
content: string;
|
|
6
|
-
options?:
|
|
6
|
+
options?: MarkdownOptions;
|
|
7
7
|
onLoaded?: () => void;
|
|
8
8
|
onLinkClick?: (uri: URI) => void;
|
|
9
9
|
}) => React.JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown-widget.d.ts","sourceRoot":"","sources":["../../src/browser/markdown-widget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"markdown-widget.d.ts","sourceRoot":"","sources":["../../src/browser/markdown-widget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAuC,GAAG,EAAiB,MAAM,4BAA4B,CAAC;AAErG,OAAO,EAAoB,eAAe,EAAE,MAAM,WAAW,CAAC;AAE9D,eAAO,MAAM,QAAQ,iDAKlB;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAClC,sBAoCA,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown-widget.js","sourceRoot":"","sources":["../../src/browser/markdown-widget.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAG1B,iEAAqG;AAErG,
|
|
1
|
+
{"version":3,"file":"markdown-widget.js","sourceRoot":"","sources":["../../src/browser/markdown-widget.tsx"],"names":[],"mappings":";;;;AAAA,0DAA0B;AAG1B,iEAAqG;AAErG,sCAA8D;AAEvD,MAAM,QAAQ,GAAG,CAAC,EACvB,OAAO,EACP,OAAO,EACP,QAAQ,EACR,WAAW,GAMZ,EAAE,EAAE;IACH,IAAI,SAAS,GAAuB,IAAI,CAAC;IACzC,MAAM,eAAe,GAAqB,IAAA,gCAAa,EAAC,yBAAgB,CAAC,CAAC;IAE1E,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,QAAQ,GAAG,IAAI,6BAAU,EAAE,CAAC;YAClC,MAAM,YAAY,GAAG,IAAI,0CAAuB,EAAE,CAAC;YACnD,QAAQ,CAAC,UAAU,CAAC;gBAClB,OAAO,EAAE,GAAG,EAAE;oBACZ,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,CAAC;aACF,CAAC,CAAC;YACH,eAAe;iBACZ,0BAA0B,CAAC,OAAO,EAAE,SAAU,EAAE,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC;iBACpG,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACV,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,EAAE,CAAC;gBACb,CAAC;YACH,CAAC,CAAC,CAAC;YAEL,OAAO,GAAG,EAAE;gBACV,QAAQ,CAAC,OAAO,EAAE,CAAC;YACrB,CAAC,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,OAAO,CACL,uCACE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE;YACV,SAAS,GAAG,EAAE,CAAC;QACjB,CAAC,EACD,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GACpB,CACR,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,QAAQ,YA8CnB"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { IMarkedOptions } from '@opensumi/ide-components/lib/utils';
|
|
2
1
|
import { CancellationToken, Event, IDisposable, URI } from '@opensumi/ide-core-browser';
|
|
3
2
|
import { IWebviewService } from '@opensumi/ide-webview';
|
|
4
|
-
import { IMarkdownService } from '../common';
|
|
3
|
+
import { IMarkdownService, MarkdownOptions } from '../common';
|
|
5
4
|
export declare class MarkdownServiceImpl implements IMarkdownService {
|
|
6
5
|
webviewService: IWebviewService;
|
|
7
6
|
private readonly openerService;
|
|
8
7
|
private isSupportedLink;
|
|
9
|
-
previewMarkdownInContainer(content: string, container: HTMLElement, cancellationToken: CancellationToken, options?:
|
|
10
|
-
getBody(content: string, options:
|
|
8
|
+
previewMarkdownInContainer(content: string, container: HTMLElement, cancellationToken: CancellationToken, options?: MarkdownOptions, onUpdate?: Event<string>, onLinkClick?: (uri: URI) => void): Promise<IDisposable>;
|
|
9
|
+
getBody(content: string, options: MarkdownOptions | undefined): Promise<string>;
|
|
11
10
|
}
|
|
12
11
|
//# sourceMappingURL=markdown.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.service.d.ts","sourceRoot":"","sources":["../../src/browser/markdown.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"markdown.service.d.ts","sourceRoot":"","sources":["../../src/browser/markdown.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAc,KAAK,EAAE,WAAW,EAAkB,GAAG,EAAE,MAAM,4BAA4B,CAAC;AAEpH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAI9D,qBACa,mBAAoB,YAAW,gBAAgB;IAE1D,cAAc,EAAE,eAAe,CAAC;IAGhC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAG/C,OAAO,CAAC,eAAe;IAIjB,0BAA0B,CAC9B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,WAAW,EACtB,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACxB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAC/B,OAAO,CAAC,WAAW,CAAC;IA2CjB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAetF"}
|
|
@@ -49,14 +49,20 @@ let MarkdownServiceImpl = class MarkdownServiceImpl {
|
|
|
49
49
|
return disposer;
|
|
50
50
|
}
|
|
51
51
|
async getBody(content, options) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
52
|
+
// marked 15.x 不再支持回调形式
|
|
53
|
+
try {
|
|
54
|
+
const result = (0, utils_1.parseMarkdown)(content, options);
|
|
55
|
+
if (typeof result === 'string') {
|
|
56
|
+
return removeEmbeddedSVGs(renderBody(result));
|
|
57
|
+
}
|
|
58
|
+
// 处理异步结果
|
|
59
|
+
const htmlContent = await result;
|
|
60
|
+
return removeEmbeddedSVGs(renderBody(htmlContent));
|
|
61
|
+
}
|
|
62
|
+
catch (err) {
|
|
63
|
+
// 错误处理
|
|
64
|
+
return renderBody('Failed to parse markdown.');
|
|
65
|
+
}
|
|
60
66
|
}
|
|
61
67
|
};
|
|
62
68
|
exports.MarkdownServiceImpl = MarkdownServiceImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markdown.service.js","sourceRoot":"","sources":["../../src/browser/markdown.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,8DAAmF;AACnF,iEAAoH;AACpH,mFAA+E;AAC/E,uDAAwD;AAIxD,mDAA8C;AAGvC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAO9B,oBAAoB;IACZ,eAAe,CAAC,GAAQ;QAC9B,OAAO,wBAAU,CAAC,4BAA4B,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC9B,OAAe,EACf,SAAsB,EACtB,iBAAoC,EACpC,
|
|
1
|
+
{"version":3,"file":"markdown.service.js","sourceRoot":"","sources":["../../src/browser/markdown.service.ts"],"names":[],"mappings":"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"}
|
package/lib/common/index.d.ts
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import { CancellationToken, Event, IDisposable, URI } from '@opensumi/ide-core-common';
|
|
2
|
+
export interface MarkdownOptions {
|
|
3
|
+
baseUrl?: string;
|
|
4
|
+
gfm?: boolean;
|
|
5
|
+
breaks?: boolean;
|
|
6
|
+
pedantic?: boolean;
|
|
7
|
+
renderer?: any;
|
|
8
|
+
}
|
|
2
9
|
export interface IMarkdownService {
|
|
3
|
-
previewMarkdownInContainer(content: string, container: HTMLElement, cancellationToken: CancellationToken, options?:
|
|
4
|
-
baseUrl?: string | undefined;
|
|
5
|
-
}, onUpdate?: Event<string>, onLinkClick?: (uri: URI) => void): Promise<IDisposable>;
|
|
10
|
+
previewMarkdownInContainer(content: string, container: HTMLElement, cancellationToken: CancellationToken, options?: MarkdownOptions, onUpdate?: Event<string>, onLinkClick?: (uri: URI) => void): Promise<IDisposable>;
|
|
6
11
|
}
|
|
7
12
|
export declare const IMarkdownService: unique symbol;
|
|
8
13
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAEvF,MAAM,WAAW,gBAAgB;IAC/B,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,WAAW,EACtB,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAEvF,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,0BAA0B,CACxB,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,WAAW,EACtB,iBAAiB,EAAE,iBAAiB,EACpC,OAAO,CAAC,EAAE,eAAe,EACzB,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,EACxB,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,GAC/B,OAAO,CAAC,WAAW,CAAC,CAAC;CACzB;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC"}
|
package/lib/common/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAqBa,QAAA,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-markdown",
|
|
3
|
-
"version": "3.8.3-next-
|
|
3
|
+
"version": "3.8.3-next-1747194730.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "3.8.3-next-
|
|
20
|
+
"@opensumi/ide-core-common": "3.8.3-next-1747194730.0"
|
|
21
21
|
},
|
|
22
22
|
"devDependencies": {
|
|
23
|
-
"@opensumi/ide-components": "3.8.3-next-
|
|
24
|
-
"@opensumi/ide-core-browser": "3.8.3-next-
|
|
25
|
-
"@opensumi/ide-dev-tool": "3.8.3-next-
|
|
26
|
-
"@opensumi/ide-editor": "3.8.3-next-
|
|
27
|
-
"@opensumi/ide-webview": "3.8.3-next-
|
|
23
|
+
"@opensumi/ide-components": "3.8.3-next-1747194730.0",
|
|
24
|
+
"@opensumi/ide-core-browser": "3.8.3-next-1747194730.0",
|
|
25
|
+
"@opensumi/ide-dev-tool": "3.8.3-next-1747194730.0",
|
|
26
|
+
"@opensumi/ide-editor": "3.8.3-next-1747194730.0",
|
|
27
|
+
"@opensumi/ide-webview": "3.8.3-next-1747194730.0"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "baa3a0c27172a01ad92cdd85d0137fb5a0d706ca"
|
|
30
30
|
}
|
|
@@ -3,7 +3,7 @@ import React from 'react';
|
|
|
3
3
|
import { IMarkedOptions } from '@opensumi/ide-components/lib/utils';
|
|
4
4
|
import { CancellationTokenSource, Disposable, URI, useInjectable } from '@opensumi/ide-core-browser';
|
|
5
5
|
|
|
6
|
-
import { IMarkdownService } from '../common';
|
|
6
|
+
import { IMarkdownService, MarkdownOptions } from '../common';
|
|
7
7
|
|
|
8
8
|
export const Markdown = ({
|
|
9
9
|
content,
|
|
@@ -12,7 +12,7 @@ export const Markdown = ({
|
|
|
12
12
|
onLinkClick,
|
|
13
13
|
}: {
|
|
14
14
|
content: string;
|
|
15
|
-
options?:
|
|
15
|
+
options?: MarkdownOptions;
|
|
16
16
|
onLoaded?: () => void;
|
|
17
17
|
onLinkClick?: (uri: URI) => void;
|
|
18
18
|
}) => {
|
|
@@ -4,7 +4,7 @@ import { CancellationToken, Disposable, Event, IDisposable, IOpenerService, URI
|
|
|
4
4
|
import { HttpOpener } from '@opensumi/ide-core-browser/lib/opener/http-opener';
|
|
5
5
|
import { IWebviewService } from '@opensumi/ide-webview';
|
|
6
6
|
|
|
7
|
-
import { IMarkdownService } from '../common';
|
|
7
|
+
import { IMarkdownService, MarkdownOptions } from '../common';
|
|
8
8
|
|
|
9
9
|
import { markdownCss } from './mardown.style';
|
|
10
10
|
|
|
@@ -25,7 +25,7 @@ export class MarkdownServiceImpl implements IMarkdownService {
|
|
|
25
25
|
content: string,
|
|
26
26
|
container: HTMLElement,
|
|
27
27
|
cancellationToken: CancellationToken,
|
|
28
|
-
options?:
|
|
28
|
+
options?: MarkdownOptions,
|
|
29
29
|
onUpdate?: Event<string>,
|
|
30
30
|
onLinkClick?: (uri: URI) => void,
|
|
31
31
|
): Promise<IDisposable> {
|
|
@@ -71,15 +71,20 @@ export class MarkdownServiceImpl implements IMarkdownService {
|
|
|
71
71
|
return disposer;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
async getBody(content: string, options:
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
74
|
+
async getBody(content: string, options: MarkdownOptions | undefined): Promise<string> {
|
|
75
|
+
// marked 15.x 不再支持回调形式
|
|
76
|
+
try {
|
|
77
|
+
const result = parseMarkdown(content, options as IMarkedOptions);
|
|
78
|
+
if (typeof result === 'string') {
|
|
79
|
+
return removeEmbeddedSVGs(renderBody(result));
|
|
80
|
+
}
|
|
81
|
+
// 处理异步结果
|
|
82
|
+
const htmlContent = await result;
|
|
83
|
+
return removeEmbeddedSVGs(renderBody(htmlContent));
|
|
84
|
+
} catch (err) {
|
|
85
|
+
// 错误处理
|
|
86
|
+
return renderBody('Failed to parse markdown.');
|
|
87
|
+
}
|
|
83
88
|
}
|
|
84
89
|
}
|
|
85
90
|
|
package/src/common/index.ts
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
import { CancellationToken, Event, IDisposable, URI } from '@opensumi/ide-core-common';
|
|
2
2
|
|
|
3
|
+
export interface MarkdownOptions {
|
|
4
|
+
baseUrl?: string;
|
|
5
|
+
gfm?: boolean;
|
|
6
|
+
breaks?: boolean;
|
|
7
|
+
pedantic?: boolean;
|
|
8
|
+
renderer?: any;
|
|
9
|
+
}
|
|
10
|
+
|
|
3
11
|
export interface IMarkdownService {
|
|
4
12
|
previewMarkdownInContainer(
|
|
5
13
|
content: string,
|
|
6
14
|
container: HTMLElement,
|
|
7
15
|
cancellationToken: CancellationToken,
|
|
8
|
-
options?:
|
|
16
|
+
options?: MarkdownOptions,
|
|
9
17
|
onUpdate?: Event<string>,
|
|
10
18
|
onLinkClick?: (uri: URI) => void,
|
|
11
19
|
): Promise<IDisposable>;
|