fix(admin-server): move ts-morph to dependencies (#11240)

* fix(admin-server): move ts-morph to dependencies

* chore(ci): add pm2 logs to playwright test artifacts

* chore(ci): add startup waits to auth, profile, gql

* chore(ci): extend check-url.sh timeout

* chore(ci): use large instance for playwright tests... debugging

Co-authored-by: Danny Coates <dannycoates@gmail.com>

.circleci/config.yml

@@ -265,7 +265,7 @@ jobs:
           path: artifacts/tests
 
   playwright-functional-tests:
-    resource_class: medium+
+    resource_class: large
     docker:
       - image: mcr.microsoft.com/playwright:v1.17.1-focal
       - image: redis
@@ -280,6 +280,9 @@ jobs:
       - run:
           name: Running playwright tests
           command: ./packages/functional-tests/scripts/test-ci.sh
+      - store_artifacts:
+          path: ~/.pm2/logs
+          destination: logs
       - store_artifacts:
           path: artifacts
       - store_test_results:

_scripts/check-url.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-RETRY=60
+RETRY=120
 for i in $(eval echo "{1..$RETRY}"); do
   if [ "$(curl -s -o /dev/null --silent -w "%{http_code}"  http://$1)" == "${2:-200}" ]; then
     echo "$1 took $SECONDS seconds"

packages/functional-tests/playwright.config.ts

@@ -46,6 +46,7 @@ const config: PlaywrightTestConfig<TestOptions, WorkerOptions> = {
       ]
     : 'list',
   workers: CI ? 1 : undefined,
+  maxFailures: CI ? 2 : 0,
 };
 
 export default config;

packages/fxa-admin-server/package.json

@@ -57,6 +57,7 @@
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
+    "ts-morph": "^13.0.2",
     "tslib": "^2.3.1"
   },
   "devDependencies": {
@@ -80,7 +81,6 @@
     "proxyquire": "^2.1.3",
     "supertest": "^6.1.6",
     "ts-jest": "^27.0.7",
-    "ts-morph": "^13.0.2",
     "tsconfig-paths": "^3.12.0",
     "typescript": "^4.5.2",
     "yargs": "^17.0.1"

packages/fxa-auth-server/scripts/start-local.sh

@@ -5,3 +5,5 @@ export NODE_ENV=dev
 npm run gen-keys
 ../../_scripts/check-mysql.sh
 pm2 start pm2.config.js
+
+../../_scripts/check-url.sh localhost:9000/__heartbeat__

packages/fxa-graphql-api/package.json

@@ -8,7 +8,7 @@
     "lint": "eslint *",
     "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",
     "watch": "tsc -w",
-    "start": "pm2 start pm2.config.js",
+    "start": "pm2 start pm2.config.js && ../../_scripts/check-url.sh localhost:8290/__heartbeat__",
     "stop": "pm2 stop pm2.config.js",
     "restart": "pm2 restart pm2.config.js",
     "delete": "pm2 delete pm2.config.js",

packages/fxa-profile-server/package.json

@@ -7,7 +7,7 @@
     "lint": "eslint .",
     "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",
     "outdated": "npm outdated --depth 0 || exit 0",
-    "start": "mkdirp var/public && pm2 start pm2.config.js",
+    "start": "mkdirp var/public && pm2 start pm2.config.js && ../../_scripts/check-url.sh localhost:1111/__heartbeat__",
     "stop": "pm2 stop pm2.config.js",
     "restart": "pm2 restart pm2.config.js",
     "delete": "pm2 delete pm2.config.js",