8000 Merge main into branch · microsoft/TypeScript@b341699 · GitHub
[go: up one dir, main page]
Skip to content

Commit b341699

Browse files
weswighamweswigham
committed
Merge main into branch
2 parents e2d22fa + ea36fb3 commit b341699

File tree

1,158 files changed

+44801
-11967
lines changed
  • decoratorOnClassMethod19(target=es2015).types

    • Some content is hidden

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

    1,158 files changed

    +44801
    -11967
    lines changed

    ‎.eslintignore

    Lines changed: 5 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,9 @@
    1+
    **/node_modules/**
    12
    /built/local/**
    23
    /tests/**
    34
    /lib/**
    45
    /src/lib/*.generated.d.ts
    6+
    /scripts/*.js
    7+
    /scripts/eslint/built/**
    8+
    /internal/**
    9+
    /coverage/**

    ‎.eslintrc.json

    Lines changed: 11 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,17 @@
    1313
    "plugins": [
    1414
    "@typescript-eslint", "jsdoc", "no-null", "import"
    1515
    ],
    16+
    "overrides": [
    17+
    // By default, the ESLint CLI only looks at .js files. But, it will also look at
    18+
    // any files which are referenced in an override config. Most users of typescript-eslint
    19+
    // get this behavior by default by extending a recommended typescript-eslint config, which
    20+
    // just so happens to override some core ESLint rules. We don't extend from any config, so
    21+
    // explicitly reference TS files here so the CLI picks them up.
    22+
    //
    23+
    // ESLint in VS Code will lint any opened file (so long as it's not eslintignore'd), so
    24+
    // that will work regardless of the below.
    25+
    { "files": ["*.ts"] }
    26+
    ],
    1627
    "rules": {
    1728
    "@typescript-eslint/adjacent-overload-signatures": "error",
    1829
    "@typescript-eslint/array-type": "error",

    ‎.github/pr_owners.txt

    Lines changed: 1 addition & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,16 +1,14 @@
    11
    sandersn
    2-
    elibarzilay
    32
    weswigham
    43
    andrewbranch
    54
    RyanCavanaugh
    65
    sheetalkamat
    7-
    orta
    86
    rbuckton
    97
    ahejlsberg
    108
    amcasey
    11-
    jessetrinity
    129
    minestarks
    1310
    armanio123
    1411
    gabritto
    1512
    jakebailey
    1613
    DanielRosenwasser
    14+
    navya9singh

    ‎.github/workflows/ci.yml

    Lines changed: 0 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -31,10 +31,6 @@ jobs:
    3131
    with:
    3232
    node-version: ${{ matrix.node-version }}
    3333
    check-latest: true
    34-
    - name: Remove existing TypeScript
    35-
    run: |
    36-
    npm uninstall typescript --no-save
    37-
    npm uninstall tslint --no-save
    3834
    - run: npm ci
    3935

    4036
    # Re: https://github.com/actions/setup-node/pull/125

    ‎.github/workflows/release-branch-artifact.yaml

    Lines changed: 0 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,10 +12,6 @@ jobs:
    1212
    steps:
    1313
    - uses: actions/checkout@v2
    1414
    - uses: actions/setup-node@v3
    15-
    - name: Remove existing TypeScript
    16-
    run: |
    17-
    npm uninstall typescript --no-save
    18-
    npm uninstall tslint --no-save
    1915
    - name: npm install and test
    2016
    run: |
    2117
    npm ci

    ‎.github/workflows/update-package-lock.yaml

    Lines changed: 3 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -16,13 +16,14 @@ jobs:
    1616
    - uses: actions/checkout@v2
    1717
    - uses: actions/setup-node@v3
    1818
    with:
    19-
    node-version: 14
    19+
    node-version: 16
    2020

    2121
    - name: Configure git and update package-lock.json
    2222
    run: |
    2323
    git config user.email "typescriptbot@microsoft.com"
    2424
    git config user.name "TypeScript Bot"
    25-
    npm install --package-lock-only --ignore-scripts
    25+
    rm package-lock.json
    26+
    npm install --package-lock-only --ignore-scripts # This is a no-op if package-lock.json is present.
    2627
    git add -f package-lock.json
    2728
    if git commit -m "Update package-lock.json"; then
    2829
    git push

    ‎.gitignore

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -54,6 +54,7 @@ scripts/produceLKG.js
    5454
    scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
    5555
    scripts/generateLocalizedDiagnosticMessages.js
    5656
    scripts/request-pr-review.js
    57+
    scripts/errorCheck.js
    5758
    scripts/*.js.map
    5859
    scripts/typings/
    5960
    coverage/

    ‎.vscode/settings.template.json

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -6,7 +6,6 @@
    66
    ],
    77
    "eslint.options": {
    88
    "rulePaths": ["./scripts/eslint/built/rules/"],
    9-
    "extensions": [".ts"]
    109
    },
    1110
    // To use the last-known-good (LKG) compiler version:
    1211
    // "typescript.tsdk": "lib"

    ‎Gulpfile.js

    Lines changed: 6 additions & 24 deletions
    Original file line numberDiff line numberDiff line change
    @@ -92,18 +92,12 @@ const localize = async () => {
    9292
    }
    9393
    };
    9494

    95-
    const buildShims = () => buildProject("src/shims");
    96-
    const cleanShims = () => cleanProject("src/shims");
    97-
    cleanTasks.push(cleanShims);
    98-
    9995
    const buildDebugTools = () => buildProject("src/debug");
    10096
    const cleanDebugTools = () => cleanProject("src/debug");
    10197
    cleanTasks.push(cleanDebugTools);
    10298

    103-
    const buildShimsAndTools = parallel(buildShims, buildDebugTools);
    104-
    10599
    // Pre-build steps when targeting the LKG compiler
    106-
    const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildShimsAndTools));
    100+
    const lkgPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildDebugTools));
    107101

    108102
    const buildTsc = () => buildProject("src/tsc");
    109103
    task("tsc", series(lkgPreBuild, buildTsc));
    @@ -119,7 +113,7 @@ task("watch-tsc", series(lkgPreBuild, parallel(watchLib, watchDiagnostics, watch
    119113
    task("watch-tsc").description = "Watch for changes and rebuild the command-line compiler only.";
    120114

    121115
    // Pre-build steps when targeting the built/local compiler.
    122-
    const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildShimsAndTools, buildTsc));
    116+
    const localPreBuild = parallel(generateLibs, series(buildScripts, generateDiagnostics, buildDebugTools, buildTsc));
    123117

    124118
    // Pre-build steps to use based on supplied options.
    125119
    const preBuild = cmdLineOptions.lkg ? lkgPreBuild : localPreBuild;
    @@ -356,15 +350,13 @@ task("run-eslint-rules-tests").description = "Runs the eslint rule tests";
    356350

    357351
    /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
    358352
    const eslint = (folder) => async () => {
    359-
    360353
    const formatter = cmdLineOptions.ci ? "stylish" : "autolinkable-stylish";
    361354
    const args = [
    362355
    "node_modules/eslint/bin/eslint",
    363356
    "--cache",
    364357
    "--cache-location", `${folder}/.eslintcache`,
    365358
    "--format", formatter,
    366359
    "--rulesdir", "scripts/eslint/built/rules",
    367-
    "--ext", ".ts",
    368360
    ];
    369361

    370362
    if (cmdLineOptions.fix) {
    @@ -377,22 +369,12 @@ const eslint = (folder) => async () => {
    377369
    return exec(process.execPath, args);
    378370
    };
    379371

    380-
    const lintScripts = eslint("scripts");
    381-
    lintScripts.displayName = "lint-scripts";
    382-
    task("lint-scripts", series([buildEslintRules, lintScripts]));
    383-
    task("lint-scripts").description = "Runs eslint on the scripts sources.";
    384-
    385-
    const lintCompiler = eslint("src");
    386-
    lintCompiler.displayName = "lint-compiler";
    387-
    task("lint-compiler", series([buildEslintRules, lintCompiler]));
    388-
    task("lint-compiler").description = "Runs eslint on the compiler sources.";
    389-
    task("lint-compiler").flags = {
    390-
    " --ci": "Runs eslint additional rules",
    391-
    };
    372+
    const lintRoot = eslint(".");
    373+
    lintRoot.displayName = "lint";
    392374

    393-
    const lint = series([buildEslintRules, lintScripts, lintCompiler]);
    375+
    const lint = series([buildEslintRules, lintRoot]);
    394376
    lint.displayName = "lint";
    395-
    task("lint", series([buildEslintRules, lint]));
    377+
    task("lint", lint);
    396378
    task("lint").description = "Runs eslint on the compiler and scripts sources.";
    397379
    task("lint").flags = {
    398380
    " --ci": "Runs eslint additional rules",

    0 commit comments

    Comments
     (0)
    0