Skip to content

Commit 467b428

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/multi-8aa068d8a0
2 parents 7f92546 + 7ffe407 commit 467b428

File tree

159 files changed

+8550
-7448
lines changed

Some content is hidden

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

159 files changed

+8550
-7448
lines changed

.github/labeler.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,13 @@ build:
7777
- any: ['*.js', '*.yml', '*.json', '*.ts', '*.xml', '*.travis']
7878

7979
linting:
80-
- any:
81-
[
82-
'.browserslistrc',
83-
'.eslintrc.js',
84-
'.editorconfig',
85-
'.prettierignore',
86-
'prettierrc.json',
87-
]
80+
- any: ['.browserslistrc', '.eslintrc.js', '.editorconfig', '.prettierignore', 'prettierrc.json']
8881

8982
documentation:
9083
- any: ['*.md', 'LICENSE', '.example']
9184

9285
tailwindcss:
93-
- any:
94-
[
95-
'tailwindcss-perspective.js',
96-
'tailwind.config.js',
97-
'resources/css/**/*.css',
98-
]
86+
- any: ['tailwindcss-perspective.js', 'tailwind.config.js', 'resources/css/**/*.css']
9987

10088
vite:
10189
- any: ['vite.config.ts', 'tsconfig.vite-config.json', 'tsconfig.json']

.github/workflows/codacy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ name: Codacy Security Scan
1515

1616
on:
1717
push:
18-
branches: [ "master", "main" ]
18+
branches: ['master', 'main']
1919
pull_request:
2020
# The branches below must be a subset of the branches above
21-
branches: [ "master" ]
21+
branches: ['master']
2222
schedule:
2323
- cron: '31 16 * * 6'
2424

.github/workflows/laravel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
steps:
1414
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
1515
with:
16-
php-version: '8.0'
16+
php-version: '8.2'
1717
- uses: actions/checkout@v3
1818
- name: Copy .env
1919
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
2020
- name: Install Dependencies
21-
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
21+
run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
2222
- name: Generate key
2323
run: php artisan key:generate
2424
- name: Directory Permissions

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [16.x, 18.x]
18+
node-version: [20.x]
1919
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2020

2121
steps:

.prettierrc.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"trailingComma": "all",
3+
"tabWidth": 2,
4+
"semi": true,
5+
"singleQuote": true,
6+
"printWidth": 120,
7+
"bracketSpacing": true
8+
}

eslint.config.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import { defineConfig } from 'eslint/config';
2+
import pluginVue from 'eslint-plugin-vue';
3+
4+
export default defineConfig([
5+
...pluginVue.configs['flat/recommended'],
6+
{
7+
files: ['resources/js/**/*.js'],
8+
languageOptions: {
9+
ecmaVersion: 2021,
10+
sourceType: 'module',
11+
},
12+
rules: {
13+
semi: ['error', 'always'],
14+
'prefer-const': 'warn',
15+
'no-unused-vars': 'warn',
16+
'vue/multi-word-component-names': 'warn',
17+
'vue/require-v-for-key': 'warn',
18+
'vue/one-component-per-file': 'warn',
19+
'vue/no-reserved-component-names': 'warn',
20+
'vue/no-unused-vars': 0,
21+
'vue/html-self-closing': 0,
22+
'@typescript-eslint/no-empty-function': 0,
23+
'no-useless-catch': 0,
24+
'@typescript-eslint/no-unused-vars': 0,
25+
'vue/no-unused-components': 0,
26+
'vue/require-explicit-emits': 0,
27+
'no-undef': 0,
28+
},
29+
},
30+
]);

0 commit comments

Comments
 (0)