diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 434d5a208..43127c4fe 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -34,7 +34,7 @@ jobs: VITE_GRAASP_LIBRARY_HOST: ${{ vars.VITE_GRAASP_LIBRARY_HOST }} VITE_GRAASP_PLAYER_HOST: ${{ vars.VITE_GRAASP_PLAYER_HOST }} VITE_H5P_INTEGRATION_URL: ${{ secrets.VITE_H5P_INTEGRATION_URL }} - VITE_GRAASP_ASSETS_URL: ${{ secrets.VITE_GRAASP_ASSETS_URL }} + VITE_GRAASP_ASSETS_URL: ${{ vars.VITE_GRAASP_ASSETS_URL }} VITE_SENTRY_ENV: ${{ vars.VITE_SENTRY_ENV }} VITE_SENTRY_DSN: ${{ secrets.VITE_SENTRY_DSN }} # VITE_GA_MEASUREMENT_ID: ${{ secrets.VITE_GA_MEASUREMENT_ID }} @@ -50,6 +50,6 @@ jobs: build-folder: 'build' aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_DEV }} aws-region: ${{ secrets.AWS_REGION_DEV }} - aws-s3-bucket-name: ${{ secrets.AWS_S3_BUCKET_NAME_GRAASP_COMPOSE_DEV }} + aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_DEV }} - cloudfront-distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_GRAASP_COMPOSE_DEV }} + cloudfront-distribution-id: ${{ vars.CLOUDFRONT_DISTRIBUTION_ID }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index b989d34d3..654c29b7d 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -37,7 +37,7 @@ jobs: VITE_GRAASP_LIBRARY_HOST: ${{ vars.VITE_GRAASP_LIBRARY_HOST }} VITE_GRAASP_PLAYER_HOST: ${{ vars.VITE_GRAASP_PLAYER_HOST }} VITE_H5P_INTEGRATION_URL: ${{ secrets.VITE_H5P_INTEGRATION_URL }} - VITE_GRAASP_ASSETS_URL: ${{ secrets.VITE_GRAASP_ASSETS_URL }} + VITE_GRAASP_ASSETS_URL: ${{ vars.VITE_GRAASP_ASSETS_URL }} VITE_SENTRY_ENV: ${{ vars.VITE_SENTRY_ENV }} VITE_SENTRY_DSN: ${{ secrets.VITE_SENTRY_DSN }} VITE_GA_MEASUREMENT_ID: ${{ secrets.VITE_GA_MEASUREMENT_ID }} @@ -53,6 +53,6 @@ jobs: build-folder: 'build' aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_PROD }} aws-region: ${{ secrets.AWS_REGION_PROD }} - aws-s3-bucket-name: ${{ secrets.AWS_S3_BUCKET_NAME_GRAASP_COMPOSE_PROD }} + aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_PROD }} - cloudfront-distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_GRAASP_COMPOSE_PROD }} + cloudfront-distribution-id: ${{ vars.CLOUDFRONT_DISTRIBUTION_ID }} diff --git a/.github/workflows/deploy-stage.yml b/.github/workflows/deploy-stage.yml index fdcffa59f..c22472452 100644 --- a/.github/workflows/deploy-stage.yml +++ b/.github/workflows/deploy-stage.yml @@ -37,7 +37,7 @@ jobs: VITE_GRAASP_LIBRARY_HOST: ${{ vars.VITE_GRAASP_LIBRARY_HOST }} VITE_GRAASP_PLAYER_HOST: ${{ vars.VITE_GRAASP_PLAYER_HOST }} VITE_H5P_INTEGRATION_URL: ${{ secrets.VITE_H5P_INTEGRATION_URL }} - VITE_GRAASP_ASSETS_URL: ${{ secrets.VITE_GRAASP_ASSETS_URL }} + VITE_GRAASP_ASSETS_URL: ${{ vars.VITE_GRAASP_ASSETS_URL }} VITE_SENTRY_ENV: ${{ vars.VITE_SENTRY_ENV }} VITE_SENTRY_DSN: ${{ secrets.VITE_SENTRY_DSN }} # un-comment to enable Google Analytics @@ -54,6 +54,6 @@ jobs: build-folder: 'build' aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_STAGE }} aws-region: ${{ secrets.AWS_REGION_STAGE }} - aws-s3-bucket-name: ${{ secrets.AWS_S3_BUCKET_NAME_GRAASP_COMPOSE_STAGE }} + aws-s3-bucket-name: ${{ vars.AWS_S3_BUCKET_NAME }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_STAGE }} - cloudfront-distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_GRAASP_COMPOSE_STAGE }} + cloudfront-distribution-id: ${{ vars.CLOUDFRONT_DISTRIBUTION_ID }} diff --git a/README.md b/README.md index 4c0ce2029..684f5471a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ -[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-) +[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors) diff --git a/tsconfig.json b/tsconfig.json index 329d4bbf0..8279d87b8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,6 +10,7 @@ "esModuleInterop": true, "allowSyntheticDefaultImports": true, "strict": true, + /* Bundler mode */ "moduleResolution": "bundler", "allowImportingTsExtensions": true, @@ -24,13 +25,13 @@ "types": ["vite/client"], "baseUrl": "./src", "paths": { - "@/*": ["./*"] - } + "@/*": ["./*"], + }, }, "include": ["src"], "references": [ { - "path": "./tsconfig.node.json" - } - ] + "path": "./tsconfig.node.json", + }, + ], }