+
+
+
+
+
+
diff --git a/packages/nextra/src/client/icons/index.ts b/packages/nextra/src/client/icons/index.ts
index d16f060d55..099ff5ecad 100644
--- a/packages/nextra/src/client/icons/index.ts
+++ b/packages/nextra/src/client/icons/index.ts
@@ -5,6 +5,7 @@ export { ReactComponent as DiscordIcon } from './discord.svg'
export { ReactComponent as ExpandIcon } from './expand.svg'
export { ReactComponent as GitHubIcon } from './github.svg'
export { ReactComponent as GlobeIcon } from './globe.svg'
+export { ReactComponent as GoIcon } from './go.svg'
export { ReactComponent as InformationCircleIcon } from './information-circle.svg'
export { ReactComponent as MenuIcon } from './menu.svg'
export { ReactComponent as MoonIcon } from './moon.svg'
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/index.ts b/packages/nextra/src/server/index.ts
index e7005dded5..a29c814474 100644
--- a/packages/nextra/src/server/index.ts
+++ b/packages/nextra/src/server/index.ts
@@ -20,6 +20,8 @@ const DEFAULT_EXTENSIONS = ['js', 'jsx', 'ts', 'tsx']
const AGNOSTIC_PAGE_MAP_PATH = `.next${sep}static${sep}chunks${sep}nextra-page-map`
+const RE_SEP = sep === '/' ? '/' : '\\\\'
+
const nextra: Nextra = nextraConfig => {
const { error } = nextraConfigSchema.safeParse(nextraConfig)
if (error) {
@@ -152,6 +154,14 @@ const nextra: Nextra = nextraConfig => {
})
}
+ const defaultLoaderOptions = [
+ options.defaultLoaders.babel,
+ {
+ loader: 'nextra/loader',
+ options: loaderOptions
+ }
+ ]
+
rules.push(
{
// Match Markdown imports from non-pages. These imports have an
@@ -162,13 +172,7 @@ const nextra: Nextra = nextraConfig => {
issuer: request =>
(!!request && !request.includes(AGNOSTIC_PAGE_MAP_PATH)) ||
request === null,
- use: [
- options.defaultLoaders.babel,
- {
- loader: 'nextra/loader',
- options: loaderOptions
- }
- ]
+ use: defaultLoaderOptions
},
{
// Match pages (imports without an issuer request).
@@ -198,15 +202,16 @@ const nextra: Nextra = nextraConfig => {
},
{
// Use platform separator because /pages\/_app\./ will not work on windows
- test: new RegExp(`pages${sep === '/' ? '/' : '\\\\'}_app\\.`),
+ test: new RegExp(`pages${RE_SEP}_app\\.`),
issuer: request => !request,
- use: [
- options.defaultLoaders.babel,
- {
- loader: 'nextra/loader',
- options: loaderOptions
- }
- ]
+ use: defaultLoaderOptions
+ },
+ {
+ test: new RegExp(
+ `@typescript${RE_SEP}vfs${RE_SEP}dist${RE_SEP}vfs\\.`
+ ),
+ issuer: request => !!request,
+ use: defaultLoaderOptions
}
)
diff --git a/packages/nextra/src/server/loader.ts b/packages/nextra/src/server/loader.ts
index e6ee41b14e..e3d61d4cd3 100644
--- a/packages/nextra/src/server/loader.ts
+++ b/packages/nextra/src/server/loader.ts
@@ -83,6 +83,14 @@ export async function loader(
const currentPath = slash(mdxPath)
+ if (currentPath.includes('@typescript/vfs/dist/vfs.')) {
+ // Fixes https://github.com/microsoft/TypeScript-Website/pull/3022
+ // Fixes https://github.com/shuding/nextra/issues/3322#issuecomment-2384046618
+ return source
+ .replace(/String\.fromCharCode\(112, ?97, ?116, ?104\)/, '"path"')
+ .replace(/String\.fromCharCode\(102, ?115\)/, '"fs"')
+ }
+
if (currentPath.includes('/pages/api/')) {
logger.warn(
`Ignoring ${currentPath} because it is located in the "pages/api" folder.`
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/rehype-plugins/__tests__/rehype-icon.test.ts b/packages/nextra/src/server/rehype-plugins/__tests__/rehype-icon.test.ts
index 676c6326d1..9c930a2b20 100644
--- a/packages/nextra/src/server/rehype-plugins/__tests__/rehype-icon.test.ts
+++ b/packages/nextra/src/server/rehype-plugins/__tests__/rehype-icon.test.ts
@@ -91,6 +91,7 @@ describe('rehypeIcon', () => {
import { RustIcon } from 'nextra/icons'
import { TerraformIcon } from 'nextra/icons'
import { MoveIcon } from 'nextra/icons'
+ import { GoIcon } from 'nextra/icons'
function _createMdxContent(props) {
const _components = {
code: 'code',
@@ -231,6 +232,20 @@ describe('rehypeIcon', () => {
<_components.span>
+ {'\\n'}
+ <_components.pre icon={GoIcon} tabIndex="0" data-language="go" data-word-wrap="" data-copy="">
+ <_components.code>
+ <_components.span>
+
+
+ {'\\n'}
+ <_components.pre icon={GoIcon} tabIndex="0" data-language="golang" data-word-wrap="" data-copy="">
+ <_components.code>
+ <_components.span>
+ <_components.span />
+
+
+
)
}
diff --git a/packages/nextra/src/server/rehype-plugins/rehype-icon.ts b/packages/nextra/src/server/rehype-plugins/rehype-icon.ts
index f1f95c865c..caf61625b0 100644
--- a/packages/nextra/src/server/rehype-plugins/rehype-icon.ts
+++ b/packages/nextra/src/server/rehype-plugins/rehype-icon.ts
@@ -25,7 +25,9 @@ export const REHYPE_ICON_DEFAULT_REPLACES: Record = {
rs: 'RustIcon',
terraform: 'TerraformIcon',
tf: 'TerraformIcon',
- move: 'MoveIcon'
+ move: 'MoveIcon',
+ go: 'GoIcon',
+ golang: 'GoIcon'
}
function createImport(iconName: string) {
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]'),
diff --git a/packages/nextra/styles/steps.css b/packages/nextra/styles/steps.css
index e50d881e01..754e708339 100644
--- a/packages/nextra/styles/steps.css
+++ b/packages/nextra/styles/steps.css
@@ -10,7 +10,7 @@
@apply _absolute _size-[33px];
@apply _border-4 _border-[rgb(var(--nextra-bg))] _bg-gray-100 dark:_bg-neutral-800;
@apply _rounded-full _text-neutral-400 _text-base _font-normal _text-center _-indent-px;
- @apply _mt-[3px] _ml-[-41px];
+ @apply _mt-[3px] _ms-[-41px];
content: counter(var(--counter-id));
}
}
+ 