Skip to content

Commit bd712ab

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/rest-tuple-union-shorter-contextual-params
2 parents 67892c3 + acf854b commit bd712ab

File tree

6,745 files changed

+1141251
-1326654
lines changed

Some content is hidden

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

6,745 files changed

+1141251
-1326654
lines changed

.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
ARG VARIANT="14-buster"
55
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
66

7-
RUN sudo -u node npm install -g gulp-cli
7+
RUN sudo -u node npm install -g hereby

.dockerignore

-47
This file was deleted.

.eslintignore

-22
This file was deleted.

.eslintplugin.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const fs = require("fs");
22
const path = require("path");
33

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

88
module.exports = {

.eslintrc.json

+46-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"root": true,
23
"parser": "@typescript-eslint/parser",
34
"parserOptions": {
45
"warnOnUnsupportedTypeScriptVersion": false,
@@ -10,20 +11,26 @@
1011
"es6": true
1112
},
1213
"plugins": [
13-
"@typescript-eslint", "jsdoc", "no-null", "import", "eslint-plugin-local"
14+
"@typescript-eslint", "no-null", "import", "eslint-plugin-local"
1415
],
15-
"overrides": [
16-
// By default, the ESLint CLI only looks at .js files. But, it will also look at
17-
// any files which are referenced in an override config. Most users of typescript-eslint
18-
// get this behavior by default by extending a recommended typescript-eslint config, which
19-
// just so happens to override some core ESLint rules. We don't extend from any config, so
20-
// explicitly reference TS files here so the CLI picks them up.
21-
//
22-
// ESLint in VS Code will lint any opened file (so long as it's not eslintignore'd), so
23-
// that will work regardless of the below.
24-
{ "files": ["*.ts", "*.mts", "*.cts", "*.mjs", "*.cjs"] }
16+
"ignorePatterns": [
17+
"**/node_modules/**",
18+
"/built/**",
19+
"/tests/**",
20+
"/lib/**",
21+
"/src/lib/*.generated.d.ts",
22+
"/scripts/**/*.js",
23+
"/scripts/**/*.d.*",
24+
"/internal/**",
25+
"/coverage/**"
2526
],
2627
"rules": {
28+
"sort-imports": ["error", {
29+
"ignoreCase": true,
30+
"ignoreDeclarationSort": true,
31+
"allowSeparatedGroups": true
32+
}],
33+
2734
"@typescript-eslint/adjacent-overload-signatures": "error",
2835
"@typescript-eslint/array-type": "error",
2936
"@typescript-eslint/no-array-constructor": "error",
@@ -98,17 +105,14 @@
98105
"local/simple-indent": "error",
99106
"local/debug-assert": "error",
100107
"local/no-keywords": "error",
101-
"local/one-namespace-per-file": "error",
108+
"local/jsdoc-format": "error",
102109

103110
// eslint-plugin-import
104111
"import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],
105112

106113
// eslint-plugin-no-null
107114
"no-null/no-null": "error",
108115

109-
// eslint-plugin-jsdoc
110-
"jsdoc/check-alignment": "error",
111-
112116
// eslint
113117
"constructor-super": "error",
114118
"curly": ["error", "multi-line"],
@@ -151,5 +155,31 @@
151155
"no-prototype-builtins": "error",
152156
"no-self-assign": "error",
153157
"no-dupe-else-if": "error"
154-
}
158+
},
159+
"overrides": [
160+
// By default, the ESLint CLI only looks at .js files. But, it will also look at
161+
// any files which are referenced in an override config. Most users of typescript-eslint
162+
// get this behavior by default by extending a recommended typescript-eslint config, which
163+
// just so happens to override some core ESLint rules. We don't extend from any config, so
164+
// explicitly reference TS files here so the CLI picks them up.
165+
//
166+
// ESLint in VS Code will lint any opened file (so long as it's not eslintignore'd), so
167+
// that will work regardless of the below.
168+
//
169+
// The same applies to mjs files; ESLint appears to not scan those either.
170+
{ "files": ["*.ts", "*.mts", "*.cts", "*.mjs", "*.cjs"] },
171+
{
172+
"files": ["*.mjs", "*.mts"],
173+
"rules": {
174+
// These globals don't exist outside of CJS files.
175+
"no-restricted-globals": ["error",
176+
{ "name": "__filename" },
177+
{ "name": "__dirname" },
178+
{ "name": "require" },
179+
{ "name": "module" },
180+
{ "name": "exports" }
181+
]
182+
}
183+
}
184+
]
155185
}

.git-blame-ignore-revs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Generated module conversion step - inlineImports
2+
07758c08ab72481885e662c98d67a0e3a071b032
3+
# Generated module conversion step - stripNamespaces
4+
b6c053882696af8ddd94a600429f30584d303d7f
5+
# Generated module conversion step - explicitify
6+
9a0b85ce2a3f85f498ab2c05474b4c0b96b111c9
7+
# Generated module conversion step - unindent
8+
94724a8c2e68a4c7e267072ca79971f317c45e4a
+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
name : CodeQL Configuration
22

33
paths:
4-
- './src'
4+
- src
5+
- scripts
6+
- Herebyfile.mjs
7+
paths-ignore:
8+
- src/lib

0 commit comments

Comments
 (0)