Fix custom error page on catchall (#183)

aralroca · May 27, 2020 · 7d05a0e · 7d05a0e
1 parent d3bfb62
commit 7d05a0e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/cli/builder.js b/cli/builder.js
@@ -297,8 +297,22 @@ export default function DefaultLanguageCatchAll() {
 `
 }
 
+function getErrorImport() {
+ const pages = fs.readdirSync(currentPagesDir)
+
+ if (pages.some((page) => page.startsWith('404.'))) {
+ return "import Error from '../pages/404';"
+ }
+
+ if (pages.some((page) => page.startsWith('_error.'))) {
+ return "import Error from '../pages/_error';"
+ }
+
+ return "import Error from 'next/error';"
+}
+
 function getCatchAllTemplate() {
- return `import Error from 'next/error';
+ return `${getErrorImport()}
 import { useRouter } from 'next/router';
 
 export default function CatchAll() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "next-translate",
- "version": "0.17.0-canary.1",
+ "version": "0.17.0-canary.2",
  "description": "Next.js utility to translate pages without the need of a server (static i18n pages generator).",
  "license": "MIT",
  "keywords": [