Fix <Link> not working correctly with i18n and basepath (#2668)

(patch)
blitz-js · Aug 24, 2021 · e49da74 · e49da74
1 parent 827bcf3
commit e49da74
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/nextjs/packages/next/client/link.tsx b/nextjs/packages/next/client/link.tsx
@@ -106,7 +106,7 @@ function linkClicked(
   })
 }
 
-function Link(props: React.PropsWithChildren<LinkProps>) {
+export function Link(props: React.PropsWithChildren<LinkProps>) {
   if (process.env.NODE_ENV !== 'production') {
     function createPropError(args: {
       key: string

diff --git a/packages/babel-preset/src/rewrite-imports.test.ts b/packages/babel-preset/src/rewrite-imports.test.ts
@@ -16,14 +16,14 @@ pluginTester({
     {
       code: `import {Image, Link} from 'blitz';`,
       output: `
-        import { Link } from '@blitzjs/core';
+        import { Link } from 'next/link';
         import { Image } from 'next/image';
       `,
     },
     {
       code: `import {Image as BlitzImage, Link} from 'blitz';`,
       output: `
-        import { Link } from '@blitzjs/core';
+        import { Link } from 'next/link';
         import { Image as BlitzImage } from 'next/image';
       `,
     },

diff --git a/packages/babel-preset/src/rewrite-imports.ts b/packages/babel-preset/src/rewrite-imports.ts
@@ -8,6 +8,7 @@ import { BabelType } from 'babel-plugin-tester';
 const defaultImportSource = '@blitzjs/core';
 
 const specialImports: Record<string, string> = {
+  Link: 'next/link',
   Image: 'next/image',
   Script: 'next/script',
 

diff --git a/packages/blitz/src/index.ts b/packages/blitz/src/index.ts
@@ -13,8 +13,12 @@ export * from "@blitzjs/core/server"
  */
 export {default as Image} from "next/image"
 export type {ImageProps, ImageLoader, ImageLoaderProps} from "next/image"
+
+export * from "next/link"
+
 export {Script} from "next/script"
 export type {Props as ScriptProps} from "next/script"
+
 export * from "next/stdlib"
 export * from "next/stdlib-server"
 export * from "next/data-client"

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,6 +1,5 @@
 export * from "./types"
 export * from "./router"
-export * from "./link"
 export * from "./error"
 export * from "./error-boundary"
 export {withBlitzAppRoot} from "./blitz-app-root"

diff --git a/packages/core/src/link.ts b/packages/core/src/link.ts