From 9496ad786d7c0c3821d723bf66c7ecc75bbdf6f2 Mon Sep 17 00:00:00 2001 From: wuxh Date: Sun, 17 Sep 2023 13:19:42 +0800 Subject: [PATCH 1/6] feat(dev): add absolute addresses for plugin development --- src/loaders/markdown/transformer/remarkMeta.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/loaders/markdown/transformer/remarkMeta.ts b/src/loaders/markdown/transformer/remarkMeta.ts index 465237be66..4485041f6c 100644 --- a/src/loaders/markdown/transformer/remarkMeta.ts +++ b/src/loaders/markdown/transformer/remarkMeta.ts @@ -64,7 +64,8 @@ export default function remarkMeta(opts: IRemarkMetaOpts): Transformer { vFile.data.frontmatter = { title: '', toc: 'menu', - filename: winPath(path.relative(opts.cwd, opts.fileAbsPath)), + filename: path.basename(opts.fileAbsPath), + resourcePath: opts.fileAbsPath, ...(guessAtomId && { atomId: guessAtomId }), }; From e0a864462c4a3f778c5a677150a02ab451e4b99f Mon Sep 17 00:00:00 2001 From: wuxh Date: Sun, 17 Sep 2023 13:30:58 +0800 Subject: [PATCH 2/6] chore: fix --- src/loaders/markdown/transformer/remarkMeta.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/loaders/markdown/transformer/remarkMeta.ts b/src/loaders/markdown/transformer/remarkMeta.ts index 4485041f6c..c30913a8f9 100644 --- a/src/loaders/markdown/transformer/remarkMeta.ts +++ b/src/loaders/markdown/transformer/remarkMeta.ts @@ -64,7 +64,7 @@ export default function remarkMeta(opts: IRemarkMetaOpts): Transformer { vFile.data.frontmatter = { title: '', toc: 'menu', - filename: path.basename(opts.fileAbsPath), + filename: winPath(path.relative(opts.cwd, opts.fileAbsPath)), resourcePath: opts.fileAbsPath, ...(guessAtomId && { atomId: guessAtomId }), }; From cfaab1893bcf21e528ab8bff841b32baa4471ce9 Mon Sep 17 00:00:00 2001 From: wuxh Date: Sun, 17 Sep 2023 18:54:39 +0800 Subject: [PATCH 3/6] chore: update --- src/loaders/markdown/transformer/index.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/loaders/markdown/transformer/index.ts b/src/loaders/markdown/transformer/index.ts index 389043d065..45a26af6ea 100644 --- a/src/loaders/markdown/transformer/index.ts +++ b/src/loaders/markdown/transformer/index.ts @@ -3,8 +3,9 @@ import type { ILocalesConfig, IRouteMeta } from '@/client/theme-api/types'; import { VERSION_2_DEPRECATE_SOFT_BREAKS } from '@/constants'; import type { IApi, IDumiConfig, IDumiTechStack } from '@/types'; import enhancedResolve from 'enhanced-resolve'; +import path from 'path'; import type { IRoute } from 'umi'; -import { semver } from 'umi/plugin-utils'; +import { semver, winPath } from 'umi/plugin-utils'; import type { Plugin, Processor } from 'unified'; import type { Data } from 'vfile'; import rehypeDemo from './rehypeDemo'; @@ -197,6 +198,13 @@ export default async (raw: string, opts: IMdTransformerOptions) => { }), ); + // information is stored in an object. + processor.data({ + ...(processor.data() ?? {}), + filename: winPath(path.relative(opts.cwd, opts.fileAbsPath)), + fileAbsPath: opts.fileAbsPath, + }); + const result = await processor.use(rehypeJsxify).process(raw); return { From fddfce9b8e072dcaf1edcd54311891b8e7530cba Mon Sep 17 00:00:00 2001 From: wuxh Date: Sun, 17 Sep 2023 18:55:11 +0800 Subject: [PATCH 4/6] chore: remove --- src/loaders/markdown/transformer/remarkMeta.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/loaders/markdown/transformer/remarkMeta.ts b/src/loaders/markdown/transformer/remarkMeta.ts index c30913a8f9..465237be66 100644 --- a/src/loaders/markdown/transformer/remarkMeta.ts +++ b/src/loaders/markdown/transformer/remarkMeta.ts @@ -65,7 +65,6 @@ export default function remarkMeta(opts: IRemarkMetaOpts): Transformer { title: '', toc: 'menu', filename: winPath(path.relative(opts.cwd, opts.fileAbsPath)), - resourcePath: opts.fileAbsPath, ...(guessAtomId && { atomId: guessAtomId }), }; From 5efdf6b5ce19851d112247715b38e3a37dcecceb Mon Sep 17 00:00:00 2001 From: wuxh Date: Sun, 17 Sep 2023 22:15:26 +0800 Subject: [PATCH 5/6] Revert "chore: update" This reverts commit cfaab1893bcf21e528ab8bff841b32baa4471ce9. --- src/loaders/markdown/transformer/index.ts | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/loaders/markdown/transformer/index.ts b/src/loaders/markdown/transformer/index.ts index 45a26af6ea..389043d065 100644 --- a/src/loaders/markdown/transformer/index.ts +++ b/src/loaders/markdown/transformer/index.ts @@ -3,9 +3,8 @@ import type { ILocalesConfig, IRouteMeta } from '@/client/theme-api/types'; import { VERSION_2_DEPRECATE_SOFT_BREAKS } from '@/constants'; import type { IApi, IDumiConfig, IDumiTechStack } from '@/types'; import enhancedResolve from 'enhanced-resolve'; -import path from 'path'; import type { IRoute } from 'umi'; -import { semver, winPath } from 'umi/plugin-utils'; +import { semver } from 'umi/plugin-utils'; import type { Plugin, Processor } from 'unified'; import type { Data } from 'vfile'; import rehypeDemo from './rehypeDemo'; @@ -198,13 +197,6 @@ export default async (raw: string, opts: IMdTransformerOptions) => { }), ); - // information is stored in an object. - processor.data({ - ...(processor.data() ?? {}), - filename: winPath(path.relative(opts.cwd, opts.fileAbsPath)), - fileAbsPath: opts.fileAbsPath, - }); - const result = await processor.use(rehypeJsxify).process(raw); return { From bb14979f05b6cb46a4bf4b37e5b3d197eddf21ff Mon Sep 17 00:00:00 2001 From: wuxh Date: Sun, 17 Sep 2023 22:19:23 +0800 Subject: [PATCH 6/6] chore: update --- src/loaders/markdown/transformer/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/loaders/markdown/transformer/index.ts b/src/loaders/markdown/transformer/index.ts index 389043d065..63198e9104 100644 --- a/src/loaders/markdown/transformer/index.ts +++ b/src/loaders/markdown/transformer/index.ts @@ -197,6 +197,9 @@ export default async (raw: string, opts: IMdTransformerOptions) => { }), ); + // info available to all plugins + processor.data('fileAbsPath', opts.fileAbsPath); + const result = await processor.use(rehypeJsxify).process(raw); return {