Skip to content

Commit

Permalink
Merge branch 'main' into DSW-2157-nuxt-percy
Browse files Browse the repository at this point in the history
  • Loading branch information
jamieomaguire authored Oct 17, 2024
2 parents 1f90ced + a34c601 commit 6fda4ff
Show file tree
Hide file tree
Showing 52 changed files with 11 additions and 1,501 deletions.
115 changes: 0 additions & 115 deletions .github/workflows/ci-nextjs-v13.yml

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/handle-closed-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
list-environments:
runs-on: ubuntu-latest
outputs:
hasNextJs13Env: ${{ steps.list-environments.outputs.hasNextJs13Env }}
hasNextJs14Env: ${{ steps.list-environments.outputs.hasNextJs14Env }}
hasNuxtEnv: ${{ steps.list-environments.outputs.hasNuxtEnv }}
hasVanillaJsEnv: ${{ steps.list-environments.outputs.hasVanillaJsEnv }}
Expand Down Expand Up @@ -42,33 +41,18 @@ jobs:
console.log('Environment List:', envList);
// Check for existence of specific environments
const hasNextJs13Env = envList.includes(`nextjs-app-v13-pr-${pullRequestNumber}`);
const hasNextJs14Env = envList.includes(`nextjs-app-v14-pr-${pullRequestNumber}`);
const hasNuxtEnv = envList.includes(`nuxt-app-pr-${pullRequestNumber}`);
const hasVanillaJsEnv = envList.includes(`vanilla-app-pr-${pullRequestNumber}`);
console.log('Has NextJS 13 Env:', hasNextJs13Env);
console.log('Has NextJS 14 Env:', hasNextJs14Env);
console.log('Has Nuxt Env:', hasNuxtEnv);
console.log('Has VanillaJS Env:', hasVanillaJsEnv);
core.setOutput('hasNextJs13Env', hasNextJs13Env ? 'true' : 'false');
core.setOutput('hasNextJs14Env', hasNextJs14Env ? 'true' : 'false');
core.setOutput('hasNuxtEnv', hasNuxtEnv ? 'true' : 'false');
core.setOutput('hasVanillaJsEnv', hasVanillaJsEnv ? 'true' : 'false');
- name: Delete associated NextJS 13 app environment
if: ${{ steps.list-environments.outputs.hasNextJs13Env == 'true' }}
uses: ./.github/actions/amplify-teardown
with:
github-token: ${{ secrets.PIE_BOT_TOKEN }}
amplify-app-id: d1106vmj1ozg8d
aws-region: 'eu-west-1'
aws-access-key-id: ${{ secrets.AWS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
environment-name: nextjs-app-v13-pr-${{ github.event.pull_request.number }}
branch-name: 'pr${{ github.event.pull_request.number }}'

- name: Delete associated NextJS 14 app environment
if: ${{ steps.list-environments.outputs.hasNextJs14Env == 'true' }}
uses: ./.github/actions/amplify-teardown
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ PIE Aperture is designed to be a testbed repo for the [PIE Web component library

## Aperture deployment links
[Nuxt application](https://aperture-nuxt.pie.design/)
[NextJS 13 application](https://aperture-nextjs-v13.pie.design/)
[NextJS 14 application](https://aperture-nextjs-v14.pie.design/)
[Vanilla application](https://aperture-vanilla.pie.design/)

Expand All @@ -29,7 +28,7 @@ Tests can be run by executing the following command at the root of the monorepo:
yarn test:visual
# Run visual tests for a specific project
# app-name - can be one of the following: nextjs-app-v13, nuxt-app, vanilla-app
# app-name - can be one of the following: nextjs-app-v14, nuxt-app, vanilla-app
yarn test:visual --filter=<app-name>
```

Expand Down Expand Up @@ -60,7 +59,7 @@ When running test locally, Playwright will automatically execute the `yarn dev`
After test execution, if you wish to view a test report (for example on test failure), you can execute the following command from the root of the monorepo:

```
# app-name - can be one of the following: nextjs-app-v13, nuxt-app, vanilla-app
# app-name - can be one of the following: nextjs-app-v14, nuxt-app, vanilla-app
yarn playwright:show-report --filter=<app-name>
```

Expand Down
20 changes: 1 addition & 19 deletions amplify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,4 @@ applications:
- '**/*'
cache:
paths:
- node_modules/**/*

- appRoot: nextjs-app-v13
frontend:
phases:
preBuild:
commands:
- yarn install
build:
commands:
- yarn build
artifacts:
baseDirectory: .next
files:
- '**/*'
cache:
paths:
- node_modules/**/*

- node_modules/**/*
3 changes: 0 additions & 3 deletions nextjs-app-v13/.eslintrc.json

This file was deleted.

3 changes: 0 additions & 3 deletions nextjs-app-v13/.yarnrc.yml

This file was deleted.

34 changes: 0 additions & 34 deletions nextjs-app-v13/README.md

This file was deleted.

14 changes: 0 additions & 14 deletions nextjs-app-v13/next.config.js

This file was deleted.

42 changes: 0 additions & 42 deletions nextjs-app-v13/package.json

This file was deleted.

1 change: 0 additions & 1 deletion nextjs-app-v13/public/animations/courier.json

This file was deleted.

1 change: 0 additions & 1 deletion nextjs-app-v13/public/animations/order-confirmed.json

This file was deleted.

1 change: 0 additions & 1 deletion nextjs-app-v13/public/animations/preparing.json

This file was deleted.

Binary file removed nextjs-app-v13/public/favicon.ico
Binary file not shown.
Binary file removed nextjs-app-v13/public/logo.png
Binary file not shown.
37 changes: 0 additions & 37 deletions nextjs-app-v13/src/layout/navigation.tsx

This file was deleted.

18 changes: 0 additions & 18 deletions nextjs-app-v13/src/pages/_app.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions nextjs-app-v13/src/pages/_document.tsx

This file was deleted.

Loading

0 comments on commit 6fda4ff

Please sign in to comment.