diff --git a/.dockerignore b/.dockerignore index d11cac7..27e01c1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,7 +2,6 @@ .vscode deploy node_modules -.travis.yml* Dockerfile.* **/*.unit.ts diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c52b4e1..90cd99c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ permissions: contents: read env: - node: 18 + node: 20 jobs: unit: runs-on: ubuntu-latest @@ -35,15 +35,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} - with: - args: > - -Dsonar.organization=schulcloud-verbund - -Dsonar.projectKey=hpi-schul-cloud_shd-client - -Dsonar.sources=. - -Dsonar.exclusions=src/serverApi/**/*.* - -Dsonar.coverage.exclusions=tests/**/*.*,**/*.unit.ts,**/*.unit.js - -Dsonar.cpd.exclusions=tests/**/*.*,**/*.unit.ts,**/*.unit.js,**/locales/*.ts - -Dsonar.javascript.lcov.reportPaths=./coverage/lcov.info lint: runs-on: ubuntu-latest diff --git a/.nvmrc b/.nvmrc index 3c03207..209e3ef 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +20 diff --git a/.pullapprove.yml b/.pullapprove.yml deleted file mode 100644 index da65480..0000000 --- a/.pullapprove.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: 3 - -pullapprove_conditions: -- condition: "'WIP' not in labels" - unmet_status: pending - explanation: "Work in progress" -- condition: "'- [ ]' not in body" - unmet_status: failure - explanation: "Please finish all the required checklist tasks" - - -notifications: -- when: pull_request.opened - comment: | - Hey @{{ author }}, thanks for the PR! The review will start once - the tests, CI checks and PR requirements (see checklist in your PR) have passed. -- when: pullapprove.approved - if: "author_association == 'CONTRIBUTOR'" - comment: "The review is completed. Thanks @{{ author }}, we'll take it from here." diff --git a/Dockerfile b/Dockerfile index e769f4d..d9c7285 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build stage -FROM docker.io/node:18-bullseye AS build-stage +FROM docker.io/node:20-bullseye AS build-stage ## add libraries needed for installing canvas npm package RUN apt update && apt install -y g++ libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev; diff --git a/package-lock.json b/package-lock.json index 509a96b..be33661 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "fishery": "^2.2.2", "jest": "^27.5.1", "prettier": "^3.3.3", - "sass": "^1.77.8", + "sass": "^1.67.0", "sass-loader": "^13.3.3", "ts-jest": "^27.1.5", "typescript": "^4.9.5", @@ -55,7 +55,7 @@ "webpack-plugin-vuetify": "^2.0.1" }, "engines": { - "node": "18", + "node": "20", "npm": ">=9" } }, @@ -16599,10 +16599,11 @@ "dev": true }, "node_modules/sass": { - "version": "1.77.8", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", - "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz", + "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==", "dev": true, + "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", diff --git a/package.json b/package.json index b7a1796..04141d5 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "fishery": "^2.2.2", "jest": "^27.5.1", "prettier": "^3.3.3", - "sass": "^1.77.8", + "sass": "^1.67.0", "sass-loader": "^13.3.3", "ts-jest": "^27.1.5", "typescript": "^4.9.5", @@ -64,7 +64,7 @@ "webpack-plugin-vuetify": "^2.0.1" }, "engines": { - "node": "18", + "node": "20", "npm": ">=9" } } diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..dc2722e --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,14 @@ +sonar.organization=schulcloud-verbund +sonar.projectKey=hpi-schul-cloud_nuxt-client + +sonar.sources=. +sonar.tests=. + +# Exclude test files, locales and generated code from source scope +sonar.exclusions=tests/**/*,**/*.unit.ts,**/*.unit.js,src/serverApi/**/*,**/locales/**.ts + +# Include test files in test scope +sonar.test.inclusions=tests/**/*,**/*.unit.ts,**/*.unit.js + +# Coverage report directory of jest +sonar.javascript.lcov.reportPaths=./coverage/lcov.info \ No newline at end of file