diff --git a/docs/pages/apis/pool.mdx b/docs/pages/apis/pool.mdx index 608835fc6..fbe0279e1 100644 --- a/docs/pages/apis/pool.mdx +++ b/docs/pages/apis/pool.mdx @@ -91,7 +91,7 @@ const result = await pool.query('SELECT $1::text as name', ['brianc']) console.log(result.rows[0].name) // brianc ``` -Notice in the example above there is no need to check out or release a client. The pool is doing the acquiring and releasing internally. I find `pool.query` to be a handy shortcut many situations and use it exclusively unless I need a transaction. +Notice in the example above there is no need to check out or release a client. The pool is doing the acquiring and releasing internally. I find `pool.query` to be a handy shortcut in many situations and I use it exclusively unless I need a transaction.
@@ -112,7 +112,7 @@ Acquires a client from the pool. - If there are idle clients in the pool one will be returned to the callback on `process.nextTick`. - If the pool is not full but all current clients are checked out a new client will be created & returned to this callback. -- If the pool is 'full' and all clients are currently checked out will wait in a FIFO queue until a client becomes available by it being released back to the pool. +- If the pool is 'full' and all clients are currently checked out, requests will wait in a FIFO queue until a client becomes available by being released back to the pool. ```js import { Pool } from 'pg' diff --git a/packages/pg-bundler-test/esbuild-cloudflare.config.mjs b/packages/pg-bundler-test/esbuild-cloudflare.config.mjs index d083bc506..b9947d626 100644 --- a/packages/pg-bundler-test/esbuild-cloudflare.config.mjs +++ b/packages/pg-bundler-test/esbuild-cloudflare.config.mjs @@ -4,5 +4,5 @@ await esbuild.build({ entryPoints: ['./src/index.mjs'], bundle: true, outfile: './dist/esbuild-cloudflare.js', - conditions: ['import', 'cloudflare'], + conditions: ['import', 'workerd'], }) diff --git a/packages/pg-bundler-test/package.json b/packages/pg-bundler-test/package.json index 4c0aa0c01..b16d47775 100644 --- a/packages/pg-bundler-test/package.json +++ b/packages/pg-bundler-test/package.json @@ -1,6 +1,6 @@ { "name": "pg-bundler-test", - "version": "0.0.1", + "version": "0.0.2", "description": "Test bundlers with pg-cloudflare, https://github.com/brianc/node-postgres/issues/3452", "license": "MIT", "private": true, @@ -9,7 +9,7 @@ "@rollup/plugin-commonjs": "^28.0.3", "@rollup/plugin-node-resolve": "^16.0.1", "esbuild": "^0.25.5", - "pg-cloudflare": "^1.2.6", + "pg-cloudflare": "^1.2.7", "rollup": "^4.41.1", "vite": "^6.3.5", "webpack": "^5.99.9", diff --git a/packages/pg-bundler-test/rollup-cloudflare.config.mjs b/packages/pg-bundler-test/rollup-cloudflare.config.mjs index 6e5c8824d..592b477ea 100644 --- a/packages/pg-bundler-test/rollup-cloudflare.config.mjs +++ b/packages/pg-bundler-test/rollup-cloudflare.config.mjs @@ -8,6 +8,6 @@ export default defineConfig({ file: 'dist/rollup-cloudflare.js', format: 'es', }, - plugins: [nodeResolve({ exportConditions: ['import', 'cloudflare'], preferBuiltins: true }), commonjs()], + plugins: [nodeResolve({ exportConditions: ['import', 'workerd'], preferBuiltins: true }), commonjs()], external: ['cloudflare:sockets'], }) diff --git a/packages/pg-bundler-test/vite-cloudflare.config.mjs b/packages/pg-bundler-test/vite-cloudflare.config.mjs index c48720ebe..58ed0827d 100644 --- a/packages/pg-bundler-test/vite-cloudflare.config.mjs +++ b/packages/pg-bundler-test/vite-cloudflare.config.mjs @@ -14,7 +14,7 @@ export default defineConfig({ }, }, resolve: { - conditions: ['import', 'cloudflare'], + conditions: ['import', 'workerd'], }, plugins: [commonjs()], }) diff --git a/packages/pg-bundler-test/webpack-cloudflare.config.mjs b/packages/pg-bundler-test/webpack-cloudflare.config.mjs index 4645d485a..50d4ff4a2 100644 --- a/packages/pg-bundler-test/webpack-cloudflare.config.mjs +++ b/packages/pg-bundler-test/webpack-cloudflare.config.mjs @@ -6,7 +6,7 @@ export default { output: { filename: 'webpack-cloudflare.js', }, - resolve: { conditionNames: ['import', 'cloudflare'] }, + resolve: { conditionNames: ['import', 'workerd'] }, plugins: [ // ignore cloudflare:sockets imports new webpack.IgnorePlugin({ diff --git a/packages/pg-cloudflare/README.md b/packages/pg-cloudflare/README.md index 32c3faef7..68663c45c 100644 --- a/packages/pg-cloudflare/README.md +++ b/packages/pg-cloudflare/README.md @@ -19,7 +19,7 @@ config. For example: ```js export default { ..., - resolve: { conditionNames: [..., "cloudflare"] }, + resolve: { conditionNames: [..., "workerd"] }, plugins: [ // ignore cloudflare:sockets imports new webpack.IgnorePlugin({ @@ -29,11 +29,15 @@ config. For example: } ``` - `vite.config.js` + + > [!NOTE] + > If you are using the [Cloudflare Vite plugin](https://www.npmjs.com/package/@cloudflare/vite-plugin) then the following configuration is not necessary. + ```js export default defineConfig({ ..., resolve: { - conditions: [..., "cloudflare"], + conditions: [..., "workerd"], }, build: { ..., @@ -44,11 +48,12 @@ config. For example: }, }) ``` + - `rollup.config.js` ```js export default defineConfig({ ..., - plugins: [..., nodeResolve({ exportConditions: [..., 'cloudflare'] })], + plugins: [..., nodeResolve({ exportConditions: [..., 'workerd'] })], // don't try to bundle cloudflare:sockets external: [..., 'cloudflare:sockets'], }) @@ -57,7 +62,7 @@ config. For example: ```js await esbuild.build({ ..., - conditions: [..., 'cloudflare'], + conditions: [..., 'workerd'], }) ``` diff --git a/packages/pg-cloudflare/package.json b/packages/pg-cloudflare/package.json index a52919d1a..46fba8882 100644 --- a/packages/pg-cloudflare/package.json +++ b/packages/pg-cloudflare/package.json @@ -1,6 +1,6 @@ { "name": "pg-cloudflare", - "version": "1.2.6", + "version": "1.2.7", "description": "A socket implementation that can run on Cloudflare Workers using native TCP connections.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -11,12 +11,13 @@ }, "exports": { ".": { - "cloudflare": { + "workerd": { "import": "./esm/index.mjs", "require": "./dist/index.js" }, "default": "./dist/empty.js" - } + }, + "./package.json": "./package.json" }, "scripts": { "build": "tsc", diff --git a/packages/pg-connection-string/index.js b/packages/pg-connection-string/index.js index 4d83975ec..e34eabf4c 100644 --- a/packages/pg-connection-string/index.js +++ b/packages/pg-connection-string/index.js @@ -1,5 +1,7 @@ 'use strict' +const { emitWarning } = require('node:process') + //Parse method copied from https://github.com/brianc/node-postgres //Copyright (c) 2010-2014 Brian Carlson (brian.m.carlson@gmail.com) //MIT License @@ -33,6 +35,7 @@ function parse(str, options = {}) { } catch (err) { // Remove the input from the error message to avoid leaking sensitive information err.input && (err.input = '*****REDACTED*****') + throw err } // We'd like to use Object.fromEntries() here but Node.js 10 does not support it @@ -138,6 +141,9 @@ function parse(str, options = {}) { case 'require': case 'verify-ca': case 'verify-full': { + if (config.sslmode !== 'verify-full') { + deprecatedSslModeWarning(config.sslmode) + } break } case 'no-verify': { @@ -206,6 +212,20 @@ function parseIntoClientConfig(str) { return toClientConfig(parse(str)) } +function deprecatedSslModeWarning(sslmode) { + if (!deprecatedSslModeWarning.warned) { + deprecatedSslModeWarning.warned = true + emitWarning(`SECURITY WARNING: The SSL modes 'prefer', 'require', and 'verify-ca' are treated as aliases for 'verify-full'. +In the next major version (pg-connection-string v3.0.0 and pg v9.0.0), these modes will adopt standard libpq semantics, which have weaker security guarantees. + +To prepare for this change: +- If you want the current behavior, explicitly use 'sslmode=verify-full' +- If you want libpq compatibility now, use 'uselibpqcompat=true&sslmode=${sslmode}' + +See https://www.postgresql.org/docs/current/libpq-ssl.html for libpq SSL mode definitions.`) + } +} + module.exports = parse parse.parse = parse diff --git a/packages/pg-connection-string/test/parse.ts b/packages/pg-connection-string/test/parse.ts index 1ba636788..a58edbe9c 100644 --- a/packages/pg-connection-string/test/parse.ts +++ b/packages/pg-connection-string/test/parse.ts @@ -330,6 +330,7 @@ describe('parse', function () { parse(connectionString) } catch (err: unknown) { expect(JSON.stringify(err)).to.not.include(password, 'Password should not be in the error message') + expect(JSON.stringify(err)).to.include('REDACTED', 'The thrown error should contain the redacted URL') return } throw new Error('Expected an error to be thrown') diff --git a/packages/pg-cursor/package.json b/packages/pg-cursor/package.json index 5b70a6452..9da6f5b03 100644 --- a/packages/pg-cursor/package.json +++ b/packages/pg-cursor/package.json @@ -1,6 +1,6 @@ { "name": "pg-cursor", - "version": "2.15.2", + "version": "2.15.3", "description": "Query cursor extension for node-postgres", "main": "index.js", "exports": { @@ -25,7 +25,7 @@ "license": "MIT", "devDependencies": { "mocha": "^10.5.2", - "pg": "^8.16.2" + "pg": "^8.16.3" }, "peerDependencies": { "pg": "^8" diff --git a/packages/pg-esm-test/common-js-imports.test.cjs b/packages/pg-esm-test/common-js-imports.test.cjs index 21c03e049..261e8ed07 100644 --- a/packages/pg-esm-test/common-js-imports.test.cjs +++ b/packages/pg-esm-test/common-js-imports.test.cjs @@ -5,9 +5,14 @@ const { describe, it } = test const paths = [ 'pg', 'pg/lib/index.js', + 'pg/lib/index', + 'pg/lib/connection-parameters', 'pg/lib/connection-parameters.js', + 'pg/lib/type-overrides', 'pg-protocol/dist/messages.js', + 'pg-protocol/dist/messages', 'pg-native/lib/build-result.js', + 'pg-cloudflare/package.json', ] for (const path of paths) { describe(`importing ${path}`, () => { diff --git a/packages/pg-esm-test/package.json b/packages/pg-esm-test/package.json index 9f1ec6246..482486eda 100644 --- a/packages/pg-esm-test/package.json +++ b/packages/pg-esm-test/package.json @@ -1,11 +1,11 @@ { "name": "pg-esm-test", - "version": "1.2.2", + "version": "1.2.3", "description": "A test module for PostgreSQL with ESM support", "main": "index.js", "type": "module", "scripts": { - "test": "node --test --conditions=cloudflare" + "test": "node --test --conditions=workerd" }, "keywords": [ "postgres", @@ -14,13 +14,13 @@ "test" ], "devDependencies": { - "pg": "^8.16.2", - "pg-cloudflare": "^1.2.6", - "pg-cursor": "^2.15.2", - "pg-native": "^3.5.1", + "pg": "^8.16.3", + "pg-cloudflare": "^1.2.7", + "pg-cursor": "^2.15.3", + "pg-native": "^3.5.2", "pg-pool": "^3.10.1", - "pg-protocol": "^1.10.2", - "pg-query-stream": "^4.10.2" + "pg-protocol": "^1.10.3", + "pg-query-stream": "^4.10.3" }, "author": "Brian M. Carlson ", "license": "MIT" diff --git a/packages/pg-native/index.js b/packages/pg-native/index.js index cf14477a7..8c83406bb 100644 --- a/packages/pg-native/index.js +++ b/packages/pg-native/index.js @@ -18,7 +18,7 @@ const Client = (module.exports = function (config) { this._reading = false this._read = this._read.bind(this) - // allow custom type converstion to be passed in + // allow custom type conversion to be passed in this._types = config.types || types // allow config to specify returning results diff --git a/packages/pg-native/package.json b/packages/pg-native/package.json index 261b66b4f..92bf5cac2 100644 --- a/packages/pg-native/package.json +++ b/packages/pg-native/package.json @@ -1,6 +1,6 @@ { "name": "pg-native", - "version": "3.5.1", + "version": "3.5.2", "description": "A slightly nicer interface to Postgres over node-libpq", "main": "index.js", "exports": { diff --git a/packages/pg-pool/README.md b/packages/pg-pool/README.md index 3ff657fe0..f3bb2d6be 100644 --- a/packages/pg-pool/README.md +++ b/packages/pg-pool/README.md @@ -1,9 +1,11 @@ # pg-pool + [![Build Status](https://travis-ci.org/brianc/node-pg-pool.svg?branch=master)](https://travis-ci.org/brianc/node-pg-pool) A connection pool for node-postgres ## install + ```sh npm i pg-pool pg ``` @@ -48,14 +50,15 @@ const pgNativePool = new Pool({ Client: PgNativeClient }) ``` ##### Note: + The Pool constructor does not support passing a Database URL as the parameter. To use pg-pool on heroku, for example, you need to parse the URL into a config object. Here is an example of how to parse a Database URL. ```js -const Pool = require('pg-pool'); +const Pool = require('pg-pool') const url = require('url') -const params = url.parse(process.env.DATABASE_URL); -const auth = params.auth.split(':'); +const params = url.parse(process.env.DATABASE_URL) +const auth = params.auth.split(':') const config = { user: auth[0], @@ -63,10 +66,10 @@ const config = { host: params.hostname, port: params.port, database: params.pathname.split('/')[1], - ssl: true -}; + ssl: true, +} -const pool = new Pool(config); +const pool = new Pool(config) /* Transforms, 'postgres://DBuser:secret@DBHost:#####/myDB', into @@ -79,7 +82,7 @@ const pool = new Pool(config); ssl: true } */ -``` +``` ### acquire clients with a promise @@ -87,15 +90,17 @@ pg-pool supports a fully promise-based api for acquiring clients ```js const pool = new Pool() -pool.connect().then(client => { - client.query('select $1::text as name', ['pg-pool']).then(res => { - client.release() - console.log('hello from', res.rows[0].name) - }) - .catch(e => { - client.release() - console.error('query error', e.message, e.stack) - }) +pool.connect().then((client) => { + client + .query('select $1::text as name', ['pg-pool']) + .then((res) => { + client.release() + console.log('hello from', res.rows[0].name) + }) + .catch((e) => { + client.release() + console.error('query error', e.message, e.stack) + }) }) ``` @@ -105,7 +110,7 @@ this ends up looking much nicer if you're using [co](https://github.com/tj/co) o ```js // with async/await -(async () => { +;(async () => { const pool = new Pool() const client = await pool.connect() try { @@ -114,10 +119,10 @@ this ends up looking much nicer if you're using [co](https://github.com/tj/co) o } finally { client.release() } -})().catch(e => console.error(e.message, e.stack)) +})().catch((e) => console.error(e.message, e.stack)) // with co -co(function * () { +co(function* () { const client = yield pool.connect() try { const result = yield client.query('select $1::text as name', ['brianc']) @@ -125,7 +130,7 @@ co(function * () { } finally { client.release() } -}).catch(e => console.error(e.message, e.stack)) +}).catch((e) => console.error(e.message, e.stack)) ``` ### your new favorite helper method @@ -148,14 +153,14 @@ pool.query('SELECT $1::text as name', ['brianc'], function (err, res) { }) ``` -__pro tip:__ unless you need to run a transaction (which requires a single client for multiple queries) or you +**pro tip:** unless you need to run a transaction (which requires a single client for multiple queries) or you have some other edge case like [streaming rows](https://github.com/brianc/node-pg-query-stream) or using a [cursor](https://github.com/brianc/node-pg-cursor) -you should almost always just use `pool.query`. Its easy, it does the right thing :tm:, and wont ever forget to return +you should almost always just use `pool.query`. Its easy, it does the right thing :tm:, and wont ever forget to return clients back to the pool after the query is done. ### drop-in backwards compatible -pg-pool still and will always support the traditional callback api for acquiring a client. This is the exact API node-postgres has shipped with for years: +pg-pool still and will always support the traditional callback api for acquiring a client. This is the exact API node-postgres has shipped with for years: ```js const pool = new Pool() @@ -175,7 +180,7 @@ pool.connect((err, client, done) => { ### shut it down When you are finished with the pool if all the clients are idle the pool will close them after `config.idleTimeoutMillis` and your app -will shutdown gracefully. If you don't want to wait for the timeout you can end the pool as follows: +will shutdown gracefully. If you don't want to wait for the timeout you can end the pool as follows: ```js const pool = new Pool() @@ -187,7 +192,7 @@ await pool.end() ### a note on instances -The pool should be a __long-lived object__ in your application. Generally you'll want to instantiate one pool when your app starts up and use the same instance of the pool throughout the lifetime of your application. If you are frequently creating a new pool within your code you likely don't have your pool initialization code in the correct place. Example: +The pool should be a **long-lived object** in your application. Generally you'll want to instantiate one pool when your app starts up and use the same instance of the pool throughout the lifetime of your application. If you are frequently creating a new pool within your code you likely don't have your pool initialization code in the correct place. Example: ```js // assume this is a file in your program at ./your-app/lib/db.js @@ -215,11 +220,11 @@ module.exports.connect = () => { ### events -Every instance of a `Pool` is an event emitter. These instances emit the following events: +Every instance of a `Pool` is an event emitter. These instances emit the following events: #### error -Emitted whenever an idle client in the pool encounters an error. This is common when your PostgreSQL server shuts down, reboots, or a network partition otherwise causes it to become unavailable while your pool has connected clients. +Emitted whenever an idle client in the pool encounters an error. This is common when your PostgreSQL server shuts down, reboots, or a network partition otherwise causes it to become unavailable while your pool has connected clients. Example: @@ -229,7 +234,7 @@ const pool = new Pool() // attach an error handler to the pool for when a connected, idle client // receives an error by being disconnected, etc -pool.on('error', function(error, client) { +pool.on('error', function (error, client) { // handle this in the same way you would treat process.on('uncaughtException') // it is supplied the error as well as the idle client which received the error }) @@ -237,7 +242,7 @@ pool.on('error', function(error, client) { #### connect -Fired whenever the pool creates a __new__ `pg.Client` instance and successfully connects it to the backend. +Fired whenever the pool creates a **new** `pg.Client` instance and successfully connects it to the backend. Example: @@ -247,20 +252,19 @@ const pool = new Pool() const count = 0 -pool.on('connect', client => { +pool.on('connect', (client) => { client.count = count++ }) pool .connect() - .then(client => { + .then((client) => { return client .query('SELECT $1::int AS "clientCount"', [client.count]) - .then(res => console.log(res.rows[0].clientCount)) // outputs 0 + .then((res) => console.log(res.rows[0].clientCount)) // outputs 0 .then(() => client) }) - .then(client => client.release()) - + .then((client) => client.release()) ``` #### acquire @@ -293,12 +297,11 @@ setTimeout(function () { console.log('connect count:', connectCount) // output: connect count: 10 console.log('acquire count:', acquireCount) // output: acquire count: 200 }, 100) - ``` ### environment variables -pg-pool & node-postgres support some of the same environment variables as `psql` supports. The most common are: +pg-pool & node-postgres support some of the same environment variables as `psql` supports. The most common are: ``` PGDATABASE=my_db @@ -308,40 +311,19 @@ PGPORT=5432 PGSSLMODE=require ``` -Usually I will export these into my local environment via a `.env` file with environment settings or export them in `~/.bash_profile` or something similar. This way I get configurability which works with both the postgres suite of tools (`psql`, `pg_dump`, `pg_restore`) and node, I can vary the environment variables locally and in production, and it supports the concept of a [12-factor app](http://12factor.net/) out of the box. - -## bring your own promise - -In versions of node `<=0.12.x` there is no native promise implementation available globally. You can polyfill the promise globally like this: - -```js -// first run `npm install promise-polyfill --save -if (typeof Promise == 'undefined') { - global.Promise = require('promise-polyfill') -} -``` - -You can use any other promise implementation you'd like. The pool also allows you to configure the promise implementation on a per-pool level: - -```js -const bluebirdPool = new Pool({ - Promise: require('bluebird') -}) -``` - -__please note:__ in node `<=0.12.x` the pool will throw if you do not provide a promise constructor in one of the two ways mentioned above. In node `>=4.0.0` the pool will use the native promise implementation by default; however, the two methods above still allow you to "bring your own." +Usually I will export these into my local environment via a `.env` file with environment settings or export them in `~/.bash_profile` or something similar. This way I get configurability which works with both the postgres suite of tools (`psql`, `pg_dump`, `pg_restore`) and node, I can vary the environment variables locally and in production, and it supports the concept of a [12-factor app](http://12factor.net/) out of the box. ## maxUses and read-replica autoscaling (e.g. AWS Aurora) The maxUses config option can help an application instance rebalance load against a replica set that has been auto-scaled after the connection pool is already full of healthy connections. -The mechanism here is that a connection is considered "expended" after it has been acquired and released `maxUses` number of times. Depending on the load on your system, this means there will be an approximate time in which any given connection will live, thus creating a window for rebalancing. +The mechanism here is that a connection is considered "expended" after it has been acquired and released `maxUses` number of times. Depending on the load on your system, this means there will be an approximate time in which any given connection will live, thus creating a window for rebalancing. -Imagine a scenario where you have 10 app instances providing an API running against a replica cluster of 3 that are accessed via a round-robin DNS entry. Each instance runs a connection pool size of 20. With an ambient load of 50 requests per second, the connection pool will likely fill up in a few minutes with healthy connections. +Imagine a scenario where you have 10 app instances providing an API running against a replica cluster of 3 that are accessed via a round-robin DNS entry. Each instance runs a connection pool size of 20. With an ambient load of 50 requests per second, the connection pool will likely fill up in a few minutes with healthy connections. -If you have weekly bursts of traffic which peak at 1,000 requests per second, you might want to grow your replicas to 10 during this period. Without setting `maxUses`, the new replicas will not be adopted by the app servers without an intervention -- namely, restarting each in turn in order to build up new connection pools that are balanced against all the replicas. Adding additional app server instances will help to some extent because they will adopt all the replicas in an even way, but the initial app servers will continue to focus additional load on the original replicas. +If you have weekly bursts of traffic which peak at 1,000 requests per second, you might want to grow your replicas to 10 during this period. Without setting `maxUses`, the new replicas will not be adopted by the app servers without an intervention -- namely, restarting each in turn in order to build up new connection pools that are balanced against all the replicas. Adding additional app server instances will help to some extent because they will adopt all the replicas in an even way, but the initial app servers will continue to focus additional load on the original replicas. -This is where the `maxUses` configuration option comes into play. Setting `maxUses` to 7500 will ensure that over a period of 30 minutes or so the new replicas will be adopted as the pre-existing connections are closed and replaced with new ones, thus creating a window for eventual balance. +This is where the `maxUses` configuration option comes into play. Setting `maxUses` to 7500 will ensure that over a period of 30 minutes or so the new replicas will be adopted as the pre-existing connections are closed and replaced with new ones, thus creating a window for eventual balance. You'll want to test based on your own scenarios, but one way to make a first guess at `maxUses` is to identify an acceptable window for rebalancing and then solve for the value: @@ -362,7 +344,7 @@ To run tests clone the repo, `npm i` in the working dir, and then run `npm test` ## contributions -I love contributions. Please make sure they have tests, and submit a PR. If you're not sure if the issue is worth it or will be accepted it never hurts to open an issue to begin the conversation. If you're interested in keeping up with node-postgres releated stuff, you can follow me on twitter at [@briancarlson](https://twitter.com/briancarlson) - I generally announce any noteworthy updates there. +I love contributions. Please make sure they have tests, and submit a PR. If you're not sure if the issue is worth it or will be accepted it never hurts to open an issue to begin the conversation. If you're interested in keeping up with node-postgres releated stuff, you can follow me on twitter at [@briancarlson](https://twitter.com/briancarlson) - I generally announce any noteworthy updates there. ## license diff --git a/packages/pg-pool/index.js b/packages/pg-pool/index.js index b3d9ada96..3e505f797 100644 --- a/packages/pg-pool/index.js +++ b/packages/pg-pool/index.js @@ -372,8 +372,10 @@ class Pool extends EventEmitter { let tid if (this.options.idleTimeoutMillis && this._isAboveMin()) { tid = setTimeout(() => { - this.log('remove idle client') - this._remove(client, this._pulseQueue.bind(this)) + if (this._isAboveMin()) { + this.log('remove idle client') + this._remove(client, this._pulseQueue.bind(this)) + } }, this.options.idleTimeoutMillis) if (this.options.allowExitOnIdle) { diff --git a/packages/pg-pool/package.json b/packages/pg-pool/package.json index e2482a00d..93f60ce23 100644 --- a/packages/pg-pool/package.json +++ b/packages/pg-pool/package.json @@ -30,9 +30,9 @@ "author": "Brian M. Carlson", "license": "MIT", "bugs": { - "url": "https://github.com/brianc/node-pg-pool/issues" + "url": "https://github.com/brianc/node-postgres/issues" }, - "homepage": "https://github.com/brianc/node-pg-pool#readme", + "homepage": "https://github.com/brianc/node-postgres/tree/master/packages/pg-pool#readme", "devDependencies": { "bluebird": "3.7.2", "co": "4.6.0", diff --git a/packages/pg-pool/test/bring-your-own-promise.js b/packages/pg-pool/test/bring-your-own-promise.js deleted file mode 100644 index e905ccc0b..000000000 --- a/packages/pg-pool/test/bring-your-own-promise.js +++ /dev/null @@ -1,42 +0,0 @@ -'use strict' -const co = require('co') -const expect = require('expect.js') - -const describe = require('mocha').describe -const it = require('mocha').it -const BluebirdPromise = require('bluebird') - -const Pool = require('../') - -const checkType = (promise) => { - expect(promise).to.be.a(BluebirdPromise) - return promise.catch((e) => undefined) -} - -describe('Bring your own promise', function () { - it( - 'uses supplied promise for operations', - co.wrap(function* () { - const pool = new Pool({ Promise: BluebirdPromise }) - const client1 = yield checkType(pool.connect()) - client1.release() - yield checkType(pool.query('SELECT NOW()')) - const client2 = yield checkType(pool.connect()) - // TODO - make sure pg supports BYOP as well - client2.release() - yield checkType(pool.end()) - }) - ) - - it( - 'uses promises in errors', - co.wrap(function* () { - const pool = new Pool({ Promise: BluebirdPromise, port: 48484 }) - yield checkType(pool.connect()) - yield checkType(pool.end()) - yield checkType(pool.connect()) - yield checkType(pool.query()) - yield checkType(pool.end()) - }) - ) -}) diff --git a/packages/pg-pool/test/sizing.js b/packages/pg-pool/test/sizing.js index c237995a8..0e93d7376 100644 --- a/packages/pg-pool/test/sizing.js +++ b/packages/pg-pool/test/sizing.js @@ -124,3 +124,19 @@ describe('pool size of 2', () => { }) ) }) + +describe('pool min size', () => { + it( + 'does not drop below min when clients released at same time', + co.wrap(function* () { + const pool = new Pool({ max: 2, min: 1, idleTimeoutMillis: 10 }) + const client = yield pool.connect() + const client2 = yield pool.connect() + client.release() + client2.release() + yield new Promise((resolve) => setTimeout(resolve, 20)) + expect(pool.idleCount).to.equal(1) + return yield pool.end() + }) + ) +}) diff --git a/packages/pg-protocol/package.json b/packages/pg-protocol/package.json index 7f2684261..a57b2fffe 100644 --- a/packages/pg-protocol/package.json +++ b/packages/pg-protocol/package.json @@ -1,6 +1,6 @@ { "name": "pg-protocol", - "version": "1.10.2", + "version": "1.10.3", "description": "The postgres client/server binary protocol, implemented in TypeScript", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -10,11 +10,8 @@ "require": "./dist/index.js", "default": "./dist/index.js" }, - "./dist/*": { - "import": "./dist/*", - "require": "./dist/*", - "default": "./dist/*" - } + "./dist/*": "./dist/*.js", + "./dist/*.js": "./dist/*.js" }, "license": "MIT", "devDependencies": { diff --git a/packages/pg-query-stream/package.json b/packages/pg-query-stream/package.json index b7ab9be71..62bd27b6a 100644 --- a/packages/pg-query-stream/package.json +++ b/packages/pg-query-stream/package.json @@ -1,6 +1,6 @@ { "name": "pg-query-stream", - "version": "4.10.2", + "version": "4.10.3", "description": "Postgres query result returned as readable stream", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -45,7 +45,7 @@ "concat-stream": "~1.0.1", "eslint-plugin-promise": "^7.2.1", "mocha": "^10.5.2", - "pg": "^8.16.2", + "pg": "^8.16.3", "stream-spec": "~0.3.5", "ts-node": "^8.5.4", "typescript": "^4.0.3" @@ -54,6 +54,6 @@ "pg": "^8" }, "dependencies": { - "pg-cursor": "^2.15.2" + "pg-cursor": "^2.15.3" } } diff --git a/packages/pg/lib/client.js b/packages/pg/lib/client.js index 9d6295141..903db6c66 100644 --- a/packages/pg/lib/client.js +++ b/packages/pg/lib/client.js @@ -2,6 +2,7 @@ const EventEmitter = require('events').EventEmitter const utils = require('./utils') +const nodeUtils = require('node:util') const sasl = require('./crypto/sasl') const TypeOverrides = require('./type-overrides') @@ -11,6 +12,27 @@ const defaults = require('./defaults') const Connection = require('./connection') const crypto = require('./crypto/utils') +const activeQueryDeprecationNotice = nodeUtils.deprecate( + () => {}, + 'Client.activeQuery is deprecated and will be removed in a future version.' +) + +const queryQueueDeprecationNotice = nodeUtils.deprecate( + () => {}, + 'Client.queryQueue is deprecated and will be removed in a future version.' +) + +const pgPassDeprecationNotice = nodeUtils.deprecate( + () => {}, + 'pgpass support is deprecated and will be removed in a future version. ' + + 'You can provide an async function as the password property to the Client/Pool constructor that returns a password instead. Within this funciton you can call the pgpass module in your own code.' +) + +const byoPromiseDeprecationNotice = nodeUtils.deprecate( + () => {}, + 'Passing a custom Promise implementation to the Client/Pool constructor is deprecated and will be removed in a future version.' +) + class Client extends EventEmitter { constructor(config) { super() @@ -34,6 +56,9 @@ class Client extends EventEmitter { const c = config || {} + if (c.Promise) { + byoPromiseDeprecationNotice() + } this._Promise = c.Promise || global.Promise this._types = new TypeOverrides(c.types) this._ending = false @@ -42,6 +67,7 @@ class Client extends EventEmitter { this._connected = false this._connectionError = false this._queryable = true + this._activeQuery = null this.enableChannelBinding = Boolean(c.enableChannelBinding) // set true to use SCRAM-SHA-256-PLUS when offered this.connection = @@ -53,7 +79,7 @@ class Client extends EventEmitter { keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0, encoding: this.connectionParameters.client_encoding || 'utf8', }) - this.queryQueue = [] + this._queryQueue = [] this.binary = c.binary || defaults.binary this.processID = null this.secretKey = null @@ -70,6 +96,20 @@ class Client extends EventEmitter { this._connectionTimeoutMillis = c.connectionTimeoutMillis || 0 } + get activeQuery() { + activeQueryDeprecationNotice() + return this._activeQuery + } + + set activeQuery(val) { + activeQueryDeprecationNotice() + this._activeQuery = val + } + + _getActiveQuery() { + return this._activeQuery + } + _errorAllQueries(err) { const enqueueError = (query) => { process.nextTick(() => { @@ -77,13 +117,14 @@ class Client extends EventEmitter { }) } - if (this.activeQuery) { - enqueueError(this.activeQuery) - this.activeQuery = null + const activeQuery = this._getActiveQuery() + if (activeQuery) { + enqueueError(activeQuery) + this._activeQuery = null } - this.queryQueue.forEach(enqueueError) - this.queryQueue.length = 0 + this._queryQueue.forEach(enqueueError) + this._queryQueue.length = 0 } _connect(callback) { @@ -203,9 +244,7 @@ class Client extends EventEmitter { con.on('notification', this._handleNotification.bind(this)) } - // TODO(bmc): deprecate pgpass "built in" integration since this.password can be a function - // it can be supplied by the user if required - this is a breaking change! - _checkPgPass(cb) { + _getPassword(cb) { const con = this.connection if (typeof this.password === 'function') { this._Promise @@ -233,6 +272,7 @@ class Client extends EventEmitter { const pgPass = require('pgpass') pgPass(this.connectionParameters, (pass) => { if (undefined !== pass) { + pgPassDeprecationNotice() this.connectionParameters.password = this.password = pass } cb() @@ -244,13 +284,13 @@ class Client extends EventEmitter { } _handleAuthCleartextPassword(msg) { - this._checkPgPass(() => { + this._getPassword(() => { this.connection.password(this.password) }) } _handleAuthMD5Password(msg) { - this._checkPgPass(async () => { + this._getPassword(async () => { try { const hashedPassword = await crypto.postgresMd5PasswordHash(this.user, this.password, msg.salt) this.connection.password(hashedPassword) @@ -261,7 +301,7 @@ class Client extends EventEmitter { } _handleAuthSASL(msg) { - this._checkPgPass(() => { + this._getPassword(() => { try { this.saslSession = sasl.startSession(msg.mechanisms, this.enableChannelBinding && this.connection.stream) this.connection.sendSASLInitialResponseMessage(this.saslSession.mechanism, this.saslSession.response) @@ -314,8 +354,8 @@ class Client extends EventEmitter { } this.emit('connect') } - const { activeQuery } = this - this.activeQuery = null + const activeQuery = this._getActiveQuery() + this._activeQuery = null this.readyForQuery = true if (activeQuery) { activeQuery.handleReadyForQuery(this.connection) @@ -323,7 +363,7 @@ class Client extends EventEmitter { this._pulseQueryQueue() } - // if we receieve an error event or error message + // if we receive an error event or error message // during the connection process we handle it here _handleErrorWhileConnecting(err) { if (this._connectionError) { @@ -355,49 +395,51 @@ class Client extends EventEmitter { if (this._connecting) { return this._handleErrorWhileConnecting(msg) } - const activeQuery = this.activeQuery + const activeQuery = this._getActiveQuery() if (!activeQuery) { this._handleErrorEvent(msg) return } - this.activeQuery = null + this._activeQuery = null activeQuery.handleError(msg, this.connection) } _handleRowDescription(msg) { // delegate rowDescription to active query - this.activeQuery.handleRowDescription(msg) + this._getActiveQuery().handleRowDescription(msg) } _handleDataRow(msg) { // delegate dataRow to active query - this.activeQuery.handleDataRow(msg) + this._getActiveQuery().handleDataRow(msg) } _handlePortalSuspended(msg) { // delegate portalSuspended to active query - this.activeQuery.handlePortalSuspended(this.connection) + this._getActiveQuery().handlePortalSuspended(this.connection) } _handleEmptyQuery(msg) { // delegate emptyQuery to active query - this.activeQuery.handleEmptyQuery(this.connection) + this._getActiveQuery().handleEmptyQuery(this.connection) } _handleCommandComplete(msg) { - if (this.activeQuery == null) { + const activeQuery = this._getActiveQuery() + if (activeQuery == null) { const error = new Error('Received unexpected commandComplete message from backend.') this._handleErrorEvent(error) return } // delegate commandComplete to active query - this.activeQuery.handleCommandComplete(msg, this.connection) + activeQuery.handleCommandComplete(msg, this.connection) } _handleParseComplete() { - if (this.activeQuery == null) { + const activeQuery = this._getActiveQuery() + if (activeQuery == null) { const error = new Error('Received unexpected parseComplete message from backend.') this._handleErrorEvent(error) return @@ -405,17 +447,17 @@ class Client extends EventEmitter { // if a prepared statement has a name and properly parses // we track that its already been executed so we don't parse // it again on the same client - if (this.activeQuery.name) { - this.connection.parsedStatements[this.activeQuery.name] = this.activeQuery.text + if (activeQuery.name) { + this.connection.parsedStatements[activeQuery.name] = activeQuery.text } } _handleCopyInResponse(msg) { - this.activeQuery.handleCopyInResponse(this.connection) + this._getActiveQuery().handleCopyInResponse(this.connection) } _handleCopyData(msg) { - this.activeQuery.handleCopyData(msg, this.connection) + this._getActiveQuery().handleCopyData(msg, this.connection) } _handleNotification(msg) { @@ -471,8 +513,8 @@ class Client extends EventEmitter { con.on('connect', function () { con.cancel(client.processID, client.secretKey) }) - } else if (client.queryQueue.indexOf(query) !== -1) { - client.queryQueue.splice(client.queryQueue.indexOf(query), 1) + } else if (client._queryQueue.indexOf(query) !== -1) { + client._queryQueue.splice(client._queryQueue.indexOf(query), 1) } } @@ -497,21 +539,22 @@ class Client extends EventEmitter { _pulseQueryQueue() { if (this.readyForQuery === true) { - this.activeQuery = this.queryQueue.shift() - if (this.activeQuery) { + this._activeQuery = this._queryQueue.shift() + const activeQuery = this._getActiveQuery() + if (activeQuery) { this.readyForQuery = false this.hasExecuted = true - const queryError = this.activeQuery.submit(this.connection) + const queryError = activeQuery.submit(this.connection) if (queryError) { process.nextTick(() => { - this.activeQuery.handleError(queryError, this.connection) + activeQuery.handleError(queryError, this.connection) this.readyForQuery = true this._pulseQueryQueue() }) } } else if (this.hasExecuted) { - this.activeQuery = null + this._activeQuery = null this.emit('drain') } } @@ -565,9 +608,9 @@ class Client extends EventEmitter { query.callback = () => {} // Remove from queue - const index = this.queryQueue.indexOf(query) + const index = this._queryQueue.indexOf(query) if (index > -1) { - this.queryQueue.splice(index, 1) + this._queryQueue.splice(index, 1) } this._pulseQueryQueue() @@ -601,7 +644,7 @@ class Client extends EventEmitter { return result } - this.queryQueue.push(query) + this._queryQueue.push(query) this._pulseQueryQueue() return result } @@ -626,7 +669,7 @@ class Client extends EventEmitter { } } - if (this.activeQuery || !this._queryable) { + if (this._getActiveQuery() || !this._queryable) { // if we have an active query we need to force a disconnect // on the socket - otherwise a hung query could block end forever this.connection.stream.destroy() @@ -642,6 +685,10 @@ class Client extends EventEmitter { }) } } + get queryQueue() { + queryQueueDeprecationNotice() + return this._queryQueue + } } // expose a Query constructor diff --git a/packages/pg/lib/native/query.js b/packages/pg/lib/native/query.js index 9a4b28214..e02294f63 100644 --- a/packages/pg/lib/native/query.js +++ b/packages/pg/lib/native/query.js @@ -19,7 +19,7 @@ const NativeQuery = (module.exports = function (config, values, callback) { // then emit them as they come in // without setting singleRowMode to true // this has almost no meaning because libpq - // reads all rows into memory befor returning any + // reads all rows into memory before returning any this._emitRowEvents = false this.on( 'newListener', diff --git a/packages/pg/lib/query.js b/packages/pg/lib/query.js index 3b7c90fa4..64aab5ff2 100644 --- a/packages/pg/lib/query.js +++ b/packages/pg/lib/query.js @@ -112,7 +112,7 @@ class Query extends EventEmitter { // if a named prepared statement is created with empty query text // the backend will send an emptyQuery message but *not* a command complete message // since we pipeline sync immediately after execute we don't need to do anything here - // unless we have rows specified, in which case we did not pipeline the intial sync call + // unless we have rows specified, in which case we did not pipeline the initial sync call handleEmptyQuery(connection) { if (this.rows) { connection.sync() diff --git a/packages/pg/package.json b/packages/pg/package.json index c47b214da..2da9786eb 100644 --- a/packages/pg/package.json +++ b/packages/pg/package.json @@ -1,6 +1,6 @@ { "name": "pg", - "version": "8.16.2", + "version": "8.16.3", "description": "PostgreSQL client - pure javascript & libpq with the same API", "keywords": [ "database", @@ -28,16 +28,13 @@ "./package.json": { "default": "./package.json" }, - "./lib/*": { - "import": "./lib/*", - "require": "./lib/*", - "default": "./lib/*" - } + "./lib/*": "./lib/*.js", + "./lib/*.js": "./lib/*.js" }, "dependencies": { "pg-connection-string": "^2.9.1", "pg-pool": "^3.10.1", - "pg-protocol": "^1.10.2", + "pg-protocol": "^1.10.3", "pg-types": "2.2.0", "pgpass": "1.0.5" }, @@ -53,7 +50,7 @@ "wrangler": "^3.x" }, "optionalDependencies": { - "pg-cloudflare": "^1.2.6" + "pg-cloudflare": "^1.2.7" }, "peerDependencies": { "pg-native": ">=3.0.1" diff --git a/packages/pg/test/integration/client/simple-query-tests.js b/packages/pg/test/integration/client/simple-query-tests.js index af431d345..60a8f76f7 100644 --- a/packages/pg/test/integration/client/simple-query-tests.js +++ b/packages/pg/test/integration/client/simple-query-tests.js @@ -19,15 +19,8 @@ test('simple query interface', function () { rows.push(row['name']) }) query.once('row', function (row) { - test('Can iterate through columns', function () { - const columnCount = Object.keys(row).length - if ('length' in row) { - assert.lengthIs( - row, - columnCount, - 'Iterating through the columns gives a different length from calling .length.' - ) - } + test('returned right columns', function () { + assert.deepStrictEqual(row, { name: row.name }) }) }) diff --git a/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js b/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js index 8a5e4656c..166cd9f35 100644 --- a/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js +++ b/packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js @@ -31,8 +31,6 @@ suite.test('emits end when not in query', function () { client.connection.emit('connect') process.nextTick(function () { client.connection.emit('readyForQuery') - assert.equal(client.queryQueue.length, 0) - assert(client.activeQuery, 'client should have issued query') process.nextTick(function () { stream.emit('close') }) diff --git a/yarn.lock b/yarn.lock index 811817b20..f87946940 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1034,6 +1034,13 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" +"@isaacs/fs-minipass@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32" + integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w== + dependencies: + minipass "^7.0.4" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1827,10 +1834,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/agent@^2.0.0": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" - integrity sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og== +"@npmcli/agent@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-3.0.0.tgz#1685b1fbd4a1b7bb4f930cbb68ce801edfe7aa44" + integrity sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q== dependencies: agent-base "^7.1.0" http-proxy-agent "^7.0.0" @@ -1838,10 +1845,10 @@ lru-cache "^10.0.1" socks-proxy-agent "^8.0.3" -"@npmcli/fs@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.1.tgz#59cdaa5adca95d135fc00f2bb53f5771575ce726" - integrity sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg== +"@npmcli/fs@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-4.0.0.tgz#a1eb1aeddefd2a4a347eca0fab30bc62c0e1c0f2" + integrity sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q== dependencies: semver "^7.3.5" @@ -1959,10 +1966,10 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@pkgr/core@^0.2.3": - version "0.2.4" - resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.4.tgz#d897170a2b0ba51f78a099edccd968f7b103387c" - integrity sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw== +"@pkgr/core@^0.2.4": + version "0.2.7" + resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.7.tgz#eb5014dfd0b03e7f3ba2eeeff506eed89b028058" + integrity sha512-YLT9Zo3oNPJoBjBc4q8G2mjU4tqIbf5CEOORbUUr48dCD9q3umJ3IPlVqOqDakPfd2HuwccBaqlGhN4Gmr5OWg== "@rollup/plugin-commonjs@^28.0.3": version "28.0.3" @@ -2668,10 +2675,10 @@ abbrev@1.0.x: resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz" integrity sha1-kbR5JYinc4wl813W9jdSovh3YTU= -abbrev@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" - integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== +abbrev@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-3.0.1.tgz#8ac8b3b5024d31464fe2a5feeea9f4536bf44025" + integrity sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg== acorn-jsx@^5.3.2: version "5.3.2" @@ -3199,12 +3206,12 @@ cacache@^12.0.0, cacache@^12.0.3: unique-filename "^1.1.1" y18n "^4.0.0" -cacache@^18.0.0: - version "18.0.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-18.0.3.tgz#864e2c18414e1e141ae8763f31e46c2cb96d1b21" - integrity sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg== +cacache@^19.0.1: + version "19.0.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-19.0.1.tgz#3370cc28a758434c85c2585008bd5bdcff17d6cd" + integrity sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ== dependencies: - "@npmcli/fs" "^3.1.0" + "@npmcli/fs" "^4.0.0" fs-minipass "^3.0.0" glob "^10.2.2" lru-cache "^10.0.1" @@ -3212,10 +3219,10 @@ cacache@^18.0.0: minipass-collect "^2.0.1" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - p-map "^4.0.0" - ssri "^10.0.0" - tar "^6.1.11" - unique-filename "^3.0.0" + p-map "^7.0.2" + ssri "^12.0.0" + tar "^7.4.3" + unique-filename "^4.0.0" cache-base@^1.0.1: version "1.0.1" @@ -3411,10 +3418,10 @@ chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.4: resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chownr@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" + integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g== chrome-trace-event@^1.0.2: version "1.0.4" @@ -4434,12 +4441,12 @@ eslint-plugin-node@^11.1.0: semver "^6.1.0" eslint-plugin-prettier@^5.1.2: - version "5.2.6" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.6.tgz#be39e3bb23bb3eeb7e7df0927cdb46e4d7945096" - integrity sha512-mUcf7QG2Tjk7H055Jk0lGBjbgDnfrvqjhXh9t2xLMSCjZVcw9Rb1V6sVNXO0th3jgeO7zllWPTNRil3JW94TnQ== + version "5.5.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.1.tgz#470820964de9aedb37e9ce62c3266d2d26d08d15" + integrity sha512-dobTkHT6XaEVOo8IO90Q4DOSxnm3Y151QxPJlM/vKC0bVy+d6cVWQZLlFiuZPP0wS6vZwSKeJgKkcS+KfMBlRw== dependencies: prettier-linter-helpers "^1.0.0" - synckit "^0.11.0" + synckit "^0.11.7" eslint-plugin-promise@^7.2.1: version "7.2.1" @@ -4965,13 +4972,6 @@ fs-minipass@^1.2.7: dependencies: minipass "^2.6.0" -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - fs-minipass@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54" @@ -5205,7 +5205,7 @@ glob@8.1.0: minimatch "^5.0.1" once "^1.3.0" -glob@^10.2.2, glob@^10.3.10: +glob@^10.2.2: version "10.4.1" resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2" integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw== @@ -5227,19 +5227,7 @@ glob@^5.0.15: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.1, glob@^7.1.3, glob@^7.1.4: - version "7.1.6" - resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.6: +glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -5794,11 +5782,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== - is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" @@ -6479,23 +6462,22 @@ make-error@^1.1.1: resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^13.0.0: - version "13.0.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz#273ba2f78f45e1f3a6dca91cede87d9fa4821e36" - integrity sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA== +make-fetch-happen@^14.0.3: + version "14.0.3" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz#d74c3ecb0028f08ab604011e0bc6baed483fcdcd" + integrity sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ== dependencies: - "@npmcli/agent" "^2.0.0" - cacache "^18.0.0" + "@npmcli/agent" "^3.0.0" + cacache "^19.0.1" http-cache-semantics "^4.1.1" - is-lambda "^1.0.1" minipass "^7.0.2" - minipass-fetch "^3.0.0" + minipass-fetch "^4.0.0" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.3" - proc-log "^4.2.0" + negotiator "^1.0.0" + proc-log "^5.0.0" promise-retry "^2.0.1" - ssri "^10.0.0" + ssri "^12.0.0" make-fetch-happen@^5.0.0: version "5.0.2" @@ -6763,14 +6745,14 @@ minipass-collect@^2.0.1: dependencies: minipass "^7.0.3" -minipass-fetch@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.5.tgz#f0f97e40580affc4a35cc4a1349f05ae36cb1e4c" - integrity sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg== +minipass-fetch@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-4.0.1.tgz#f2d717d5a418ad0b1a7274f9b913515d3e78f9e5" + integrity sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ== dependencies: minipass "^7.0.3" minipass-sized "^1.0.3" - minizlib "^2.1.2" + minizlib "^3.0.1" optionalDependencies: encoding "^0.1.13" @@ -6810,12 +6792,7 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.1.2: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4, minipass@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== @@ -6827,13 +6804,12 @@ minizlib@^1.3.3: dependencies: minipass "^2.9.0" -minizlib@^2.1.1, minizlib@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== +minizlib@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.0.2.tgz#f33d638eb279f664439aa38dc5f91607468cb574" + integrity sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA== dependencies: - minipass "^3.0.0" - yallist "^4.0.0" + minipass "^7.1.2" mississippi@^3.0.0: version "3.0.0" @@ -6866,10 +6842,10 @@ mkdirp-promise@^5.0.1: dependencies: mkdirp "*" -mkdirp@*, mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mkdirp@*, mkdirp@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.5" @@ -7002,10 +6978,10 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -negotiator@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +negotiator@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a" + integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg== neo-async@^2.6.0, neo-async@^2.6.2: version "2.6.2" @@ -7034,20 +7010,20 @@ node-fetch@^2.5.0, node-fetch@^2.6.1: whatwg-url "^5.0.0" node-gyp@>=10.x: - version "10.2.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.2.0.tgz#80101c4aa4f7ab225f13fcc8daaaac4eb1a8dd86" - integrity sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw== + version "11.3.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-11.3.0.tgz#e543e3dcd69877e4a9a682ce355150c5d6a6947b" + integrity sha512-9J0+C+2nt3WFuui/mC46z2XCZ21/cKlFDuywULmseD/LlmnOrSeEAE4c/1jw6aybXLmpZnQY3/LmOJfgyHIcng== dependencies: env-paths "^2.2.0" exponential-backoff "^3.1.1" - glob "^10.3.10" graceful-fs "^4.2.6" - make-fetch-happen "^13.0.0" - nopt "^7.0.0" - proc-log "^4.1.0" + make-fetch-happen "^14.0.3" + nopt "^8.0.0" + proc-log "^5.0.0" semver "^7.3.5" - tar "^6.2.1" - which "^4.0.0" + tar "^7.4.3" + tinyglobby "^0.2.12" + which "^5.0.0" node-gyp@^5.0.2: version "5.1.1" @@ -7093,12 +7069,12 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -nopt@^7.0.0: - version "7.2.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.1.tgz#1cac0eab9b8e97c9093338446eddd40b2c8ca1e7" - integrity sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w== +nopt@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-8.1.0.tgz#b11d38caf0f8643ce885818518064127f602eae3" + integrity sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A== dependencies: - abbrev "^2.0.0" + abbrev "^3.0.0" normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0: version "2.5.0" @@ -7449,12 +7425,10 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" +p-map@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-7.0.3.tgz#7ac210a2d36f81ec28b736134810f7ba4418cdb6" + integrity sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA== p-pipe@^1.2.0: version "1.2.0" @@ -7862,10 +7836,10 @@ printable-characters@^1.0.42: resolved "https://registry.yarnpkg.com/printable-characters/-/printable-characters-1.0.42.tgz#3f18e977a9bd8eb37fcc4ff5659d7be90868b3d8" integrity sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ== -proc-log@^4.1.0, proc-log@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-4.2.0.tgz#b6f461e4026e75fdfe228b265e9f7a00779d7034" - integrity sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA== +proc-log@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-5.0.0.tgz#e6c93cf37aef33f835c53485f314f50ea906a9d8" + integrity sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ== process-nextick-args@~2.0.0: version "2.0.1" @@ -8833,10 +8807,10 @@ sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@^10.0.0: - version "10.0.6" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.6.tgz#a8aade2de60ba2bce8688e3fa349bad05c7dc1e5" - integrity sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ== +ssri@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-12.0.0.tgz#bcb4258417c702472f8191981d3c8a771fee6832" + integrity sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ== dependencies: minipass "^7.0.3" @@ -9111,13 +9085,12 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -synckit@^0.11.0: - version "0.11.4" - resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.4.tgz#48972326b59723fc15b8d159803cf8302b545d59" - integrity sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ== +synckit@^0.11.7: + version "0.11.8" + resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.8.tgz#b2aaae998a4ef47ded60773ad06e7cb821f55457" + integrity sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A== dependencies: - "@pkgr/core" "^0.2.3" - tslib "^2.8.1" + "@pkgr/core" "^0.2.4" tapable@^2.1.1, tapable@^2.2.0: version "2.2.2" @@ -9137,17 +9110,17 @@ tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: safe-buffer "^5.2.1" yallist "^3.1.1" -tar@^6.1.11, tar@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" - integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" +tar@^7.4.3: + version "7.4.3" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571" + integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw== + dependencies: + "@isaacs/fs-minipass" "^4.0.0" + chownr "^3.0.0" + minipass "^7.1.2" + minizlib "^3.0.1" + mkdirp "^3.0.1" + yallist "^5.0.0" temp-dir@^1.0.0: version "1.0.0" @@ -9251,15 +9224,7 @@ tinyexec@^0.3.2: resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2" integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA== -tinyglobby@^0.2.12: - version "0.2.13" - resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.13.tgz#a0e46515ce6cbcd65331537e57484af5a7b2ff7e" - integrity sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw== - dependencies: - fdir "^6.4.4" - picomatch "^4.0.2" - -tinyglobby@^0.2.13: +tinyglobby@^0.2.12, tinyglobby@^0.2.13: version "0.2.14" resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d" integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ== @@ -9387,7 +9352,7 @@ tslib@^1.9.0: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.4.0, tslib@^2.8.1: +tslib@^2.4.0: version "2.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w== @@ -9541,12 +9506,12 @@ unique-filename@^1.1.1: dependencies: unique-slug "^2.0.0" -unique-filename@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" - integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g== +unique-filename@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-4.0.0.tgz#a06534d370e7c977a939cd1d11f7f0ab8f1fed13" + integrity sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ== dependencies: - unique-slug "^4.0.0" + unique-slug "^5.0.0" unique-slug@^2.0.0: version "2.0.2" @@ -9555,10 +9520,10 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unique-slug@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3" - integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ== +unique-slug@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-5.0.0.tgz#ca72af03ad0dbab4dad8aa683f633878b1accda8" + integrity sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg== dependencies: imurmurhash "^0.1.4" @@ -9852,10 +9817,10 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -which@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/which/-/which-4.0.0.tgz#cd60b5e74503a3fbcfbf6cd6b4138a8bae644c1a" - integrity sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg== +which@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/which/-/which-5.0.0.tgz#d93f2d93f79834d4363c7d0c23e00d07c466c8d6" + integrity sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ== dependencies: isexe "^3.1.1" @@ -10090,6 +10055,11 @@ yallist@^4.0.0: resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yallist@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533" + integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw== + yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"