Skip to content
Snippets Groups Projects
Unverified Commit 755a9986 authored by Griefed's avatar Griefed :joystick: Committed by GitHub
Browse files

Merge pull request #98 from Griefed/develop 

Develop
parents a964ae4c 278ccbd9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.github/workflows/github_release.yml
+ 3
− 3
View file @ 755a9986
...@@ -49,7 +49,7 @@ jobs: ...@@ -49,7 +49,7 @@ jobs:
prerelease: false prerelease: false
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
...@@ -104,7 +104,7 @@ jobs: ...@@ -104,7 +104,7 @@ jobs:
# DEPLOY TO GH-PAGES # DEPLOY TO GH-PAGES
- name: Deploy to GitHub-Pages - name: Deploy to GitHub-Pages
uses: JamesIves/github-pages-deploy-action@4.1.6 uses: JamesIves/github-pages-deploy-action@4.1.7
with: with:
branch: gh-pages branch: gh-pages
folder: dist/spa folder: dist/spa
...@@ -155,7 +155,7 @@ jobs: ...@@ -155,7 +155,7 @@ jobs:
# SETUP NODE ENVIRONMENT # SETUP NODE ENVIRONMENT
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
......
.github/workflows/major.yml
+ 1
− 1
View file @ 755a9986
...@@ -41,7 +41,7 @@ jobs: ...@@ -41,7 +41,7 @@ jobs:
prerelease: false prerelease: false
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
......
.github/workflows/minor.yml
+ 1
− 1
View file @ 755a9986
...@@ -41,7 +41,7 @@ jobs: ...@@ -41,7 +41,7 @@ jobs:
prerelease: false prerelease: false
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
......
.github/workflows/patch.yml
+ 1
− 1
View file @ 755a9986
...@@ -41,7 +41,7 @@ jobs: ...@@ -41,7 +41,7 @@ jobs:
prerelease: false prerelease: false
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
......
.github/workflows/test.yml
+ 2
− 2
View file @ 755a9986
...@@ -17,7 +17,7 @@ jobs: ...@@ -17,7 +17,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
...@@ -65,7 +65,7 @@ jobs: ...@@ -65,7 +65,7 @@ jobs:
# SETUP NODE ENVIRONMENT # SETUP NODE ENVIRONMENT
- name: Setup Node.js environment - name: Setup Node.js environment
uses: actions/setup-node@v2.4.1 uses: actions/setup-node@v2.5.0
with: with:
# Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0 # Version Spec of the version to use. Examples: 12.x, 10.15.1, >=10.15.0
node-version: '>= 16.9.1' node-version: '>= 16.9.1'
......
Dockerfile
+ 1
− 1
View file @ 755a9986
...@@ -13,7 +13,7 @@ RUN \ ...@@ -13,7 +13,7 @@ RUN \
npm install && \ npm install && \
quasar build quasar build
FROM lsiobase/nginx:3.14 FROM lsiobase/nginx:3.15-php8-version-ef5b8f3b
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
......
Dockerfile.develop
+ 1
− 1
View file @ 755a9986
...@@ -14,7 +14,7 @@ RUN \ ...@@ -14,7 +14,7 @@ RUN \
npm install && \ npm install && \
quasar build quasar build
FROM lsiobase/nginx:3.14 FROM lsiobase/nginx:3.15-php8-version-ef5b8f3b
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
......
package-lock.json
+ 851
− 769
View file @ 755a9986
This diff is collapsed.
package.json
+ 7
− 7
View file @ 755a9986
...@@ -22,20 +22,20 @@ ...@@ -22,20 +22,20 @@
"test": "echo \"No test specified\" && exit 0" "test": "echo \"No test specified\" && exit 0"
}, },
"dependencies": { "dependencies": {
"@quasar/extras": "^1.12.1", "@quasar/extras": "^1.12.2",
"core-js": "^3.19.1", "core-js": "^3.19.3",
"mersenne-twister": "^1.1.0", "mersenne-twister": "^1.1.0",
"noise-map": "^1.1.0", "noise-map": "^1.1.0",
"quasar": "^2.3.3" "quasar": "^2.3.4"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "^7.16.3", "@babel/eslint-parser": "^7.16.3",
"@quasar/app": "^3.2.3", "@quasar/app": "^3.2.5",
"electron": "^16.0.1", "electron": "^16.0.4",
"electron-packager": "^15.4.0", "electron-packager": "^15.4.0",
"eslint": "8.3.0", "eslint": "8.4.1",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-vue": "^8.1.1", "eslint-plugin-vue": "^8.2.0",
"eslint-webpack-plugin": "^3.1.1" "eslint-webpack-plugin": "^3.1.1"
}, },
"browserslist": [ "browserslist": [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies