Compare commits
No commits in common. "main" and "upgrade-dependencies" have entirely different histories.
main
...
upgrade-de
25
.drone.yml
25
.drone.yml
@ -15,27 +15,24 @@ trigger:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: reuse
|
- name: reuse
|
||||||
image: fsfe/reuse:5.0.2-debian@sha256:7928d25ed14a1bc22758d917ebc6aecbb8bcd1a4da7aa748d7179c9011bbfb0b
|
image: fsfe/reuse:3.0.2-debian
|
||||||
- name: lint
|
- name: lint
|
||||||
image: node:20.18.0-alpine@sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9
|
image: node:20.12.2
|
||||||
commands:
|
commands:
|
||||||
- npm ci
|
- npm ci
|
||||||
- npm run lint -- --no-fix
|
- npm run lint
|
||||||
- name: audit
|
- name: audit
|
||||||
image: node:20.18.0-alpine@sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9
|
image: node:20.12.2
|
||||||
commands:
|
commands:
|
||||||
- npm install -g better-npm-audit
|
- npm install -g better-npm-audit
|
||||||
- better-npm-audit audit --production --level=moderate
|
- better-npm-audit audit --production --level=moderate
|
||||||
- name: docker-dry-run
|
- name: docker-dry-run
|
||||||
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
image: plugins/docker:20.17.3
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
||||||
target: ki-frontend
|
target: ki-frontend
|
||||||
dry_run: true
|
dry_run: true
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- pull_request
|
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
@ -53,7 +50,7 @@ depends_on:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: docker-publish
|
- name: docker-publish
|
||||||
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
image: plugins/docker:20.17.3
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
||||||
@ -80,7 +77,7 @@ depends_on:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: deploy-dev
|
- name: deploy-dev
|
||||||
image: appleboy/drone-ssh:1.7.5@sha256:995677e073454912f26d4c0fdd2f9df2e1f5a30d6603d3f2ece667311b6babb3
|
image: appleboy/drone-ssh:1.7.5
|
||||||
settings:
|
settings:
|
||||||
host:
|
host:
|
||||||
- dev01.wtf-eg.net
|
- dev01.wtf-eg.net
|
||||||
@ -102,14 +99,14 @@ trigger:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: reuse
|
- name: reuse
|
||||||
image: fsfe/reuse:5.0.2-debian@sha256:7928d25ed14a1bc22758d917ebc6aecbb8bcd1a4da7aa748d7179c9011bbfb0b
|
image: fsfe/reuse:3.0.2-debian
|
||||||
- name: lint
|
- name: lint
|
||||||
image: node:20.18.0-alpine@sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9
|
image: node:20.12.2
|
||||||
commands:
|
commands:
|
||||||
- npm ci
|
- npm ci
|
||||||
- npm run lint -- --no-fix
|
- npm run lint
|
||||||
- name: docker-publish
|
- name: docker-publish
|
||||||
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
image: plugins/docker:20.17.3
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
repo: git.wtf-eg.de/kompetenzinventar/frontend
|
||||||
|
28
.reuse/dep5
Normal file
28
.reuse/dep5
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
|
Upstream-Name: ki-frontend
|
||||||
|
Upstream-Contact: Scammo <kontakt@samuelbrinkmann.de>
|
||||||
|
Source: https://git.wtf-eg.de/kompetenzinventar/ki-frontend
|
||||||
|
|
||||||
|
Files: package.json package-lock.json
|
||||||
|
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
License: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
Files: .browserslistrc .dockerignore .eslintrc.js .gitignore
|
||||||
|
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
License: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
Files: src/assets/img/wtf*
|
||||||
|
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
License: LicenseRef-WTF
|
||||||
|
|
||||||
|
Files: src/assets/language_level.json src/assets/skill_level.json
|
||||||
|
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
License: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
Files: public/img/bootstrap-icons-1.5.0/*
|
||||||
|
Copyright: Copyright (c) 2019-2020 The Bootstrap Authors
|
||||||
|
License: MIT
|
||||||
|
|
||||||
|
Files: public/fonts/Lato*
|
||||||
|
Copyright: 2010-2015, Łukasz Dziedzic (dziedzic@typoland.com)
|
||||||
|
License: OFL-1.1-RFN
|
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
FROM node:20.18.0-alpine@sha256:c13b26e7e602ef2f1074aef304ce6e9b7dd284c419b35d89fcf3cc8e44a8def9 as builder
|
FROM node:20.12.2-alpine as builder
|
||||||
|
|
||||||
COPY package.json package-lock.json ./
|
COPY package.json package-lock.json ./
|
||||||
RUN npm install
|
RUN npm install
|
||||||
@ -15,7 +15,7 @@ COPY src src
|
|||||||
RUN npm ci && npm run build
|
RUN npm ci && npm run build
|
||||||
|
|
||||||
|
|
||||||
FROM nginx:1.27-alpine@sha256:2140dad235c130ac861018a4e13a6bc8aea3a35f3a40e20c1b060d51a7efd250 as ki-frontend
|
FROM nginx:1.24-alpine as ki-frontend
|
||||||
|
|
||||||
LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-frontend.git
|
LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-frontend.git
|
||||||
LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-frontend
|
LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-frontend
|
||||||
|
40
REUSE.toml
40
REUSE.toml
@ -1,40 +0,0 @@
|
|||||||
version = 1
|
|
||||||
SPDX-PackageName = "ki-frontend"
|
|
||||||
SPDX-PackageSupplier = "Scammo <kontakt@samuelbrinkmann.de>"
|
|
||||||
SPDX-PackageDownloadLocation = "https://git.wtf-eg.de/kompetenzinventar/ki-frontend"
|
|
||||||
|
|
||||||
[[annotations]]
|
|
||||||
path = ["package.json", "package-lock.json", "renovate.json"]
|
|
||||||
precedence = "aggregate"
|
|
||||||
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
|
||||||
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
|
||||||
|
|
||||||
[[annotations]]
|
|
||||||
path = [".browserslistrc", ".dockerignore", ".eslintrc.js", ".gitignore", "REUSE.toml"]
|
|
||||||
precedence = "aggregate"
|
|
||||||
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
|
||||||
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
|
||||||
|
|
||||||
[[annotations]]
|
|
||||||
path = "src/assets/img/wtf**"
|
|
||||||
precedence = "aggregate"
|
|
||||||
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
|
||||||
SPDX-License-Identifier = "LicenseRef-WTF"
|
|
||||||
|
|
||||||
[[annotations]]
|
|
||||||
path = ["src/assets/language_level.json", "src/assets/skill_level.json"]
|
|
||||||
precedence = "aggregate"
|
|
||||||
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
|
||||||
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
|
||||||
|
|
||||||
[[annotations]]
|
|
||||||
path = "public/img/bootstrap-icons-1.5.0/**"
|
|
||||||
precedence = "aggregate"
|
|
||||||
SPDX-FileCopyrightText = "Copyright (c) 2019-2020 The Bootstrap Authors"
|
|
||||||
SPDX-License-Identifier = "MIT"
|
|
||||||
|
|
||||||
[[annotations]]
|
|
||||||
path = "public/fonts/Lato**"
|
|
||||||
precedence = "aggregate"
|
|
||||||
SPDX-FileCopyrightText = "2010-2015, Łukasz Dziedzic (dziedzic@typoland.com)"
|
|
||||||
SPDX-License-Identifier = "OFL-1.1-RFN"
|
|
3160
package-lock.json
generated
3160
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
37
package.json
37
package.json
@ -7,25 +7,22 @@
|
|||||||
"lint": "vue-cli-service lint"
|
"lint": "vue-cli-service lint"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/eslint-parser": "7.25.9",
|
"@babel/eslint-parser": "7.23.10",
|
||||||
"@vue/cli-plugin-babel": "5.0.8",
|
"@vue/cli-plugin-babel": "~5.0.8",
|
||||||
"@vue/cli-plugin-eslint": "5.0.8",
|
"@vue/cli-plugin-eslint": "~5.0.8",
|
||||||
"@vue/cli-plugin-router": "5.0.8",
|
"@vue/cli-plugin-router": "~5.0.8",
|
||||||
"@vue/cli-service": "5.0.8",
|
"@vue/cli-service": "~5.0.8",
|
||||||
"@vue/compiler-sfc": "3.5.6",
|
"@vue/compiler-sfc": "^3.4.19",
|
||||||
"bootstrap": "5.3.3",
|
"bootstrap": "^5.3.3",
|
||||||
"bootstrap-icons": "1.11.3",
|
"bootstrap-icons": "^1.11.3",
|
||||||
"core-js": "3.39.0",
|
"core-js": "^3.38.1",
|
||||||
"eslint": "8.57.1",
|
"eslint": "^7.32.0",
|
||||||
"eslint-plugin-vue": "9.30.0",
|
"eslint-plugin-vue": "^9.27.0",
|
||||||
"sass": "1.80.4",
|
"sass": "^1.77.8",
|
||||||
"sass-loader": "16.0.3",
|
"sass-loader": "^14.2.1",
|
||||||
"v-tooltip": "4.0.0-beta.17",
|
"v-tooltip": "^4.0.0-beta.17",
|
||||||
"vue": "3.5.6",
|
"vue": "^3.4.0",
|
||||||
"vue-router": "4.4.5",
|
"vue-router": "^4.4.3",
|
||||||
"vuex": "4.1.0"
|
"vuex": "^4.1.0"
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"sass-embedded": "1.80.4"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:best-practices",
|
|
||||||
"group:linters",
|
|
||||||
"group:test",
|
|
||||||
"npm:unpublishSafe",
|
|
||||||
":disableDependencyDashboard",
|
|
||||||
":maintainLockFilesWeekly",
|
|
||||||
":pinAllExceptPeerDependencies",
|
|
||||||
":separateMultipleMajorReleases"
|
|
||||||
],
|
|
||||||
"packageRules": [
|
|
||||||
{
|
|
||||||
"matchPackageNames": [
|
|
||||||
"node"
|
|
||||||
],
|
|
||||||
"allowedVersions": "/^[1-9][02468]\\./"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user