Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
mlantz committed Aug 27, 2024
2 parents 243cdc8 + dac006d commit 9f86031
Show file tree
Hide file tree
Showing 45 changed files with 547 additions and 3,133 deletions.
20 changes: 20 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
extends: [
"eslint:recommended",
"plugin:vue/vue3-recommended",
"plugin:vue/vue3-essential",
"plugin:vue/vue3-strongly-recommended",
],
rules: {
"no-undef": 0,
"vue/multi-word-component-names": 0,
"vue/no-v-html": 0,
"vue/require-default-prop": 0,
"vue/no-setup-props-destructure": 0,
indent: ["error", 4],
quotes: ["error", "double"],
"object-curly-spacing": ["error", "always"],
semi: ["error", "always"],
"comma-spacing": ["error", { before: false, after: true }],
},
};
146 changes: 0 additions & 146 deletions .eslintrc.js

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['8.2']
php-versions: ['8.3']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'

- name: Install Dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-suggest --no-progress --prefer-dist
Expand All @@ -29,8 +29,8 @@ jobs:
js:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['8.2']
php-versions: ['8.3']

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
coverage: 'xdebug'

- name: Copy .env
Expand Down
Loading

0 comments on commit 9f86031

Please sign in to comment.