Skip to content

Commit

Permalink
Merge pull request #656 from Sonia-corporation/dependencies/major/cha…
Browse files Browse the repository at this point in the history
…lk-5.x
  • Loading branch information
C0ZEN authored Aug 3, 2022
2 parents 47d08ba + 8d4553b commit 175b4be
Show file tree
Hide file tree
Showing 19 changed files with 3,328 additions and 306 deletions.
2 changes: 2 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ plugins:
- '.eslintcache'
- '!src/**/*.ts'
- '!src/**/*.js'
- '!src/**/*.mjs'
- '!tests/**/*.ts'
- '!scripts/**/*.ts'
- '!scripts/**/*.js'
- '!scripts/**/*.mjs'
exclude_patterns:
- '.cache/'
- '.cache-jest/'
Expand Down
11 changes: 3 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "typescript-sort-keys", "jest", "prettier", "progress", "jsdoc", "import", "typescript-sort-keys"],
"settings": {
"import/extensions": [".js", ".ts", ".tsx"],
"import/extensions": [".js", ".ts", ".tsx", ".mjs"],
"import/parsers": {
"@typescript-eslint/parser": [".ts"]
},
Expand All @@ -47,12 +47,7 @@
},
"rules": {
"@typescript-eslint/no-inferrable-types": "off",
"no-restricted-imports": [
"error",
{
"patterns": [".*"]
}
],
"no-restricted-imports": ["error"],
"progress/activate": 1,
"@typescript-eslint/member-ordering": [
"error",
Expand Down Expand Up @@ -459,7 +454,7 @@
},
"overrides": [
{
"files": ["*.js"],
"files": ["*.js", "*.mjs"],
"rules": {
"@typescript-eslint/explicit-module-boundary-types": "off",
"import/no-commonjs": "off"
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
*.htm text diff=html
*.html text diff=html
*.js text
*.mjs text
*.jsp text
*.jspf text
*.jspx text
Expand Down Expand Up @@ -146,6 +147,7 @@
*.inc text
*.ini text
*.js text
*.mjs text
*.json text
*.jsx text
*.less text
Expand Down
2 changes: 2 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
'test :test_tube:':
- src/**/*.spec.ts
- src/**/*.spec.js
- src/**/*.spec.mjs
- tests/**
- documentation/**/*.spec.ts
- documentation/**/*.spec.tsx
- documentation/**/*.spec.js
- documentation/**/*.spec.mjs

'CI :robot:':
- .github/workflows/**
Expand Down
2 changes: 1 addition & 1 deletion .idea/jsLinters/eslint.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .lintstagedrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"*.{ts,js}": [
"*.{ts,js,mjs}": [
"npm run lint:ts:hook"
],
"*.{md,json,yml,html,mdx}": [
Expand Down
Loading

0 comments on commit 175b4be

Please sign in to comment.