Update moon cy tasks with concurrently

cisagov · Mar 14, 2023 · 1396acb · 1396acb
1 parent 951afc1
commit 1396acb
Show file tree

Hide file tree

Showing 4 changed files with 243 additions and 87 deletions.
diff --git a/applications/client/moon.yml b/applications/client/moon.yml
@@ -6,6 +6,7 @@ tasks:
     deps:
       - ~:build-vite
   start-dev:
+    local: true
     deps:
       - ^:build
       - ~:start-vite

diff --git a/applications/redeye-e2e/moon.yml b/applications/redeye-e2e/moon.yml
@@ -3,23 +3,34 @@ dependsOn:
   - 'client'
 tasks:
   open-cy:
-    command: 'cross-env npx -c "moon run @redeye/client:start-dev @redeye/server:start-dev && moon run @redeye/e2e:start-cypress"'
+    command: 'concurrently "yarn moon run @redeye/client:start-dev @redeye/server:start-dev" "yarn moon run @redeye/e2e:start-cypress"'
     local: true
-    platform: node
+    options:
+      runFromWorkspaceRoot: true
   open-cy-blue:
-    command: 'npx -c "SERVER_BLUE_TEAM=true moon run @redeye/client:start-dev @redeye/server:start-dev & moon run @redeye/e2e:start-cypress"'
+    command: 'concurrently "SERVER_BLUE_TEAM=true yarn moon run @redeye/client:start-dev @redeye/server:start-dev" "yarn moon run @redeye/e2e:start-cypress"'
     local: true
+    options:
+      runFromWorkspaceRoot: true
     env:
       SERVER_BLUE_TEAM: 'true'
   cy-ci-chrome-redteam:
     local: true
-    command: 'npx -c "moon run @redeye/e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/redteam/**/**/** & moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
+    command: 'concurrently "yarn moon run @redeye/e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/redteam/**/**/**" "yarn moon run @redeye/client:start-dev @redeye/server:start-dev"'
+    options:
+      runFromWorkspaceRoot: true
   cy-ci-firefox-redteam:
     local: true
-    command: 'npx -c "moon run @redeye/e2e:run-cypress -- --browser=firefox --headed --spec **/**/e2e/redteam/**/**/** & moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
+    command: 'concurrently "yarn moon run @redeye/e2e:run-cypress -- --browser=firefox --headed --spec **/**/e2e/redteam/**/**/**" "yarn moon run @redeye/client:start-dev @redeye/server:start-dev"'
+    options:
+      runFromWorkspaceRoot: true
   cy-ci-safari-redteam:
     local: true
-    command: 'npx -c "moon run @redeye/e2e:run-cypress -- --browser=webkit --headed --spec **/**/e2e/redteam/**/**/** & moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
+    command: 'concurrently "yarn moon run @redeye/e2e:run-cypress -- --browser=webkit --headed --spec **/**/e2e/redteam/**/**/**" "yarn moon run @redeye/client:start-dev @redeye/server:start-dev"'
+    options:
+      runFromWorkspaceRoot: true
   cy-ci-chrome-blueteam:
     local: true
-    command: 'npx -c "moon run @redeye/e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/blueteam/**/**/** & SERVER_BLUE_TEAM=true moon run @redeye/client:start-dev @redeye/server:start-dev || exit 0"'
+    command: 'concurrently "yarn moon run @redeye/e2e:run-cypress -- --headed --browser=chrome --spec **/**/e2e/blueteam/**/**/**" "SERVER_BLUE_TEAM=true yarn moon run @redeye/client:start-dev @redeye/server:start-dev"'
+    options:
+      runFromWorkspaceRoot: true
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
 		"@mikro-orm/entity-generator": "5.6.6",
 		"@mikro-orm/migrations": "5.6.6",
 		"@mikro-orm/seeder": "5.6.6",
-		"@moonrepo/cli": "^0.25.4",
+		"@moonrepo/cli": "^0.26.1",
 		"@swc/cli": "~0.1.55",
 		"@swc/core": "~1.2.143",
 		"@swc/helpers": "~0.3.3",