Skip to content

Commit 9f86031

Browse files
committed
Merge branch 'develop'
2 parents 243cdc8 + dac006d commit 9f86031

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+547
-3133
lines changed

Diff for: .eslintrc.cjs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
module.exports = {
2+
extends: [
3+
"eslint:recommended",
4+
"plugin:vue/vue3-recommended",
5+
"plugin:vue/vue3-essential",
6+
"plugin:vue/vue3-strongly-recommended",
7+
],
8+
rules: {
9+
"no-undef": 0,
10+
"vue/multi-word-component-names": 0,
11+
"vue/no-v-html": 0,
12+
"vue/require-default-prop": 0,
13+
"vue/no-setup-props-destructure": 0,
14+
indent: ["error", 4],
15+
quotes: ["error", "double"],
16+
"object-curly-spacing": ["error", "always"],
17+
semi: ["error", "always"],
18+
"comma-spacing": ["error", { before: false, after: true }],
19+
},
20+
};

Diff for: .eslintrc.js

-146
This file was deleted.

Diff for: .github/workflows/style.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
php-versions: ['8.2']
14+
php-versions: ['8.3']
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717

1818
- name: Setup PHP
1919
uses: shivammathur/setup-php@v2
2020
with:
21-
php-version: '8.2'
21+
php-version: '8.3'
2222

2323
- name: Install Dependencies
2424
run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
@@ -29,8 +29,8 @@ jobs:
2929
js:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v3
33-
- uses: actions/setup-node@v3
32+
- uses: actions/checkout@v4
33+
- uses: actions/setup-node@v4
3434
with:
3535
node-version: 20
3636

Diff for: .github/workflows/tests.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
php-versions: ['8.2']
15+
php-versions: ['8.3']
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: actions/setup-node@v3
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-node@v4
2020
with:
2121
node-version: 20
2222

2323
- name: Setup PHP
2424
uses: shivammathur/setup-php@v2
2525
with:
26-
php-version: '8.2'
26+
php-version: '8.3'
2727
coverage: 'xdebug'
2828

2929
- name: Copy .env

0 commit comments

Comments
 (0)