Skip to content

Commit

Permalink
Merge pull request #264 from systemli/indent-size
Browse files Browse the repository at this point in the history
🎨 Change indent to 2
  • Loading branch information
0x46616c6b authored Mar 28, 2022
2 parents 4b97dea + 6894f57 commit 095abe5
Show file tree
Hide file tree
Showing 33 changed files with 1,159 additions and 1,180 deletions.
3 changes: 0 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4

[*.yaml]
indent_size = 2

[*.md]
Expand Down
73 changes: 40 additions & 33 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
{
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
}
},
"plugins": [
"react",
"react-hooks",
"@typescript-eslint"
],
"rules": {
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "warn",
"no-console": "warn",
"react/jsx-boolean-value": [
"warn",
"never"
],
"react/jsx-no-bind": "warn",
"react/jsx-sort-props": [
"warn",
{
"reservedFirst": true
}
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
}
},
"plugins": ["react", "react-hooks", "@typescript-eslint"],
"rules": {
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": "warn",
"no-console": "warn",
"react/jsx-boolean-value": ["warn", "never"],
"react/jsx-no-bind": "warn",
"react/jsx-sort-props": [
"warn",
{
"reservedFirst": true
}
],
"react/prop-types": "off",
"react/react-in-jsx-scope": "off"
},
"settings": {
"react": {
"version": "detect"
}
"react/prop-types": "off",
"react/react-in-jsx-scope": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
}
60 changes: 30 additions & 30 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
name-template: '$RESOLVED_VERSION'
tag-template: '$RESOLVED_VERSION'
categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: '🧹 Maintenance'
labels:
- 'chore'
- 'dependencies'
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: '🧹 Maintenance'
labels:
- 'chore'
- 'dependencies'
version-resolver:
major:
labels:
- 'feature'
minor:
labels:
- 'enhancement'
patch:
labels:
- 'fix'
- 'bugfix'
- 'bug'
- 'chore'
- 'dependencies'
default: patch
major:
labels:
- 'feature'
minor:
labels:
- 'enhancement'
patch:
labels:
- 'fix'
- 'bugfix'
- 'bug'
- 'chore'
- 'dependencies'
default: patch
template: |
## Changes
## Changes
$CHANGES
$CHANGES
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION
2 changes: 1 addition & 1 deletion .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
build:
name: Build
runs-on: ubuntu-20.04
needs: [test]
needs: [ test ]
strategy:
matrix:
node-version: [ '14', '16' ]
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"arrowParens": "avoid",
"semi": false,
"singleQuote": true,
"tabWidth": 4
"tabWidth": 2
}
32 changes: 16 additions & 16 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import type { Config } from '@jest/types'

const config: Config.InitialOptions = {
verbose: false,
testEnvironment: 'jsdom',
preset: 'ts-jest',
moduleNameMapper: {
'react-markdown': '<rootDir>/src/__mocks_/react-markdown.js',
'^.+.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
'jest-transform-stub',
},
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
'^.+\\.(js|jsx)$': 'babel-jest',
'.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
'jest-transform-stub',
},
transformIgnorePatterns: ['<rootDir>/node_modules/(?!react-markdown/)'],
setupFilesAfterEnv: ['./jest-setup.ts'],
verbose: false,
testEnvironment: 'jsdom',
preset: 'ts-jest',
moduleNameMapper: {
'react-markdown': '<rootDir>/src/__mocks_/react-markdown.js',
'^.+.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
'jest-transform-stub',
},
transform: {
'^.+\\.(ts|tsx)$': 'ts-jest',
'^.+\\.(js|jsx)$': 'babel-jest',
'.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$':
'jest-transform-stub',
},
transformIgnorePatterns: ['<rootDir>/node_modules/(?!react-markdown/)'],
setupFilesAfterEnv: ['./jest-setup.ts'],
}
export default config
Loading

0 comments on commit 095abe5

Please sign in to comment.