chore: 🤖 Put build in base path only for repo's staging environment

heldrida · heldrida · commit 6900754a5117 · 2025-04-03T14:53:17.000+01:00
diff --git a/.changeset/silent-ads-remain.md b/.changeset/silent-ads-remain.md
@@ -0,0 +1,5 @@
+---
+"@fleek-platform/dashboard": patch
+---
+
+Put build in base path only for repo's staging environment
diff --git a/.github/workflows/fleek-deploy-common.yml b/.github/workflows/fleek-deploy-common.yml
@@ -66,7 +66,7 @@ jobs:
       - name: Setup fleek.config.json
         run: |
           DIST="out"
-          BUILD="pnpm run build"
+          BUILD="pnpm run build && .scripts/put_build_in_base_path"
           
           .scripts/setup-fleek-config \
             "$FLEEK_SLUG" \
diff --git a/.scripts/build_static_site b/.scripts/build_static_site
@@ -5,30 +5,17 @@ source .scripts/test_runner_vars
 
 outputDir="out"
 outputBakDir="$outputDir.bak"
-outputWithBaseDir="$outputDir/$NEXT_PUBLIC_DASHBOARD_BASE_PATH"
 indexForRedirectBaseDir="$outputDir/index.html"
 
 echo "👷 Build Static site..."
 
 echo "🤖 Run next build..."
 
-if ! next build; then
+if ! pnpm exec next build; then
   echo "👹 Oops! Nextjs build failed"
   exit 1
 fi
 
-if [[ ! -z "$NEXT_PUBLIC_DASHBOARD_BASE_PATH" ]]; then
-  mv "$outputDir" "$outputBakDir"
-  mkdir -p "$outputWithBaseDir"
-
-  if ! cp -r "$outputBakDir"/* "$outputWithBaseDir"; then
-    echo "👹 Oops! Failed to copy $outputDir to $outputWithBaseDir for some reason..."
-    exit 1
-  fi
-
-  echo "<html><head><script>window.location.href=\"$NEXT_PUBLIC_DASHBOARD_BASE_PATH\";</script></head></html>" > "$indexForRedirectBaseDir"
-fi
-
 echo "🤖 Generate sitemap..."
 if ! pnpm run generate:sitemap; then
   echo "👹 Oops! Sitemap generator failure"
diff --git a/.scripts/put_build_in_base_path b/.scripts/put_build_in_base_path
@@ -1,39 +1,28 @@
 #!/bin/bash
 
-set -e
+echo "👷 Put build in base path (if required)..."
 
-if [[ -z "$1" ]]; then
-  echo "👹 Oops! Missing arguments required for base path NEXT_PUBLIC_BASE_PATH"
-  exit 1
-fi
-
-NEXT_PUBLIC_BASE_PATH="$1"
-OUTPUT_DIR="out"
-TEMP_DIR="$OUTPUT_DIR.bak"
-DEST_DIR="$OUTPUT_DIR/$NEXT_PUBLIC_BASE_PATH"
+if [[ -z "$NEXT_PUBLIC_DASHBOARD_BASE_PATH" && -z "$CI" ]]; then
+  echo "🦖 Skipping build static files due to be running outside CI. The dev server should suggest the address with base path for you!"
 
-if [[ ! -d "$OUTPUT_DIR" ]]; then
-  echo "👹 Oops! The output dir $OUT_DIR doesn not exist"
-
-  exit 1
+  exit 0
 fi
 
-mv "$OUTPUT_DIR" "$TEMP_DIR" || exit 1
-echo "✅ Moved $OUTPUT_DIR to $TEMP_DIR"
-
-mkdir -p "$DEST_DIR" || exit 1
-echo "✅ Created $DEST_DIR"
+if [[ -n "$NEXT_PUBLIC_DASHBOARD_BASE_PATH" && "$NEXT_PUBLIC_DASHBOARD_BASE_PATH" != '/' ]]; then
+  echo "🤖 Must copy files to base path $NEXT_PUBLIC_DASHBOARD_BASE_PATH..."
+  
+  mv "$outputDir" "$outputBakDir"
+  mkdir -p "$outputWithBaseDir"
 
-cp -r "$TEMP_DIR"/* "$DEST_DIR"
-echo "✅ Moved files from $TEMP_DIR to $DEST_DIR"
+  if ! cp -r "$outputBakDir"/* "$outputWithBaseDir"; then
+    echo "👹 Oops! Failed to copy $outputDir to $outputWithBaseDir for some reason..."
+    exit 1
+  else
+    echo "✅ Copied output files to $outputWithBaseDir"
+  fi
 
-rm -rf "$TEMP_DIR" || exit 1
-echo "✅ Removed $TEMP_DIR"
-
-if [[ -d "$DEST_DIR" && "$(ls -A $DEST_DIR)" ]]; then
-  echo "✅ Created $DEST_DIR"
-else
-  echo "👹 Oops! Failed to create $DEST_DIR for some reason..."
-
-  exit 1
+  echo "<html><head><script>window.location.href=\"$NEXT_PUBLIC_DASHBOARD_BASE_PATH\";</script></head></html>" > "$indexForRedirectBaseDir"
 fi
+
+echo
+echo "👍 Put build in base path completed!"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@fleek-platform/dashboard": patch
 +---
++
 +Put build in base path only for repo's staging environment