From edc6c29479f9b8c3e54d38b91f5e199e3e9117db Mon Sep 17 00:00:00 2001 From: Dimitri POSTOLOV Date: Wed, 2 Oct 2024 22:27:30 +0200 Subject: [PATCH] remove `truthy()` helper function (#3341) --- .changeset/loud-coins-pull.md | 5 +++++ .gitignore | 1 + packages/nextra/src/server/compile.ts | 8 ++++---- packages/nextra/src/server/page-map.ts | 5 ++--- .../src/server/remark-plugins/remark-static-image.ts | 3 +-- packages/nextra/src/server/utils.ts | 6 ------ 6 files changed, 13 insertions(+), 15 deletions(-) create mode 100644 .changeset/loud-coins-pull.md diff --git a/.changeset/loud-coins-pull.md b/.changeset/loud-coins-pull.md new file mode 100644 index 0000000000..d64e3c70f1 --- /dev/null +++ b/.changeset/loud-coins-pull.md @@ -0,0 +1,5 @@ +--- +'nextra': patch +--- + +remove `truthy()` helper function diff --git a/.gitignore b/.gitignore index 346b276368..f9136cb436 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store .next/ +.tsup/ node_modules/ *.log dist/ diff --git a/packages/nextra/src/server/compile.ts b/packages/nextra/src/server/compile.ts index 7825079f6f..95408e5c66 100644 --- a/packages/nextra/src/server/compile.ts +++ b/packages/nextra/src/server/compile.ts @@ -51,7 +51,7 @@ import { remarkStaticImage, remarkStructurize } from './remark-plugins/index.js' -import { logger, truthy } from './utils.js' +import { logger } from './utils.js' const cachedCompilerForFormat: Record< Exclude, @@ -252,7 +252,7 @@ export async function compileMdx( } ] satisfies Pluggable, remarkSmartypants - ].filter(truthy), + ].filter(v => !!v), rehypePlugins: [ ...(rehypePlugins || []), format === 'md' && [ @@ -295,7 +295,7 @@ export async function compileMdx( rehypeAttachCodeMeta ]), [rehypeExtractTocContent, { isRemoteContent }] - ].filter(truthy), + ].filter(v => !!v), recmaPlugins: [ (() => (ast: Program, file) => { const mdxContentIndex = ast.body.findIndex(node => { @@ -347,7 +347,7 @@ export async function compileMdx( }) satisfies Plugin<[], Program>, isRemoteContent ? recmaRewriteFunctionBody : recmaRewriteJsx, ...(recmaPlugins || []) - ].filter(truthy) + ].filter(v => !!v) }) } } diff --git a/packages/nextra/src/server/page-map.ts b/packages/nextra/src/server/page-map.ts index 49905ccfeb..a642e60d65 100644 --- a/packages/nextra/src/server/page-map.ts +++ b/packages/nextra/src/server/page-map.ts @@ -20,8 +20,7 @@ import { createAstExportConst, createAstObject, normalizePageRoute, - pageTitleFromFilename, - truthy + pageTitleFromFilename } from './utils.js' const fs = gracefulFs.promises @@ -164,7 +163,7 @@ async function collectFiles({ }) }) - const pageMap = (await Promise.all(promises)).filter(truthy) + const pageMap = (await Promise.all(promises)).filter(v => !!v) return { // @ts-expect-error -- fixme diff --git a/packages/nextra/src/server/remark-plugins/remark-static-image.ts b/packages/nextra/src/server/remark-plugins/remark-static-image.ts index 7e81bcf47f..5f5fa8d13c 100644 --- a/packages/nextra/src/server/remark-plugins/remark-static-image.ts +++ b/packages/nextra/src/server/remark-plugins/remark-static-image.ts @@ -5,7 +5,6 @@ import slash from 'slash' import type { Plugin } from 'unified' import { visit } from 'unist-util-visit' import { EXTERNAL_URL_REGEX, PUBLIC_DIR } from '../constants.js' -import { truthy } from '../utils.js' /** * @link https://github.com/vercel/next.js/blob/6cfebfb02c2a52a1f99fca59a2eac2d704d053db/packages/next/build/webpack/loaders/next-image-loader.js#L6 @@ -99,7 +98,7 @@ export const remarkStaticImage: Plugin<[], Root> = () => ast => { } } } - ].filter(truthy) + ].filter(v => !!v) }) } diff --git a/packages/nextra/src/server/utils.ts b/packages/nextra/src/server/utils.ts index 18c335f554..b8f5c5da0c 100644 --- a/packages/nextra/src/server/utils.ts +++ b/packages/nextra/src/server/utils.ts @@ -9,12 +9,6 @@ import slash from 'slash' import title from 'title' import { DEFAULT_PROPERTY_PROPS } from './constants.js' -type Truthy = T extends false | '' | 0 | null | undefined ? never : T // from lodash - -export function truthy(value: T): value is Truthy { - return !!value -} - export const logger = { info: console.log.bind(null, '-', '\x1b[36minfo\x1b[0m', '[nextra]'), warn: console.log.bind(null, '-', '\x1b[33mwarn\x1b[0m', '[nextra]'),