Skip to content

Commit

Permalink
Merge pull request #28 from cyberixae/eslint_config_0_0_13
Browse files Browse the repository at this point in the history
Eslint config 0 0 13
  • Loading branch information
cyberixae authored Apr 20, 2022
2 parents 627a7de + 4d12881 commit 23e7748
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 66 deletions.
4 changes: 1 addition & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{
"extends": [
"eslint-config-maasglobal-ts"
]
"extends": ["eslint-config-maasglobal-ts/strict"]
}
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export async function fetchUser(userId: UserId): Promise<User|null> {
'content-type': CONTENT_TYPE_JSON
})
const request = await validator(endpoint.Request, 'strict').decodePromise({
userId
userId
})
const tunnel = rpc.tunnel(POST, urlVariables, requestHeaders, endpoint, fetch)
Expand All @@ -253,7 +253,7 @@ export async function fetchUser(userId: UserId): Promise<User|null> {
throw new Error('application error: ' + result.right.error)
}
if (Null.is(result.right.data.user)) {
return null
return null
}
return result.right.data.user
Expand Down Expand Up @@ -323,4 +323,3 @@ node --eval "require('./lib/examples/fetch-user-client').fetchUser('user:1c53291
# Stop Test Server
kill -9 %-
```

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,11 @@
"@typescript-eslint/parser": "^4.3.0",
"@typescript-eslint/typescript-estree": "^4.3.0",
"eslint": "^6.8.0",
"eslint-config-maasglobal-ts": "^0.0.10",
"eslint-config-maasglobal-ts": "^0.0.13",
"eslint-config-prettier": "^6.12.0",
"eslint-plugin-deprecation": "^1.2.0",
"eslint-plugin-fp": "^2.3.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-json": "^2.1.0",
"eslint-plugin-prettier": "^3.1.2",
"eslint-plugin-simple-import-sort": "^5.0.3",
"fp-ts": "^2.11.1",
Expand All @@ -56,7 +55,9 @@
"typecheck": "tsc -p src/tsconfig.json",
"build": "yarn clean && tsc",
"eslint": "eslint --max-warnings=0 '**/*.{ts,js,json}'",
"prettify": "yarn eslint --fix || true",
"eslint-fix": "yarn eslint --fix||true",
"prettier": "prettier --write --ignore-path .gitignore --config node_modules/eslint-config-maasglobal-ts/prettierrc.js '**/*.{css,html,js,ts,json,md,yaml,yml}'",
"prettify": "yarn eslint-fix && yarn prettier",
"lint": "yarn eslint",
"ci": "yarn lint && yarn typecheck && yarn test && yarn build",
"deploy-npm": "yarn ci && yarn publish --non-interactive",
Expand Down
11 changes: 2 additions & 9 deletions tsconfig.eslint.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
{
"extends": "./tsconfig.json",
"include": [
"*.json",
"*.js",
"src/**/*.ts",
"./**/tsconfig.json"
],
"exclude": [
"node_modules"
]
"include": ["*.json", "*.js", "src/**/*.ts", "./**/tsconfig.json"],
"exclude": ["node_modules"]
}
52 changes: 4 additions & 48 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1558,10 +1558,10 @@ eslint-ast-utils@^1.0.0:
lodash.get "^4.4.2"
lodash.zip "^4.2.0"

eslint-config-maasglobal-ts@^0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/eslint-config-maasglobal-ts/-/eslint-config-maasglobal-ts-0.0.10.tgz#a8e00d33d8084ffc7781d64f8c3d80c109ce170e"
integrity sha512-UheJNArRFpa0w/DxwAOE6cIc6Uc4/M1wFkG7Y0HMglfZ813jk3KbigrixCjevj1Wa2koMqSWUWuxIK1o9UvVmA==
eslint-config-maasglobal-ts@^0.0.13:
version "0.0.13"
resolved "https://registry.yarnpkg.com/eslint-config-maasglobal-ts/-/eslint-config-maasglobal-ts-0.0.13.tgz#1c2f1658ba74a4d803629e3466cc625a6051b59f"
integrity sha512-sOquEedcBMOUmEBU7qrT0Puc46GspbuChcGivKIzMQcR10caRq7p1PVDfPUlXMSqPUgIt/4y0y1tZHrVFlZJzQ==

eslint-config-prettier@^6.12.0:
version "6.15.0"
Expand Down Expand Up @@ -1626,14 +1626,6 @@ eslint-plugin-import@^2.22.1:
resolve "^1.20.0"
tsconfig-paths "^3.11.0"

eslint-plugin-json@^2.1.0:
version "2.1.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.1.2.tgz#5bc1c221984583c0c5ff21c488386e8263a6bbb7"
integrity sha512-isM/fsUxS4wN1+nLsWoV5T4gLgBQnsql3nMTr8u+cEls1bL8rRQO5CP5GtxJxaOfbcKqnz401styw+H/P+e78Q==
dependencies:
lodash "^4.17.19"
vscode-json-languageservice "^3.7.0"

eslint-plugin-prettier@^3.1.2:
version "3.4.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
Expand Down Expand Up @@ -3079,11 +3071,6 @@ json5@^1.0.1:
dependencies:
minimist "^1.2.0"

jsonc-parser@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==

kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
version "3.2.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
Expand Down Expand Up @@ -4548,37 +4535,6 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"

vscode-json-languageservice@^3.7.0:
version "3.11.0"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz#ad574b36c4346bd7830f1d34b5a5213d3af8d232"
integrity sha512-QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==
dependencies:
jsonc-parser "^3.0.0"
vscode-languageserver-textdocument "^1.0.1"
vscode-languageserver-types "3.16.0-next.2"
vscode-nls "^5.0.0"
vscode-uri "^2.1.2"

vscode-languageserver-textdocument@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz#178168e87efad6171b372add1dea34f53e5d330f"
integrity sha512-UIcJDjX7IFkck7cSkNNyzIz5FyvpQfY7sdzVy+wkKN/BLaD4DQ0ppXQrKePomCxTS7RrolK1I0pey0bG9eh8dA==

[email protected]:
version "3.16.0-next.2"
resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz#940bd15c992295a65eae8ab6b8568a1e8daa3083"
integrity sha512-QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==

vscode-nls@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz#99f0da0bd9ea7cda44e565a74c54b1f2bc257840"
integrity sha512-u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA==

vscode-uri@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c"
integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A==

w3c-hr-time@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
Expand Down

0 comments on commit 23e7748

Please sign in to comment.