Resolving issues from review

department-of-veterans-affairs · Oct 13, 2023 · 4186f9f · 4186f9f
1 parent f3bd3d4
commit 4186f9f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
@@ -232,6 +232,8 @@ services:
 
         # Build storybook and the frontends in parallel
         - bash -lc 'time task --taskfile=tugboat.yml'
+        # Build next build server
+        - bash -lc 'composer va:next:start'
 
   memcache:
     image: tugboatqa/memcached:1.6

diff --git a/composer.json b/composer.json
@@ -574,7 +574,7 @@
         "va:web:build": "Perform a content build.",
         "va:web:install": "Prepare the content-build project.",
         "va:web:prepare-dotenv": "Prepare the ./web/.env file.",
-		"va:next-preview": "Prepare the next preview server"
+        "va:next-preview": "Prepare the next preview server"
     },
     "scripts": {
         "pre-install-cmd": [
@@ -821,19 +821,19 @@
             "! ./scripts/should-run-directly.sh || ./scripts/web-prepare-dotenv.sh",
             "./scripts/should-run-directly.sh || ddev composer va:web:prepare-dotenv --"
         ],
-		"va:next:install": [
+        "va:next:install": [
             "# Prepare the next build project",
-			"! ./scripts/should-run-directly.sh || ./scripts/next-install.sh",
+            "! ./scripts/should-run-directly.sh || ./scripts/next-install.sh",
             "./scripts/should-run-directly.sh || ddev composer va:next:install --"
         ],
         "va:next:build": [
             "# Prepare the next build server",
-			"! ./scripts/should-run-directly.sh || ./scripts/next-build.sh",
+            "! ./scripts/should-run-directly.sh || ./scripts/next-build.sh",
             "./scripts/should-run-directly.sh || ddev composer va:next:build --"
         ],
         "va:next:start": [
             "# Start the next build server",
-			"! ./scripts/should-run-directly.sh || yarn start",
+            "! ./scripts/should-run-directly.sh || next-start.sh",
             "./scripts/should-run-directly.sh || ddev composer va:next:start--"
         ]
     }

diff --git a/scripts/next-build.sh b/scripts/next-build.sh
@@ -8,5 +8,4 @@ source ~/.bashrc
 
 cd next
 
-APP_ENV=tugboat yarn build:preview
-yarn next:start
+APP_ENV=tugboat yarn build:preview
diff --git a/scripts/next-start.sh b/scripts/next-start.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+source ~/.bashrc
+
+cd next
+
+APP_ENV=tugboat yarn start