Skip to content

Commit

Permalink
Merge pull request #553 from YunoHost/pre-vue3-prettier-yarn
Browse files Browse the repository at this point in the history
[2. pre-vue3] prettier + yarn to match yunohost-portal stack
  • Loading branch information
Psycojoker authored Mar 5, 2024
2 parents 6a7e797 + b01b06c commit d0cca4d
Show file tree
Hide file tree
Showing 116 changed files with 5,774 additions and 5,465 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install npm dependencies
run: cd app && npm ci
- name: Install yarn dependencies
run: cd app && yarn install --frozen-lockfile
- name: Run linter
run: cd app && npm run lint
run: cd app && yarn lint
28 changes: 4 additions & 24 deletions app/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,17 @@ module.exports = {
root: true,
env: {
es2021: true,
node: true
node: true,
},
extends: [
'plugin:vue/strongly-recommended',
'eslint:recommended',
'standard'
'plugin:prettier/recommended',
],
rules: {
'vue/max-attributes-per-line': [
'error',
{
singleline: 3,
multiline: 3
}
],
'vue/multi-word-component-names': 'off', // FIXME this should be adressed at some point
'no-console': 'warn',
'template-curly-spacing': 'off',
camelcase: 'warn',
indent: 'off',
'no-irregular-whitespace': 'off',
'no-unused-vars': [
'warn',
{ varsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' }
{ varsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' },
],
quotes: 'warn',
'no-multiple-empty-lines': [
'error',
{
max: 2
}
]
}
},
}
1 change: 1 addition & 0 deletions app/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist/
19 changes: 19 additions & 0 deletions app/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"semi": false,
"tabWidth": 2,
"singleQuote": true,
"overrides": [
{
"files": "**/*.json",
"options": {
"tabWidth": 4
}
},
{
"files": "./*.json",
"options": {
"tabWidth": 2
}
}
]
}
45 changes: 24 additions & 21 deletions app/index.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes"
/>
<meta name="format-detection" content="telephone=no" />
<meta name="robots" content="noindex, nofollow" />
<link rel="icon" href="/favicon.png" />
<title>YunoHost Admin</title>
</head>

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes">
<meta name="format-detection" content="telephone=no" />
<meta name="robots" content="noindex, nofollow">
<link rel="icon" href="/favicon.png">
<title>YunoHost Admin</title>
</head>

<body>
<noscript>
<strong>We're sorry but YunoHost Admin doesn't work properly without JavaScript enabled. Please enable it to
continue.</strong>
</noscript>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>

</html>
<body>
<noscript>
<strong>
We're sorry but YunoHost Admin doesn't work properly without JavaScript
enabled. Please enable it to continue.
</strong>
</noscript>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>
</html>
Loading

0 comments on commit d0cca4d

Please sign in to comment.