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

Merge pull request #7576 from weseek/support/omit-blockdiag

support: Remove Blockdiag codes
Yuki Takei 3 лет назад
Родитель
Сommit
baa065334e

+ 0 - 1
apps/app/src/client/services/renderer/renderer.tsx

@@ -31,7 +31,6 @@ import {
 import loggerFactory from '~/utils/logger';
 import loggerFactory from '~/utils/logger';
 
 
 // import EasyGrid from './PreProcessor/EasyGrid';
 // import EasyGrid from './PreProcessor/EasyGrid';
-// import BlockdiagConfigurer from './markdown-it/blockdiag';
 
 
 import '@growi/remark-lsx/dist/client/style.css';
 import '@growi/remark-lsx/dist/client/style.css';
 
 

+ 0 - 1
apps/app/src/interfaces/services/renderer.ts

@@ -10,5 +10,4 @@ export type RendererConfig = {
 
 
   drawioUri: string,
   drawioUri: string,
   plantumlUri: string,
   plantumlUri: string,
-  blockdiagUri: string | null,
 } & XssOptionConfig;
 } & XssOptionConfig;

+ 0 - 1
apps/app/src/pages/[[...path]].page.tsx

@@ -578,7 +578,6 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
 
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
-    blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
 
     // XSS Options
     // XSS Options
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),

+ 0 - 1
apps/app/src/pages/_private-legacy-pages.page.tsx

@@ -97,7 +97,6 @@ async function injectServerConfigurations(context: GetServerSidePropsContext, pr
 
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
-    blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
 
     // XSS Options
     // XSS Options
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),

+ 0 - 1
apps/app/src/pages/_search.page.tsx

@@ -134,7 +134,6 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
 
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
-    blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
 
     // XSS Options
     // XSS Options
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),

+ 0 - 1
apps/app/src/pages/me/[[...path]].page.tsx

@@ -160,7 +160,6 @@ async function injectServerConfigurations(context: GetServerSidePropsContext, pr
 
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
-    blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
 
     // XSS Options
     // XSS Options
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),

+ 0 - 1
apps/app/src/pages/share/[[...path]].page.tsx

@@ -157,7 +157,6 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
 
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
-    blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
 
     // XSS Options
     // XSS Options
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),
     isEnabledXssPrevention: configManager.getConfig('markdown', 'markdown:rehypeSanitize:isEnabledPrevention'),

+ 0 - 18
apps/app/src/services/renderer/markdown-it/blockdiag.ts

@@ -1,18 +0,0 @@
-import { RendererConfig } from '~/interfaces/services/renderer';
-
-export default class BlockdiagConfigurer {
-
-  generateSourceUrl: string;
-
-  constructor(config: RendererConfig) {
-    this.generateSourceUrl = config.blockdiagUri || 'https://blockdiag-api.com/';
-  }
-
-  configure(md) {
-    // md.use(require('markdown-it-blockdiag'), {
-    //   generateSourceUrl: this.generateSourceUrl,
-    //   marker: ':::',
-    // });
-  }
-
-}

+ 0 - 1
apps/app/src/services/renderer/renderer.tsx

@@ -27,7 +27,6 @@ import { pukiwikiLikeLinker } from './remark-plugins/pukiwiki-like-linker';
 import * as xsvToTable from './remark-plugins/xsv-to-table';
 import * as xsvToTable from './remark-plugins/xsv-to-table';
 
 
 // import EasyGrid from './PreProcessor/EasyGrid';
 // import EasyGrid from './PreProcessor/EasyGrid';
-// import BlockdiagConfigurer from './markdown-it/blockdiag';
 
 
 
 
 const logger = loggerFactory('growi:services:renderer');
 const logger = loggerFactory('growi:services:renderer');