Skip to content

Commit

Permalink
Merge branch 'main' into enable-todoslist-task-editing
Browse files Browse the repository at this point in the history
  • Loading branch information
NicoPennec authored Nov 28, 2024
2 parents 41502ad + 6a0464d commit ce5e6f6
Show file tree
Hide file tree
Showing 306 changed files with 7,688 additions and 7,285 deletions.
12 changes: 8 additions & 4 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ module.exports = {
},
extends: [
'eslint:recommended',
'plugin:vue/recommended',
'plugin:vue/vue3-recommended',
'plugin:prettier/recommended'
],
rules: {
'no-console': 'off',
'no-console':
process.env.NODE_ENV === 'production'
? ['error', { allow: ['error', 'warn'] }]
: 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-empty-pattern': ['error', { allowObjectPatternsAsParameters: true }],
'no-unused-vars': ['error', { args: 'none' }],
Expand All @@ -26,14 +29,15 @@ module.exports = {
// additional rules for Vue
'vue/component-definition-name-casing': ['error', 'kebab-case'],
'vue/component-name-in-template-casing': ['error', 'kebab-case'],
'vue/custom-event-name-casing': ['error', 'kebab-case'],
'vue/eqeqeq': ['error', 'always', { null: 'ignore' }],
'vue/no-unused-emit-declarations': 'error',
'vue/prop-name-casing': ['error', 'camelCase'],
'vue/require-explicit-emits': 'error',

// disabled vue/recommended rules
'vue/attributes-order': 'off',
'vue/multi-word-component-names': 'off',
'vue/no-lone-template': 'off',
'vue/no-use-v-if-with-v-for': 'off',
'vue/no-v-html': 'off',
'vue/order-in-components': 'off',
'vue/require-default-prop': 'off',
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
---
name: 'Kitsu CI'

on:
pull_request:
branches:
- master
push:
branches:
- master
on: [push, pull_request]

jobs:
ci:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: 'Kitsu release'
on:
push:
branches:
- master
- main
tags:
- '*'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy Kitsu to staging environment
on:
push:
branches:
- master
- main

jobs:
build:
Expand All @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Update Kitsu on staging server
uses: appleboy/ssh-action@v1.0.3
uses: appleboy/ssh-action@v1.1.0
env:
HUSKY: 0
NODE_OPTIONS: '--max_old_space_size=8192'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For further information about features and installation, please refer to the
## Contributing

There are many ways to contribute to Kitsu, from simple tasks to most complex ones. We created a
[contributing guide](https://github.com/cgwire/kitsu/blob/master/CONTRIBUTING.md) explaining everything.
[contributing guide](https://github.com/cgwire/kitsu/blob/main/CONTRIBUTING.md) explaining everything.
You will find all the information you are looking for!

## Sponsors
Expand Down
8 changes: 4 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
We release Kitsu versions through GitHub.
Every time a new version is ready, we follow this process:

1. Rebase sources on the `master` branch.
1. Rebase sources on the `main` branch.
2. Up the version number through the `npm` CLI.
3. Tag the commit with the Kitsu version.
4. Push changes to the `master` branch.
4. Push changes to the `main` branch.

You can run the following script to perform these commands at once:

```bash
git pull --rebase origin master
git pull --rebase origin main
npm version patch
git push origin master --tag
git push origin main --tag
```

# Deployment
Expand Down
16 changes: 16 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"compilerOptions": {
"baseUrl": ".",
"checkJs": false,
"moduleResolution": "bundler",
"paths": {
"@/*": ["src/*"]
},
"resolveJsonModule": true,
"target": "ES2021"
},
"vueCompilerOptions": {
"target": "auto"
},
"include": ["src/**/*", "tests/**/*"]
}
Loading

0 comments on commit ce5e6f6

Please sign in to comment.