Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meta: use node: protocol when using Node.js built-in core modules #3871

Merged
merged 1 commit into from Jul 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintrc.js
Expand Up @@ -32,6 +32,7 @@ module.exports = {
// extra:
'compat',
'jsdoc',
'unicorn',
],
parser: '@babel/eslint-parser',
parserOptions: {
Expand Down Expand Up @@ -73,6 +74,7 @@ module.exports = {
'node/handle-callback-err': 'error',
'prefer-destructuring': 'error',
'prefer-spread': 'error',
'unicorn/prefer-node-protocol': 'error',

// transloadit rules we would like to enforce in the future
// but will require separate PRs to gradually get there
Expand Down
6 changes: 3 additions & 3 deletions bin/build-css.js
Expand Up @@ -5,9 +5,9 @@ const postcssLogical = require('postcss-logical')
const postcssDirPseudoClass = require('postcss-dir-pseudo-class')
const cssnano = require('cssnano')
const chalk = require('chalk')
const { promisify } = require('util')
const fs = require('fs')
const path = require('path')
const { promisify } = require('node:util')
const fs = require('node:fs')
const path = require('node:path')
const resolve = require('resolve')
const glob = promisify(require('glob'))

Expand Down
6 changes: 3 additions & 3 deletions bin/build-lib.js
@@ -1,10 +1,10 @@
const chalk = require('chalk')
const babel = require('@babel/core')
const t = require('@babel/types')
const { promisify } = require('util')
const { promisify } = require('node:util')
const glob = promisify(require('glob'))
const fs = require('fs')
const path = require('path')
const fs = require('node:fs')
const path = require('node:path')

const { mkdir, stat, writeFile } = fs.promises

Expand Down
6 changes: 3 additions & 3 deletions bin/upload-to-cdn.js
Expand Up @@ -21,9 +21,9 @@
//
// - Kevin van Zonneveld <kevin@transloadit.com>

const path = require('path')
const { pipeline, finished } = require('stream/promises')
const { readFile } = require('fs/promises')
const path = require('node:path')
const { pipeline, finished } = require('node:stream/promises')
const { readFile } = require('node:fs/promises')
const AWS = require('aws-sdk')
const packlist = require('npm-packlist')
const tar = require('tar')
Expand Down
2 changes: 1 addition & 1 deletion examples/angular-example/e2e/protractor.conf.js
Expand Up @@ -26,7 +26,7 @@ exports.config = {
},
onPrepare () {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.json'),
project: require('node:path').join(__dirname, './tsconfig.json'),
})
// eslint-disable-next-line no-undef
jasmine.getEnv().addReporter(new SpecReporter({
Expand Down
2 changes: 1 addition & 1 deletion examples/angular-example/karma.conf.js
Expand Up @@ -25,7 +25,7 @@ module.exports = function karma (config) {
suppressAll: true, // removes the duplicated traces
},
coverageReporter: {
dir: require('path').join(__dirname, './coverage/angular-example'),
dir: require('node:path').join(__dirname, './coverage/angular-example'),
subdir: '.',
reporters: [
{ type: 'html' },
Expand Down
4 changes: 2 additions & 2 deletions examples/aws-companion/server.js
@@ -1,5 +1,5 @@
const fs = require('fs')
const path = require('path')
const fs = require('node:fs')
const path = require('node:path')
const companion = require('../../packages/@uppy/companion')
const app = require('express')()

Expand Down
4 changes: 2 additions & 2 deletions examples/digitalocean-spaces/server.js
@@ -1,5 +1,5 @@
const fs = require('fs')
const path = require('path')
const fs = require('node:fs')
const path = require('node:path')
const budo = require('budo')
const router = require('router')
const companion = require('../../packages/@uppy/companion')
Expand Down
2 changes: 1 addition & 1 deletion examples/node-xhr/server.js
@@ -1,5 +1,5 @@
const formidable = require('formidable')
const http = require('http')
const http = require('node:http')

http.createServer((req, res) => {
const headers = {
Expand Down
2 changes: 1 addition & 1 deletion examples/svelte-example/rollup.config.js
Expand Up @@ -19,7 +19,7 @@ function serve () {
return {
writeBundle () {
if (server) return
server = require('child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
server = require('node:child_process').spawn('npm', ['run', 'start', '--', '--dev'], {
stdio: ['ignore', 'inherit', 'inherit'],
shell: true,
})
Expand Down
2 changes: 1 addition & 1 deletion examples/transloadit/main.js
@@ -1,4 +1,4 @@
const { inspect } = require('util')
const { inspect } = require('node:util')
const robodog = require('@uppy/robodog')

const TRANSLOADIT_KEY = '35c1aed03f5011e982b6afe82599b6a0'
Expand Down
4 changes: 2 additions & 2 deletions examples/transloadit/server.js
@@ -1,6 +1,6 @@
/* eslint-disable compat/compat */
const http = require('http')
const qs = require('querystring')
const http = require('node:http')
const qs = require('node:querystring')
const e = require('he').encode

/**
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -86,6 +86,7 @@
"eslint-plugin-promise": "^5.1.1",
"eslint-plugin-react": "^7.22.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-unicorn": "^43.0.0",
"events.once": "^2.0.2",
"exorcist": "^2.0.0",
"fakefile": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/package.json
Expand Up @@ -79,7 +79,7 @@
"@types/lodash.merge": "4.6.6",
"@types/morgan": "1.7.37",
"@types/ms": "0.7.31",
"@types/node": "18.0.3",
"@types/node": "^18.0.3",
"@types/react": "^17.0.13",
"@types/request": "2.48.4",
"@types/webpack": "^5.28.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/config/companion.js
@@ -1,5 +1,5 @@
const ms = require('ms')
const fs = require('fs')
const fs = require('node:fs')
const { isURL } = require('validator')
const logger = require('../server/logger')

Expand Down
8 changes: 4 additions & 4 deletions packages/@uppy/companion/src/server/Uploader.js
Expand Up @@ -4,10 +4,10 @@ const { randomUUID } = require('node:crypto')
const isObject = require('isobject')
const validator = require('validator')
const request = require('request')
const { pipeline: pipelineCb } = require('stream')
const { join } = require('path')
const fs = require('fs')
const { promisify } = require('util')
const { pipeline: pipelineCb } = require('node:stream')
const { join } = require('node:path')
const fs = require('node:fs')
const { promisify } = require('node:util')

// TODO move to `require('streams/promises').pipeline` when dropping support for Node.js 14.x.
const pipeline = promisify(pipelineCb)
Expand Down
@@ -1,5 +1,5 @@
const qs = require('querystring')
const { URL } = require('url')
const qs = require('node:querystring')
const { URL } = require('node:url')
const { hasMatch } = require('../helpers/utils')
const oAuthState = require('../helpers/oauth-state')

Expand Down
@@ -1,4 +1,4 @@
const { URL } = require('url')
const { URL } = require('node:url')
const serialize = require('serialize-javascript')

const tokenService = require('../helpers/jwt')
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/server/controllers/url.js
@@ -1,6 +1,6 @@
const router = require('express').Router
const request = require('request')
const { URL } = require('url')
const { URL } = require('node:url')
const validator = require('validator')

const { startDownUpload } = require('../helpers/upload')
Expand Down
@@ -1,4 +1,4 @@
const { EventEmitter } = require('events')
const { EventEmitter } = require('node:events')

module.exports = () => {
return new EventEmitter()
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/server/helpers/oauth-state.js
@@ -1,4 +1,4 @@
const crypto = require('crypto')
const crypto = require('node:crypto')
// @ts-ignore
const atob = require('atob')
const { encrypt, decrypt } = require('./utils')
Expand Down
8 changes: 4 additions & 4 deletions packages/@uppy/companion/src/server/helpers/request.js
@@ -1,8 +1,8 @@
// eslint-disable-next-line max-classes-per-file
const http = require('http')
const https = require('https')
const { URL } = require('url')
const dns = require('dns')
const http = require('node:http')
const https = require('node:https')
const { URL } = require('node:url')
const dns = require('node:dns')
const request = require('request')
const ipaddr = require('ipaddr.js')

Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/server/helpers/utils.js
@@ -1,4 +1,4 @@
const crypto = require('crypto')
const crypto = require('node:crypto')

/**
*
Expand Down
6 changes: 3 additions & 3 deletions packages/@uppy/companion/src/server/jobs.js
@@ -1,7 +1,7 @@
const schedule = require('node-schedule')
const fs = require('fs')
const path = require('path')
const { promisify } = require('util')
const fs = require('node:fs')
const path = require('node:path')
const { promisify } = require('node:util')
const request = require('request')

const { FILE_NAME_PREFIX } = require('./Uploader')
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/server/logger.js
@@ -1,6 +1,6 @@
const chalk = require('chalk')
const escapeStringRegexp = require('escape-string-regexp')
const util = require('util')
const util = require('node:util')
const { ProviderApiError, ProviderAuthError } = require('./provider/error')

const valuesToMask = []
Expand Down
@@ -1,5 +1,5 @@
const mime = require('mime-types')
const querystring = require('querystring')
const querystring = require('node:querystring')

exports.isFolder = (item) => {
return item.type === 'folder'
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/server/provider/box/index.js
@@ -1,6 +1,6 @@
const request = require('request')
const purest = require('purest')({ request })
const { promisify } = require('util')
const { promisify } = require('node:util')

const Provider = require('../Provider')
const logger = require('../../logger')
Expand Down
@@ -1,4 +1,4 @@
const querystring = require('querystring')
const querystring = require('node:querystring')

// @todo use the "about" endpoint to get the username instead
// see: https://developers.google.com/drive/api/v2/reference/about/get
Expand Down
@@ -1,7 +1,7 @@
/* eslint-disable no-underscore-dangle */
const request = require('request')
const purest = require('purest')({ request })
const { promisify } = require('util')
const { promisify } = require('node:util')

const Provider = require('../Provider')
const logger = require('../../logger')
Expand Down
@@ -1,5 +1,5 @@
const mime = require('mime-types')
const querystring = require('querystring')
const querystring = require('node:querystring')

exports.getUsername = (data) => {
return data.user_email
Expand Down
@@ -1,6 +1,6 @@
const request = require('request')
const purest = require('purest')({ request })
const { promisify } = require('util')
const { promisify } = require('node:util')

const Provider = require('../Provider')
const logger = require('../../logger')
Expand Down
@@ -1,4 +1,4 @@
const querystring = require('querystring')
const querystring = require('node:querystring')

exports.isFolder = (item) => {
return !!item.type
Expand Down
@@ -1,6 +1,6 @@
const request = require('request')
const purest = require('purest')({ request })
const { promisify } = require('util')
const { promisify } = require('node:util')

const Provider = require('../Provider')
const { getURLMeta } = require('../../helpers/request')
Expand Down
@@ -1,4 +1,4 @@
const querystring = require('querystring')
const querystring = require('node:querystring')

const MEDIA_TYPES = Object.freeze({
video: 'VIDEO',
Expand Down
@@ -1,6 +1,6 @@
const request = require('request')
const purest = require('purest')({ request })
const { promisify } = require('util')
const { promisify } = require('node:util')

const Provider = require('../../Provider')
const { getURLMeta } = require('../../../helpers/request')
Expand Down
@@ -1,4 +1,4 @@
const querystring = require('querystring')
const querystring = require('node:querystring')

exports.isFolder = (item) => {
if (item.remoteItem) {
Expand Down
@@ -1,6 +1,6 @@
const request = require('request')
const purest = require('purest')({ request })
const { promisify } = require('util')
const { promisify } = require('node:util')

const Provider = require('../Provider')
const logger = require('../../logger')
Expand Down
@@ -1,4 +1,4 @@
const querystring = require('querystring')
const querystring = require('node:querystring')

exports.isFolder = (item) => { // eslint-disable-line no-unused-vars
return false
Expand Down
@@ -1,5 +1,5 @@
const request = require('request')
const { promisify } = require('util')
const { promisify } = require('node:util')

const SearchProvider = require('../SearchProvider')
const { getURLMeta } = require('../../helpers/request')
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/src/server/provider/zoom/index.js
@@ -1,4 +1,4 @@
const { promisify } = require('util')
const { promisify } = require('node:util')
const request = require('request')
const moment = require('moment-timezone')
const purest = require('purest')({ request })
Expand Down
4 changes: 2 additions & 2 deletions packages/@uppy/companion/src/standalone/helper.js
@@ -1,7 +1,7 @@
const fs = require('fs')
const fs = require('node:fs')
const merge = require('lodash.merge')
const stripIndent = require('common-tags/lib/stripIndent')
const crypto = require('crypto')
const crypto = require('node:crypto')

const utils = require('../server/helpers/utils')
const logger = require('../server/logger')
Expand Down
4 changes: 2 additions & 2 deletions packages/@uppy/companion/src/standalone/index.js
@@ -1,9 +1,9 @@
const express = require('express')
const qs = require('querystring')
const qs = require('node:querystring')
const helmet = require('helmet')
const morgan = require('morgan')
const bodyParser = require('body-parser')
const { URL } = require('url')
const { URL } = require('node:url')
const session = require('express-session')
const addRequestId = require('express-request-id')()
const connectRedis = require('connect-redis')
Expand Down
4 changes: 2 additions & 2 deletions packages/@uppy/companion/test/__mocks__/purest.js
@@ -1,5 +1,5 @@
const fs = require('fs')
const qs = require('querystring')
const fs = require('node:fs')
const qs = require('node:querystring')

const fixtures = require('../fixtures').providers

Expand Down
4 changes: 2 additions & 2 deletions packages/@uppy/companion/test/__tests__/http-agent.js
@@ -1,8 +1,8 @@
/* global test:false, expect:false, describe:false, */

const request = require('request')
const http = require('http')
const https = require('https')
const http = require('node:http')
const https = require('node:https')
const { getProtectedHttpAgent, getRedirectEvaluator, FORBIDDEN_IP_ADDRESS } = require('../../src/server/helpers/request')

describe('test getRedirectEvaluator', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/test/__tests__/uploader.js
Expand Up @@ -3,7 +3,7 @@
jest.mock('tus-js-client')

const intoStream = require('into-stream')
const fs = require('fs')
const fs = require('node:fs')
const nock = require('nock')

const Uploader = require('../../src/server/Uploader')
Expand Down
2 changes: 1 addition & 1 deletion website/build-examples.js
Expand Up @@ -23,7 +23,7 @@

const { glob } = require('multi-glob')
const chalk = require('chalk')
const path = require('path')
const path = require('node:path')
const notifier = require('node-notifier')

const esbuild = require('esbuild')
Expand Down