Skip to content

Commit e079811

Browse files
rbucktonrbuckton
committed
Merge branch 'main' into tagged-template-inference
2 parents 95b896b + 9f1983d commit e079811

File tree

184 files changed

+5289
-2547
lines changed

Some content is hidden

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

184 files changed

+5289
-2547
lines changed

‎.eslintrc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
{ "selector": "variable", "format": ["camelCase", "PascalCase", "UPPER_CASE"], "leadingUnderscore": "allow", "filter": { "regex": "^(_{1,2}filename|_{1,2}dirname|_+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
2828
{ "selector": "function", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
2929
{ "selector": "parameter", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^(_+|[A-Za-z]+_[A-Z][a-z]+)$", "match": false } },
30-
{ "selector": "method", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
31-
{ "selector": "memberLike", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
30+
{ "selector": "method", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^([0-9]+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
31+
{ "selector": "memberLike", "format": ["camelCase"], "leadingUnderscore": "allow", "filter": { "regex": "^([0-9]+|[A-Za-z]+_[A-Za-z]+)$", "match": false } },
3232
{ "selector": "enumMember", "format": ["camelCase", "PascalCase"], "leadingUnderscore": "allow", "filter": { "regex": "^[A-Za-z]+_[A-Za-z]+$", "match": false } },
3333
{ "selector": "property", "format": null }
3434
],

‎.vscode/settings.template.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"eslint.options": {
88
"rulePaths": ["./scripts/eslint/built/rules/"],
9-
"ext": [".ts"]
9+
"extensions": [".ts"]
1010
},
1111
// To use the last-known-good (LKG) compiler version:
1212
// "typescript.tsdk": "lib"

‎package-lock.json

+1,753-2,263
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+20-19
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@
3333
"@octokit/rest": "latest",
3434
"@types/chai": "latest",
3535
"@types/convert-source-map": "latest",
36+
"@types/fs-extra": "^9.0.13",
3637
"@types/glob": "latest",
3738
"@types/gulp": "^4.0.9",
3839
"@types/gulp-concat": "latest",
3940
"@types/gulp-newer": "latest",
40-
"@types/gulp-rename": "0.0.33",
41-
"@types/gulp-sourcemaps": "0.0.32",
41+
"@types/gulp-rename": "latest",
42+
"@types/gulp-sourcemaps": "latest",
4243
"@types/merge2": "latest",
4344
"@types/microsoft__typescript-etw": "latest",
4445
"@types/minimatch": "latest",
@@ -47,29 +48,29 @@
4748
"@types/mocha": "latest",
4849
"@types/ms": "latest",
4950
"@types/node": "latest",
50-
"@types/node-fetch": "^2.3.4",
51+
"@types/node-fetch": "^2.6.2",
5152
"@types/q": "latest",
5253
"@types/source-map-support": "latest",
53-
"@types/xml2js": "^0.4.0",
54-
"@typescript-eslint/eslint-plugin": "^4.28.0",
55-
"@typescript-eslint/experimental-utils": "^4.28.0",
56-
"@typescript-eslint/parser": "^4.28.0",
54+
"@types/xml2js": "^0.4.11",
55+
"@typescript-eslint/eslint-plugin": "^5.28.0",
56+
"@typescript-eslint/parser": "^5.28.0",
57+
"@typescript-eslint/utils": "^5.28.0",
5758
"async": "latest",
58-
"azure-devops-node-api": "^11.0.1",
59+
"azure-devops-node-api": "^11.1.1",
5960
"chai": "latest",
6061
"chalk": "^4.1.2",
6162
"convert-source-map": "latest",
62-
"del": "5.1.0",
63-
"diff": "^4.0.2",
64-
"eslint": "7.12.1",
65-
"eslint-formatter-autolinkable-stylish": "1.1.4",
66-
"eslint-plugin-import": "2.22.1",
67-
"eslint-plugin-jsdoc": "30.7.6",
63+
"del": "6.1.1",
64+
"diff": "^5.1.0",
65+
"eslint": "8.17.0",
66+
"eslint-formatter-autolinkable-stylish": "1.2.0",
67+
"eslint-plugin-import": "2.26.0",
68+
"eslint-plugin-jsdoc": "39.3.2",
6869
"eslint-plugin-no-null": "1.0.2",
6970
"fancy-log": "latest",
70-
"fs-extra": "^9.0.0",
71+
"fs-extra": "^9.1.0",
7172
"glob": "latest",
72-
"gulp": "^4.0.0",
73+
"gulp": "^4.0.2",
7374
"gulp-concat": "latest",
7475
"gulp-insert": "latest",
7576
"gulp-newer": "latest",
@@ -81,14 +82,14 @@
8182
"mocha": "latest",
8283
"mocha-fivemat-progress-reporter": "latest",
8384
"ms": "^2.1.3",
84-
"node-fetch": "^2.6.1",
85-
"prex": "^0.4.3",
85+
"node-fetch": "^2.6.7",
86+
"prex": "^0.4.7",
8687
"q": "latest",
8788
"source-map-support": "latest",
8889
"typescript": "^4.5.5",
8990
"vinyl": "latest",
9091
"vinyl-sourcemaps-apply": "latest",
91-
"xml2js": "^0.4.19"
92+
"xml2js": "^0.4.23"
9293
},
9394
"scripts": {
9495
"prepare": "gulp build-eslint-rules",

‎scripts/buildProtocol.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ function writeProtocolFile(outputFile: string, protocolTs: string, typeScriptSer
159159
if (fileName === protocolFileName) {
160160
return ts.createSourceFile(fileName, protocolDts, options.target);
161161
}
162-
return originalGetSourceFile.apply(host, [fileName]);
162+
return originalGetSourceFile.apply(host, [fileName, ts.ScriptTarget.Latest]);
163163
};
164164
const rootFiles = includeTypeScriptServices ? [protocolFileName, typeScriptServicesDts] : [protocolFileName];
165165
return ts.createProgram(rootFiles, options, host);

‎scripts/eslint/rules/boolean-trivia.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "boolean-trivia",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Best Practices",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/debug-assert.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "debug-assert",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Possible Errors",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/no-double-space.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "no-double-space",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Stylistic Issues",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/no-in-operator.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "no-in-operator",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Best Practices",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/no-keywords.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree, AST_NODE_TYPES } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "no-keywords",
66
meta: {
77
docs: {
88
description: `disallows the use of certain TypeScript keywords as variable or parameter names`,
9-
category: "Stylistic Issues",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/no-type-assertion-whitespace.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "no-type-assertion-whitespace",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Stylistic Issues",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/object-literal-surrounding-space.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "object-literal-surrounding-space",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Stylistic Issues",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/one-namespace-per-file.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "one-namespace-per-file",
66
meta: {
77
docs: {
88
description: `Limits each file to having at most one top-level namespace declaration`,
9-
category: "Possible Errors",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/only-arrow-functions.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { AST_NODE_TYPES, TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
type MessageId = "onlyArrowFunctionsError";
@@ -12,7 +12,6 @@ export = createRule<Options, MessageId>({
1212
meta: {
1313
docs: {
1414
description: `Disallows traditional (non-arrow) function expressions.`,
15-
category: "Best Practices",
1615
recommended: "error",
1716
},
1817
messages: {

‎scripts/eslint/rules/simple-indent.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "simple-indent",
66
meta: {
77
docs: {
88
description: "Enforce consistent indentation",
9-
category: "Stylistic Issues",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/type-operator-spacing.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { TSESTree, AST_TOKEN_TYPES } from "@typescript-eslint/experimental-utils";
1+
import { TSESTree, AST_TOKEN_TYPES } from "@typescript-eslint/utils";
22
import { createRule } from "./utils";
33

44
export = createRule({
55
name: "type-operator-spacing",
66
meta: {
77
docs: {
88
description: ``,
9-
category: "Stylistic Issues",
109
recommended: "error",
1110
},
1211
messages: {

‎scripts/eslint/rules/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
import { ESLintUtils } from "@typescript-eslint/experimental-utils";
1+
import { ESLintUtils } from "@typescript-eslint/utils";
22
export const createRule = ESLintUtils.RuleCreator(() => "");

‎scripts/eslint/tests/support/RuleTester.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as path from "path";
2-
import { TSESLint } from "@typescript-eslint/experimental-utils";
2+
import { TSESLint } from "@typescript-eslint/utils";
33

44
export const ROOT_DIR = path.join(process.cwd(), "scripts", "eslint", "tests", "fixtures");
55
export const FILENAME = path.join(ROOT_DIR, "file.ts");

‎scripts/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
"strictNullChecks": true,
3+
"strict": true,
44
"removeComments": false,
55
"declaration": false,
66
"sourceMap": true,

0 commit comments

Comments
 (0)