From 5dbe5c6cac77f8eb0364d3b12cc8c7faf5ede5e9 Mon Sep 17 00:00:00 2001
From: DefectingCat <i@defect.ink>
Date: Wed, 31 Aug 2022 14:27:59 +0800
Subject: [PATCH] Update next export

---
 lib/fetcher.ts  |  2 ++
 next.config.mjs | 13 ++++++++++++-
 package.json    |  8 +++++---
 yarn.lock       |  9 ++++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lib/fetcher.ts b/lib/fetcher.ts
index 8af218f..b457600 100644
--- a/lib/fetcher.ts
+++ b/lib/fetcher.ts
@@ -4,6 +4,8 @@ import { GistsFile } from 'types';
 const password = process.env.NEXT_PUBLIC_GITHUB_API;
 const octokit = new Octokit({
   auth: password,
+  // @TODO reverse proxy
+  baseUrl: 'http://api.github.com',
 });
 
 const linkMatch = /<(.*?)>/;
diff --git a/next.config.mjs b/next.config.mjs
index 4962c97..14bc4dd 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -14,6 +14,7 @@
 //     images: { domains: ['avatars.githubusercontent.com'] },
 //   },
 // ]);
+
 /**
  * @type {import('next').NextConfig}
  */
@@ -24,8 +25,18 @@ const nextConfig = {
   experimental: {
     // runtime: 'nodejs',
     // outputStandalone: true,
-    images: { allowFutureImage: true },
+    images:
+      process.env.NEXT_BUILD === 'export'
+        ? { allowFutureImage: true, unoptimized: true }
+        : { allowFutureImage: true },
   },
+  // images:
+  //   process.env.NEXT_BUILD === 'export'
+  //     ? {
+  //         loader: 'imgix',
+  //         path: 'https://rua.plus/',
+  //       }
+  //     : {},
   pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
 };
 
diff --git a/package.json b/package.json
index 1337461..bd14455 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,9 @@
   "private": true,
   "scripts": {
     "dev": "next dev",
-    "build": "next build && node scripts/build-search.mjs",
-    "build:export": "next build && next export && node scripts/build-search.mjs",
+    "build": "next build && yarn build:search",
+    "build:export": "cross-env NEXT_BUILD=export next build && cross-env NEXT_BUILD=export next export",
+    "build:search": "node scripts/build-search.mjs",
     "start": "next start",
     "lint": "next lint",
     "test": "jest --watch",
@@ -40,6 +41,7 @@
     "@types/node": "18.7.13",
     "@types/react": "18.0.17",
     "autoprefixer": "^10.4.8",
+    "cross-env": "^7.0.3",
     "dotenv": "^16.0.1",
     "eslint": "8.22.0",
     "eslint-config-next": "12.2.5",
@@ -52,4 +54,4 @@
     "tailwindcss": "^3.1.8",
     "typescript": "4.7.4"
   }
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 84bff7b..2acc18b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3063,6 +3063,13 @@ crelt@^1.0.5:
   resolved "https://registry.npmmirror.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94"
   integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==
 
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.npmmirror.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -3072,7 +3079,7 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==