From 025ac4e28cc00550b6b50280af1b2fb85ad39d51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= Date: Tue, 16 Jun 2020 19:55:14 +0200 Subject: [PATCH] refactor(v2): legacy export = syntax (#2948) --- .../src/markdownLoader.ts | 22 ++++++++++++++----- .../src/markdown/index.ts | 8 +++++-- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts b/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts index 997204d9e0..e0e7844adb 100644 --- a/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts +++ b/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts @@ -7,19 +7,31 @@ import {loader} from 'webpack'; import {truncate, linkify} from './blogUtils'; -const {parseQuery, getOptions} = require('loader-utils'); +import {parseQuery, getOptions} from 'loader-utils'; -export = function (fileString: string) { +const markdownLoader: loader.Loader = function (source) { + const fileString = source as string; const callback = this.async(); const {truncateMarker, siteDir, contentPath, blogPosts} = getOptions(this); + // Linkify posts - let finalContent = linkify(fileString, siteDir, contentPath, blogPosts); + let finalContent = linkify( + fileString as string, + siteDir, + contentPath, + blogPosts, + ); // Truncate content if requested (e.g: file.md?truncated=true). - const {truncated} = this.resourceQuery && parseQuery(this.resourceQuery); + const truncated: string | undefined = this.resourceQuery + ? parseQuery(this.resourceQuery).truncated + : undefined; + if (truncated) { finalContent = truncate(finalContent, truncateMarker); } return callback && callback(null, finalContent); -} as loader.Loader; +}; + +export default markdownLoader; diff --git a/packages/docusaurus-plugin-content-docs/src/markdown/index.ts b/packages/docusaurus-plugin-content-docs/src/markdown/index.ts index 2df83f4ad4..6c54199a8e 100644 --- a/packages/docusaurus-plugin-content-docs/src/markdown/index.ts +++ b/packages/docusaurus-plugin-content-docs/src/markdown/index.ts @@ -9,9 +9,11 @@ import {getOptions} from 'loader-utils'; import {loader} from 'webpack'; import linkify from './linkify'; -export = function (fileString: string) { +const markdownLoader: loader.Loader = function (source) { + const fileString = source as string; const callback = this.async(); const {docsDir, siteDir, versionedDir, sourceToPermalink} = getOptions(this); + return ( callback && callback( @@ -26,4 +28,6 @@ export = function (fileString: string) { ), ) ); -} as loader.Loader; +}; + +export default markdownLoader;