Skip to content

Commit

Permalink
Add handling for ESM typescript (#1162)
Browse files Browse the repository at this point in the history
  • Loading branch information
phawxby authored Jan 13, 2023
1 parent 3459ed2 commit db1f2c2
Show file tree
Hide file tree
Showing 5 changed files with 353 additions and 341 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
node-version: [14.x, 16.x]
node-version: [14.x, 16.x, 18.x]

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@
"minimist": ">=1.2.6",
"npm": " >=8.11.0",
"glob/minimatch": "3.1.2",
"@npmcli/map-workspaces/glob/minimatch": ">=3.0.5"
"@npmcli/map-workspaces/glob/minimatch": ">=3.0.5",
"json5": ">=2.2.2",
"trim-off-newlines": ">=1.0.3"
},
"auto": {
"baseBranch": "release",
Expand Down
2 changes: 1 addition & 1 deletion packages/xerox-eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"eslint-import-resolver-typescript": "^3.0.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jest": "^27.0.0",
"eslint-plugin-jsdoc": "^39.0.0",
"eslint-plugin-jsdoc": "39.6.4",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-testing-library": "^5.0.0",
Expand Down
7 changes: 5 additions & 2 deletions packages/xerox-eslint-config/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,17 @@ module.exports = {
},
overrides: [
{
files: ['*.js'],
files: ['*.{js,cjs}'],
rules: {
'jsdoc/require-jsdoc': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
},
},
{
files: ['*.test.{tsx,ts}', '**/__mocks__/**/*.{tsx,ts}'],
files: [
'*.test.{tsx,ts,mts,mtsx}',
'**/__mocks__/**/*.{tsx,ts,mts,mtsx}',
],
rules: {
'jsdoc/require-jsdoc': 'off',
'@typescript-eslint/no-explicit-any': 'off',
Expand Down
Loading

0 comments on commit db1f2c2

Please sign in to comment.