Merge pull request #2184 from embroider-build/update-types-node

Updating @types/node
embroider-build · Nov 25, 2024 · 8d218f9 · 8d218f9
2 parents 0aa8fc6 + 31ed2c2
commit 8d218f9
Show file tree

Hide file tree

Showing 9 changed files with 469 additions and 377 deletions.
diff --git a/packages/compat/package.json b/packages/compat/package.json
@@ -86,7 +86,7 @@
     "@types/js-string-escape": "^1.0.0",
     "@types/jsdom": "^16.2.11",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
     "broccoli-node-api": "^1.7.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -66,7 +66,7 @@
     "@types/js-string-escape": "^1.0.0",
     "@types/jsdom": "^16.2.11",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.5",
     "@types/tmp": "^0.1.0",

diff --git a/packages/hbs-loader/package.json b/packages/hbs-loader/package.json
@@ -20,7 +20,7 @@
   "dependencies": {},
   "devDependencies": {
     "@embroider/core": "workspace:^",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "typescript": "^5.4.5",
     "webpack": "^5"
   },

diff --git a/packages/macros/package.json b/packages/macros/package.json
@@ -44,7 +44,7 @@
     "@types/babel__template": "^7.4.0",
     "@types/babel__traverse": "^7.18.5",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
     "babel-plugin-ember-template-compilation": "^2.3.0",

diff --git a/packages/macros/tests/babel/helpers.ts b/packages/macros/tests/babel/helpers.ts
@@ -79,7 +79,7 @@ disabledTest.failing = disabledTest;
 
 export function allModes(fn: CreateModeTests): CreateTests {
   return function createTests(transform: Transform) {
-    for (let mode of ['build-time', 'run-time']) {
+    for (const mode of ['build-time', 'run-time']) {
       describe(mode, function () {
         function applyMode(macrosConfig: MacrosConfig) {
           if (mode === 'run-time') {

diff --git a/packages/vite/src/assets.ts b/packages/vite/src/assets.ts
@@ -7,7 +7,6 @@ import { join, posix } from 'path';
 import fs from 'fs-extra';
 const { existsSync, readFileSync, lstatSync } = fs;
 import send from 'send';
-import type { Readable } from 'stream';
 
 function findPublicAsset(relativePath: string, resolver: Resolver) {
   const packageCache = resolver.packageCache;
@@ -47,7 +46,7 @@ export function assets(): Plugin {
           if (req.originalUrl && req.originalUrl.length > 1) {
             const assetUrl = findPublicAsset(req.originalUrl.split('?')[0], resolverLoader.resolver);
             if (assetUrl) {
-              return send(req as Readable, assetUrl).pipe(res);
+              return send(req, assetUrl).pipe(res as unknown as NodeJS.WritableStream);
             }
           }
           return next();

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -48,7 +48,7 @@
     "@types/fs-extra": "^9.0.12",
     "@types/lodash": "^4.14.170",
     "@types/mini-css-extract-plugin": "^1.4.3",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "@types/semver": "^7.3.6",
     "typescript": "^5.4.5",
     "webpack": "^5.38.1"