diff --git a/.eslintrc.yml b/.eslintrc.yml index 70bc9a6e7e1..f9359bf2892 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -8,3 +8,7 @@ rules: indent: [error, 2, { MemberExpression: "off", SwitchCase: 1 }] no-trailing-spaces: error no-unused-vars: [error, { vars: all, args: none, ignoreRestSiblings: true }] + no-restricted-globals: + - error + - name: Buffer + message: Use `import { Buffer } from "node:buffer"` instead of the global Buffer. diff --git a/lib/response.js b/lib/response.js index 9362d0ed5dd..09fa0611b4f 100644 --- a/lib/response.js +++ b/lib/response.js @@ -31,6 +31,7 @@ var send = require('send'); var extname = path.extname; var resolve = path.resolve; var vary = require('vary'); +const { Buffer } = require('node:buffer'); /** * Response prototype. diff --git a/lib/utils.js b/lib/utils.js index d53c5a13374..a466ec89f06 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -19,6 +19,7 @@ var mime = require('mime-types') var proxyaddr = require('proxy-addr'); var qs = require('qs'); var querystring = require('querystring'); +const { Buffer } = require('node:buffer'); /** * A list of lowercased HTTP methods that are supported by Node.js. diff --git a/test/express.json.js b/test/express.json.js index 6f7768afc23..28746bfebda 100644 --- a/test/express.json.js +++ b/test/express.json.js @@ -2,6 +2,7 @@ var assert = require('node:assert') var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage +const { Buffer } = require('node:buffer'); var express = require('..') var request = require('supertest') diff --git a/test/express.raw.js b/test/express.raw.js index aface9093d5..5576e225283 100644 --- a/test/express.raw.js +++ b/test/express.raw.js @@ -5,6 +5,7 @@ var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage var express = require('..') var request = require('supertest') +const { Buffer } = require('node:buffer'); describe('express.raw()', function () { before(function () { diff --git a/test/express.static.js b/test/express.static.js index 16a8ec0516f..a2035631d66 100644 --- a/test/express.static.js +++ b/test/express.static.js @@ -3,6 +3,8 @@ var assert = require('node:assert') var express = require('..') var path = require('node:path') +const { Buffer } = require('node:buffer'); + var request = require('supertest') var utils = require('./support/utils') diff --git a/test/express.text.js b/test/express.text.js index 2ce6052a07b..e96cc5efe52 100644 --- a/test/express.text.js +++ b/test/express.text.js @@ -2,7 +2,7 @@ var assert = require('node:assert') var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage - +const { Buffer } = require('node:buffer'); var express = require('..') var request = require('supertest') diff --git a/test/express.urlencoded.js b/test/express.urlencoded.js index 2f32f9fed1b..f4acf231989 100644 --- a/test/express.urlencoded.js +++ b/test/express.urlencoded.js @@ -2,6 +2,7 @@ var assert = require('node:assert') var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage +const { Buffer } = require('node:buffer'); var express = require('..') var request = require('supertest') diff --git a/test/res.attachment.js b/test/res.attachment.js index 68e611bbc79..8644bab5b2d 100644 --- a/test/res.attachment.js +++ b/test/res.attachment.js @@ -1,5 +1,7 @@ 'use strict' +const { Buffer } = require('node:buffer'); + var express = require('../') , request = require('supertest'); diff --git a/test/res.download.js b/test/res.download.js index db42662e2b2..e9966007eba 100644 --- a/test/res.download.js +++ b/test/res.download.js @@ -3,6 +3,7 @@ var after = require('after'); var assert = require('node:assert') var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage +const { Buffer } = require('node:buffer'); var express = require('..'); var path = require('node:path') diff --git a/test/res.send.js b/test/res.send.js index 78a69a5c666..8547b77648b 100644 --- a/test/res.send.js +++ b/test/res.send.js @@ -1,6 +1,7 @@ 'use strict' var assert = require('node:assert') +const { Buffer } = require('node:buffer'); var express = require('..'); var methods = require('../lib/utils').methods; var request = require('supertest'); diff --git a/test/res.sendFile.js b/test/res.sendFile.js index 9b0cd83cca3..16eea79761e 100644 --- a/test/res.sendFile.js +++ b/test/res.sendFile.js @@ -3,6 +3,7 @@ var after = require('after'); var assert = require('node:assert') var AsyncLocalStorage = require('node:async_hooks').AsyncLocalStorage +const { Buffer } = require('node:buffer'); var express = require('../') , request = require('supertest') diff --git a/test/support/utils.js b/test/support/utils.js index a43ca0bb435..fb816b08000 100644 --- a/test/support/utils.js +++ b/test/support/utils.js @@ -5,6 +5,7 @@ */ var assert = require('node:assert'); +const { Buffer } = require('node:buffer'); /** * Module exports. diff --git a/test/utils.js b/test/utils.js index b11b26680bd..1c06036aa98 100644 --- a/test/utils.js +++ b/test/utils.js @@ -1,6 +1,7 @@ 'use strict' var assert = require('node:assert'); +const { Buffer } = require('node:buffer'); var utils = require('../lib/utils'); describe('utils.etag(body, encoding)', function(){