From e7d1847043f0cde55dc3a4873606ce4fc6263cde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 10:36:40 +0000 Subject: [PATCH 1/5] chore(deps): update dependency @cypress/webpack-preprocessor to v6 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0a95b65..eb60e7d3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "vuex": "~3.6.2" }, "devDependencies": { - "@cypress/webpack-preprocessor": "~5.11.1", + "@cypress/webpack-preprocessor": "~6.0.0", "@empathyco/eslint-plugin-x": "^2.0.0-alpha.27", "@empathyco/x-tailwindcss": "^1.0.0-alpha.31", "@empathyco/x-translations": "^1.1.0-alpha.33", @@ -2010,19 +2010,19 @@ } }, "node_modules/@cypress/webpack-preprocessor": { - "version": "5.11.1", - "resolved": "https://registry.npmjs.org/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.11.1.tgz", - "integrity": "sha512-kfdF+W/Tns81rFplnqlgZ+t6V+FJ7vegeQCYolLyhh0nJ8eG3s5HvV/ak/zSlbQnaOmAuYiZIChJFVZLUWuNOA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@cypress/webpack-preprocessor/-/webpack-preprocessor-6.0.0.tgz", + "integrity": "sha512-1AS1Et5CNPJii0+DdBZBS8e0hlM2BkBNmYRdZO4/16A3KS3em1sjPZtFw7jJF00m6DYAdB9iy6QW/lLZ2bN0gg==", "dev": true, "dependencies": { "bluebird": "3.7.1", - "debug": "^4.3.2", + "debug": "^4.3.4", "lodash": "^4.17.20" }, "peerDependencies": { "@babel/core": "^7.0.1", "@babel/preset-env": "^7.0.0", - "babel-loader": "^8.0.2", + "babel-loader": "^8.3 || ^9", "webpack": "^4 || ^5" } }, diff --git a/package.json b/package.json index 5b944564..145a1333 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "vuex": "~3.6.2" }, "devDependencies": { - "@cypress/webpack-preprocessor": "~5.11.1", + "@cypress/webpack-preprocessor": "~6.0.0", "@empathyco/eslint-plugin-x": "^2.0.0-alpha.27", "@empathyco/x-tailwindcss": "^1.0.0-alpha.31", "@empathyco/x-translations": "^1.1.0-alpha.33", From 9754bab3aae1654136bb521f3494e1a11218af79 Mon Sep 17 00:00:00 2001 From: Laura Martinez Garcia Date: Wed, 25 Oct 2023 14:09:26 +0200 Subject: [PATCH 2/5] refactor aws deploy path --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3c85bef2..c9bd4741 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,7 +24,7 @@ jobs: uses: ./.github/actions/deploy with: aws_role: ${{ secrets.AWS_ROLE_TEST_ACCOUNT }} - aws_deploy_path: ${{ secrets.TEST_BUCKET }}/preview/${{ github.event.number }} + aws_deploy_path: ${{ secrets.TEST_BUCKET }}/preview/${{ github.event.number }}/ aws_s3_sync_args: '--include \"*\" --exclude \"*/*\"' cloudfront_distribution_id: ${{ secrets.CLOUDFRONT_ID_TEST }} cloudfront_invalidation_paths: '/preview/${{ github.event.number }}/*' From 3d7d253084ffbe3afc89843cd17fd9fb11f7592b Mon Sep 17 00:00:00 2001 From: Laura Martinez Garcia Date: Wed, 25 Oct 2023 15:33:21 +0200 Subject: [PATCH 3/5] refactor aws deploy path --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index c9bd4741..3c85bef2 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -24,7 +24,7 @@ jobs: uses: ./.github/actions/deploy with: aws_role: ${{ secrets.AWS_ROLE_TEST_ACCOUNT }} - aws_deploy_path: ${{ secrets.TEST_BUCKET }}/preview/${{ github.event.number }}/ + aws_deploy_path: ${{ secrets.TEST_BUCKET }}/preview/${{ github.event.number }} aws_s3_sync_args: '--include \"*\" --exclude \"*/*\"' cloudfront_distribution_id: ${{ secrets.CLOUDFRONT_ID_TEST }} cloudfront_invalidation_paths: '/preview/${{ github.event.number }}/*' From 47ec18a62647d3ec9d7a9470f4e1110636e0e940 Mon Sep 17 00:00:00 2001 From: Laura Martinez Garcia Date: Wed, 25 Oct 2023 15:46:38 +0200 Subject: [PATCH 4/5] refactor aws args --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 3c85bef2..74887a11 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -25,7 +25,7 @@ jobs: with: aws_role: ${{ secrets.AWS_ROLE_TEST_ACCOUNT }} aws_deploy_path: ${{ secrets.TEST_BUCKET }}/preview/${{ github.event.number }} - aws_s3_sync_args: '--include \"*\" --exclude \"*/*\"' + aws_s3_sync_args: '--include * --exclude */*' cloudfront_distribution_id: ${{ secrets.CLOUDFRONT_ID_TEST }} cloudfront_invalidation_paths: '/preview/${{ github.event.number }}/*' - name: Adding comment to PR with preview link and validation results From 15f9506a93bf7188fa21988152f2c7c8a54bf2d9 Mon Sep 17 00:00:00 2001 From: Laura Martinez Garcia Date: Wed, 25 Oct 2023 16:16:37 +0200 Subject: [PATCH 5/5] refactor aws args --- .github/workflows/pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 74887a11..8133350e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -25,7 +25,7 @@ jobs: with: aws_role: ${{ secrets.AWS_ROLE_TEST_ACCOUNT }} aws_deploy_path: ${{ secrets.TEST_BUCKET }}/preview/${{ github.event.number }} - aws_s3_sync_args: '--include * --exclude */*' + aws_s3_sync_args: --include '*' --exclude '*/*' cloudfront_distribution_id: ${{ secrets.CLOUDFRONT_ID_TEST }} cloudfront_invalidation_paths: '/preview/${{ github.event.number }}/*' - name: Adding comment to PR with preview link and validation results