refactor!: use node: protocol imports (#1435)

.eslintrc.js

@@ -34,11 +34,11 @@ module.exports = {
       'error',
       {
         name: 'Buffer',
-        message: "Import 'Buffer' from 'buffer' module instead",
+        message: "Import 'Buffer' from 'node:buffer' module instead",
       },
       {
         name: 'process',
-        message: "Import 'process' from 'process' module instead",
+        message: "Import 'process' from 'node:process' module instead",
       },
     ],
     // we use underscores to indicate private fields in classes

examples/events/http/handler.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { env } = require('process')
+const { env } = require('node:process')
 
 const { stringify } = JSON
 

examples/lambda-invoke/handler.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { Buffer } = require('buffer')
+const { Buffer } = require('node:buffer')
 const { config, Lambda } = require('aws-sdk')
 
 const { stringify } = JSON

examples/tools/serverless-webpack/webpack.config.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { resolve } = require('path')
+const { resolve } = require('node:path')
 const { lib } = require('serverless-webpack')
 
 module.exports = {

jest.config.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { env } = require('process')
+const { env } = require('node:process')
 
 module.exports = {
   bail: true,

src/ServerlessOffline.js

@@ -1,4 +1,4 @@
-import process, { env, exit } from 'process'
+import process, { env, exit } from 'node:process'
 import updateNotifier from 'update-notifier'
 import chalk from 'chalk'
 import { parse as semverParse } from 'semver'

src/debugLog.js

@@ -1,4 +1,4 @@
-import { env } from 'process'
+import { env } from 'node:process'
 
 export default typeof env.SLS_DEBUG !== 'undefined'
   ? console.log.bind(null, '[offline]')

src/events/http/Endpoint.js

@@ -1,5 +1,5 @@
-import { existsSync, readFileSync } from 'fs'
-import { resolve } from 'path'
+import { existsSync, readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
 import OfflineEndpoint from './OfflineEndpoint.js'
 import debugLog from '../../debugLog.js'
 

src/events/http/HttpServer.js

@@ -1,11 +1,11 @@
-import { Buffer } from 'buffer'
-import { readFileSync } from 'fs'
-import { join, resolve } from 'path'
-import process, { env, exit } from 'process'
+import { Buffer } from 'node:buffer'
+import { readFileSync } from 'node:fs'
+import { join, resolve } from 'node:path'
+import process, { env, exit } from 'node:process'
 import h2o2 from '@hapi/h2o2'
 import { Server } from '@hapi/hapi'
 import { createRequire } from 'module'
-import * as pathUtils from 'path'
+import * as pathUtils from 'node:path'
 import authFunctionNameExtractor from '../authFunctionNameExtractor.js'
 import authJWTSettingsExtractor from './authJWTSettingsExtractor.js'
 import createAuthScheme from './createAuthScheme.js'

src/events/http/lambda-events/LambdaIntegrationEvent.js

@@ -1,4 +1,4 @@
-import { env } from 'process'
+import { env } from 'node:process'
 import renderVelocityTemplateObject from './renderVelocityTemplateObject.js'
 import VelocityContext from './VelocityContext.js'
 

src/events/http/lambda-events/LambdaProxyIntegrationEvent.js

@@ -1,5 +1,5 @@
-import { Buffer } from 'buffer'
-import { env } from 'process'
+import { Buffer } from 'node:buffer'
+import { env } from 'node:process'
 import { decode } from 'jsonwebtoken'
 import {
   createUniqueId,

src/events/http/lambda-events/LambdaProxyIntegrationEventV2.js

@@ -1,5 +1,5 @@
-import { Buffer } from 'buffer'
-import { env } from 'process'
+import { Buffer } from 'node:buffer'
+import { env } from 'node:process'
 import { decode } from 'jsonwebtoken'
 import {
   formatToClfTime,

src/events/http/lambda-events/VelocityContext.js

@@ -1,5 +1,5 @@
-import { Buffer } from 'buffer'
-import { env } from 'process'
+import { Buffer } from 'node:buffer'
+import { env } from 'node:process'
 import jsEscapeString from 'js-string-escape'
 import { decode } from 'jsonwebtoken'
 import {

src/events/websocket/HttpServer.js

@@ -1,4 +1,4 @@
-import { exit } from 'process'
+import { exit } from 'node:process'
 import { Server } from '@hapi/hapi'
 import { catchAllRoute, connectionsRoutes } from './http-routes/index.js'
 import serverlessLog from '../../serverlessLog.js'

src/lambda/HttpServer.js

@@ -1,5 +1,5 @@
 import { Server } from '@hapi/hapi'
-import { exit } from 'process'
+import { exit } from 'node:process'
 import { invocationsRoute, invokeAsyncRoute } from './routes/index.js'
 import serverlessLog from '../serverlessLog.js'
 import debugLog from '../debugLog.js'

src/lambda/LambdaFunction.js

@@ -1,5 +1,5 @@
-import { dirname, join, resolve } from 'path'
-import { performance } from 'perf_hooks'
+import { dirname, join, resolve } from 'node:path'
+import { performance } from 'node:perf_hooks'
 import { emptyDir, ensureDir, readFile, remove, writeFile } from 'fs-extra'
 import jszip from 'jszip'
 import HandlerRunner from './handler-runner/index.js'

src/lambda/__tests__/LambdaFunction.test.js

@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-// import { performance } from 'perf_hooks'
+import { resolve } from 'node:path'
+// import { performance } from 'node:perf_hooks'
 import LambdaFunction from '../LambdaFunction.js'
 import { DEFAULT_LAMBDA_TIMEOUT } from '../../config/index.js'
 

src/lambda/__tests__/fixtures/Lambda/LambdaFunctionThatReturnsJSONObject.fixture.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import LambdaFunction from '../../../LambdaFunction.js'
 
 export default class LambdaFunctionThatReturnsJSONObject {

src/lambda/__tests__/fixtures/Lambda/LambdaFunctionThatReturnsNativeString.fixture.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import LambdaFunction from '../../../LambdaFunction.js'
 
 export default class LambdaFunctionThatReturnsNativeString {

src/lambda/handler-runner/child-process-runner/ChildProcessRunner.js

@@ -1,4 +1,4 @@
-import path from 'path'
+import path from 'node:path'
 import { node } from 'execa'
 
 const childProcessHelperPath = path.resolve(__dirname, 'childProcessHelper.js')

src/lambda/handler-runner/child-process-runner/childProcessHelper.js

@@ -1,4 +1,4 @@
-import process, { argv } from 'process'
+import process, { argv } from 'node:process'
 import InProcessRunner from '../in-process-runner/index.js'
 
 // TODO handle this:

src/lambda/handler-runner/docker-runner/DockerContainer.js

@@ -1,7 +1,7 @@
-import { createHash } from 'crypto'
-import { createWriteStream, unlinkSync } from 'fs'
-import { platform } from 'os'
-import { dirname, join, sep } from 'path'
+import { createHash } from 'node:crypto'
+import { createWriteStream, unlinkSync } from 'node:fs'
+import { platform } from 'node:os'
+import { dirname, join, sep } from 'node:path'
 import { Lambda } from 'aws-sdk'
 import execa from 'execa'
 import { ensureDir, pathExists, readFile, writeFile } from 'fs-extra'

src/lambda/handler-runner/go-runner/GoRunner.js

@@ -1,7 +1,7 @@
-import { mkdir, readFile, rmdir, writeFile } from 'fs/promises'
-import { EOL } from 'os'
-import { sep, resolve, parse as pathParse } from 'path'
-import process, { chdir, cwd } from 'process'
+import { mkdir, readFile, rmdir, writeFile } from 'node:fs/promises'
+import { EOL } from 'node:os'
+import { sep, resolve, parse as pathParse } from 'node:path'
+import process, { chdir, cwd } from 'node:process'
 import execa, { sync } from 'execa'
 
 const { parse, stringify } = JSON
@@ -89,13 +89,13 @@ export default class GoRunner {
 
     try {
       await mkdir(this.#tmpPath, { recursive: true })
-    } catch (e) {
+    } catch {
       // @ignore
     }
 
     try {
       await writeFile(this.#tmpFile, out, 'utf8')
-    } catch (e) {
+    } catch {
       // @ignore
     }
 
@@ -124,7 +124,7 @@ export default class GoRunner {
       // Make sure we have the mock-lambda runner
       sync('go', ['get', 'github.com/icarus-sullivan/mock-lambda@e065469'])
       sync('go', ['build'])
-    } catch (e) {
+    } catch {
       // @ignore
     }
 

src/lambda/handler-runner/in-process-runner/InProcessRunner.js

@@ -1,7 +1,7 @@
-import { readdirSync } from 'fs'
-import { dirname, resolve } from 'path'
-import { performance } from 'perf_hooks'
-import process from 'process'
+import { readdirSync } from 'node:fs'
+import { dirname, resolve } from 'node:path'
+import { performance } from 'node:perf_hooks'
+import process from 'node:process'
 
 const { assign, keys } = Object
 

src/lambda/handler-runner/java-runner/JavaRunner.js

@@ -1,5 +1,5 @@
-import { EOL } from 'os'
-import process from 'process'
+import { EOL } from 'node:os'
+import process from 'node:process'
 import fetch from 'node-fetch'
 import { invokeJavaLocal } from 'java-invoke-local'
 

src/lambda/handler-runner/python-runner/PythonRunner.js

@@ -1,19 +1,19 @@
-import { spawn } from 'child_process'
-import { EOL, platform } from 'os'
-import { delimiter, join, relative, resolve } from 'path'
-import process, { cwd } from 'process'
-import readline from 'readline'
+import { spawn } from 'node:child_process'
+import { EOL, platform } from 'node:os'
+import { delimiter, join, relative, resolve } from 'node:path'
+import process, { cwd } from 'node:process'
+import readline from 'node:readline'
 
 const { parse, stringify } = JSON
 const { assign } = Object
 const { has } = Reflect
 
 export default class PythonRunner {
+  #allowCache = false
   #env = null
   #handlerName = null
   #handlerPath = null
   #runtime = null
-  #allowCache = false
 
   constructor(funOptions, env, allowCache, v3Utils) {
     const { handlerName, handlerPath, runtime } = funOptions

src/lambda/handler-runner/ruby-runner/RubyRunner.js

@@ -1,6 +1,6 @@
-import { EOL, platform } from 'os'
-import { relative, resolve } from 'path'
-import { cwd } from 'process'
+import { EOL, platform } from 'node:os'
+import { relative, resolve } from 'node:path'
+import { cwd } from 'node:process'
 import execa from 'execa'
 
 const { parse, stringify } = JSON

src/lambda/handler-runner/worker-thread-runner/WorkerThreadRunner.js

@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import { MessageChannel, Worker } from 'worker_threads' // eslint-disable-line import/no-unresolved
+import { resolve } from 'node:path'
+import { MessageChannel, Worker } from 'node:worker_threads' // eslint-disable-line import/no-unresolved
 
 const workerThreadHelperPath = resolve(__dirname, './workerThreadHelper.js')
 

src/lambda/handler-runner/worker-thread-runner/workerThreadHelper.js

@@ -1,5 +1,5 @@
-import { env } from 'process'
-import { parentPort, workerData } from 'worker_threads' // eslint-disable-line import/no-unresolved
+import { env } from 'node:process'
+import { parentPort, workerData } from 'node:worker_threads' // eslint-disable-line import/no-unresolved
 import InProcessRunner from '../in-process-runner/index.js'
 
 const { functionKey, handlerName, handlerPath } = workerData

src/lambda/routes/invocations/invocationsRoute.js

@@ -1,4 +1,4 @@
-import { Buffer } from 'buffer'
+import { Buffer } from 'node:buffer'
 import { Headers } from 'node-fetch'
 import InvocationsController from './InvocationsController.js'
 

src/main.js

@@ -2,7 +2,7 @@
 
 // UNCOMMENT FOR DEVELOPMENT:
 //
-// const { resolve } = require('path')
+// const { resolve } = require('node:path')
 //
 // // eslint-disable-next-line import/no-extraneous-dependencies
 // require('@babel/register')({

src/utils/createApiKey.js

@@ -1,4 +1,4 @@
-import { createHash } from 'crypto'
+import { createHash } from 'node:crypto'
 
 export default function createApiKey() {
   return createHash('md5').digest('hex')

tests/_setupTeardown/npmInstall.js

@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import { env } from 'process'
+import { resolve } from 'node:path'
+import { env } from 'node:process'
 import execa from 'execa'
 import promiseMap from 'p-map'
 import {

tests/endToEnd/environmentVariables/environmentVariables.test.js

@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import { env } from 'process'
+import { resolve } from 'node:path'
+import { env } from 'node:process'
 import fetch from 'node-fetch'
 import {
   joinUrl,

tests/endToEnd/environmentVariables/handler.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { env } = require('process')
+const { env } = require('node:process')
 
 const { stringify } = JSON
 

tests/endToEnd/optionParameters/optionParameters.test.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import fetch from 'node-fetch'
 import {
   joinUrl,

tests/endToEnd/starRoutes/starRoutes.test.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import fetch from 'node-fetch'
 import {
   joinUrl,

tests/endToEnd/starRoutesWithProperties/starRoutes.test.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import fetch from 'node-fetch'
 import {
   joinUrl,

tests/endToEnd/trailingSlash/trailingSlash.test.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import fetch from 'node-fetch'
 import {
   joinUrl,

tests/integration/_testHelpers/compressArtifact.js

@@ -1,4 +1,4 @@
-import { dirname, resolve } from 'path'
+import { dirname, resolve } from 'node:path'
 import archiver from 'archiver'
 import { createWriteStream, ensureDir, stat } from 'fs-extra'
 

tests/integration/_testHelpers/setupTeardown.js

@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import process, { env } from 'process'
+import { resolve } from 'node:path'
+import process, { env } from 'node:process'
 import { node } from 'execa'
 
 let serverlessProcess

tests/integration/artifact/local/localArtifact.test.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import fetch from 'node-fetch'
 import {
   compressArtifact,

tests/integration/authorizer/authorizer.test.js

@@ -1,7 +1,7 @@
 // tests based on:
 // https://dev.to/piczmar_0/serverless-authorizers---custom-rest-authorizer-16
 
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import fetch from 'node-fetch'
 import { joinUrl, setup, teardown } from '../_testHelpers/index.js'
 

tests/integration/custom-authentication/authenticationCustomVariable.test.js

@@ -1,5 +1,5 @@
 import fetch from 'node-fetch'
-import { resolve } from 'path'
+import { resolve } from 'node:path'
 import { joinUrl, setup, teardown } from '../_testHelpers/index.js'
 
 jest.setTimeout(30000)

tests/integration/docker/access-host/accessHost.test.js

@@ -1,5 +1,5 @@
-import { resolve } from 'path'
-import { env } from 'process'
+import { resolve } from 'node:path'
+import { env } from 'node:process'
 import { Server } from '@hapi/hapi'
 import fetch from 'node-fetch'
 import { joinUrl, setup, teardown } from '../../_testHelpers/index.js'