From 86de79de693395bd7bb4402aba2a16015a5ffe98 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 31 Mar 2025 17:01:31 +0100 Subject: [PATCH 1/3] chore: move prerelease projects under separate top level folder, update workflow --- .github/workflows/e2e-test.yml | 15 +++------------ .../browser}/index.html | 0 .../browser}/package.json | 0 .../browser}/playwright.config.js | 0 .../browser}/tests/encrypt.spec.js | 0 .../ui-components}/index.html | 0 .../ui-components}/package.json | 0 .../ui-components}/playwright.config.js | 0 .../ui-components}/tests/cards.spec.js | 0 9 files changed, 3 insertions(+), 12 deletions(-) rename {e2e-tests/browser-pre-release => pre-release/browser}/index.html (100%) rename {e2e-tests/browser-pre-release => pre-release/browser}/package.json (100%) rename {e2e-tests/browser-pre-release => pre-release/browser}/playwright.config.js (100%) rename {e2e-tests/browser-pre-release => pre-release/browser}/tests/encrypt.spec.js (100%) rename {e2e-tests/ui-components-pre-release => pre-release/ui-components}/index.html (100%) rename {e2e-tests/ui-components-pre-release => pre-release/ui-components}/package.json (100%) rename {e2e-tests/ui-components-pre-release => pre-release/ui-components}/playwright.config.js (100%) rename {e2e-tests/ui-components-pre-release => pre-release/ui-components}/tests/cards.spec.js (100%) diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index ed8479fe5..639c84978 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -71,21 +71,12 @@ jobs: steps: - name: Check out code uses: actions/checkout@v4 - - uses: pnpm/action-setup@v4 - with: - run_install: false - - name: Setup Node.js environment - uses: actions/setup-node@v4 - with: - node-version-file: ".nvmrc" - cache: "pnpm" - - name: Install deps - run: pnpm install --frozen-lockfile - name: Create list of E2E test projects id: e2e-targets run: |- - E2E_TEST_PROJECTS=$(pnpm m ls --depth=1 --json | jq -cr '[.[] | select(.name|endswith("e2e-tests")) | .name]') - echo "e2e-test-projects=$E2E_TEST_PROJECTS" >> $GITHUB_OUTPUT + E2E_TEST_PROJECTS=$(ls e2e-tests | gxargs -d '\n' -I '{}' cat e2e-tests/{}/package.json | jq .name) + FORMATTED_E2E_PROJECTS=$(echo $E2E_TEST_PROJECTS | jq -rcs) + echo "e2e-test-projects=$FORMATTED_E2E_PROJECTS" >> $GITHUB_OUTPUT # The e2e tests run for quite a long time. Until we can accurately select the appropriate tests to run, we're running them in parallel (2 jobs per project, each with 3-4 worker processes.) e2e-test: name: "Run E2E Tests for ${{ matrix.project }} (Shard ${{ matrix.shard }}/${{ matrix.total-shards }})" diff --git a/e2e-tests/browser-pre-release/index.html b/pre-release/browser/index.html similarity index 100% rename from e2e-tests/browser-pre-release/index.html rename to pre-release/browser/index.html diff --git a/e2e-tests/browser-pre-release/package.json b/pre-release/browser/package.json similarity index 100% rename from e2e-tests/browser-pre-release/package.json rename to pre-release/browser/package.json diff --git a/e2e-tests/browser-pre-release/playwright.config.js b/pre-release/browser/playwright.config.js similarity index 100% rename from e2e-tests/browser-pre-release/playwright.config.js rename to pre-release/browser/playwright.config.js diff --git a/e2e-tests/browser-pre-release/tests/encrypt.spec.js b/pre-release/browser/tests/encrypt.spec.js similarity index 100% rename from e2e-tests/browser-pre-release/tests/encrypt.spec.js rename to pre-release/browser/tests/encrypt.spec.js diff --git a/e2e-tests/ui-components-pre-release/index.html b/pre-release/ui-components/index.html similarity index 100% rename from e2e-tests/ui-components-pre-release/index.html rename to pre-release/ui-components/index.html diff --git a/e2e-tests/ui-components-pre-release/package.json b/pre-release/ui-components/package.json similarity index 100% rename from e2e-tests/ui-components-pre-release/package.json rename to pre-release/ui-components/package.json diff --git a/e2e-tests/ui-components-pre-release/playwright.config.js b/pre-release/ui-components/playwright.config.js similarity index 100% rename from e2e-tests/ui-components-pre-release/playwright.config.js rename to pre-release/ui-components/playwright.config.js diff --git a/e2e-tests/ui-components-pre-release/tests/cards.spec.js b/pre-release/ui-components/tests/cards.spec.js similarity index 100% rename from e2e-tests/ui-components-pre-release/tests/cards.spec.js rename to pre-release/ui-components/tests/cards.spec.js From 41759662a98194c23b4dd7f4b2e15702bbb80567 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 31 Mar 2025 17:14:41 +0100 Subject: [PATCH 2/3] chore: sync lock file after moving pre release projects moved --- pnpm-lock.yaml | 24 ++++++++++++------------ pnpm-workspace.yaml | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 380844aaa..4be46363a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -353,12 +353,6 @@ importers: specifier: 'catalog:' version: 5.4.11(@types/node@22.10.7)(lightningcss@1.27.0)(terser@5.39.0) - e2e-tests/browser-pre-release: - devDependencies: - vite: - specifier: 'catalog:' - version: 5.4.11(@types/node@22.10.7)(lightningcss@1.27.0)(terser@5.39.0) - e2e-tests/inputs: dependencies: '@evervault/inputs': @@ -378,12 +372,6 @@ importers: specifier: 'catalog:' version: 9.3.0 - e2e-tests/ui-components-pre-release: - devDependencies: - vite: - specifier: 'catalog:' - version: 5.4.11(@types/node@22.10.7)(lightningcss@1.27.0)(terser@5.39.0) - e2e-tests/ui-components/vanilla-test-server: dependencies: '@evervault/browser': @@ -1111,6 +1099,18 @@ importers: specifier: 'catalog:' version: 6.0.2(vite@5.4.11(@types/node@22.10.7)(lightningcss@1.27.0)(terser@5.39.0)) + pre-release/browser: + devDependencies: + vite: + specifier: 'catalog:' + version: 5.4.11(@types/node@22.10.7)(lightningcss@1.27.0)(terser@5.39.0) + + pre-release/ui-components: + devDependencies: + vite: + specifier: 'catalog:' + version: 5.4.11(@types/node@22.10.7)(lightningcss@1.27.0)(terser@5.39.0) + packages: '@0no-co/graphql.web@1.0.13': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b8a044327..69dd8bb9e 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,6 +3,7 @@ packages: - packages/* - examples/* - e2e-tests/** + - pre-release/** catalog: "@actions/core": ^1.11.1 "@actions/github": ^6.0.0 From 60129a50b785d3cb0d03e4be20b96f05644058fa Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 1 Apr 2025 10:48:05 +0100 Subject: [PATCH 3/3] chore: namespace internal projects under @repo to use explicit reserved npm namespace --- .github/workflows/revert-release.yml | 2 +- actions/revert-deploy/package.json | 2 +- e2e-tests/browser/package.json | 2 +- e2e-tests/browser/playwright.config.js | 2 +- e2e-tests/inputs/package.json | 2 +- e2e-tests/ui-components/package.json | 2 +- e2e-tests/ui-components/playwright.config.js | 2 +- e2e-tests/ui-components/vanilla-test-server/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/revert-release.yml b/.github/workflows/revert-release.yml index 50e302f58..4a9f9d611 100644 --- a/.github/workflows/revert-release.yml +++ b/.github/workflows/revert-release.yml @@ -32,7 +32,7 @@ jobs: - name: Install dependencies run: pnpm install - name: Build release-gate-tests - run: pnpm --filter @ev/revert-s3-deploy... build + run: pnpm --filter @repo/revert-s3-deploy... build - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: diff --git a/actions/revert-deploy/package.json b/actions/revert-deploy/package.json index 7cd4aecea..858fdc7ba 100644 --- a/actions/revert-deploy/package.json +++ b/actions/revert-deploy/package.json @@ -1,5 +1,5 @@ { - "name": "@ev/revert-s3-deploy", + "name": "@repo/revert-s3-deploy", "description": "GitHub Actions for revert S3 deployments", "private": true, "exports": "./dist/index.js", diff --git a/e2e-tests/browser/package.json b/e2e-tests/browser/package.json index 9bcdf7319..98c447d65 100644 --- a/e2e-tests/browser/package.json +++ b/e2e-tests/browser/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@evervault/browser-e2e-tests", + "name": "@repo/browser-e2e-tests", "version": "1.0.10", "scripts": { "dev:test": "playwright test", diff --git a/e2e-tests/browser/playwright.config.js b/e2e-tests/browser/playwright.config.js index 320cd0188..92e948480 100644 --- a/e2e-tests/browser/playwright.config.js +++ b/e2e-tests/browser/playwright.config.js @@ -65,7 +65,7 @@ export default defineConfig({ timeout: 20 * 1000, }, { - command: "pnpm --filter=@evervault/browser-e2e-tests preview", + command: "pnpm --filter=@repo/browser-e2e-tests preview", url: "http://localhost:4006", timeout: 20 * 1000, }, diff --git a/e2e-tests/inputs/package.json b/e2e-tests/inputs/package.json index 6f1ce9d7c..4538111c5 100644 --- a/e2e-tests/inputs/package.json +++ b/e2e-tests/inputs/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@evervault/inputs-e2e-tests", + "name": "@repo/inputs-e2e-tests", "version": "1.0.14", "scripts": { "dev:test": "playwright test", diff --git a/e2e-tests/ui-components/package.json b/e2e-tests/ui-components/package.json index f63640e90..94906a92a 100644 --- a/e2e-tests/ui-components/package.json +++ b/e2e-tests/ui-components/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "@evervault/ui-components-e2e-tests", + "name": "@repo/ui-components-e2e-tests", "version": "1.2.4", "scripts": { "e2e:test": "playwright test", diff --git a/e2e-tests/ui-components/playwright.config.js b/e2e-tests/ui-components/playwright.config.js index b8e528475..8ac095138 100644 --- a/e2e-tests/ui-components/playwright.config.js +++ b/e2e-tests/ui-components/playwright.config.js @@ -69,7 +69,7 @@ export default defineConfig({ timeout: 20 * 3000, }, { - command: "pnpm --filter e2e-tests-ui-components-vanilla-server dev", + command: "pnpm --filter @repo/e2e-tests-ui-components-vanilla-server dev", url: "http://localhost:4005", timeout: 20 * 3000, }, diff --git a/e2e-tests/ui-components/vanilla-test-server/package.json b/e2e-tests/ui-components/vanilla-test-server/package.json index 57f7284d6..d1c210402 100644 --- a/e2e-tests/ui-components/vanilla-test-server/package.json +++ b/e2e-tests/ui-components/vanilla-test-server/package.json @@ -1,5 +1,5 @@ { - "name": "e2e-tests-ui-components-vanilla-server", + "name": "@repo/e2e-tests-ui-components-vanilla-server", "private": true, "version": "0.0.44", "type": "module",