Skip to content

Commit

Permalink
Merge branch 'main' into actions-storybook
Browse files Browse the repository at this point in the history
  • Loading branch information
tiberiuichim authored Oct 3, 2023
2 parents 7ac9e7b + 6280cd3 commit eb95944
Show file tree
Hide file tree
Showing 396 changed files with 14,398 additions and 6,151 deletions.
29 changes: 26 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"mocha": true,
"jasmine": true
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
Expand Down Expand Up @@ -38,14 +38,37 @@
["@package", "./src"],
["@root", "./src"]
],
"extensions": [".js", ".jsx", ".json"]
"extensions": [".js", ".jsx", ".ts", ".tsx", ".json"]
},
"babel-plugin-root-import": {
"rootPathSuffix": "src"
}
},
"import/core-modules": ["load-volto-addons"]
"import/core-modules": ["load-volto-addons"],
"react": {
"version": "detect"
}
},
"overrides": [
{
"files": ["**/*.ts", "**/*.tsx"],
// "react-app" already loads plugin:@typescript-eslint/eslint-plugin
// and it complains on having two different versions around.
// Re-add it if at some point, we stop relying on it
"extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
"plugins": ["prettier", "react-hooks", "jsx-a11y"],
"parser": "@typescript-eslint/parser"
},
{
"files": [
"**/*.stories.js",
"**/*.stories.jsx"
],
"rules": {
"import/no-anonymous-default-export": "off"
}
}
],
"globals": {
"root": true,
"__DEVELOPMENT__": true,
Expand Down
Loading

0 comments on commit eb95944

Please sign in to comment.