Skip to content

Commit 1caae73

Browse files
AndaristAndarist
committed
Merge remote-tracking branch 'origin/main' into fix/quick-info-index-signature-on-interface-with-base
2 parents aa36cbc + 3b49ce9 commit 1caae73

File tree

1,109 files changed

+41870
-40628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,109 files changed

+41870
-40628
lines changed

‎.devcontainer/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/javascript-node/.devcontainer/base.Dockerfile
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.245.2/containers/javascript-node/.devcontainer/base.Dockerfile
22

3-
# [Choice] Node.js version: 14, 12, 10
4-
ARG VARIANT="14-buster"
3+
# [Choice] Node.js version: 18, 16, 14
4+
ARG VARIANT="18-buster"
55
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
66

77
RUN sudo -u node npm install -g hereby

‎.devcontainer/devcontainer.json

+16-12
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,24 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
"VARIANT": "14"
6+
"VARIANT": "18"
77
}
88
},
9-
"settings": {
10-
"terminal.integrated.defaultProfile.linux": "bash",
11-
"terminal.integrated.profiles.linux": {
12-
"bash": {
13-
"path": "/bin/bash",
14-
"icon": "terminal-bash",
9+
"customizations": {
10+
"vscode": {
11+
"settings": {
12+
"terminal.integrated.defaultProfile.linux": "bash",
13+
"terminal.integrated.profiles.linux": {
14+
"bash": {
15+
"path": "/bin/bash",
16+
"icon": "terminal-bash"
17+
}
18+
}
1519
},
16-
},
20+
"extensions": [
21+
"dbaeumer.vscode-eslint"
22+
]
23+
}
1724
},
18-
"extensions": [
19-
"dbaeumer.vscode-eslint"
20-
],
2125
"remoteUser": "node"
22-
}
26+
}

‎.dprint.jsonc

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
{
2+
"indentWidth": 4,
3+
"lineWidth": 1000,
4+
"newLineKind": "auto",
5+
"useTabs": false,
6+
"typescript": {
7+
"semiColons": "always",
8+
"quoteStyle": "preferDouble",
9+
"quoteProps": "consistent",
10+
"useBraces": "whenNotSingleLine",
11+
"bracePosition": "sameLineUnlessHanging",
12+
"singleBodyPosition": "sameLine",
13+
"nextControlFlowPosition": "nextLine", // Stroustrup style braces.
14+
"trailingCommas": "onlyMultiLine",
15+
"preferHanging": false,
16+
"operatorPosition": "maintain",
17+
18+
"arrowFunction.useParentheses": "preferNone",
19+
"conditionalExpression.linePerExpression": false, // Keep our "match/case"-ish conditionals.
20+
"functionExpression.spaceAfterFunctionKeyword": true,
21+
"importDeclaration.forceMultiLine": true,
22+
"constructorType.spaceAfterNewKeyword": true,
23+
"constructSignature.spaceAfterNewKeyword": true,
24+
25+
// Let eslint-plugin-simple-import-sort handle this.
26+
"module.sortImportDeclarations": "maintain",
27+
"module.sortExportDeclarations": "maintain",
28+
"exportDeclaration.sortNamedExports": "maintain",
29+
"importDeclaration.sortNamedImports": "maintain"
30+
},
31+
"prettier": {
32+
"associations": [
33+
"**/*.{yaml,yml}"
34+
],
35+
"yml.tabWidth": 2,
36+
"yaml.tabWidth": 2,
37+
"yml.singleQuote": true,
38+
"yaml.singleQuote": true
39+
},
40+
"excludes": [
41+
"**/node_modules",
42+
"**/*-lock.json",
43+
"coverage/**",
44+
"lib/**",
45+
"built/**",
46+
"tests/**",
47+
"internal/**",
48+
"**/*.generated.*",
49+
"scripts/*.d.*"
50+
],
51+
"plugins": [
52+
"https://plugins.dprint.dev/typescript-0.86.1.wasm",
53+
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe"
54+
]
55+
}

‎.eslintplugin.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ const path = require("path");
33

44
const rulesDir = path.join(__dirname, "scripts", "eslint", "rules");
55
const ext = ".cjs";
6-
const ruleFiles = fs.readdirSync(rulesDir).filter((p) => p.endsWith(ext));
6+
const ruleFiles = fs.readdirSync(rulesDir).filter(p => p.endsWith(ext));
77

88
module.exports = {
9-
rules: Object.fromEntries(ruleFiles.map((p) => {
9+
rules: Object.fromEntries(ruleFiles.map(p => {
1010
return [p.slice(0, -ext.length), require(path.join(rulesDir, p))];
1111
})),
12-
}
12+
};

‎.eslintrc.json

+1-29
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@
104104
],
105105

106106
// Todo: For each of these, investigate whether we want to enable them ✨
107-
"prefer-rest-params": "off",
108-
"prefer-spread": "off",
109107
"@typescript-eslint/no-unused-vars": "off",
110108

111109
// Pending https://github.com/typescript-eslint/typescript-eslint/issues/4820
@@ -130,33 +128,7 @@
130128

131129
// eslint-plugin-simple-import-sort
132130
"simple-import-sort/imports": "error",
133-
"simple-import-sort/exports": "error",
134-
135-
// Formatting rules; remove once a formatter enforces these.
136-
"curly": ["error", "multi-line"],
137-
"linebreak-style": ["error", "windows"],
138-
"max-statements-per-line": ["error", { "max": 1 }],
139-
"new-parens": "error",
140-
"no-trailing-spaces": "error",
141-
"quote-props": ["error", "consistent-as-needed"],
142-
"space-in-parens": "error",
143-
"@typescript-eslint/brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
144-
"@typescript-eslint/no-extra-semi": "error",
145-
"@typescript-eslint/quotes": ["error", "double", { "avoidEscape": true, "allowTemplateLiterals": true }],
146-
"@typescript-eslint/semi": "error",
147-
"@typescript-eslint/space-before-function-paren": [
148-
"error",
149-
{
150-
"asyncArrow": "always",
151-
"anonymous": "always",
152-
"named": "never"
153-
}
154-
],
155-
"local/object-literal-surrounding-space": "error",
156-
"local/no-type-assertion-whitespace": "error",
157-
"local/type-operator-spacing": "error",
158-
"local/no-double-space": "error",
159-
"local/simple-indent": "error"
131+
"simple-import-sort/exports": "error"
160132
},
161133
"overrides": [
162134
// By default, the ESLint CLI only looks at .js files. But, it will also look at

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ b6c053882696af8ddd94a600429f30584d303d7f
66
9a0b85ce2a3f85f498ab2c05474b4c0b96b111c9
77
# Generated module conversion step - unindent
88
94724a8c2e68a4c7e267072ca79971f317c45e4a
9+
# dprint
10+
5e8c261b6ab746213f19ee3501eb8c48a6215dd7

‎.github/ISSUE_TEMPLATE/Bug_report.md

-73
This file was deleted.

‎.github/ISSUE_TEMPLATE/Feature_request.md

-61
This file was deleted.

0 commit comments

Comments
 (0)