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

+ 0 - 1
packages/app/.env.development

@@ -7,7 +7,6 @@ MIGRATIONS_DIR=src/migrations/
 APP_SITE_URL=http://localhost:3000
 APP_SITE_URL=http://localhost:3000
 FILE_UPLOAD=mongodb
 FILE_UPLOAD=mongodb
 # MONGO_GRIDFS_TOTAL_LIMIT=10485760
 # MONGO_GRIDFS_TOTAL_LIMIT=10485760
-MATHJAX=1
 # NO_CDN=true
 # NO_CDN=true
 MONGO_URI="mongodb://mongo:27017/growi"
 MONGO_URI="mongodb://mongo:27017/growi"
 # REDIS_URI="http://redis:6379"
 # REDIS_URI="http://redis:6379"

+ 1 - 2
packages/app/src/interfaces/services/renderer.ts

@@ -12,7 +12,6 @@ export type GrowiHydratedEnv = {
   BLOCKDIAG_URI: string | null,
   BLOCKDIAG_URI: string | null,
   DRAWIO_URI: string | null,
   DRAWIO_URI: string | null,
   HACKMD_URI: string | null,
   HACKMD_URI: string | null,
-  MATHJAX: string | null,
   NO_CDN: string | null,
   NO_CDN: string | null,
   GROWI_CLOUD_URI: string | null,
   GROWI_CLOUD_URI: string | null,
   GROWI_APP_ID_FOR_GROWI_CLOUD: string | null,
   GROWI_APP_ID_FOR_GROWI_CLOUD: string | null,
@@ -20,5 +19,5 @@ export type GrowiHydratedEnv = {
 
 
 export type GrowiRendererConfig = {
 export type GrowiRendererConfig = {
   highlightJsStyleBorder: boolean
   highlightJsStyleBorder: boolean
-  env: Pick<GrowiHydratedEnv, 'MATHJAX' | 'PLANTUML_URI' | 'BLOCKDIAG_URI'>
+  env: Pick<GrowiHydratedEnv, 'PLANTUML_URI' | 'BLOCKDIAG_URI'>
 } & XssOptionConfig;
 } & XssOptionConfig;

+ 1 - 3
packages/app/src/pages/[[...path]].page.tsx

@@ -47,7 +47,7 @@ import {
   useIsForbidden, useIsNotFound, useIsTrashPage, useShared, useShareLinkId, useIsSharedUser, useIsAbleToDeleteCompletely,
   useIsForbidden, useIsNotFound, useIsTrashPage, useShared, useShareLinkId, useIsSharedUser, useIsAbleToDeleteCompletely,
   useAppTitle, useSiteUrl, useConfidential, useIsEnabledStaleNotification,
   useAppTitle, useSiteUrl, useConfidential, useIsEnabledStaleNotification,
   useIsSearchServiceConfigured, useIsSearchServiceReachable, useIsMailerSetup,
   useIsSearchServiceConfigured, useIsSearchServiceReachable, useIsMailerSetup,
-  useAclEnabled, useIsAclEnabled, useHasSlackConfig, useDrawioUri, useHackmdUri, useMathJax,
+  useAclEnabled, useIsAclEnabled, useHasSlackConfig, useDrawioUri, useHackmdUri,
   useNoCdn, useEditorConfig, useCsrfToken, useIsSearchScopeChildrenAsDefault, useCurrentPageId, useCurrentPathname, useIsSlackConfigured,
   useNoCdn, useEditorConfig, useCsrfToken, useIsSearchScopeChildrenAsDefault, useCurrentPageId, useCurrentPathname, useIsSlackConfigured,
 } from '../stores/context';
 } from '../stores/context';
 import { useXss } from '../stores/xss';
 import { useXss } from '../stores/xss';
@@ -95,7 +95,6 @@ type Props = CommonProps & {
   // hasSlackConfig: boolean,
   // hasSlackConfig: boolean,
   // drawioUri: string,
   // drawioUri: string,
   // hackmdUri: string,
   // hackmdUri: string,
-  // mathJax: string,
   // noCdn: string,
   // noCdn: string,
   // highlightJsStyle: string,
   // highlightJsStyle: string,
   // isAllReplyShown: boolean,
   // isAllReplyShown: boolean,
@@ -159,7 +158,6 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   // useHasSlackConfig(props.hasSlackConfig);
   // useHasSlackConfig(props.hasSlackConfig);
   // useDrawioUri(props.drawioUri);
   // useDrawioUri(props.drawioUri);
   // useHackmdUri(props.hackmdUri);
   // useHackmdUri(props.hackmdUri);
-  // useMathJax(props.mathJax);
   // useNoCdn(props.noCdn);
   // useNoCdn(props.noCdn);
   // useIndentSize(props.adminPreferredIndentSize);
   // useIndentSize(props.adminPreferredIndentSize);
 
 

+ 0 - 6
packages/app/src/server/service/config-loader.ts

@@ -73,12 +73,6 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    ValueType.STRING,
     type:    ValueType.STRING,
     default: null,
     default: null,
   },
   },
-  MATHJAX: {
-    ns:      'crowi',
-    key:     'app:mathJax',
-    type:    ValueType.STRING,
-    default: null,
-  },
   NO_CDN: {
   NO_CDN: {
     ns:      'crowi',
     ns:      'crowi',
     key:     'app:noCdn',
     key:     'app:noCdn',

+ 1 - 1
packages/app/src/services/renderer/growi-renderer.ts

@@ -98,7 +98,7 @@ export default class GrowiRenderer {
       new TaskListsConfigurer(),
       new TaskListsConfigurer(),
       new HeaderConfigurer(),
       new HeaderConfigurer(),
       new EmojiConfigurer(),
       new EmojiConfigurer(),
-      new MathJaxConfigurer(this.growiRendererConfig),
+      new MathJaxConfigurer(),
       new DrawioViewerConfigurer(),
       new DrawioViewerConfigurer(),
       new PlantUMLConfigurer(this.growiRendererConfig),
       new PlantUMLConfigurer(this.growiRendererConfig),
       new BlockdiagConfigurer(this.growiRendererConfig),
       new BlockdiagConfigurer(this.growiRendererConfig),

+ 1 - 7
packages/app/src/services/renderer/markdown-it/mathjax.js

@@ -1,13 +1,7 @@
 export default class MathJaxConfigurer {
 export default class MathJaxConfigurer {
 
 
-  constructor(growiConfig) {
-    this.isEnabled = !!growiConfig.env.MATHJAX; // convert to boolean
-  }
-
   configure(md) {
   configure(md) {
-    if (this.isEnabled) {
-      md.use(require('markdown-it-mathjax')());
-    }
+    md.use(require('markdown-it-mathjax')());
   }
   }
 
 
 }
 }