Просмотр исходного кода

move renderer under @growi/plugin-lsx

Yuki Takei 3 лет назад
Родитель
Сommit
bfe95b2b9a

+ 1 - 1
packages/app/src/services/renderer/renderer.tsx

@@ -2,6 +2,7 @@
 import { ComponentType } from 'react';
 
 import { Lsx } from '@growi/plugin-lsx/components';
+import * as lsxGrowiPlugin from '@growi/plugin-lsx/services/renderer';
 import growiPlugin from '@growi/remark-growi-plugin';
 import { Schema as SanitizeOption } from 'hast-util-sanitize';
 import { SpecialComponents } from 'react-markdown/lib/ast-to-react';
@@ -26,7 +27,6 @@ import { NextLink } from '~/components/ReactMarkdownComponents/NextLink';
 import { RendererConfig } from '~/interfaces/services/renderer';
 import loggerFactory from '~/utils/logger';
 
-import * as lsxGrowiPlugin from './growi-plugins/lsx';
 import { addClass } from './rehype-plugins/add-class';
 import { relativeLinks } from './rehype-plugins/relative-links';
 import { relativeLinksByPukiwikiLikeLinker } from './rehype-plugins/relative-links-by-pukiwiki-like-linker';

+ 1 - 0
packages/plugin-lsx/package.json

@@ -10,6 +10,7 @@
   "main": "dist/cjs/index.js",
   "exports": {
     "./components": "./dist/cjs/components/index.js",
+    "./services/renderer": "./dist/cjs/services/renderer/index.js",
     "./server/routes": "./dist/cjs/server/routes/index.js"
   },
   "module": "dist/esm/index.js",

+ 1 - 0
packages/plugin-lsx/src/index.ts

@@ -3,3 +3,4 @@ import * as _serverRoutes from './server/routes';
 export const serverRoutes = _serverRoutes;
 
 export * from './components';
+export * from './services/renderer';

+ 1 - 0
packages/plugin-lsx/src/services/renderer/index.ts

@@ -0,0 +1 @@
+export * from './lsx';

+ 1 - 3
packages/app/src/services/renderer/growi-plugins/lsx.ts → packages/plugin-lsx/src/services/renderer/lsx.ts

@@ -7,8 +7,6 @@ import { selectAll, HastNode } from 'hast-util-select';
 import { Plugin } from 'unified';
 import { visit } from 'unist-util-visit';
 
-import { IHrefResolver } from '../rehype-plugins/relative-links';
-
 const NODE_NAME_PATTERN = new RegExp(/ls|lsx/);
 const SUPPORTED_ATTRIBUTES = ['prefix', 'num', 'depth', 'sort', 'reverse', 'filter'];
 
@@ -59,7 +57,7 @@ export type LsxRehypePluginParams = {
   pagePath?: string,
 }
 
-const pathResolver: IHrefResolver = (relativeHref, basePath) => {
+const pathResolver = (relativeHref: string, basePath: string): string => {
   // generate relative pathname
   const baseUrl = new URL(pathUtils.addTrailingSlash(basePath), 'https://example.com');
   const relativeUrl = new URL(relativeHref, baseUrl);