Merge pull request #13090 from meteor/typescript-5.4.4

[3.x] Update Node 20.12.2, Npm 10.5.0 and Typescript 5.4.5 (Dev bundle 20.12.2.0)

.github/workflows/meteor-selftest-windows.yml

@@ -0,0 +1,55 @@
+name: Meteor Selftest Windows
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - release-3.0
+  push:
+    branches:
+      - release-3.0
+
+env:
+  METEOR_PRETTY_OUTPUT: 0
+  SELF_TEST_TOOL_NODE_FLAGS: ' '
+  TOOL_NODE_FLAGS: --expose-gc
+  TIMEOUT_SCALE_FACTOR: 20
+  METEOR_HEADLESS: true
+  SELF_TEST_EXCLUDE: '^NULL-LEAVE-THIS-HERE-NULL$'
+
+jobs:
+  test:
+    runs-on: windows-2019-meteor
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: 20.x
+
+      - name: Install dependencies
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\install.ps1
+
+      - name: Run tests
+        shell: pwsh
+        run: |
+          $env:PATH = "C:\Program Files\7-Zip;$env:PATH"
+          .\scripts\windows\ci\test.ps1
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: |
+            .\dev_bundle
+            .\.babel-cache
+            .\.meteor
+          key: ${{ runner.os }}-meteor-${{ hashFiles('**/package-lock.json') }}

.github/workflows/npm-eslint-plugin-meteor.yml

@@ -16,15 +16,12 @@ jobs:
     defaults:
       run:
         working-directory: npm-packages/eslint-plugin-meteor
-    strategy:
-      matrix:
-        node-version: 20.x
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 20.x
           cache: npm
       - run: npm ci
       - run: npm test

.github/workflows/npm-meteor-babel.yml

@@ -16,15 +16,12 @@ jobs:
     defaults:
       run:
         working-directory: npm-packages/meteor-babel
-    strategy:
-      matrix:
-        node-version: 20.x
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 14.x
           cache: npm
       - run: npm ci
       - run: npm run test

appveyor.yml

@@ -1,47 +0,0 @@
-version: '{build}'
-
-branches:
-  except:
-    - /^dev-bundle-/
-
-skip_branch_with_pr: true
-
-clone_folder: C:\projects\meteor
-image: Visual Studio 2019
-
-environment:
-  METEOR_PRETTY_OUTPUT: 0
-  SELF_TEST_TOOL_NODE_FLAGS: " "
-  TOOL_NODE_FLAGS: --expose-gc
-  TIMEOUT_SCALE_FACTOR: 8
-  METEOR_HEADLESS: true
-  SELF_TEST_EXCLUDE: "^NULL-LEAVE-THIS-HERE-NULL$"
-platform:
-  - x64
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - platform: x64
-
-# We don't need the actual "build", just the tests.
-build: off
-
-install:
-  - ps: C:\projects\meteor\scripts\windows\appveyor\install.ps1
-
-test_script:
-  - ps: C:\projects\meteor\scripts\windows\appveyor\test.ps1
-
-on_failure:
-    - ps: |
-        $npmLogsDir = "$($Env:AppData)\npm-cache\_logs"
-        If (Test-Path "$npmLogsDir") {
-          Get-ChildItem "${npmLogsDir}\*.log" |
-            % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-        }
-
-cache:
-  - dev_bundle -> meteor
-  - .babel-cache -> meteor
-  - .meteor

meteor

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUNDLE_VERSION=20.11.1.2
+BUNDLE_VERSION=20.12.2.0
 
 
 # OS Check. Put here because here is where we download the precompiled

npm-packages/eslint-plugin-meteor/scripts/dev-bundle-tool-package.js

@@ -10,11 +10,11 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.1.0",
+    npm: "10.5.0",
     pacote: "https://github.com/meteor/pacote/tarball/a81b0324686e85d22c7688c47629d4009000e8b8",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
-    typescript: "4.9.5",
+    typescript: "5.4.5",
     "@meteorjs/babel": "7.19.0-beta.3",
     "@meteorjs/reify": "0.24.0",
     // So that Babel can emit require("@babel/runtime/helpers/...") calls.

npm-packages/meteor-babel/package.json

@@ -48,7 +48,7 @@
     "convert-source-map": "^1.6.0",
     "lodash": "^4.17.21",
     "meteor-babel-helpers": "0.0.3",
-    "typescript": "~5.4.3"
+    "typescript": "~5.4.5"
   },
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "7.14.5",

package-lock.json

@@ -3446,9 +3446,9 @@
       }
     },
     "typescript": {
-      "version": "4.9.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
-      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
       "dev": true
     },
     "unbox-primitive": {

package.json

@@ -30,7 +30,7 @@
     "eslint-plugin-react": "^7.32.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.8.6",
-    "typescript": "^4.9.5"
+    "typescript": "^5.4.5"
   },
   "jshintConfig": {
     "esversion": 11

scripts/build-dev-bundle-common.sh

@@ -5,10 +5,10 @@ set -u
 
 UNAME=$(uname)
 ARCH=$(uname -m)
-NODE_VERSION=20.11.1
+NODE_VERSION=20.12.2
 MONGO_VERSION_64BIT=7.0.5
 MONGO_VERSION_32BIT=3.2.22
-NPM_VERSION=10.2.4
+NPM_VERSION=10.5.0
 
 
 if [ "$UNAME" == "Linux" ] ; then

scripts/dev-bundle-tool-package.js

@@ -10,10 +10,10 @@ var packageJson = {
   dependencies: {
     // Explicit dependency because we are replacing it with a bundled version
     // and we want to make sure there are no dependencies on a higher version
-    npm: "10.2.4",
+    npm: "10.5.0",
     "node-gyp": "9.4.0",
     "@mapbox/node-pre-gyp": "1.0.11",
-    typescript: "5.4.3",
+    typescript: "5.4.5",
     "@meteorjs/babel": "7.19.0-beta.4",
     // Keep the versions of these packages consistent with the versions
     // found in dev-bundle-server-package.js.

scripts/windows/ci/test.ps1

@@ -25,19 +25,6 @@ If ($selfTestExitCode -eq 0) {
   Write-Host "FAILURE! (Exit: $selfTestExitCode)" -ForegroundColor Red
 }
 
-Write-Host "Uploading JUnit test results..." -ForegroundColor Magenta
-$wc = New-Object 'System.Net.WebClient'
-Get-ChildItem $env:TEMP 'self-test-junit-*.xml' | Foreach-Object {
-  Write-Host " - $($_.FullName)" -ForegroundColor Magenta
-  Write-Host "   - as Artifact..." -ForegroundColor Magenta
-  Push-AppveyorArtifact $_.FullName
-  Write-Host "   - as Test Results..." -ForegroundColor Magenta
-  $artifactPostUrl = `
-    "https://ci.appveyor.com/api/testresults/junit/",
-    $env:APPVEYOR_JOB_ID -Join ''
-  $wc.UploadFile($artifactPostUrl, ($_.FullName))
-}
-
 If ($selfTestExitCode -ne 0) {
   Exit $selfTestExitCode
 }

tools/cli/main.js

@@ -552,7 +552,8 @@ var springboard = async function (rel, options) {
       var execPath = files.convertToOSPath(executable);
       var child = require("child_process").spawn(execPath, newArgv, {
         env: process.env,
-        stdio: 'inherit'
+        stdio: 'inherit',
+        shell: true,
       }).on('exit', resolve);
     }));
   }

tools/runners/run-mongo.js

@@ -70,6 +70,7 @@ function spawnMongod(mongodPath, port, dbPath, replSetName) {
       },
       process.env
     ),
+    ...process.platform === 'win32' && { shell: true },
   });
 }
 

tools/static-assets/skel-typescript/package.json

@@ -18,7 +18,7 @@
     "@types/node": "^18.16.5",
     "@types/react": "^18.2.5",
     "@types/react-dom": "^18.2.4",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.5"
   },
   "meteor": {
     "mainModule": {

tools/tool-testing/run.js

@@ -143,6 +143,7 @@ export default class Run {
       this._args, {
         cwd: files.convertToOSPath(this.cwd),
         env,
+        ...process.platform === 'win32' && { shell: true },
       });
 
     this.proc.on('close', (code, signal) => {

tools/utils/processes.ts

@@ -107,7 +107,7 @@ export function execFileAsync(
       spawnArgs.forEach(arg => {
         command += ' ' + arg;
       });
-      child = child_process.exec(command, { cwd, env });
+      child = child_process.spawn(command, { cwd, env, shell: true });
     }
 
     let capturedStdout = '';