Merge branch 'main' into preserve-alias-symbols-on-type-alias-references-more

Author: weswigham

.devcontainer/Dockerfile

@@ -4,4 +4,4 @@
 ARG VARIANT="14-buster"
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
 
-RUN sudo -u node npm install -g gulp-cli
+RUN sudo -u node npm install -g hereby

.eslintignore

@@ -1,5 +1,5 @@
 **/node_modules/**
-/built/local/**
+/built/**
 /tests/**
 /lib/**
 /src/lib/*.generated.d.ts

.eslintrc.json

@@ -10,9 +10,15 @@
         "es6": true
     },
     "plugins": [
-        "@typescript-eslint", "jsdoc", "no-null", "import", "eslint-plugin-local"
+        "@typescript-eslint", "no-null", "import", "eslint-plugin-local"
     ],
     "rules": {
+        "sort-imports": ["error", {
+            "ignoreCase": true,
+            "ignoreDeclarationSort": true,
+            "allowSeparatedGroups": true
+        }],
+
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "error",
         "@typescript-eslint/no-array-constructor": "error",
@@ -87,17 +93,14 @@
         "local/simple-indent": "error",
         "local/debug-assert": "error",
         "local/no-keywords": "error",
-        "local/one-namespace-per-file": "error",
+        "local/jsdoc-format": "error",
 
         // eslint-plugin-import
         "import/no-extraneous-dependencies": ["error", { "optionalDependencies": false }],
 
         // eslint-plugin-no-null
         "no-null/no-null": "error",
 
-        // eslint-plugin-jsdoc
-        "jsdoc/check-alignment": "error",
-
         // eslint
         "constructor-super": "error",
         "curly": ["error", "multi-line"],

.git-blame-ignore-revs

@@ -0,0 +1,8 @@
+# Generated module conversion step - inlineImports
+07758c08ab72481885e662c98d67a0e3a071b032
+# Generated module conversion step - stripNamespaces
+b6c053882696af8ddd94a600429f30584d303d7f
+# Generated module conversion step - explicitify
+9a0b85ce2a3f85f498ab2c05474b4c0b96b111c9
+# Generated module conversion step - unindent
+94724a8c2e68a4c7e267072ca79971f317c45e4a

.github/codeql/codeql-configuration.yml

@@ -1,4 +1,34 @@
 name : CodeQL Configuration
 
 paths:
-  - './src' 
+  - src
+  - scripts
+  - Gulpfile.mjs
+paths-ignore:
+  - src/lib
+
+# These queries appear to time out after the module conversion.
+# https://github.com/github/codeql/issues/10937
+query-filters:
+  - exclude:
+      id: js/path-injection # TaintedPath.ql
+  - exclude:
+      id: js/command-line-injection # CommandInjection.ql
+  - exclude:
+      id: js/code-injection # CodeInjection.ql
+  - exclude:
+      id: js/bad-code-sanitization # ImproperCodeSanitization.ql
+  - exclude:
+      id: js/unsafe-dynamic-method-access # UnsafeDynamicMethodAccess.ql
+  - exclude:
+      id: js/clear-text-logging # CleartextLogging.ql
+  - exclude:
+      id: js/regex-injection # RegExpInjection.ql
+  - exclude:
+      id: js/unvalidated-dynamic-method-call # UnvalidatedDynamicMethodCall.ql
+  - exclude:
+      id: js/insecure-download # InsecureDownload.ql
+  - exclude:
+      id: js/prototype-polluting-assignment # PrototypePollutingAssignment.ql
+  - exclude:
+      id: js/request-forgery # RequestForgery.ql

.github/pull_request_template.md

@@ -4,7 +4,7 @@ Thank you for submitting a pull request!
 Please verify that:
 * [ ] There is an associated issue in the `Backlog` milestone (**required**)
 * [ ] Code is up-to-date with the `main` branch
-* [ ] You've successfully run `gulp runtests` locally
+* [ ] You've successfully run `hereby runtests` locally
 * [ ] There are new or updated unit tests validating the change
 
 Refer to CONTRIBUTING.MD for more details.

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

@@ -17,8 +17,8 @@ jobs:
         git config user.name "TypeScript Bot"
         npm install
         git rm -r --quiet tests/baselines/reference :^tests/baselines/reference/docker :^tests/baselines/reference/user
-        gulp runtests-parallel --ci --fix || true
-        gulp baseline-accept
+        npx hereby runtests-parallel --ci --fix || true
+        npx hereby baseline-accept
         git add ./src
         git add ./tests/baselines/reference
         git diff --cached

.github/workflows/ci.yml

@@ -21,6 +21,13 @@ jobs:
           - "*"
           - lts/*
           - lts/-1
+        bundle:
+          - "true"
+        include:
+          - node-version: "*"
+            bundle: "false"
+
+    name: Test Node ${{ matrix.node-version }} with --bundle=${{ matrix.bundle }}
 
     steps:
     - uses: actions/checkout@v3
@@ -32,7 +39,7 @@ jobs:
     - run:  npm ci
 
     - name: Tests
-      run:  npm test
+      run:  npm run test -- --bundle=${{ matrix.bundle }}
 
   lint:
     runs-on: ubuntu-latest
@@ -62,11 +69,87 @@ jobs:
     - name: Adding playwright
       run: npm install --no-save --no-package-lock playwright
 
-    - name: Build local
-      run: gulp local
-
     - name: Validate the browser can import TypeScript
-      run: gulp test-browser-integration
+      run: npx hereby test-browser-integration
+
+  typecheck:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run:  npm ci
+
+    - name: Build src
+      run: npx hereby build-src
+
+  smoke:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run:  npm ci
+
+    - run: npx hereby lkg
+    - run: |
+        npm pack
+        mv typescript*.tgz typescript.tgz
+        echo "PACKAGE=$PWD/typescript.tgz" >> $GITHUB_ENV
+
+    - name: Smoke test
+      run: |
+        cd "$(mktemp -d)"
+        npm init --yes
+        npm install $PACKAGE tslib
+
+        echo "Testing tsc..."
+        npx tsc --version
+
+        echo "Testing tsserver..."
+        echo '{"seq": 1, "command": "status"}' | npx tsserver
+
+        cat > smoke.js << 'EOF'
+        console.log(`Testing ${process.argv[2]}...`);
+        const { __importDefault, __importStar } = require("tslib");
+        const ts = require(process.argv[2]);
+
+        // See: https://github.com/microsoft/TypeScript/pull/51474#issuecomment-1310871623
+        const fns = [
+          [() => ts.version,                          true],
+          [() => ts.default.version,                  false],
+          [() => __importDefault(ts).version,         false],
+          [() => __importDefault(ts).default.version, true],
+          [() => __importStar(ts).version,            true],
+          [() => __importStar(ts).default.version,    true],
+        ];
+
+        for (const [fn, shouldSucceed] of fns) {
+          let success = false;
+          try {
+            success = !!fn();
+          }
+          catch {}
+          const status = success ? "succeeded" : "failed";
+          if (success === shouldSucceed) {
+            console.log(`${fn.toString()} ${status} as expected.`);
+          }
+          else {
+            console.log(`${fn.toString()} unexpectedly ${status}.`);
+            process.exitCode = 1;
+          }
+        }
+        console.log("ok");
+        EOF
+
+        node ./smoke.js typescript
+        node ./smoke.js typescript/lib/tsserverlibrary
 
   misc:
     runs-on: ubuntu-latest
@@ -80,7 +163,27 @@ jobs:
     - run:  npm ci
 
     - name: Build scripts
-      run: gulp scripts
+      run: npx hereby scripts
 
     - name: ESLint tests
-      run: gulp run-eslint-rules-tests
+      run: npx hereby run-eslint-rules-tests
+
+  self-check:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run:  npm ci
+
+    - name: Build tsc
+      run: npx hereby tsc
+
+    - name: Clean
+      run: npx hereby clean-src
+
+    - name: Self build
+      run: npx hereby build-src --built

.github/workflows/codeql.yml

@@ -1,50 +1,64 @@
-name: "Code scanning - action"
+name: "Code Scanning - Action"
 
 on:
   push:
+    branches:
+      - main
+      - release-*
   pull_request:
+    branches:
+      - main
+      - release-*
   schedule:
-    - cron: '0 19 * * 0'
+    #        ┌───────────── minute (0 - 59)
+    #        │  ┌───────────── hour (0 - 23)
+    #        │  │ ┌───────────── day of the month (1 - 31)
+    #        │  │ │ ┌───────────── month (1 - 12 or JAN-DEC)
+    #        │  │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
+    #        │  │ │ │ │
+    #        │  │ │ │ │
+    #        │  │ │ │ │
+    #        *  * * * *
+    - cron: '30 1 * * 0'
 
 jobs:
   CodeQL-Build:
-
-    # CodeQL runs on ubuntu-latest and windows-latest
+    # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest
     runs-on: ubuntu-latest
     if: github.repository == 'microsoft/TypeScript'
 
+    permissions:
+      # required for all workflows
+      security-events: write
+
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        config-file: ./.github/codeql/codeql-configuration.yml
-      # Override language selection by uncommenting this and choosing your languages
-      # with:
-      #   languages: go, javascript, csharp, python, cpp, java
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          config-file: ./.github/codeql/codeql-configuration.yml
+        # Override language selection by uncommenting this and choosing your languages
+        # with:
+        #   languages: go, javascript, csharp, python, cpp, java
+
+      # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below).
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following
+      #    three lines and modify them (or add more) to build your code if your
+      #    project uses a compiled language
+
+      #- run: |
+      #     make bootstrap
+      #     make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.github/workflows/error-deltas-watchdog.yaml

@@ -0,0 +1,36 @@
+name: "typescript-error-deltas Watchdog"
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 3' # Every Wednesday
+
+jobs:
+  check-for-recent:
+    runs-on: ubuntu-latest
+    if: github.repository == 'microsoft/TypeScript'
+    permissions:
+      contents: read # Apparently required to create issues
+      issues: write
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      TAGS: "@navya9singh @RyanCavanaugh @DanielRosenwasser"
+    steps:
+    - name: NewErrors
+      run: | # --json and --jq prints exactly one issue number per line of output
+        DATE=$(date --date="7 days ago" --iso-8601)
+        gh issue list --repo microsoft/typescript --search "[NewErrors] created:>=$DATE" --state all --json number --jq ".[].number" \
+        | grep -qe "[0-9]" \
+        || gh issue create --repo ${{ github.repository }} --title "No NewErrors issue since $DATE" --body "$TAGS Please check the [pipeline](https://typescript.visualstudio.com/TypeScript/_build?definitionId=48)."
+    - name: ServerErrors TS
+      run: |
+        DATE=$(date --date="7 days ago" --iso-8601)
+        gh issue list --repo microsoft/typescript --search "[ServerErrors][TypeScript] created:>=$DATE" --state all --json number --jq ".[].number" \
+        | grep -qe "[0-9]" \
+        || gh issue create --repo ${{ github.repository }} --title "No TypeScript ServerErrors issue since $DATE" --body "$TAGS Please check the [pipeline](https://typescript.visualstudio.com/TypeScript/_build?definitionId=59)."
+    - name: ServerErrors JS
+      run: |
+        DATE=$(date --date="7 days ago" --iso-8601)
+        gh issue list --repo microsoft/typescript --search "[ServerErrors][JavaScript] created:>=$DATE" --state all --json number --jq ".[].number" \
+        | grep -qe "[0-9]" \
+        || gh issue create --repo ${{ github.repository }} --title "No JavaScript ServerErrors issue since $DATE" --body "$TAGS Please check the [pipeline](https://typescript.visualstudio.com/TypeScript/_build?definitionId=58)."