Merge branch 'main' into implement49733-part5

Author: sandersn

.eslintrc.json

@@ -11,7 +11,7 @@
         "es6": true
     },
     "plugins": [
-        "@typescript-eslint", "no-null", "import", "eslint-plugin-local"
+        "@typescript-eslint", "no-null", "import", "eslint-plugin-local", "simple-import-sort"
     ],
     "ignorePatterns": [
         "**/node_modules/**",
@@ -25,11 +25,8 @@
         "/coverage/**"
     ],
     "rules": {
-        "sort-imports": ["error", {
-            "ignoreCase": true,
-            "ignoreDeclarationSort": true,
-            "allowSeparatedGroups": true
-        }],
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
 
         "@typescript-eslint/adjacent-overload-signatures": "error",
         "@typescript-eslint/array-type": "error",
@@ -100,7 +97,7 @@
             "allowDeclarations": true
         }],
         "local/no-double-space": "error",
-        "local/boolean-trivia": "error",
+        "local/argument-trivia": "error",
         "local/no-in-operator": "error",
         "local/simple-indent": "error",
         "local/debug-assert": "error",
@@ -180,6 +177,14 @@
                     { "name": "exports" }
                 ]
             }
+        },
+        {
+            // These files contain imports in a specific order that are generally unsafe to modify.
+            "files": ["**/_namespaces/**"],
+            "rules": {
+                "simple-import-sort/imports": "off",
+                "simple-import-sort/exports": "off"
+            }
         }
     ]
 }

.github/fabricbot.json

@@ -31,7 +31,7 @@
           {
             "name": "addReply",
             "parameters": {
-              "comment": "Thanks for the PR! It looks like you've changed the TSServer protocol in some way. Please ensure that any changes here don't break consumers of the current TSServer API. For some extra review, we'll ping @sheetalkamat, @mjbvz, and @minestarks for you. Feel free to loop in other consumers/maintainers if necessary"
+              "comment": "Thanks for the PR! It looks like you've changed the TSServer protocol in some way. Please ensure that any changes here don't break consumers of the current TSServer API. For some extra review, we'll ping @sheetalkamat, @mjbvz, @zkat, and @joj for you. Feel free to loop in other consumers/maintainers if necessary"
             }
           }
         ],
@@ -487,7 +487,7 @@
           {
             "name": "addReply",
             "parameters": {
-              "comment": "Thanks for the PR! It looks like you've changed 'preProcess.ts' in some way. Please ensure that any changes here don't break consumers with unique project systems such as Visual Studio. Pinging @sheetalkamat and @minestarks so they are aware of the changes."
+              "comment": "Thanks for the PR! It looks like you've changed 'preProcess.ts' in some way. Please ensure that any changes here don't break consumers with unique project systems such as Visual Studio. Pinging @sheetalkamat, @zkat, and @joj so they are aware of the changes."
             }
           }
         ]

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

@@ -3,10 +3,16 @@ name: Accept Baselines and Fix Lints
 on:
   workflow_dispatch: {}
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
@@ -15,8 +21,8 @@ jobs:
       run: |
         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
+        npm ci
+        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

@@ -10,6 +10,9 @@ on:
       - main
       - release-*
 
+permissions:
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -39,7 +42,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
@@ -91,65 +95,76 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+
     - uses: actions/setup-node@v3
       with:
         node-version: "*"
         check-latest: true
+    - run: |
+        corepack enable npm
+        npm --version
+    
     - run:  npm ci
 
     - run: npx hereby lkg
     - run: |
         npm pack
         mv typescript*.tgz typescript.tgz
-        echo "PACKAGE=$PWD/typescript.tgz" >> $GITHUB_ENV
+        echo "package=$PWD/typescript.tgz" >> "$GITHUB_OUTPUT"
+      id: pack
 
     - name: Smoke test
       run: |
         cd "$(mktemp -d)"
         npm init --yes
-        npm install $PACKAGE tslib
+        npm install ${{ steps.pack.outputs.package }}
 
         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
+        node $GITHUB_WORKSPACE/scripts/checkModuleFormat.mjs typescript
+        node $GITHUB_WORKSPACE/scripts/checkModuleFormat.mjs typescript/lib/tsserverlibrary
+
+  package-size:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        path: pr
+
+    - uses: actions/checkout@v3
+      with:
+        path: base
+        ref: ${{ github.base_ref }}
+
+    - uses: actions/setup-node@v3
+      with:
+        node-version: "*"
+        check-latest: true
+    - run: |
+        corepack enable npm
+        npm --version
+
+    - run: npm ci
+      working-directory: ./pr
+
+    - run: npm ci
+      working-directory: ./base
+
+    - run: npx hereby lkg
+      working-directory: ./pr
+      
+    - run: npx hereby lkg
+      working-directory: ./base
+
+    - run: |
+        echo "See $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID for more info."
+        node ./pr/scripts/checkPackageSize.mjs ./base ./pr >> $GITHUB_STEP_SUMMARY
 
   misc:
     runs-on: ubuntu-latest

.github/workflows/codeql.yml

@@ -21,6 +21,9 @@ on:
     #        *  * * * *
     - cron: '30 1 * * 0'
 
+permissions:
+  contents: read
+
 jobs:
   CodeQL-Build:
     # CodeQL runs on ubuntu-latest, windows-latest, and macos-latest

.github/workflows/ensure-related-repos-run-crons.yml

@@ -11,6 +11,9 @@ on:
         - cron: '0 0 1 * *'
     workflow_dispatch: {}
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest

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

@@ -5,6 +5,9 @@ on:
   schedule:
     - cron: '0 0 * * 3' # Every Wednesday
 
+permissions:
+  contents: read
+
 jobs:
   check-for-recent:
     runs-on: ubuntu-latest

.github/workflows/new-release-branch.yaml

@@ -4,12 +4,21 @@ on:
   repository_dispatch:
     types: new-release-branch
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+
     steps:
     - uses: actions/setup-node@v3
+    - run: |
+        corepack enable npm
+        npm --version
     - uses: actions/checkout@v3
       with:
         fetch-depth: 5

.github/workflows/nightly.yaml

@@ -8,6 +8,9 @@ on:
   repository_dispatch:
     types: publish-nightly
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -19,6 +22,9 @@ jobs:
       with:
         # Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.
         registry-url: https://registry.npmjs.org/
+    - run: |
+        corepack enable npm
+        npm --version
     - name: Setup and publish nightly
       run: |
         npm whoami

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

@@ -5,13 +5,19 @@ on:
     branches:
       - release-*
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
+    - run: |
+        corepack enable npm
+        npm --version
     - name: npm install and test
       run: |
         npm ci