Build pages with environmental variables from .env. (#168)

* Build pages with environmental variables from .env. --------- Co-authored-by: Adam J. Arling <[email protected]> Co-authored-by: mat <[email protected]>
abolition-now · Dec 4, 2023 · 0813e2b · 0813e2b
1 parent 3607721
commit 0813e2b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
-NEXT_PUBLIC_URL = "https://canopy-iiif.vercel.app"
-NEXT_PUBLIC_BASE_PATH = ""
+NEXT_PUBLIC_URL="https://canopy-iiif.github.io"
+NEXT_PUBLIC_BASE_PATH="/canopy-iiif"
diff --git a/.github/workflows/gh-pages.deploy.yml b/.github/workflows/gh-pages.deploy.yml
@@ -8,10 +8,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    env:
-      NEXT_PUBLIC_URL: https://canopy-iiif.github.io
-      NEXT_PUBLIC_BASE_PATH: /canopy-iiif
-
     strategy:
       matrix:
         node-version: [18.x]
@@ -25,6 +21,12 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
+      - name: Load NEXT_PUBLIC_URL and NEXT_PUBLIC_BASE_PATH from .env
+        run: |
+          set -o allexport
+          source .env
+          set +o allexport
+
       - name: Install
         run: npm ci
 

diff --git a/canopy.ts b/canopy.ts
@@ -14,7 +14,7 @@ const args = process.argv;
   const config = buildConfig.getConfig(path, isDev);
 
   const url = isDev ? `http://localhost:5001` : process.env.NEXT_PUBLIC_URL;
-  const basePath = process.env.NEXT_PUBLIC_BASE_PATH;
+  const basePath = isDev ? `` : process.env.NEXT_PUBLIC_BASE_PATH;
   const baseUrl = basePath ? `${url}${basePath}` : url;
 
   const env = {

diff --git a/next.config.js b/next.config.js
@@ -7,13 +7,14 @@ module.exports = (phase) => {
   const config = getConfig(undefined, isDev);
 
   const url = isDev ? `http://localhost:5001` : process.env.NEXT_PUBLIC_URL;
-  const basePath = process.env.NEXT_PUBLIC_BASE_PATH;
+  const basePath = isDev ? `` : process.env.NEXT_PUBLIC_BASE_PATH;
   const baseUrl = basePath ? `${url}${basePath}` : url;
 
   const env = {
     CANOPY_CONFIG: {
       ...config,
       url,
+      assetPrefix: basePath,
       basePath,
       baseUrl,
     },
@@ -31,8 +32,6 @@ module.exports = (phase) => {
 
   return {
     env,
-    assetPrefix: process.env.NEXT_PUBLIC_BASE_PATH,
-    basePath: process.env.NEXT_PUBLIC_BASE_PATH,
     pageExtensions: ["ts", "tsx", "js", "jsx", "md", "mdx"],
     redirects,
     typescript: {