Merge pull request #80 from nnn-training/fix-issue-71

`GITHUB_PAGES` に `NEXT_PUBLIC_` プレフィックスを付ける
nnn-training · Mar 13, 2024 · 0c5ff7d · 0c5ff7d
2 parents 67e8cfb + a747b60
commit 0c5ff7d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -19,7 +19,7 @@ jobs:
         run: |
           yarn build
         env:
-          GITHUB_PAGES: true
+          NEXT_PUBLIC_GITHUB_PAGES: true
       - name: generate sitemap
         run: |
           npx next-sitemap

diff --git a/next.config.js b/next.config.js
@@ -51,12 +51,12 @@ module.exports = {
     )
     return config;
   },
-  assetPrefix: process.env.GITHUB_PAGES ?
+  assetPrefix: process.env.NEXT_PUBLIC_GITHUB_PAGES ?
     '/faq'
     :
     ''
   ,
-  basePath: process.env.GITHUB_PAGES ?
+  basePath: process.env.NEXT_PUBLIC_GITHUB_PAGES ?
     '/faq'
     :
     ''

diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx
@@ -22,7 +22,7 @@ const Layout: React.FunctionComponent<Props> = ({
         <Link href="/">
           <div className="flex items-center">
             <div className="icon ml-1 mb-0.5 cursor-pointer">
-              <img src={process.env.GITHUB_PAGES ? "/faq/images/nyobiko.png" : "/images/nyobiko.png"} width={100} height={100} />
+              <img src={process.env.NEXT_PUBLIC_GITHUB_PAGES ? "/faq/images/nyobiko.png" : "/images/nyobiko.png"} width={100} height={100} />
             </div>
             <h1 className="leading-4 pl-4 cursor-pointer">
               <div className="ml-1">N予備校プログラミングコース</div>

diff --git a/src/pages/[...slug].tsx b/src/pages/[...slug].tsx
@@ -55,7 +55,7 @@ type Params = {
 }
 
 const markdownToHtml = async (markdown: string, topSlug: string) => {
-  const suffix = process.env.GITHUB_PAGES ? `/faq/images/${topSlug}/` : `/images/${topSlug}/`
+  const suffix = process.env.NEXT_PUBLIC_GITHUB_PAGES ? `/faq/images/${topSlug}/` : `/images/${topSlug}/`
   markdown = markdown.replace(/\.\/images\//g, suffix)
   const htmlResult = await remark()
     .use(remarkHtml, { sanitize: false })

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -104,7 +104,7 @@ const TopPage = () => {
                 <div className="p-4 sm:flex items-center px-2">
                   <div className="pl-3 pb-2 sm:pl-2 sm:pb-0">
                     <div className="pt-0.5">
-                      <img src={process.env.GITHUB_PAGES ? "/faq/images/cc.png" : "/images/cc.png"} width={88} height={31} />
+                      <img src={process.env.NEXT_PUBLIC_GITHUB_PAGES ? "/faq/images/cc.png" : "/images/cc.png"} width={88} height={31} />
                     </div>
                   </div>
                   <div className="ml-3 sm:w-72 leading-5 ">
@@ -120,7 +120,7 @@ const TopPage = () => {
                 <div className="p-4 sm:flex items-center px-2">
                   <div className="pl-3 pb-2 sm:pl-2 sm:pb-0">
                     <div className="icon">
-                      <img src={process.env.GITHUB_PAGES ? "/faq/images/github.png" : "/images/github.png"} width={100} height={100} />
+                      <img src={process.env.NEXT_PUBLIC_GITHUB_PAGES ? "/faq/images/github.png" : "/images/github.png"} width={100} height={100} />
                     </div>
                   </div>
                   <div className=" ml-3 sm:w-96 leading-5 ">