Merge branch 'main' into fix-deprecations

Author: jakebailey

.github/workflows/accept-baselines-fix-lints.yaml

@@ -16,7 +16,7 @@ jobs:
         git config user.email "[email protected]"
         git config user.name "TypeScript Bot"
         npm install
-        git rm -r --quiet tests/baselines/reference :^tests/baselines/reference/docker :^tests/baselines/reference/user
+        git rm -r --quiet tests/baselines/reference
         npx hereby runtests-parallel --ci --fix || true
         npx hereby baseline-accept
         git add ./src

.github/workflows/ci.yml

@@ -39,7 +39,8 @@ jobs:
     - run:  npm ci
 
     - name: Tests
-      run:  npm run test -- --bundle=${{ matrix.bundle }}
+      # run tests, but lint separately
+      run:  npm run test -- --no-lint --bundle=${{ matrix.bundle }}
 
   lint:
     runs-on: ubuntu-latest

.github/workflows/scorecard.yml

@@ -0,0 +1,60 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '19 15 * * 4'
+  push:
+    branches: [ "main" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        with:
+          results_file: results.sarif
+          results_format: sarif
+
+          # Publish results to OpenSSF REST API for easy access by consumers
+          # Allows the repository to include the Scorecard badge.
+          # See https://github.com/ossf/scorecard-action#publishing-results.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        with:
+          sarif_file: results.sarif

.gitignore

@@ -34,7 +34,6 @@ tests/webTestServer.js.map
 tests/webhost/*.d.ts
 tests/webhost/webtsc.js
 tests/cases/**/*.js
-!tests/cases/docker/*.js/
 tests/cases/**/*.js.map
 *.config
 scripts/eslint/built/
@@ -59,29 +58,9 @@ internal/
 yarn.lock
 yarn-error.log
 .parallelperf.*
-tests/cases/user/*/package-lock.json
-tests/cases/user/*/node_modules/
-tests/cases/user/*/**/*.js
-tests/cases/user/*/**/*.js.map
-tests/cases/user/*/**/*.d.ts
-!tests/cases/user/zone.js/
-!tests/cases/user/bignumber.js/
-!tests/cases/user/discord.js/
 tests/baselines/reference/dt
 .failed-tests
 TEST-results.xml
 package-lock.json
-tests/cases/user/npm/npm
-tests/cases/user/TypeScript-React-Starter/TypeScript-React-Starter
-tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
-tests/cases/user/TypeScript-React-Native-Starter/TypeScript-React-Native-Starter
-tests/cases/user/TypeScript-Vue-Starter/TypeScript-Vue-Starter
-tests/cases/user/TypeScript-WeChat-Starter/TypeScript-WeChat-Starter
-tests/cases/user/create-react-app/create-react-app
-tests/cases/user/fp-ts/fp-ts
-tests/cases/user/webpack/webpack
-tests/cases/user/puppeteer/puppeteer
-tests/cases/user/axios-src/axios-src
-tests/cases/user/prettier/prettier
 .eslintcache
-*v8.log
+*v8.log

.vscode/settings.template.json

@@ -8,10 +8,10 @@
     // "typescript.tsdk": "built/local"
 
     // To ignore commits listed in .git-blame-ignore-revs in GitLens:
-    // "gitlens.advanced.blame.customArguments": [
-    //     "--ignore-revs-file",
-    //     ".git-blame-ignore-revs"
-    // ]
+    "gitlens.advanced.blame.customArguments": [
+        "--ignore-revs-file",
+        ".git-blame-ignore-revs"
+    ],
 
     // Match eslint-plugin-simple-import-sort in organize/auto-imports.
     "typescript.unstable": {
@@ -20,6 +20,12 @@
         "organizeImportsIgnoreCase": false,
         "organizeImportsNumericCollation": true
     },
+    "javascript.unstable": {
+        "organizeImportsCollation": "unicode",
+        "organizeImportsCaseFirst": "upper",
+        "organizeImportsIgnoreCase": false,
+        "organizeImportsNumericCollation": true
+    },
 
     // These options search the repo recursively and slow down
     // the build task menu. We define our own in tasks.json.

CONTRIBUTING.md

@@ -81,10 +81,7 @@ hereby tests             # Build the test infrastructure using the built compile
 hereby runtests          # Run tests using the built compiler and test infrastructure.
                          # You can override the specific suite runner used or specify a test for this command.
                          # Use --tests=<testPath> for a specific test and/or --runner=<runnerName> for a specific suite.
-                         # Valid runners include conformance, compiler, fourslash, project, user, and docker
-                         # The user and docker runners are extended test suite runners - the user runner
-                         # works on disk in the tests/cases/user directory, while the docker runner works in containers.
-                         # You'll need to have the docker executable in your system path for the docker runner to work.
+                         # Valid runners include conformance, compiler, fourslash, and project
 hereby runtests-parallel # Like runtests, but split across multiple threads. Uses a number of threads equal to the system
                          # core count by default. Use --workers=<number> to adjust this.
 hereby baseline-accept   # This replaces the baseline test results with the results obtained from hereby runtests.

Herebyfile.mjs

@@ -702,12 +702,19 @@ export const runTestsAndWatch = task({
     },
 });
 
-export const runTestsParallel = task({
-    name: "runtests-parallel",
+const doRunTestsParallel = task({
+    name: "do-runtests-parallel",
     description: "Runs all the tests in parallel using the built run.js file.",
     dependencies: runtestsDeps,
     run: () => runConsoleTests(testRunner, "min", /*runInParallel*/ cmdLineOptions.workers > 1),
 });
+
+export const runTestsParallel = task({
+    name: "runtests-parallel",
+    description: "Runs all the tests in parallel using the built run.js file, linting in parallel if --lint=true.",
+    dependencies: [doRunTestsParallel].concat(cmdLineOptions.lint ? [lint] : []),
+});
+
 // task("runtests-parallel").flags = {
 //     "   --light": "Run tests in light mode (fewer verifications, but tests run faster).",
 //     "   --keepFailed": "Keep tests in .failed-tests even if they pass.",

README.md

@@ -5,6 +5,8 @@
 [![Devops Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build?definitionId=7)
 [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
 [![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/microsoft/TypeScript/badge)](https://api.securityscorecards.dev/projects/github.com/microsoft/TypeScript)
+
 
 [TypeScript](https://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types to JavaScript that support tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](https://www.typescriptlang.org/play/), and stay up to date via [our blog](https://blogs.msdn.microsoft.com/typescript) and [Twitter account](https://twitter.com/typescript).