diff --git a/.github/workflows/_restart-argocd.yml b/.github/workflows/_restart-argocd.yml index 13c9e610b..1a33f10b2 100644 --- a/.github/workflows/_restart-argocd.yml +++ b/.github/workflows/_restart-argocd.yml @@ -21,11 +21,5 @@ jobs: run: curl -sSL -o /usr/local/bin/argocd https://github.com/argoproj/argo-cd/releases/latest/download/argocd-linux-amd64 && chmod +x /usr/local/bin/argocd - name: Restart ${{ inputs.deployment }} via the ArgoCD CLI run: | - echo ${{ github.ref }} - if [[ ${{ github.ref }} == 'refs/heads/main' ]]; then - echo restarting the production deployment ${{ inputs.deployment }} - argocd app actions run navigatum-prod restart --kind Deployment --resource-name ${{ inputs.deployment }} --auth-token ${{ secrets.ARGOCD_TOKEN }} --server argocd.nav.tum.sexy - else - echo restarting the staging deployment ${{ inputs.deployment }} - argocd app actions run pr-${{github.event.number}} restart --kind Deployment --resource-name ${{ inputs.deployment }} --auth-token ${{ secrets.ARGOCD_TOKEN }} --server argocd.nav.tum.sexy - fi + echo restarting the deployment ${{ inputs.deployment }} + argocd app actions run navigatum-prod restart --kind Deployment --resource-name ${{ inputs.deployment }} --auth-token ${{ secrets.ARGOCD_TOKEN }} --server argocd.nav.tum.sexy diff --git a/.github/workflows/add-deployment.yaml b/.github/workflows/add-deployment.yaml deleted file mode 100644 index 435081864..000000000 --- a/.github/workflows/add-deployment.yaml +++ /dev/null @@ -1,65 +0,0 @@ -name: Add a new Deployment - -on: - pull_request: - branches: [main] - types: [opened, reopened, edited] -jobs: - deploy: - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - with: - ref: deployment - - run: git config --global user.email "github-actions[bot]@users.noreply.github.com" - - run: git config --global user.name "github-actions[bot]" - - run: | - MEILI_MASTER_KEY_RAW="$(echo $RANDOM | md5sum | head -c 20)" - MEILI_MASTER_KEY="$(echo "$MEILI_MASTER_KEY_RAW"|base64)" - export MEILI_MASTER_KEY - echo > staging/pr-${{ github.event.number }}.yaml " - apiVersion: argoproj.io/v1alpha1 - kind: Application - metadata: - name: pr-${{ github.event.number }} - namespace: argocd - finalizers: - - resources-finalizer.argocd.argoproj.io - spec: - project: default - source: - repoURL: https://github.com/TUM-Dev/navigatum.git - targetRevision: ${{ github.event.pull_request.head.ref }} - path: deployment/k3s - helm: - version: v3 - values: | - namespace: pr-${{ github.event.number }} - tag: pr-${{ github.event.number }} - url: pr-${{ github.event.number }}.nav.tum.sexy - server: - MEILI_MASTER_KEY: $MEILI_MASTER_KEY - # GITHUB_TOKEN is intentionally omitted, as this file is templated and then added to git in the deployments branch - # JWT_KEY is omitted, because adding it would only make sense in conjunction with GITHUB_TOKEN - # MEILI_MASTER_KEY being added is not a security risk, since it is a hidden service and even if exposed is heavily restricted by other network policies - destination: - server: https://kubernetes.default.svc - namespace: pr-${{ github.event.number }} - syncPolicy: - automated: - selfHeal: true - prune: true - syncOptions: - - PrunePropagationPolicy=foreground - - CreateNamespace=true - retry: - limit: 2 - backoff: - duration: 5s - factor: 2 - maxDuration: 3m0s" - - run: git add . - - run: git commit -m "Add deployment for PR ${{ '#' }}${{ github.event.number }}" - - run: git push diff --git a/.github/workflows/comment-staging-url.yaml b/.github/workflows/comment-staging-url.yaml deleted file mode 100644 index a31e01fde..000000000 --- a/.github/workflows/comment-staging-url.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: Add a comment to new PRs - -on: - pull_request_target: - branches: [main] - types: [opened, reopened] -jobs: - comment: - runs-on: ubuntu-latest - steps: - - run: | - curl \ - -X POST \ - ${{ github.event.pull_request.comments_url }} \ - -H "Content-Type: application/json" \ - -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ - --data '{ "body": "👋 Thank you for contributing. A [staging environment for this PR](https://pr-${{ github.event.number }}.nav.tum.sexy) for this change will be available shortly" }' diff --git a/.github/workflows/data-cicd.yml b/.github/workflows/data-cicd.yml index 24008b63a..6c9662cda 100644 --- a/.github/workflows/data-cicd.yml +++ b/.github/workflows/data-cicd.yml @@ -55,6 +55,7 @@ jobs: packages: write data-deployment-1: uses: ./.github/workflows/_restart-argocd.yml + if: ${{ github.ref }} == 'refs/heads/main' needs: - data-build with: @@ -63,6 +64,7 @@ jobs: ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }} data-deployment-2: # we need to restart the server, as otherwise it will not serve the new data uses: ./.github/workflows/_restart-argocd.yml + if: ${{ github.ref }} == 'refs/heads/main' needs: - data-deployment-1 with: diff --git a/.github/workflows/remove-deployment.yml b/.github/workflows/remove-deployment.yml deleted file mode 100644 index a361e2de6..000000000 --- a/.github/workflows/remove-deployment.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Remove a Deployment - -on: - pull_request: - types: [closed] -jobs: - deploy: - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - with: - ref: deployment - - run: git config --global user.email "github-actions[bot]@users.noreply.github.com" - - run: git config --global user.name "github-actions[bot]" - - run: rm -f staging/pr-${{ github.event.number }}.yaml - - run: git add . - - run: git commit -m "Removed the deployment for PR ${{ '#' }}${{ github.event.number }}" - - run: git push diff --git a/.github/workflows/server-cicd.yml b/.github/workflows/server-cicd.yml index fd10db726..ea8236e9c 100644 --- a/.github/workflows/server-cicd.yml +++ b/.github/workflows/server-cicd.yml @@ -62,6 +62,7 @@ jobs: packages: write feedback-deployment: uses: ./.github/workflows/_restart-argocd.yml + if: ${{ github.ref }} == 'refs/heads/main' needs: - server-build with: @@ -70,6 +71,7 @@ jobs: ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }} calendar-deployment: uses: ./.github/workflows/_restart-argocd.yml + if: ${{ github.ref }} == 'refs/heads/main' needs: - server-build with: @@ -78,6 +80,7 @@ jobs: ARGOCD_TOKEN: ${{ secrets.ARGOCD_TOKEN }} server-deployment: uses: ./.github/workflows/_restart-argocd.yml + if: ${{ github.ref }} == 'refs/heads/main' needs: - server-build with: diff --git a/.github/workflows/webclient-cicd.yml b/.github/workflows/webclient-cicd.yml index 3de187d40..6403f382e 100644 --- a/.github/workflows/webclient-cicd.yml +++ b/.github/workflows/webclient-cicd.yml @@ -58,6 +58,7 @@ jobs: packages: write webclient-deployment: uses: ./.github/workflows/_restart-argocd.yml + if: ${{ github.ref }} == 'refs/heads/main' needs: - webclient-build with: diff --git a/data/sources/coordinates/rest.yaml b/data/sources/coordinates/rest.yaml index 26ede7743..510679454 100644 --- a/data/sources/coordinates/rest.yaml +++ b/data/sources/coordinates/rest.yaml @@ -5,6 +5,7 @@ "0205.03.302": { lat: 48.147494785237, lon: 11.567622229204972 } "0305.04.508": { lat: 48.14609440391391, lon: 11.569374210372473 } "0503.02.345A": { lat: 48.1483384891566, lon: 11.565865189789264 } +"0509.Z1.921": { lat: 48.1487386952626, lon: 11.566923686212574 } "0509.Z1.995": { lat: 48.14972497055329, lon: 11.567161041097489 } "0509.02.953A": { lat: 48.14930262787317, lon: 11.566896808473047 } diff --git a/requirements-dev.txt b/requirements-dev.txt index 48ed30900..3b0b44882 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ mypy~=1.6.0 pre-commit~=3.5.0 pylint~=3.0.0 -sourcery~=1.12.0 +sourcery~=1.13.0 types-Pillow~=10.1.0.0 types-PyYAML~=6.0.12.10 types-requests~=2.31.0.1 diff --git a/webclient/package.json b/webclient/package.json index aa0329ffc..97be43335 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -15,7 +15,6 @@ "format": "prettier --write ." }, "dependencies": { - "@sentry/vue": "7.74.1", "@vueuse/core": "10.5.0", "maplibre-gl": "3.5.1", "pinia": "2.1.7", @@ -28,15 +27,14 @@ "devDependencies": { "@intlify/unplugin-vue-i18n": "1.4.0", "@rushstack/eslint-patch": "1.5.1", - "@sentry/vite-plugin": "2.8.0", - "@types/swagger-ui-dist": "3.30.3", + "@types/swagger-ui-dist": "3.30.4", "@vitejs/plugin-vue": "4.4.0", "@vue/eslint-config-prettier": "8.0.0", "@vue/eslint-config-typescript": "12.0.0", "@vue/tsconfig": "0.4.0", "@yankeeinlondon/link-builder": "1.2.1", "cypress": "13.3.0", - "eslint": "8.52.0", + "eslint": "8.53.0", "eslint-plugin-vue": "9.18.1", "isomorphic-fetch": "3.0.0", "npm-run-all": "4.1.5", diff --git a/webclient/pnpm-lock.yaml b/webclient/pnpm-lock.yaml index 98e280f98..8c8913599 100644 --- a/webclient/pnpm-lock.yaml +++ b/webclient/pnpm-lock.yaml @@ -5,9 +5,6 @@ settings: excludeLinksFromLockfile: false dependencies: - '@sentry/vue': - specifier: 7.74.1 - version: 7.74.1(vue@3.3.4) '@vueuse/core': specifier: 10.5.0 version: 10.5.0(vue@3.3.4) @@ -40,21 +37,18 @@ devDependencies: '@rushstack/eslint-patch': specifier: 1.5.1 version: 1.5.1 - '@sentry/vite-plugin': - specifier: 2.8.0 - version: 2.8.0 '@types/swagger-ui-dist': - specifier: 3.30.3 - version: 3.30.3 + specifier: 3.30.4 + version: 3.30.4 '@vitejs/plugin-vue': specifier: 4.4.0 version: 4.4.0(vite@4.4.11)(vue@3.3.4) '@vue/eslint-config-prettier': specifier: 8.0.0 - version: 8.0.0(eslint@8.52.0)(prettier@3.0.3) + version: 8.0.0(eslint@8.53.0)(prettier@3.0.3) '@vue/eslint-config-typescript': specifier: 12.0.0 - version: 12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.52.0)(typescript@5.2.2) + version: 12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.53.0)(typescript@5.2.2) '@vue/tsconfig': specifier: 0.4.0 version: 0.4.0 @@ -65,11 +59,11 @@ devDependencies: specifier: 13.3.0 version: 13.3.0 eslint: - specifier: 8.52.0 - version: 8.52.0 + specifier: 8.53.0 + version: 8.53.0 eslint-plugin-vue: specifier: 9.18.1 - version: 9.18.1(eslint@8.52.0) + version: 9.18.1(eslint@8.53.0) isomorphic-fetch: specifier: 3.0.0 version: 3.0.0 @@ -423,13 +417,13 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.52.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.53.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.52.0 + eslint: 8.53.0 eslint-visitor-keys: 3.4.3 dev: true @@ -438,8 +432,8 @@ packages: engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} dev: true - /@eslint/eslintrc@2.1.2: - resolution: {integrity: sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==} + /@eslint/eslintrc@2.1.3: + resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 @@ -455,8 +449,8 @@ packages: - supports-color dev: true - /@eslint/js@8.52.0: - resolution: {integrity: sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==} + /@eslint/js@8.53.0: + resolution: {integrity: sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true @@ -684,159 +678,6 @@ packages: resolution: {integrity: sha512-6i/8UoL0P5y4leBIGzvkZdS85RDMG9y1ihZzmTZQ5LdHUYmZ7pKFoj8X0236s3lusPs1Fa5HTQUpwI+UfTcmeA==} dev: true - /@sentry-internal/tracing@7.74.1: - resolution: {integrity: sha512-nNaiZreQxCitG2PzYPaC7XtyA9OMsETGYMKAtiK4p62/uTmeYbsBva9BoNx1XeiHRwbrVQYRMKQ9nV5e2jS4/A==} - engines: {node: '>=8'} - dependencies: - '@sentry/core': 7.74.1 - '@sentry/types': 7.74.1 - '@sentry/utils': 7.74.1 - tslib: 2.6.2 - dev: false - - /@sentry-internal/tracing@7.76.0: - resolution: {integrity: sha512-QQVIv+LS2sbGf/e5P2dRisHzXpy02dAcLqENLPG4sZ9otRaFNjdFYEqnlJ4qko+ORpJGQEQp/BX7Q/qzZQHlAg==} - engines: {node: '>=8'} - dependencies: - '@sentry/core': 7.76.0 - '@sentry/types': 7.76.0 - '@sentry/utils': 7.76.0 - dev: true - - /@sentry/browser@7.74.1: - resolution: {integrity: sha512-OYWNne/KO60lOvkIpIlJUyiJt/9j8DGI57thSDFEYSmmbNqMitczUTBOaEStouvHKyfchqLZm1CZfWKt+z0VOA==} - engines: {node: '>=8'} - dependencies: - '@sentry-internal/tracing': 7.74.1 - '@sentry/core': 7.74.1 - '@sentry/replay': 7.74.1 - '@sentry/types': 7.74.1 - '@sentry/utils': 7.74.1 - tslib: 2.6.2 - dev: false - - /@sentry/bundler-plugin-core@2.8.0: - resolution: {integrity: sha512-DsTUgeKPqck3DkGzKjRduhPpEn0pez+/THF3gpwQBEfbPnKGr0EYugDvfungZwBFenckIvQBDTOZw0STvbgChA==} - engines: {node: '>= 14'} - dependencies: - '@sentry/cli': 2.21.2 - '@sentry/node': 7.76.0 - '@sentry/utils': 7.76.0 - dotenv: 16.3.1 - find-up: 5.0.0 - glob: 9.3.2 - magic-string: 0.27.0 - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - - /@sentry/cli@2.21.2: - resolution: {integrity: sha512-X1nye89zl+QV3FSuQDGItfM51tW9PQ7ce0TtV/12DgGgTVEgnVp5uvO3wX5XauHvulQzRPzwUL3ZK+yS5bAwCw==} - engines: {node: '>= 10'} - hasBin: true - requiresBuild: true - dependencies: - https-proxy-agent: 5.0.1 - node-fetch: 2.7.0 - progress: 2.0.3 - proxy-from-env: 1.1.0 - which: 2.0.2 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - - /@sentry/core@7.74.1: - resolution: {integrity: sha512-LvEhOSfdIvwkr+PdlrT/aA/iOLhkXrSkvjqAQyogE4ddCWeYfS0NoirxNt1EaxMBAWKhYZRqzkA7WA4LDLbzlA==} - engines: {node: '>=8'} - dependencies: - '@sentry/types': 7.74.1 - '@sentry/utils': 7.74.1 - tslib: 2.6.2 - dev: false - - /@sentry/core@7.76.0: - resolution: {integrity: sha512-M+ptkCTeCNf6fn7p2MmEb1Wd9/JXUWxIT/0QEc+t11DNR4FYy1ZP2O9Zb3Zp2XacO7ORrlL3Yc+VIfl5JTgjfw==} - engines: {node: '>=8'} - dependencies: - '@sentry/types': 7.76.0 - '@sentry/utils': 7.76.0 - dev: true - - /@sentry/node@7.76.0: - resolution: {integrity: sha512-C+YZ5S5W9oTphdWTBgV+3nDdcV1ldnupIHylHzf2Co+xNtJ76V06N5NjdJ/l9+qvQjMn0DdSp7Uu7KCEeNBT/g==} - engines: {node: '>=8'} - dependencies: - '@sentry-internal/tracing': 7.76.0 - '@sentry/core': 7.76.0 - '@sentry/types': 7.76.0 - '@sentry/utils': 7.76.0 - https-proxy-agent: 5.0.1 - transitivePeerDependencies: - - supports-color - dev: true - - /@sentry/replay@7.74.1: - resolution: {integrity: sha512-qmbOl+jYdyhoHFbPp9WemKx8UojID5hVmuVLxNIP0ANqAwmE9OQEK9YFg2cf7L/TpKb1tqz0qLgi5MYIdcdpgQ==} - engines: {node: '>=12'} - dependencies: - '@sentry/core': 7.74.1 - '@sentry/types': 7.74.1 - '@sentry/utils': 7.74.1 - dev: false - - /@sentry/types@7.74.1: - resolution: {integrity: sha512-2jIuPc+YKvXqZETwr2E8VYnsH1zsSUR/wkIvg1uTVeVNyoowJv+YsOtCdeGyL2AwiotUBSPKu7O1Lz0kq5rMOQ==} - engines: {node: '>=8'} - dev: false - - /@sentry/types@7.76.0: - resolution: {integrity: sha512-vj6z+EAbVrKAXmJPxSv/clpwS9QjPqzkraMFk2hIdE/kii8s8kwnkBwTSpIrNc8GnzV3qYC4r3qD+BXDxAGPaw==} - engines: {node: '>=8'} - dev: true - - /@sentry/utils@7.74.1: - resolution: {integrity: sha512-qUsqufuHYcy5gFhLZslLxA5kcEOkkODITXW3c7D+x+8iP/AJqa8v8CeUCVNS7RetHCuIeWAbbTClC4c411EwQg==} - engines: {node: '>=8'} - dependencies: - '@sentry/types': 7.74.1 - tslib: 2.6.2 - dev: false - - /@sentry/utils@7.76.0: - resolution: {integrity: sha512-40jFD+yfQaKpFYINghdhovzec4IEpB7aAuyH/GtE7E0gLpcqnC72r55krEIVILfqIR2Mlr5OKUzyeoCyWAU/yw==} - engines: {node: '>=8'} - dependencies: - '@sentry/types': 7.76.0 - dev: true - - /@sentry/vite-plugin@2.8.0: - resolution: {integrity: sha512-17++vXjfn0xEfE7W4FWdwoXdNNqGjXnuTvIgSLlhJvDCTcqWONDpA/TGXGLjbhQEmQ58wL4wQqmlyxoqMPlokQ==} - engines: {node: '>= 14'} - dependencies: - '@sentry/bundler-plugin-core': 2.8.0 - unplugin: 1.0.1 - transitivePeerDependencies: - - encoding - - supports-color - dev: true - - /@sentry/vue@7.74.1(vue@3.3.4): - resolution: {integrity: sha512-t74d7ZkgQSHAgyaV+sDNFAWMOBl6CPFhBlzplzCvmgaUf5rj5kAlElztm2KFqOFplfPSyJx20wc741exjfuQOw==} - engines: {node: '>=8'} - peerDependencies: - vue: 2.x || 3.x - dependencies: - '@sentry/browser': 7.74.1 - '@sentry/core': 7.74.1 - '@sentry/types': 7.74.1 - '@sentry/utils': 7.74.1 - tslib: 2.6.2 - vue: 3.3.4 - dev: false - /@types/chai-subset@1.3.4: resolution: {integrity: sha512-CCWNXrJYSUIojZ1149ksLl3AN9cmZ5djf+yUoVVV+NuYrtydItQVlL2ZDqyC6M6O9LWRnVf8yYDxbXHO2TfQZg==} dependencies: @@ -928,8 +769,8 @@ packages: '@types/geojson': 7946.0.12 dev: false - /@types/swagger-ui-dist@3.30.3: - resolution: {integrity: sha512-JKu2q4xKSYq5NJNjc+Wb7ohobueuJD8RvH5NrGFwVHn09p6ASBi/to8gfPNBRJAcuYQL7jXOqjxm287VR9HM6A==} + /@types/swagger-ui-dist@3.30.4: + resolution: {integrity: sha512-FeOBc7uj4/lAIh4jkBzorvmNoUU9JgSccyDIRo0E9MJw9KQfSxlwpHCyKGnU9kfV5N5dEdfpY8wm7to3nSwTmA==} dev: true /@types/web-bluetooth@0.0.18: @@ -944,7 +785,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin@6.9.1(@typescript-eslint/parser@6.9.1)(eslint@8.52.0)(typescript@5.2.2): + /@typescript-eslint/eslint-plugin@6.9.1(@typescript-eslint/parser@6.9.1)(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -956,13 +797,13 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.9.1(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.9.1(eslint@8.53.0)(typescript@5.2.2) '@typescript-eslint/scope-manager': 6.9.1 - '@typescript-eslint/type-utils': 6.9.1(eslint@8.52.0)(typescript@5.2.2) - '@typescript-eslint/utils': 6.9.1(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/type-utils': 6.9.1(eslint@8.53.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.9.1(eslint@8.53.0)(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.9.1 debug: 4.3.4(supports-color@8.1.1) - eslint: 8.52.0 + eslint: 8.53.0 graphemer: 1.4.0 ignore: 5.2.4 natural-compare: 1.4.0 @@ -973,7 +814,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@6.9.1(eslint@8.52.0)(typescript@5.2.2): + /@typescript-eslint/parser@6.9.1(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -988,7 +829,7 @@ packages: '@typescript-eslint/typescript-estree': 6.9.1(typescript@5.2.2) '@typescript-eslint/visitor-keys': 6.9.1 debug: 4.3.4(supports-color@8.1.1) - eslint: 8.52.0 + eslint: 8.53.0 typescript: 5.2.2 transitivePeerDependencies: - supports-color @@ -1002,7 +843,7 @@ packages: '@typescript-eslint/visitor-keys': 6.9.1 dev: true - /@typescript-eslint/type-utils@6.9.1(eslint@8.52.0)(typescript@5.2.2): + /@typescript-eslint/type-utils@6.9.1(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -1013,9 +854,9 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 6.9.1(typescript@5.2.2) - '@typescript-eslint/utils': 6.9.1(eslint@8.52.0)(typescript@5.2.2) + '@typescript-eslint/utils': 6.9.1(eslint@8.53.0)(typescript@5.2.2) debug: 4.3.4(supports-color@8.1.1) - eslint: 8.52.0 + eslint: 8.53.0 ts-api-utils: 1.0.3(typescript@5.2.2) typescript: 5.2.2 transitivePeerDependencies: @@ -1048,19 +889,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@6.9.1(eslint@8.52.0)(typescript@5.2.2): + /@typescript-eslint/utils@6.9.1(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) '@types/json-schema': 7.0.14 '@types/semver': 7.5.4 '@typescript-eslint/scope-manager': 6.9.1 '@typescript-eslint/types': 6.9.1 '@typescript-eslint/typescript-estree': 6.9.1(typescript@5.2.2) - eslint: 8.52.0 + eslint: 8.53.0 semver: 7.5.4 transitivePeerDependencies: - supports-color @@ -1184,21 +1025,21 @@ packages: /@vue/devtools-api@6.5.1: resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} - /@vue/eslint-config-prettier@8.0.0(eslint@8.52.0)(prettier@3.0.3): + /@vue/eslint-config-prettier@8.0.0(eslint@8.53.0)(prettier@3.0.3): resolution: {integrity: sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==} peerDependencies: eslint: '>= 8.0.0' prettier: '>= 3.0.0' dependencies: - eslint: 8.52.0 - eslint-config-prettier: 8.10.0(eslint@8.52.0) - eslint-plugin-prettier: 5.0.1(eslint-config-prettier@8.10.0)(eslint@8.52.0)(prettier@3.0.3) + eslint: 8.53.0 + eslint-config-prettier: 8.10.0(eslint@8.53.0) + eslint-plugin-prettier: 5.0.1(eslint-config-prettier@8.10.0)(eslint@8.53.0)(prettier@3.0.3) prettier: 3.0.3 transitivePeerDependencies: - '@types/eslint' dev: true - /@vue/eslint-config-typescript@12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.52.0)(typescript@5.2.2): + /@vue/eslint-config-typescript@12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.53.0)(typescript@5.2.2): resolution: {integrity: sha512-StxLFet2Qe97T8+7L8pGlhYBBr8Eg05LPuTDVopQV6il+SK6qqom59BA/rcFipUef2jD8P2X44Vd8tMFytfvlg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: @@ -1209,12 +1050,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 6.9.1(@typescript-eslint/parser@6.9.1)(eslint@8.52.0)(typescript@5.2.2) - '@typescript-eslint/parser': 6.9.1(eslint@8.52.0)(typescript@5.2.2) - eslint: 8.52.0 - eslint-plugin-vue: 9.18.1(eslint@8.52.0) + '@typescript-eslint/eslint-plugin': 6.9.1(@typescript-eslint/parser@6.9.1)(eslint@8.53.0)(typescript@5.2.2) + '@typescript-eslint/parser': 6.9.1(eslint@8.53.0)(typescript@5.2.2) + eslint: 8.53.0 + eslint-plugin-vue: 9.18.1(eslint@8.53.0) typescript: 5.2.2 - vue-eslint-parser: 9.3.2(eslint@8.52.0) + vue-eslint-parser: 9.3.2(eslint@8.53.0) transitivePeerDependencies: - supports-color dev: true @@ -1450,15 +1291,6 @@ packages: hasBin: true dev: true - /agent-base@6.0.2: - resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} - engines: {node: '>= 6.0.0'} - dependencies: - debug: 4.3.4(supports-color@8.1.1) - transitivePeerDependencies: - - supports-color - dev: true - /aggregate-error@3.1.0: resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} engines: {node: '>=8'} @@ -2217,11 +2049,6 @@ packages: esutils: 2.0.3 dev: true - /dotenv@16.3.1: - resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==} - engines: {node: '>=12'} - dev: true - /earcut@2.2.4: resolution: {integrity: sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==} dev: false @@ -2377,16 +2204,16 @@ packages: source-map: 0.6.1 dev: true - /eslint-config-prettier@8.10.0(eslint@8.52.0): + /eslint-config-prettier@8.10.0(eslint@8.53.0): resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} hasBin: true peerDependencies: eslint: '>=7.0.0' dependencies: - eslint: 8.52.0 + eslint: 8.53.0 dev: true - /eslint-plugin-prettier@5.0.1(eslint-config-prettier@8.10.0)(eslint@8.52.0)(prettier@3.0.3): + /eslint-plugin-prettier@5.0.1(eslint-config-prettier@8.10.0)(eslint@8.53.0)(prettier@3.0.3): resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2400,26 +2227,26 @@ packages: eslint-config-prettier: optional: true dependencies: - eslint: 8.52.0 - eslint-config-prettier: 8.10.0(eslint@8.52.0) + eslint: 8.53.0 + eslint-config-prettier: 8.10.0(eslint@8.53.0) prettier: 3.0.3 prettier-linter-helpers: 1.0.0 synckit: 0.8.5 dev: true - /eslint-plugin-vue@9.18.1(eslint@8.52.0): + /eslint-plugin-vue@9.18.1(eslint@8.53.0): resolution: {integrity: sha512-7hZFlrEgg9NIzuVik2I9xSnJA5RsmOfueYgsUGUokEDLJ1LHtxO0Pl4duje1BriZ/jDWb+44tcIlC3yi0tdlZg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) - eslint: 8.52.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) + eslint: 8.53.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.13 semver: 7.5.4 - vue-eslint-parser: 9.3.2(eslint@8.52.0) + vue-eslint-parser: 9.3.2(eslint@8.53.0) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -2438,15 +2265,15 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /eslint@8.52.0: - resolution: {integrity: sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==} + /eslint@8.53.0: + resolution: {integrity: sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.52.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.53.0) '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.2 - '@eslint/js': 8.52.0 + '@eslint/eslintrc': 2.1.3 + '@eslint/js': 8.53.0 '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -2858,16 +2685,6 @@ packages: path-is-absolute: 1.0.1 dev: true - /glob@9.3.2: - resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - fs.realpath: 1.0.0 - minimatch: 7.4.6 - minipass: 4.2.8 - path-scurry: 1.10.1 - dev: true - /global-dirs@3.0.1: resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==} engines: {node: '>=10'} @@ -3027,16 +2844,6 @@ packages: sshpk: 1.18.0 dev: true - /https-proxy-agent@5.0.1: - resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} - engines: {node: '>= 6'} - dependencies: - agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) - transitivePeerDependencies: - - supports-color - dev: true - /human-signals@1.1.1: resolution: {integrity: sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==} engines: {node: '>=8.12.0'} @@ -3636,11 +3443,6 @@ packages: get-func-name: 2.0.2 dev: true - /lru-cache@10.0.1: - resolution: {integrity: sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==} - engines: {node: 14 || >=16.14} - dev: true - /lru-cache@6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} @@ -3648,13 +3450,6 @@ packages: yallist: 4.0.0 dev: true - /magic-string@0.27.0: - resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /magic-string@0.30.5: resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} @@ -3798,13 +3593,6 @@ packages: brace-expansion: 1.1.11 dev: true - /minimatch@7.4.6: - resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==} - engines: {node: '>=10'} - dependencies: - brace-expansion: 2.0.1 - dev: true - /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -3824,16 +3612,6 @@ packages: /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - /minipass@4.2.8: - resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} - engines: {node: '>=8'} - dev: true - - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} - engines: {node: '>=16 || 14 >=14.17'} - dev: true - /mlly@1.4.2: resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} dependencies: @@ -4108,14 +3886,6 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true - /path-scurry@1.10.1: - resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 10.0.1 - minipass: 7.0.4 - dev: true - /path-type@3.0.0: resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==} engines: {node: '>=4'} @@ -4271,11 +4041,6 @@ packages: engines: {node: '>= 0.6.0'} dev: true - /progress@2.0.3: - resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==} - engines: {node: '>=0.4.0'} - dev: true - /prompts@2.4.2: resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} engines: {node: '>= 6'} @@ -4292,10 +4057,6 @@ packages: resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==} dev: true - /proxy-from-env@1.1.0: - resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: true - /psl@1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} dev: true @@ -5027,6 +4788,7 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + dev: true /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -5159,15 +4921,6 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin@1.0.1: - resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} - dependencies: - acorn: 8.11.2 - chokidar: 3.5.3 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.5.0 - dev: true - /unplugin@1.5.0: resolution: {integrity: sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==} dependencies: @@ -5394,14 +5147,14 @@ packages: vue: 3.3.4 dev: false - /vue-eslint-parser@9.3.2(eslint@8.52.0): + /vue-eslint-parser@9.3.2(eslint@8.53.0): resolution: {integrity: sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' dependencies: debug: 4.3.4(supports-color@8.1.1) - eslint: 8.52.0 + eslint: 8.53.0 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 diff --git a/webclient/src/main.ts b/webclient/src/main.ts index 1060f1c3f..a4d70a8b6 100644 --- a/webclient/src/main.ts +++ b/webclient/src/main.ts @@ -4,7 +4,6 @@ import { createPinia } from "pinia"; import App from "@/App.vue"; import router from "@/router"; import { createI18n } from "vue-i18n"; -import * as Sentry from "@sentry/vue"; const i18n = createI18n, "de" | "en", false>({ legacy: false, @@ -18,24 +17,6 @@ const i18n = createI18n, "de" | "en", false>({ const app = createApp(App); app.use(createPinia()); - -if (import.meta.env.PROD) { - Sentry.init({ - app, - dsn: "https://4e10b1156a2f4320acaac22148c8a568@glitchtip.nav.tum.sexy/2", - integrations: [ - new Sentry.Replay(), - new Sentry.BrowserTracing({ - routingInstrumentation: Sentry.vueRouterInstrumentation(router), - }), - ], - replaysSessionSampleRate: 0, - replaysOnErrorSampleRate: 1.0, - tracesSampleRate: 1.0, // 1.0 => capturing 100% of transactions - tracePropagationTargets: ["nav.tum.de"], - }); -} - app.use(router); app.use(i18n); diff --git a/webclient/vite.config.ts b/webclient/vite.config.ts index 2f1bc5b8c..2633f7c40 100644 --- a/webclient/vite.config.ts +++ b/webclient/vite.config.ts @@ -60,25 +60,6 @@ export default defineConfig({ //The next one is included due to https://github.com/vitejs/vite/issues/2415 // otherwise the router won't serve the details pages, as they include dots pluginRewriteAll(), - sentryVitePlugin({ - org: "rbg", - project: "navigatum", - authToken: "3279def15c0543e797ec3550b0273fbf58e4eb2e67e64a5ba5474bd83d5fa149", - url: "https://sentry.mm.rbg.tum.de/", - release: { - deploy: { - env: process.env.GIT_COMMIT_SHA ? "production" : "staging", - started: new Date().toISOString(), - url: "https://nav.tum.de", - }, - name: commit_message, - //setCommits: { - // repo: "TUM-Dev/NavigaTUM", - // commit: process.env.GIT_COMMIT_SHA || "development", - // auto: false, - //}, - }, - }), ], resolve: { alias: {