From 7e99c263f1f47d0982c0a6ee3053163d43980844 Mon Sep 17 00:00:00 2001 From: YujohnNattrass <46704329+YujohnNattrass@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:02:27 -0800 Subject: [PATCH 01/43] feat(build): Add trace attribute to track builds failing from Netlify maintained extensions (#5914) * feat(build): track netlify owned extensions * feat: add if plugin is maintained by netlify * fix: move adding new plugin attribute to where the others are set * fix: update netlify maintained extension names * chore: cleanup * chore: remove unused trace attribute * chore: add debug logs * update console.log * chore: log integrations * fix: fix debug log * chore: add extension author to trace * fix: add auth and slug to trace correctly * chore: add slug and author to trace * chore: add debug logs * chore: add extensionMetadata to attributes * chore: clean up * fix: fix unused var error * chore: add types for extension metadata * chore: remove debug log * chore: update test --------- Co-authored-by: NikAiyer --- packages/build/src/error/types.ts | 11 +++++++++++ packages/build/src/plugins/load.js | 18 ++++++++++++++++-- packages/build/src/steps/plugin.js | 3 ++- packages/build/src/steps/run_step.ts | 4 ++++ packages/build/src/steps/run_steps.js | 2 ++ packages/build/tests/error/tests.js | 6 ++++++ packages/config/src/types/integrations.ts | 1 + 7 files changed, 42 insertions(+), 3 deletions(-) diff --git a/packages/build/src/error/types.ts b/packages/build/src/error/types.ts index 1d6974e104..fe61f987c3 100644 --- a/packages/build/src/error/types.ts +++ b/packages/build/src/error/types.ts @@ -81,6 +81,14 @@ type PluginInfo = { pluginPackageJson: { version?: string } + extensionMetadata?: { + slug: string + name: string + version: string + has_build: boolean + has_connector: boolean + author?: string + } } export type BuildCommandLocation = { @@ -201,9 +209,12 @@ const errorLocationToTracingAttributes = function (location: ErrorLocation): Att const pluginDataToTracingAttributes = function (pluginInfo?: PluginInfo): Attributes { const pluginAttributePrefix = `${buildErrorAttributePrefix}.plugin` if (typeof pluginInfo === 'undefined') return {} + return { [`${pluginAttributePrefix}.name`]: pluginInfo?.packageName, [`${pluginAttributePrefix}.version`]: pluginInfo?.pluginPackageJson?.version, + [`${pluginAttributePrefix}.extensionAuthor`]: pluginInfo?.extensionMetadata?.author, + [`${pluginAttributePrefix}.extensionSlug`]: pluginInfo?.extensionMetadata?.slug, } } diff --git a/packages/build/src/plugins/load.js b/packages/build/src/plugins/load.js index 37cddd628d..ce874b25c3 100644 --- a/packages/build/src/plugins/load.js +++ b/packages/build/src/plugins/load.js @@ -75,7 +75,16 @@ const loadAllPlugins = measureDuration(tLoadAllPlugins, 'load_plugins') // Retrieve plugin steps for one plugin. // Do it by executing the plugin `load` event handler. const loadPlugin = async function ( - { packageName, pluginPackageJson, pluginPackageJson: { version } = {}, pluginPath, inputs, loadedFrom, origin }, + { + packageName, + pluginPackageJson, + pluginPackageJson: { version } = {}, + pluginPath, + inputs, + loadedFrom, + origin, + integration, + }, { childProcesses, index, packageJson, logs, debug, verbose, netlifyConfig, featureFlags, systemLog }, ) { const { childProcess } = childProcesses[index] @@ -97,6 +106,7 @@ const loadPlugin = async function ( origin, pluginPackageJson, childProcess, + extensionMetadata: integration, })) return pluginSteps } catch (error) { @@ -106,7 +116,11 @@ const loadPlugin = async function ( } addErrorInfo(error, { - plugin: { packageName, pluginPackageJson }, + plugin: { + packageName, + pluginPackageJson, + extensionMetadata: integration, + }, location: { event: loadEvent, packageName, loadedFrom, origin }, }) addPluginLoadErrorStatus({ error, packageName, version, debug }) diff --git a/packages/build/src/steps/plugin.js b/packages/build/src/steps/plugin.js index c4ef936492..a18eafba71 100644 --- a/packages/build/src/steps/plugin.js +++ b/packages/build/src/steps/plugin.js @@ -39,6 +39,7 @@ export const firePluginStep = async function ({ featureFlags, debug, verbose, + extensionMetadata, }) { const standardStreams = getStandardStreams(outputFlusher) const listeners = pipePluginOutput(childProcess, logs, standardStreams) @@ -103,7 +104,7 @@ export const firePluginStep = async function ({ const errorType = getPluginErrorType(newError, loadedFrom, packageName) addErrorInfo(newError, { ...errorType, - plugin: { pluginPackageJson, packageName }, + plugin: { pluginPackageJson, packageName, extensionMetadata }, location: { event, packageName, loadedFrom, origin }, }) return { newError } diff --git a/packages/build/src/steps/run_step.ts b/packages/build/src/steps/run_step.ts index e1baac58ee..4280c9dfdb 100644 --- a/packages/build/src/steps/run_step.ts +++ b/packages/build/src/steps/run_step.ts @@ -69,6 +69,7 @@ export const runStep = async function ({ userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, + extensionMetadata, }) { // Add relevant attributes to the upcoming span context const attributes: StepExecutionAttributes = { @@ -144,6 +145,7 @@ export const runStep = async function ({ durationNs, metrics, } = await fireStep({ + extensionMetadata, defaultConfig, event, childProcess, @@ -349,6 +351,7 @@ const tFireStep = function ({ explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, + extensionMetadata, }) { if (coreStep !== undefined) { return fireCoreStep({ @@ -414,5 +417,6 @@ const tFireStep = function ({ featureFlags, debug, verbose, + extensionMetadata, }) } diff --git a/packages/build/src/steps/run_steps.js b/packages/build/src/steps/run_steps.js index 21df92c67f..265dd001be 100644 --- a/packages/build/src/steps/run_steps.js +++ b/packages/build/src/steps/run_steps.js @@ -76,6 +76,7 @@ export const runSteps = async function ({ event, childProcess, packageName, + extensionMetadata, coreStep, coreStepId, coreStepName, @@ -103,6 +104,7 @@ export const runSteps = async function ({ event, childProcess, packageName, + extensionMetadata, coreStep, coreStepId, coreStepName, diff --git a/packages/build/tests/error/tests.js b/packages/build/tests/error/tests.js index 0ed48f8d63..4643a24a5b 100644 --- a/packages/build/tests/error/tests.js +++ b/packages/build/tests/error/tests.js @@ -145,6 +145,10 @@ const testMatrixAttributeTracing = [ pluginPackageJson: { version: '1.2.1', }, + extensionMetadata: { + slug: 'test-extension-slug', + author: 'test-extension-author', + }, }, }, severity: 'error', @@ -159,6 +163,8 @@ const testMatrixAttributeTracing = [ 'build.error.location.plugin.package_name': 'test-package', 'build.error.location.plugin.loaded_from': 'test-loaded-from', 'build.error.location.plugin.origin': 'test-origin', + 'build.error.plugin.extensionAuthor': 'test-extension-author', + 'build.error.plugin.extensionSlug': 'test-extension-slug', 'build.error.plugin.name': 'test-package', 'build.error.plugin.version': '1.2.1', }, diff --git a/packages/config/src/types/integrations.ts b/packages/config/src/types/integrations.ts index d3db646a9d..e44a1ad42e 100644 --- a/packages/config/src/types/integrations.ts +++ b/packages/config/src/types/integrations.ts @@ -5,4 +5,5 @@ export type Integration = { dev?: { path: string } + author?: string } From 20c73593deda6fc4a570fc7b71178687a693e03d Mon Sep 17 00:00:00 2001 From: YujohnNattrass <46704329+YujohnNattrass@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:44:21 -0800 Subject: [PATCH 02/43] fix: fail build when extension failed to be retrieved (#5915) * fix: fail build when extension failed to be retrieved * fix(config): fail build if fetching extensions returns a non 200 response * fix(config): update snapshot * chore: refactor * chore: merge with main * fix: reset package-lock.json to match origin/main --- packages/config/src/api/site_info.ts | 22 +++++++++++------- .../config/tests/api/snapshots/tests.js.md | 6 +++++ .../config/tests/api/snapshots/tests.js.snap | Bin 2232 -> 2281 bytes packages/config/tests/api/tests.js | 22 ++++++++++++++++++ 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/packages/config/src/api/site_info.ts b/packages/config/src/api/site_info.ts index 4ac6db793e..1831bf1545 100644 --- a/packages/config/src/api/site_info.ts +++ b/packages/config/src/api/site_info.ts @@ -116,7 +116,7 @@ const getIntegrations = async function ({ accountId, testOpts, offline, -}: GetIntegrationsOpts): Promise { +}: GetIntegrationsOpts): Promise { if (!siteId || offline) { return [] } @@ -130,15 +130,21 @@ const getIntegrations = async function ({ ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}` : `${baseUrl}site/${siteId}/integrations/safe` + let response try { - const response = await fetch(url) + response = await fetch(url) + if (response.status !== 200) { + throw new Error(`Unexpected status code ${response.status} from fetching extensions`) + } + } catch (error) { + throwUserError(`Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`) + } - const integrations = await response.json() - return Array.isArray(integrations) ? integrations : [] + try { + if (Number(response.headers.get(`content-length`)) === 0) return [] + const responseBody = await response.json() + return Array.isArray(responseBody) ? responseBody : [] } catch (error) { - // Integrations should not block the build if they fail to load - // TODO: We should consider blocking the build as integrations are a critical part of the build process - // https://linear.app/netlify/issue/CT-1214/implement-strategy-in-builds-to-deal-with-integrations-that-we-fail-to - return [] + throwUserError(`Failed to parse extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`) } } diff --git a/packages/config/tests/api/snapshots/tests.js.md b/packages/config/tests/api/snapshots/tests.js.md index 46de190353..0fa33a7aa1 100644 --- a/packages/config/tests/api/snapshots/tests.js.md +++ b/packages/config/tests/api/snapshots/tests.js.md @@ -2250,6 +2250,12 @@ Generated by [AVA](https://avajs.dev). "token": "test"␊ }` +## Integrations teamintegrationsInstallationsMeta API error + +> Snapshot 1 + + 'Failed retrieving extensions for site test: Unexpected status code 500 from fetching extensions. Double-check your login status with \'netlify status\' or contact support with details of your error.' + ## baseRelDir is true if build.base is overridden > Snapshot 1 diff --git a/packages/config/tests/api/snapshots/tests.js.snap b/packages/config/tests/api/snapshots/tests.js.snap index 65648ca3465f93e2ee662761da418c18abe9de26..8b774e6725b1d5289f3e4b2548393ded2250b7e2 100644 GIT binary patch literal 2281 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 GwEzHjT| { + const { output } = await new Fixture('./fixtures/base') + .withFlags({ + siteId: 'test', + mode: 'buildbot', + token: 'test', + accountId: 'account1', + featureFlags: { + cli_integration_installations_meta: true, + }, + }) + .runConfigServer([SITE_INFO_DATA, TEAM_INSTALLATIONS_META_RESPONSE_ERROR, FETCH_INTEGRATIONS_EMPTY_RESPONSE]) + + t.snapshot(normalizeOutput(output)) +}) + test('baseRelDir is true if build.base is overridden', async (t) => { const fixturesDir = normalize(`${fileURLToPath(test.meta.file)}/../fixtures`) From 0b25c72f762393fa13a50e673a0fd48eb37f5120 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 21:24:59 +0000 Subject: [PATCH 03/43] chore(deps): update dependency browserslist to v4.24.2 (#5860) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 48 ++++++++++++------------ packages/zip-it-and-ship-it/package.json | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index f96fe0cc87..0f6dd25ab8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10626,9 +10626,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", - "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "version": "4.24.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", + "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", "dev": true, "funding": [ { @@ -10646,10 +10646,10 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001646", - "electron-to-chromium": "^1.5.4", + "caniuse-lite": "^1.0.30001669", + "electron-to-chromium": "^1.5.41", "node-releases": "^2.0.18", - "update-browserslist-db": "^1.1.0" + "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" @@ -11104,9 +11104,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001647", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001647.tgz", - "integrity": "sha512-n83xdNiyeNcHpzWY+1aFbqCK7LuLfBricc4+alSQL2Xb6OR3XpnQAmlDG+pQcdTfiHRuLcQ96VOfrPSGiNJYSg==", + "version": "1.0.30001687", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz", + "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==", "dev": true, "funding": [ { @@ -13764,9 +13764,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz", - "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==", + "version": "1.5.72", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz", + "integrity": "sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==", "dev": true, "license": "ISC" }, @@ -14409,9 +14409,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -21914,9 +21914,9 @@ "dev": true }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, "node_modules/picomatch": { @@ -25094,9 +25094,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", - "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "dev": true, "funding": [ { @@ -25114,8 +25114,8 @@ ], "license": "MIT", "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" @@ -27657,7 +27657,7 @@ "@types/unixify": "1.0.2", "@types/yargs": "17.0.32", "@vitest/coverage-v8": "0.34.6", - "browserslist": "4.23.3", + "browserslist": "4.24.2", "cardinal": "2.1.1", "cpy": "9.0.1", "decompress": "4.2.1", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index 5a4d2ddfa4..f1ab3e6f56 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -89,7 +89,7 @@ "@types/unixify": "1.0.2", "@types/yargs": "17.0.32", "@vitest/coverage-v8": "0.34.6", - "browserslist": "4.23.3", + "browserslist": "4.24.2", "cardinal": "2.1.1", "cpy": "9.0.1", "decompress": "4.2.1", From 2ddadb2e51558ae5fca2b7364c50416a418458cc Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Wed, 11 Dec 2024 16:52:56 -0500 Subject: [PATCH 04/43] ci: remove the `--no-package-lock` tests (#5940) These exist to test against fully updated dependencies and transitive dependencies, but this means that builds are not reproducible and even main can suddenly start failing without any code changes. Plus, Renovate is already our blessed, more controlled solution for this. --- .github/workflows/workflow.yml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 15d4f3abf0..4c60515f1b 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -148,29 +148,6 @@ jobs: node-version: '14.16.0' install-command: npm ci machine: '4' - # The buildbot pins Netlify Build's dependencies, like `npm ci`. - # But other consumers do not, like `npm install`. - # So we test both. - - os: ubuntu-latest - node-version: '*' - install-command: npm install --no-package-lock - machine: '0' - - os: ubuntu-latest - node-version: '*' - install-command: npm install --no-package-lock - machine: '1' - - os: ubuntu-latest - node-version: '*' - install-command: npm install --no-package-lock - machine: '2' - - os: ubuntu-latest - node-version: '*' - install-command: npm install --no-package-lock - machine: '3' - - os: ubuntu-latest - node-version: '*' - install-command: npm install --no-package-lock - machine: '4' fail-fast: false steps: # Sets an output parameter if this is a release PR From dd9614239349be488ae89a5e8bae8c09f7d1013a Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Fri, 13 Dec 2024 14:04:08 -0500 Subject: [PATCH 05/43] test: rewrite test to work around Windows bug (#5945) We're not quite sure what's going on but the async import with `?one` fails on Windows with node 22.12.0. --- packages/functions-utils/tests/main.test.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/functions-utils/tests/main.test.ts b/packages/functions-utils/tests/main.test.ts index e5f2c579b1..4ad80e2396 100644 --- a/packages/functions-utils/tests/main.test.ts +++ b/packages/functions-utils/tests/main.test.ts @@ -1,6 +1,6 @@ -import { rm } from 'fs/promises' +import { readFile, rm } from 'fs/promises' import { normalize } from 'path' -import { fileURLToPath, pathToFileURL } from 'url' +import { fileURLToPath } from 'url' import cpy from 'cpy' import { pathExists } from 'path-exists' @@ -77,21 +77,22 @@ test('Should copy a source file even if dist directory already exists', async () test('Should overwrite dist file if it already exists', async () => { const dist = await getDist() const fixtureDir = `${FIXTURES_DIR}/file` + const testModule = `${dist}/test.mjs` await cpy(`${fixtureDir}/test.mjs`, fixtureDir, { rename: 'test.mjs.backup' }) try { await add(`${fixtureDir}/test.mjs`, dist) - const { func1 } = await import(`${pathToFileURL(`${dist}/test.mjs`).href}?one`) + const file1 = await readFile(testModule, 'utf8') await cpy(`${fixtureDir}/test_2.mjs`, fixtureDir, { rename: 'test.mjs' }) await add(`${fixtureDir}/test.mjs`, dist) - const { func2 } = await import(`${pathToFileURL(`${dist}/test.mjs`).href}?two`) + const file2 = await readFile(testModule, 'utf8') - expect(func1()).toBe('one') - expect(func2()).toBe('two') + expect(file1).toContain('one') + expect(file2).toContain('two') } finally { await cpy(`${fixtureDir}/test.mjs.backup`, fixtureDir, { rename: 'test.mjs' }) await rm(`${fixtureDir}/test.mjs.backup`, { force: true }) From 131a644bfde5205f730f3369b778d8914c7c0382 Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Fri, 13 Dec 2024 14:32:48 -0500 Subject: [PATCH 06/43] feat: rename unscoped NPM packages (#5943) --- package-lock.json | 24 ++++++++++++------------ packages/config/docs/main.md | 9 ++++----- packages/config/package.json | 4 ++-- packages/config/src/headers.js | 2 +- packages/config/src/redirects.ts | 2 +- packages/headers-parser/package.json | 2 +- packages/redirect-parser/package.json | 2 +- 7 files changed, 22 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0f6dd25ab8..68b65f0aa1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6646,6 +6646,10 @@ "resolved": "packages/git-utils", "link": true }, + "node_modules/@netlify/headers-parser": { + "resolved": "packages/headers-parser", + "link": true + }, "node_modules/@netlify/nock-udp": { "resolved": "packages/nock-udp", "link": true @@ -6684,6 +6688,10 @@ "node": "^14.14.0 || >=16.0.0" } }, + "node_modules/@netlify/redirect-parser": { + "resolved": "packages/redirect-parser", + "link": true + }, "node_modules/@netlify/run-utils": { "resolved": "packages/run-utils", "link": true @@ -20038,14 +20046,6 @@ "resolved": "packages/js-client", "link": true }, - "node_modules/netlify-headers-parser": { - "resolved": "packages/headers-parser", - "link": true - }, - "node_modules/netlify-redirect-parser": { - "resolved": "packages/redirect-parser", - "link": true - }, "node_modules/nise": { "version": "5.1.5", "dev": true, @@ -26662,6 +26662,8 @@ "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", + "@netlify/headers-parser": "^7.2.0", + "@netlify/redirect-parser": "^14.4.0", "chalk": "^5.0.0", "cron-parser": "^4.1.0", "deepmerge": "^4.2.2", @@ -26676,8 +26678,6 @@ "js-yaml": "^4.0.0", "map-obj": "^5.0.0", "netlify": "^13.2.0", - "netlify-headers-parser": "^7.2.0", - "netlify-redirect-parser": "^14.4.0", "node-fetch": "^3.3.1", "omit.js": "^2.0.2", "p-locate": "^6.0.0", @@ -27261,7 +27261,7 @@ } }, "packages/headers-parser": { - "name": "netlify-headers-parser", + "name": "@netlify/headers-parser", "version": "7.2.0", "license": "MIT", "dependencies": { @@ -27383,7 +27383,7 @@ } }, "packages/redirect-parser": { - "name": "netlify-redirect-parser", + "name": "@netlify/redirect-parser", "version": "14.4.0", "license": "MIT", "dependencies": { diff --git a/packages/config/docs/main.md b/packages/config/docs/main.md index 569023242a..ee11121699 100644 --- a/packages/config/docs/main.md +++ b/packages/config/docs/main.md @@ -95,8 +95,8 @@ Most Netlify CLI commands rely on configuration properties. The base command loa [using `@netlify/config` programmatically](https://github.com/netlify/cli/blob/f87d9e6e1749bedaabaace3dae98ca1ed6d84fd6/src/commands/base-command.js#L474). An `inlineConfig` flag was added to `@netlify/config` so Netlify CLI can override specific configuration properties -based on its own CLI flags, but this is not used yet (see https://github.com/netlify/cli/issues/1265, -https://github.com/netlify/cli/issues/960, https://github.com/netlify/cli/issues/961). +based on its own CLI flags, but this is not used yet (see , +, ). We try to [emulate the same environment variables](https://github.com/netlify/build/blob/558fe8869f47ecc84d05bd4d26d32df00f47a3b9/packages/config/src/env/main.js#L13) @@ -150,11 +150,10 @@ Redirects configuration is more complicated: - It can be specified either in `netlify.toml` or in a separate `_redirects` file located in the publish directory and with its own Netlify-specific file format -Therefore, that logic is abstracted to -[its own module `netlify-redirect-parser`](https://github.com/netlify/netlify-redirect-parser). +Therefore, that logic is abstracted to [its own module `@netlify/redirect-parser`](../../redirect-parser). Headers are handled very similarly to redirects, for consistency. They use a separate `_headers` file -[and `netlify-headers-parser` module](https://github.com/netlify/netlify-headers-parser). +[and `@netlify/headers-parser` module](../../headers-parser). ## Context-specific configuration diff --git a/packages/config/package.json b/packages/config/package.json index 93f8cbc5be..d89a1bc32e 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -73,8 +73,8 @@ "js-yaml": "^4.0.0", "map-obj": "^5.0.0", "netlify": "^13.2.0", - "netlify-headers-parser": "^7.2.0", - "netlify-redirect-parser": "^14.4.0", + "@netlify/headers-parser": "^7.2.0", + "@netlify/redirect-parser": "^14.4.0", "node-fetch": "^3.3.1", "omit.js": "^2.0.2", "p-locate": "^6.0.0", diff --git a/packages/config/src/headers.js b/packages/config/src/headers.js index cc35eb5181..c9ff8c0bbd 100644 --- a/packages/config/src/headers.js +++ b/packages/config/src/headers.js @@ -1,6 +1,6 @@ import { resolve } from 'path' -import { parseAllHeaders } from 'netlify-headers-parser' +import { parseAllHeaders } from '@netlify/headers-parser' import { warnHeadersParsing, warnHeadersCaseSensitivity } from './log/messages.js' diff --git a/packages/config/src/redirects.ts b/packages/config/src/redirects.ts index dbb1466fc5..e7a3c1c8db 100644 --- a/packages/config/src/redirects.ts +++ b/packages/config/src/redirects.ts @@ -1,6 +1,6 @@ import { resolve } from 'path' -import { parseAllRedirects } from 'netlify-redirect-parser' +import { parseAllRedirects } from '@netlify/redirect-parser' import { warnRedirectsParsing } from './log/messages.js' diff --git a/packages/headers-parser/package.json b/packages/headers-parser/package.json index 0fdb4cbff3..f57ca3e861 100644 --- a/packages/headers-parser/package.json +++ b/packages/headers-parser/package.json @@ -1,5 +1,5 @@ { - "name": "netlify-headers-parser", + "name": "@netlify/headers-parser", "version": "7.2.0", "description": "Parses Netlify headers into a JavaScript object representation", "type": "module", diff --git a/packages/redirect-parser/package.json b/packages/redirect-parser/package.json index f5d2b63f27..1f4e2d30d4 100644 --- a/packages/redirect-parser/package.json +++ b/packages/redirect-parser/package.json @@ -1,5 +1,5 @@ { - "name": "netlify-redirect-parser", + "name": "@netlify/redirect-parser", "version": "14.4.0", "description": "Parses netlify redirects into a js object representation", "type": "module", From e8e29f027b09631b7c66dee35c874f8533003d46 Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Fri, 13 Dec 2024 20:25:48 -0500 Subject: [PATCH 07/43] fix(deps): pin @vercel/nft due to breaking change in patch (#5944) See https://github.com/vercel/nft/issues/457 Co-authored-by: Mateusz Bocian --- package-lock.json | 56 ++++++++++++------------ packages/edge-bundler/package.json | 2 +- packages/zip-it-and-ship-it/package.json | 2 +- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68b65f0aa1..8158ed830d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8496,24 +8496,24 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "node_modules/@rollup/pluginutils": { - "version": "4.2.1", - "license": "MIT", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.3.tgz", + "integrity": "sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==", "dependencies": { - "estree-walker": "^2.0.1", - "picomatch": "^2.2.2" + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^4.0.2" }, "engines": { - "node": ">= 8.0.0" - } - }, - "node_modules/@rollup/pluginutils/node_modules/picomatch": { - "version": "2.3.1", - "license": "MIT", - "engines": { - "node": ">=8.6" + "node": ">=14.0.0" }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } } }, "node_modules/@rtsao/scc": { @@ -8693,7 +8693,6 @@ }, "node_modules/@types/estree": { "version": "1.0.5", - "dev": true, "license": "MIT" }, "node_modules/@types/glob": { @@ -9091,13 +9090,12 @@ "license": "ISC" }, "node_modules/@vercel/nft": { - "version": "0.27.6", - "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.6.tgz", - "integrity": "sha512-mwuyUxskdcV8dd7N7JnxBgvFEz1D9UOePI/WyLLzktv6HSCwgPNQGit/UJ2IykAWGlypKw4pBQjOKWvIbXITSg==", - "license": "MIT", + "version": "0.27.7", + "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.7.tgz", + "integrity": "sha512-FG6H5YkP4bdw9Ll1qhmbxuE8KwW2E/g8fJpM183fWQLeVDGqzeywMIeJ9h2txdWZ03psgWMn6QymTxaDLmdwUg==", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.11", - "@rollup/pluginutils": "^4.0.0", + "@rollup/pluginutils": "^5.1.3", "acorn": "^8.6.0", "acorn-import-attributes": "^1.9.5", "async-sema": "^3.1.1", @@ -15218,7 +15216,8 @@ }, "node_modules/estree-walker": { "version": "2.0.2", - "license": "MIT" + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==" }, "node_modules/esutils": { "version": "2.0.3", @@ -21920,12 +21919,11 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "3.0.1", - "license": "MIT", - "optional": true, - "peer": true, + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", "engines": { - "node": ">=10" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" @@ -23166,7 +23164,7 @@ }, "node_modules/rollup": { "version": "3.29.4", - "dev": true, + "devOptional": true, "license": "MIT", "bin": { "rollup": "dist/bin/rollup" @@ -26782,7 +26780,7 @@ "license": "MIT", "dependencies": { "@import-maps/resolve": "^1.0.1", - "@vercel/nft": "^0.27.0", + "@vercel/nft": "0.27.7", "ajv": "^8.11.2", "ajv-errors": "^3.0.0", "better-ajv-errors": "^1.2.0", @@ -27610,7 +27608,7 @@ "@babel/types": "7.26.3", "@netlify/binary-info": "^1.0.0", "@netlify/serverless-functions-api": "^1.31.1", - "@vercel/nft": "^0.27.1", + "@vercel/nft": "0.27.7", "archiver": "^7.0.0", "common-path-prefix": "^3.0.0", "cp-file": "^10.0.0", diff --git a/packages/edge-bundler/package.json b/packages/edge-bundler/package.json index bf04eac2f6..127bc99fe6 100644 --- a/packages/edge-bundler/package.json +++ b/packages/edge-bundler/package.json @@ -61,7 +61,7 @@ }, "dependencies": { "@import-maps/resolve": "^1.0.1", - "@vercel/nft": "^0.27.0", + "@vercel/nft": "0.27.7", "ajv": "^8.11.2", "ajv-errors": "^3.0.0", "better-ajv-errors": "^1.2.0", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index f1ab3e6f56..cc25a1c5eb 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -45,7 +45,7 @@ "@babel/types": "7.26.3", "@netlify/binary-info": "^1.0.0", "@netlify/serverless-functions-api": "^1.31.1", - "@vercel/nft": "^0.27.1", + "@vercel/nft": "0.27.7", "archiver": "^7.0.0", "common-path-prefix": "^3.0.0", "cp-file": "^10.0.0", From 214d1726e1f87eedf1aeb3b62ba5b3e87b84bfab Mon Sep 17 00:00:00 2001 From: netlify-circleci <90861860+netlify-circleci@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:46:57 -0600 Subject: [PATCH 08/43] chore: release main (#5947) --- .release-please-manifest.json | 14 ++++++------ package-lock.json | 28 ++++++++++++------------ packages/build/CHANGELOG.md | 17 ++++++++++++++ packages/build/package.json | 10 ++++----- packages/config/CHANGELOG.md | 21 ++++++++++++++++++ packages/config/package.json | 6 ++--- packages/edge-bundler/CHANGELOG.md | 7 ++++++ packages/edge-bundler/package.json | 2 +- packages/functions-utils/CHANGELOG.md | 9 ++++++++ packages/functions-utils/package.json | 4 ++-- packages/headers-parser/CHANGELOG.md | 13 +++++++++++ packages/headers-parser/package.json | 2 +- packages/redirect-parser/CHANGELOG.md | 14 ++++++++++++ packages/redirect-parser/package.json | 2 +- packages/zip-it-and-ship-it/CHANGELOG.md | 7 ++++++ packages/zip-it-and-ship-it/package.json | 2 +- 16 files changed, 123 insertions(+), 35 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 016c494c90..e5dbeb08d7 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,18 +1,18 @@ { "packages/build-info": "7.16.0", - "packages/build": "29.57.0", - "packages/edge-bundler": "12.3.0", + "packages/build": "29.58.0", + "packages/edge-bundler": "12.3.1", "packages/cache-utils": "5.2.0", - "packages/config": "20.20.0", + "packages/config": "20.21.0", "packages/framework-info": "9.9.0", - "packages/functions-utils": "5.3.0", + "packages/functions-utils": "5.3.1", "packages/git-utils": "5.2.0", - "packages/headers-parser": "7.2.0", + "packages/headers-parser": "7.3.0", "packages/js-client": "13.2.0", "packages/nock-udp": "3.2.0", - "packages/redirect-parser": "14.4.0", + "packages/redirect-parser": "14.5.0", "packages/run-utils": "5.2.0", "packages/opentelemetry-sdk-setup": "1.2.0", "packages/opentelemetry-utils": "1.3.0", - "packages/zip-it-and-ship-it": "9.42.0" + "packages/zip-it-and-ship-it": "9.42.1" } diff --git a/package-lock.json b/package-lock.json index 8158ed830d..a2789ebc8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26334,21 +26334,21 @@ }, "packages/build": { "name": "@netlify/build", - "version": "29.57.0", + "version": "29.58.0", "license": "MIT", "dependencies": { "@bugsnag/js": "^7.0.0", "@netlify/blobs": "^7.4.0", "@netlify/cache-utils": "^5.2.0", - "@netlify/config": "^20.20.0", - "@netlify/edge-bundler": "12.3.0", + "@netlify/config": "^20.21.0", + "@netlify/edge-bundler": "12.3.1", "@netlify/framework-info": "^9.9.0", - "@netlify/functions-utils": "^5.3.0", + "@netlify/functions-utils": "^5.3.1", "@netlify/git-utils": "^5.2.0", "@netlify/opentelemetry-utils": "^1.3.0", "@netlify/plugins-list": "^6.80.0", "@netlify/run-utils": "^5.2.0", - "@netlify/zip-it-and-ship-it": "9.42.0", + "@netlify/zip-it-and-ship-it": "9.42.1", "@sindresorhus/slugify": "^2.0.0", "ansi-escapes": "^6.0.0", "chalk": "^5.0.0", @@ -26656,12 +26656,12 @@ }, "packages/config": { "name": "@netlify/config", - "version": "20.20.0", + "version": "20.21.0", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", - "@netlify/headers-parser": "^7.2.0", - "@netlify/redirect-parser": "^14.4.0", + "@netlify/headers-parser": "^7.3.0", + "@netlify/redirect-parser": "^14.5.0", "chalk": "^5.0.0", "cron-parser": "^4.1.0", "deepmerge": "^4.2.2", @@ -26776,7 +26776,7 @@ }, "packages/edge-bundler": { "name": "@netlify/edge-bundler", - "version": "12.3.0", + "version": "12.3.1", "license": "MIT", "dependencies": { "@import-maps/resolve": "^1.0.1", @@ -27146,10 +27146,10 @@ }, "packages/functions-utils": { "name": "@netlify/functions-utils", - "version": "5.3.0", + "version": "5.3.1", "license": "MIT", "dependencies": { - "@netlify/zip-it-and-ship-it": "9.42.0", + "@netlify/zip-it-and-ship-it": "9.42.1", "cpy": "^9.0.0", "path-exists": "^5.0.0" }, @@ -27260,7 +27260,7 @@ }, "packages/headers-parser": { "name": "@netlify/headers-parser", - "version": "7.2.0", + "version": "7.3.0", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", @@ -27382,7 +27382,7 @@ }, "packages/redirect-parser": { "name": "@netlify/redirect-parser", - "version": "14.4.0", + "version": "14.5.0", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", @@ -27601,7 +27601,7 @@ }, "packages/zip-it-and-ship-it": { "name": "@netlify/zip-it-and-ship-it", - "version": "9.42.0", + "version": "9.42.1", "license": "MIT", "dependencies": { "@babel/parser": "^7.22.5", diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md index 258699e2e2..bd85b6fdbf 100644 --- a/packages/build/CHANGELOG.md +++ b/packages/build/CHANGELOG.md @@ -105,6 +105,23 @@ * dependencies * @netlify/config bumped from ^20.8.0 to ^20.8.1 +## [29.58.0](https://github.com/netlify/build/compare/build-v29.57.0...build-v29.58.0) (2024-12-14) + + +### Features + +* **build:** Add trace attribute to track builds failing from Netlify maintained extensions ([#5914](https://github.com/netlify/build/issues/5914)) ([7e99c26](https://github.com/netlify/build/commit/7e99c263f1f47d0982c0a6ee3053163d43980844)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @netlify/config bumped from ^20.20.0 to ^20.21.0 + * @netlify/edge-bundler bumped from 12.3.0 to 12.3.1 + * @netlify/functions-utils bumped from ^5.3.0 to ^5.3.1 + * @netlify/zip-it-and-ship-it bumped from 9.42.0 to 9.42.1 + ## [29.57.0](https://github.com/netlify/build/compare/build-v29.56.1...build-v29.57.0) (2024-12-11) diff --git a/packages/build/package.json b/packages/build/package.json index c6f794167a..6149aa64df 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/build", - "version": "29.57.0", + "version": "29.58.0", "description": "Netlify build module", "type": "module", "exports": "./lib/index.js", @@ -70,15 +70,15 @@ "@bugsnag/js": "^7.0.0", "@netlify/blobs": "^7.4.0", "@netlify/cache-utils": "^5.2.0", - "@netlify/config": "^20.20.0", - "@netlify/edge-bundler": "12.3.0", + "@netlify/config": "^20.21.0", + "@netlify/edge-bundler": "12.3.1", "@netlify/framework-info": "^9.9.0", - "@netlify/functions-utils": "^5.3.0", + "@netlify/functions-utils": "^5.3.1", "@netlify/git-utils": "^5.2.0", "@netlify/opentelemetry-utils": "^1.3.0", "@netlify/plugins-list": "^6.80.0", "@netlify/run-utils": "^5.2.0", - "@netlify/zip-it-and-ship-it": "9.42.0", + "@netlify/zip-it-and-ship-it": "9.42.1", "@sindresorhus/slugify": "^2.0.0", "ansi-escapes": "^6.0.0", "chalk": "^5.0.0", diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index 8461d72d53..469d1607c2 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -76,6 +76,27 @@ * dependencies * netlify bumped from ^13.1.8 to ^13.1.9 +## [20.21.0](https://github.com/netlify/build/compare/config-v20.20.0...config-v20.21.0) (2024-12-14) + + +### Features + +* **build:** Add trace attribute to track builds failing from Netlify maintained extensions ([#5914](https://github.com/netlify/build/issues/5914)) ([7e99c26](https://github.com/netlify/build/commit/7e99c263f1f47d0982c0a6ee3053163d43980844)) +* rename unscoped NPM packages ([#5943](https://github.com/netlify/build/issues/5943)) ([131a644](https://github.com/netlify/build/commit/131a644bfde5205f730f3369b778d8914c7c0382)) + + +### Bug Fixes + +* fail build when extension failed to be retrieved ([#5915](https://github.com/netlify/build/issues/5915)) ([20c7359](https://github.com/netlify/build/commit/20c73593deda6fc4a570fc7b71178687a693e03d)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @netlify/headers-parser bumped from ^7.2.0 to ^7.3.0 + * @netlify/redirect-parser bumped from ^14.4.0 to ^14.5.0 + ## [20.20.0](https://github.com/netlify/build/compare/config-v20.19.1...config-v20.20.0) (2024-12-11) diff --git a/packages/config/package.json b/packages/config/package.json index d89a1bc32e..94b4efec12 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/config", - "version": "20.20.0", + "version": "20.21.0", "description": "Netlify config module", "type": "module", "exports": "./lib/index.js", @@ -73,8 +73,8 @@ "js-yaml": "^4.0.0", "map-obj": "^5.0.0", "netlify": "^13.2.0", - "@netlify/headers-parser": "^7.2.0", - "@netlify/redirect-parser": "^14.4.0", + "@netlify/headers-parser": "^7.3.0", + "@netlify/redirect-parser": "^14.5.0", "node-fetch": "^3.3.1", "omit.js": "^2.0.2", "p-locate": "^6.0.0", diff --git a/packages/edge-bundler/CHANGELOG.md b/packages/edge-bundler/CHANGELOG.md index 2241c259c6..66a27c9640 100644 --- a/packages/edge-bundler/CHANGELOG.md +++ b/packages/edge-bundler/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [12.3.1](https://github.com/netlify/build/compare/edge-bundler-v12.3.0...edge-bundler-v12.3.1) (2024-12-14) + + +### Bug Fixes + +* **deps:** pin @vercel/nft due to breaking change in patch ([#5944](https://github.com/netlify/build/issues/5944)) ([e8e29f0](https://github.com/netlify/build/commit/e8e29f027b09631b7c66dee35c874f8533003d46)) + ## [12.3.0](https://github.com/netlify/build/compare/edge-bundler-v12.2.3...edge-bundler-v12.3.0) (2024-12-11) diff --git a/packages/edge-bundler/package.json b/packages/edge-bundler/package.json index 127bc99fe6..7354a048c6 100644 --- a/packages/edge-bundler/package.json +++ b/packages/edge-bundler/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/edge-bundler", - "version": "12.3.0", + "version": "12.3.1", "description": "Intelligently prepare Netlify Edge Functions for deployment", "type": "module", "main": "./dist/node/index.js", diff --git a/packages/functions-utils/CHANGELOG.md b/packages/functions-utils/CHANGELOG.md index aafb91e0b0..db4c6544b1 100644 --- a/packages/functions-utils/CHANGELOG.md +++ b/packages/functions-utils/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [5.3.1](https://github.com/netlify/build/compare/functions-utils-v5.3.0...functions-utils-v5.3.1) (2024-12-14) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @netlify/zip-it-and-ship-it bumped from 9.42.0 to 9.42.1 + ## [5.3.0](https://github.com/netlify/build/compare/functions-utils-v5.2.93...functions-utils-v5.3.0) (2024-12-11) diff --git a/packages/functions-utils/package.json b/packages/functions-utils/package.json index 5d843fe09a..b703f5d1c4 100644 --- a/packages/functions-utils/package.json +++ b/packages/functions-utils/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/functions-utils", - "version": "5.3.0", + "version": "5.3.1", "description": "Utility for adding Functions files in Netlify Build", "type": "module", "exports": "./lib/main.js", @@ -50,7 +50,7 @@ }, "license": "MIT", "dependencies": { - "@netlify/zip-it-and-ship-it": "9.42.0", + "@netlify/zip-it-and-ship-it": "9.42.1", "cpy": "^9.0.0", "path-exists": "^5.0.0" }, diff --git a/packages/headers-parser/CHANGELOG.md b/packages/headers-parser/CHANGELOG.md index 24e9abefde..d97fc522fc 100644 --- a/packages/headers-parser/CHANGELOG.md +++ b/packages/headers-parser/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [7.3.0](https://github.com/netlify/build/compare/headers-parser-v7.2.0...headers-parser-v7.3.0) (2024-12-14) + + +### Features + +* add node 22 to supported versions list ([#5917](https://github.com/netlify/build/issues/5917)) ([5455393](https://github.com/netlify/build/commit/545539369a3f1a0e9d2036df7d41a8bed1df8272)) +* rename unscoped NPM packages ([#5943](https://github.com/netlify/build/issues/5943)) ([131a644](https://github.com/netlify/build/commit/131a644bfde5205f730f3369b778d8914c7c0382)) + + +### Bug Fixes + +* switch to @iarna/toml ([#5508](https://github.com/netlify/build/issues/5508)) ([ba81c85](https://github.com/netlify/build/commit/ba81c85aad902380d24fc1722bc65d4feed24b84)) + ## [7.2.0](https://github.com/netlify/build/compare/netlify-headers-parser-v7.1.4...netlify-headers-parser-v7.2.0) (2024-12-11) diff --git a/packages/headers-parser/package.json b/packages/headers-parser/package.json index f57ca3e861..10363f5be6 100644 --- a/packages/headers-parser/package.json +++ b/packages/headers-parser/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/headers-parser", - "version": "7.2.0", + "version": "7.3.0", "description": "Parses Netlify headers into a JavaScript object representation", "type": "module", "exports": "./lib/index.js", diff --git a/packages/redirect-parser/CHANGELOG.md b/packages/redirect-parser/CHANGELOG.md index 375cb13b50..afa320bb5f 100644 --- a/packages/redirect-parser/CHANGELOG.md +++ b/packages/redirect-parser/CHANGELOG.md @@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +## [14.5.0](https://github.com/netlify/build/compare/redirect-parser-v14.4.0...redirect-parser-v14.5.0) (2024-12-14) + + +### Features + +* add node 22 to supported versions list ([#5917](https://github.com/netlify/build/issues/5917)) ([5455393](https://github.com/netlify/build/commit/545539369a3f1a0e9d2036df7d41a8bed1df8272)) +* parse custom rate limit info from redirects ([#5623](https://github.com/netlify/build/issues/5623)) ([ef4e615](https://github.com/netlify/build/commit/ef4e6157e3060efef4c5006ba891f05909586296)) +* rename unscoped NPM packages ([#5943](https://github.com/netlify/build/issues/5943)) ([131a644](https://github.com/netlify/build/commit/131a644bfde5205f730f3369b778d8914c7c0382)) + + +### Bug Fixes + +* switch to @iarna/toml ([#5508](https://github.com/netlify/build/issues/5508)) ([ba81c85](https://github.com/netlify/build/commit/ba81c85aad902380d24fc1722bc65d4feed24b84)) + ## [14.4.0](https://github.com/netlify/build/compare/netlify-redirect-parser-v14.3.0...netlify-redirect-parser-v14.4.0) (2024-12-11) diff --git a/packages/redirect-parser/package.json b/packages/redirect-parser/package.json index 1f4e2d30d4..a8fd4a75a1 100644 --- a/packages/redirect-parser/package.json +++ b/packages/redirect-parser/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/redirect-parser", - "version": "14.4.0", + "version": "14.5.0", "description": "Parses netlify redirects into a js object representation", "type": "module", "exports": "./lib/index.js", diff --git a/packages/zip-it-and-ship-it/CHANGELOG.md b/packages/zip-it-and-ship-it/CHANGELOG.md index d84cf108a9..b140d56e51 100644 --- a/packages/zip-it-and-ship-it/CHANGELOG.md +++ b/packages/zip-it-and-ship-it/CHANGELOG.md @@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +## [9.42.1](https://github.com/netlify/build/compare/zip-it-and-ship-it-v9.42.0...zip-it-and-ship-it-v9.42.1) (2024-12-14) + + +### Bug Fixes + +* **deps:** pin @vercel/nft due to breaking change in patch ([#5944](https://github.com/netlify/build/issues/5944)) ([e8e29f0](https://github.com/netlify/build/commit/e8e29f027b09631b7c66dee35c874f8533003d46)) + ## [9.42.0](https://github.com/netlify/build/compare/zip-it-and-ship-it-v9.41.1...zip-it-and-ship-it-v9.42.0) (2024-12-11) diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index cc25a1c5eb..308f416f2e 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/zip-it-and-ship-it", - "version": "9.42.0", + "version": "9.42.1", "description": "Zip it and ship it", "main": "./dist/main.js", "type": "module", From 2289a7884fc0a2fc34b86b60464441d8cb70d4bd Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Mon, 16 Dec 2024 09:41:24 -0500 Subject: [PATCH 09/43] feat(@netlify/build-info): add React Router 7 detection (#5930) * feat(@netlify/build-info): add React Router 7 detection Technically we'd want to add it to Vite's `excludedNpmDependencies`, but we actually only want to exclude RR >=7. Many RR <7 users will be using Vite, so we don't want to break that. But everything works fine if we just don't do anything here, since frameworks get priority over bundlers when there are multiple matches. (I'm not really sure why we both excluding Vite frameworks in the Vite logic). * fix: check for @react-router/dev as proxy for RR7 framework mode See https://netlify.slack.com/archives/C01TKAEBP3Q/p1733952147247699. --- .../assets/logos/react-router/dark.svg | 23 ++++ .../assets/logos/react-router/light.svg | 23 ++++ packages/build-info/src/frameworks/index.ts | 2 + .../src/frameworks/react-router.test.ts | 101 ++++++++++++++++++ .../build-info/src/frameworks/react-router.ts | 43 ++++++++ 5 files changed, 192 insertions(+) create mode 100644 packages/build-info/assets/logos/react-router/dark.svg create mode 100644 packages/build-info/assets/logos/react-router/light.svg create mode 100644 packages/build-info/src/frameworks/react-router.test.ts create mode 100644 packages/build-info/src/frameworks/react-router.ts diff --git a/packages/build-info/assets/logos/react-router/dark.svg b/packages/build-info/assets/logos/react-router/dark.svg new file mode 100644 index 0000000000..dd82028944 --- /dev/null +++ b/packages/build-info/assets/logos/react-router/dark.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/build-info/assets/logos/react-router/light.svg b/packages/build-info/assets/logos/react-router/light.svg new file mode 100644 index 0000000000..73284929d3 --- /dev/null +++ b/packages/build-info/assets/logos/react-router/light.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/build-info/src/frameworks/index.ts b/packages/build-info/src/frameworks/index.ts index 9cd1b52edc..1fe19e31f4 100644 --- a/packages/build-info/src/frameworks/index.ts +++ b/packages/build-info/src/frameworks/index.ts @@ -28,6 +28,7 @@ import { Parcel } from './parcel.js' import { Phenomic } from './phenomic.js' import { Quasar } from './quasar.js' import { Qwik } from './qwik.js' +import { ReactRouter } from './react-router.js' import { ReactStatic } from './react-static.js' import { CreateReactApp } from './react.js' import { RedwoodJS } from './redwoodjs.js' @@ -65,6 +66,7 @@ export const frameworks = [ Nuxt, Phenomic, Qwik, + ReactRouter, ReactStatic, RedwoodJS, Remix, diff --git a/packages/build-info/src/frameworks/react-router.test.ts b/packages/build-info/src/frameworks/react-router.test.ts new file mode 100644 index 0000000000..805e15daee --- /dev/null +++ b/packages/build-info/src/frameworks/react-router.test.ts @@ -0,0 +1,101 @@ +import { beforeEach, expect, test } from 'vitest' + +import { mockFileSystem } from '../../tests/mock-file-system.js' +import { NodeFS } from '../node/file-system.js' +import { Project } from '../project.js' + +beforeEach((ctx) => { + ctx.fs = new NodeFS() +}) +test('detects a site using React Router v7 as a framework', async ({ fs }) => { + const cwd = mockFileSystem({ + 'react-router.config.ts': '', + 'vite.config.ts': '', + 'package.json': JSON.stringify({ + scripts: { + build: 'react-router build', + dev: 'react-router dev', + start: 'react-router-serve ./build/server/index.js', + typecheck: 'react-router typegen && tsc', + }, + dependencies: { + '@react-router/node': '^7.0.2', + '@react-router/serve': '^7.0.2', + react: '^18.3.1', + 'react-dom': '^18.3.1', + 'react-router': '^7.0.2', + }, + devDependencies: { + '@netlify/vite-plugin-react-router': '^1.0.0', + '@react-router/dev': '^7.0.2', + typescript: '^5.6.3', + vite: '^5.4.11', + 'vite-tsconfig-paths': '^5.1.2', + }, + }), + }) + const detected = await new Project(fs, cwd).detectFrameworks() + + const detectedFrameworks = (detected ?? []).map((framework) => framework.id) + expect(detectedFrameworks).not.toContain('remix') + + expect(detected?.[0]?.id).toBe('react-router') + expect(detected?.[0]?.build?.command).toBe('react-router build') + expect(detected?.[0]?.build?.directory).toBe('build/client') + expect(detected?.[0]?.dev?.command).toBe('react-router dev') + expect(detected?.[0]?.dev?.port).toBe(5173) +}) + +test('does NOT detect a site using React Router v7 as a library', async ({ fs }) => { + const cwd = mockFileSystem({ + 'rollup.config.ts': '', + 'package.json': JSON.stringify({ + scripts: { + build: 'rollup build', + dev: 'rollup dev', + typecheck: 'react-router typegen && tsc', + }, + dependencies: { + react: '^18.3.1', + 'react-dom': '^18.3.1', + 'react-router': '^7.0.2', + }, + devDependencies: { + rollup: '^4.28.1', + typescript: '^5.6.3', + }, + }), + }) + const detected = await new Project(fs, cwd).detectFrameworks() + + const detectedFrameworks = (detected ?? []).map((framework) => framework.id) + expect(detectedFrameworks).not.toContain('react-router') +}) + +test('does NOT detect a React Router { + const cwd = mockFileSystem({ + 'vite.config.ts': '', + 'package.json': JSON.stringify({ + scripts: { + build: 'vite build', + dev: 'vite dev', + }, + dependencies: { + react: '^18.2.0', + 'react-dom': '^18.2.0', + 'react-router-dom': '^6.15.0', + }, + devDependencies: { + '@vitejs/plugin-react': '^3.0.1', + typescript: '^4.9.5', + vite: '^4.0.4', + }, + }), + }) + const detected = await new Project(fs, cwd).detectFrameworks() + + const detectedFrameworks = (detected ?? []).map((framework) => framework.id) + expect(detectedFrameworks).not.toContain('react-router') + + expect(detected?.[0]?.id).toBe('vite') +}) diff --git a/packages/build-info/src/frameworks/react-router.ts b/packages/build-info/src/frameworks/react-router.ts new file mode 100644 index 0000000000..929688121d --- /dev/null +++ b/packages/build-info/src/frameworks/react-router.ts @@ -0,0 +1,43 @@ +import { lt } from 'semver' + +import { BaseFramework, Category, DetectedFramework, Framework } from './framework.js' + +export class ReactRouter extends BaseFramework implements Framework { + readonly id = 'react-router' + name = 'React Router' + // React Router 7+ can be used either as a library or as a framework. We want to ignore lib mode (and possibly let + // other frameworks/bundlers/runners be detected). There isn't a perfect way to identify a site's mode, but at the + // time of writing both `@react-router/dev` and `react-router.config` should only be present in framework mode. + npmDependencies = ['@react-router/dev'] + configFiles = ['react-router.config.ts', 'react-router.config.js'] + category = Category.SSG + + dev = { + port: 5173, + command: 'react-router dev', + } + + build = { + command: 'react-router build', + directory: 'build/client', + } + + logo = { + default: '/logos/react-router/light.svg', + light: '/logos/react-router/light.svg', + dark: '/logos/react-router/dark.svg', + } + + async detect(): Promise { + await super.detect() + + if (this.detected) { + // React Router wasn't a framework before v7. As of v7, it's... Remix. + if (this.version && lt(this.version, '7.0.0')) { + return + } + + return this as DetectedFramework + } + } +} From e7243bd9542a99f2da38080bab58574e1687172e Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Mon, 16 Dec 2024 10:06:05 -0500 Subject: [PATCH 10/43] docs: fix weird IDE insertion (#5952) --- packages/config/docs/main.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/config/docs/main.md b/packages/config/docs/main.md index ee11121699..2d54cb7514 100644 --- a/packages/config/docs/main.md +++ b/packages/config/docs/main.md @@ -95,8 +95,8 @@ Most Netlify CLI commands rely on configuration properties. The base command loa [using `@netlify/config` programmatically](https://github.com/netlify/cli/blob/f87d9e6e1749bedaabaace3dae98ca1ed6d84fd6/src/commands/base-command.js#L474). An `inlineConfig` flag was added to `@netlify/config` so Netlify CLI can override specific configuration properties -based on its own CLI flags, but this is not used yet (see , -, ). +based on its own CLI flags, but this is not used yet (see https://github.com/netlify/cli/issues/1265, +https://github.com/netlify/cli/issues/960, https://github.com/netlify/cli/issues/961). We try to [emulate the same environment variables](https://github.com/netlify/build/blob/558fe8869f47ecc84d05bd4d26d32df00f47a3b9/packages/config/src/env/main.js#L13) From 1ce1d52c521c4ace38c41a1d2bef3ca7908756ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 15:19:18 +0000 Subject: [PATCH 11/43] chore(deps): update dependency browserslist to v4.24.3 (#5948) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- package-lock.json | 32 ++++++++++++------------ packages/zip-it-and-ship-it/package.json | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2789ebc8d..735a88096a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10632,9 +10632,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", - "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", + "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", "dev": true, "funding": [ { @@ -10652,9 +10652,9 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001669", - "electron-to-chromium": "^1.5.41", - "node-releases": "^2.0.18", + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { @@ -11110,9 +11110,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001687", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz", - "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==", + "version": "1.0.30001688", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz", + "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==", "dev": true, "funding": [ { @@ -13770,9 +13770,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.72", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz", - "integrity": "sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==", + "version": "1.5.73", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz", + "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==", "dev": true, "license": "ISC" }, @@ -20279,9 +20279,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", - "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "version": "2.0.19", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", + "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", "dev": true, "license": "MIT" }, @@ -27655,7 +27655,7 @@ "@types/unixify": "1.0.2", "@types/yargs": "17.0.32", "@vitest/coverage-v8": "0.34.6", - "browserslist": "4.24.2", + "browserslist": "4.24.3", "cardinal": "2.1.1", "cpy": "9.0.1", "decompress": "4.2.1", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index 308f416f2e..060b713728 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -89,7 +89,7 @@ "@types/unixify": "1.0.2", "@types/yargs": "17.0.32", "@vitest/coverage-v8": "0.34.6", - "browserslist": "4.24.2", + "browserslist": "4.24.3", "cardinal": "2.1.1", "cpy": "9.0.1", "decompress": "4.2.1", From 85b24889efd4d21fce3e04fd1fc79b504527ffce Mon Sep 17 00:00:00 2001 From: netlify-circleci <90861860+netlify-circleci@users.noreply.github.com> Date: Mon, 16 Dec 2024 09:36:20 -0600 Subject: [PATCH 12/43] chore: release main (#5951) --- .release-please-manifest.json | 2 +- package-lock.json | 2 +- packages/build-info/CHANGELOG.md | 7 +++++++ packages/build-info/package.json | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e5dbeb08d7..8b99165044 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,5 +1,5 @@ { - "packages/build-info": "7.16.0", + "packages/build-info": "7.17.0", "packages/build": "29.58.0", "packages/edge-bundler": "12.3.1", "packages/cache-utils": "5.2.0", diff --git a/package-lock.json b/package-lock.json index 735a88096a..e8e8f2cf87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26441,7 +26441,7 @@ }, "packages/build-info": { "name": "@netlify/build-info", - "version": "7.16.0", + "version": "7.17.0", "license": "MIT", "dependencies": { "@bugsnag/js": "^7.20.0", diff --git a/packages/build-info/CHANGELOG.md b/packages/build-info/CHANGELOG.md index e56e6f5097..9b44d4d232 100644 --- a/packages/build-info/CHANGELOG.md +++ b/packages/build-info/CHANGELOG.md @@ -64,6 +64,13 @@ * dependencies * @netlify/framework-info bumped from ^9.8.8 to ^9.8.9 +## [7.17.0](https://github.com/netlify/build/compare/build-info-v7.16.0...build-info-v7.17.0) (2024-12-16) + + +### Features + +* **@netlify/build-info:** add React Router 7 detection ([#5930](https://github.com/netlify/build/issues/5930)) ([2289a78](https://github.com/netlify/build/commit/2289a7884fc0a2fc34b86b60464441d8cb70d4bd)) + ## [7.16.0](https://github.com/netlify/build/compare/build-info-v7.15.2...build-info-v7.16.0) (2024-12-11) diff --git a/packages/build-info/package.json b/packages/build-info/package.json index d61f874d0c..a840d87b30 100644 --- a/packages/build-info/package.json +++ b/packages/build-info/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/build-info", - "version": "7.16.0", + "version": "7.17.0", "description": "Build info utility", "type": "module", "exports": { From 959e0159abfb64080705c48cefc9f15c0f303a73 Mon Sep 17 00:00:00 2001 From: Philippe Serhal Date: Mon, 16 Dec 2024 15:15:47 -0500 Subject: [PATCH 13/43] ci: pin OS and node.js major versions (#5939) * ci: pin OS images This lets Renovate manage updates instead of pulling out the rug from under us when GitHub updates their images. * ci: pin node.js major versions and let Renovate manage updates * ci: fix typo --------- Co-authored-by: Mateusz Bocian --- .github/workflows/benchmark.yml | 4 ++-- .github/workflows/fossa.yml | 2 +- .github/workflows/pre-release.yml | 4 ++-- .github/workflows/stalebot.yml | 2 +- .github/workflows/typescript-nudge.yml | 2 +- .github/workflows/workflow.yml | 27 +++++++++++++------------- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 21a8c68fcf..f3f3d11459 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -11,14 +11,14 @@ on: jobs: benchmark: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '*' + node-version: '22' cache: 'npm' check-latest: true diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index 1221aaa4c8..364b889cf2 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -12,7 +12,7 @@ defaults: jobs: fossa: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index e23983c9cc..638bf2a041 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -6,14 +6,14 @@ on: - releases/*/*/* jobs: prerelease: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-node@v4 with: - node-version: '*' + node-version: '22' check-latest: true registry-url: 'https://registry.npmjs.org' - name: Extract tag, version and package diff --git a/.github/workflows/stalebot.yml b/.github/workflows/stalebot.yml index 868fb1d840..9abdf847e5 100644 --- a/.github/workflows/stalebot.yml +++ b/.github/workflows/stalebot.yml @@ -5,7 +5,7 @@ on: jobs: stale: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/stale@v6.0.1 with: diff --git a/.github/workflows/typescript-nudge.yml b/.github/workflows/typescript-nudge.yml index bb1c0b0b5b..36fb1d7a55 100644 --- a/.github/workflows/typescript-nudge.yml +++ b/.github/workflows/typescript-nudge.yml @@ -10,7 +10,7 @@ on: name: TypeScript conversion nudge jobs: Nudge-to-convert-to-TypeScript-if-JavaScript-found: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4c60515f1b..d99a187e7c 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -8,7 +8,7 @@ on: merge_group: jobs: e2e: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 timeout-minutes: 60 steps: # Sets an output parameter if this is a release PR @@ -27,7 +27,7 @@ jobs: if: ${{ !steps.release-check.outputs.IS_RELEASE }} - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 if: ${{ !steps.release-check.outputs.IS_RELEASE }} - name: Install dependencies run: npm ci @@ -49,12 +49,13 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - node-version: ['*'] + os: [ubuntu-24.04, macos-14, windows-2022] + node-version: ['22'] # Must include the minimum deno version from the `DENO_VERSION_RANGE` constant in `node/bridge.ts`. deno-version: ['v1.39.0', 'v1.46.3'] include: - - os: ubuntu-latest + - os: ubuntu-24.04 + # Earliest supported version node-version: '14.16.0' deno-version: 'v1.46.3' fail-fast: false @@ -63,7 +64,7 @@ jobs: # https://github.com/actions/virtual-environments/issues/268 - name: Increase open file limit run: sudo ulimit -Sn 65536 - if: "${{ matrix.os == 'macOS-latest' }}" + if: "${{ matrix.os == 'macos-14' }}" - run: git config --global core.symlinks true # Sets an output parameter if this is a release PR - name: Check for release @@ -121,30 +122,30 @@ jobs: timeout-minutes: 30 strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - node-version: ['*'] + os: [ubuntu-24.04, macos-14, windows-2022] + node-version: ['22'] install-command: ['npm ci'] machine: ['0', '1', '2', '3', '4'] include: # We test on the oldest supported Node.js version, but only with a # single combination (Ubuntu) - - os: ubuntu-latest + - os: ubuntu-24.04 node-version: '14.16.0' install-command: npm ci machine: '0' - - os: ubuntu-latest + - os: ubuntu-24.04 node-version: '14.16.0' install-command: npm ci machine: '1' - - os: ubuntu-latest + - os: ubuntu-24.04 node-version: '14.16.0' install-command: npm ci machine: '2' - - os: ubuntu-latest + - os: ubuntu-24.04 node-version: '14.16.0' install-command: npm ci machine: '3' - - os: ubuntu-latest + - os: ubuntu-24.04 node-version: '14.16.0' install-command: npm ci machine: '4' From df26c5902813cc5022aa8a165bfee8cbf4039b83 Mon Sep 17 00:00:00 2001 From: YujohnNattrass <46704329+YujohnNattrass@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:12:17 -0800 Subject: [PATCH 14/43] Revert "fix: fail build when extension failed to be retrieved (#5915)" (#5954) This reverts commit 20c73593deda6fc4a570fc7b71178687a693e03d. --- packages/config/src/api/site_info.ts | 22 +++++++----------- .../config/tests/api/snapshots/tests.js.md | 6 ----- .../config/tests/api/snapshots/tests.js.snap | Bin 2281 -> 2232 bytes packages/config/tests/api/tests.js | 22 ------------------ 4 files changed, 8 insertions(+), 42 deletions(-) diff --git a/packages/config/src/api/site_info.ts b/packages/config/src/api/site_info.ts index 1831bf1545..4ac6db793e 100644 --- a/packages/config/src/api/site_info.ts +++ b/packages/config/src/api/site_info.ts @@ -116,7 +116,7 @@ const getIntegrations = async function ({ accountId, testOpts, offline, -}: GetIntegrationsOpts): Promise { +}: GetIntegrationsOpts): Promise { if (!siteId || offline) { return [] } @@ -130,21 +130,15 @@ const getIntegrations = async function ({ ? `${baseUrl}team/${accountId}/integrations/installations/meta/${siteId}` : `${baseUrl}site/${siteId}/integrations/safe` - let response try { - response = await fetch(url) - if (response.status !== 200) { - throw new Error(`Unexpected status code ${response.status} from fetching extensions`) - } - } catch (error) { - throwUserError(`Failed retrieving extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`) - } + const response = await fetch(url) - try { - if (Number(response.headers.get(`content-length`)) === 0) return [] - const responseBody = await response.json() - return Array.isArray(responseBody) ? responseBody : [] + const integrations = await response.json() + return Array.isArray(integrations) ? integrations : [] } catch (error) { - throwUserError(`Failed to parse extensions for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`) + // Integrations should not block the build if they fail to load + // TODO: We should consider blocking the build as integrations are a critical part of the build process + // https://linear.app/netlify/issue/CT-1214/implement-strategy-in-builds-to-deal-with-integrations-that-we-fail-to + return [] } } diff --git a/packages/config/tests/api/snapshots/tests.js.md b/packages/config/tests/api/snapshots/tests.js.md index 0fa33a7aa1..46de190353 100644 --- a/packages/config/tests/api/snapshots/tests.js.md +++ b/packages/config/tests/api/snapshots/tests.js.md @@ -2250,12 +2250,6 @@ Generated by [AVA](https://avajs.dev). "token": "test"␊ }` -## Integrations teamintegrationsInstallationsMeta API error - -> Snapshot 1 - - 'Failed retrieving extensions for site test: Unexpected status code 500 from fetching extensions. Double-check your login status with \'netlify status\' or contact support with details of your error.' - ## baseRelDir is true if build.base is overridden > Snapshot 1 diff --git a/packages/config/tests/api/snapshots/tests.js.snap b/packages/config/tests/api/snapshots/tests.js.snap index 8b774e6725b1d5289f3e4b2548393ded2250b7e2..65648ca3465f93e2ee662761da418c18abe9de26 100644 GIT binary patch literal 2232 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 { - const { output } = await new Fixture('./fixtures/base') - .withFlags({ - siteId: 'test', - mode: 'buildbot', - token: 'test', - accountId: 'account1', - featureFlags: { - cli_integration_installations_meta: true, - }, - }) - .runConfigServer([SITE_INFO_DATA, TEAM_INSTALLATIONS_META_RESPONSE_ERROR, FETCH_INTEGRATIONS_EMPTY_RESPONSE]) - - t.snapshot(normalizeOutput(output)) -}) - test('baseRelDir is true if build.base is overridden', async (t) => { const fixturesDir = normalize(`${fileURLToPath(test.meta.file)}/../fixtures`) From 2fc143eda38f26ef78c62d2fd4cc5001089c7ff4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:28:07 -0500 Subject: [PATCH 15/43] chore(deps): update dependency @types/uuid to v10 (#5953) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 11 ++++++----- packages/edge-bundler/package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8e8f2cf87..c2d6449b12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8872,10 +8872,11 @@ "dev": true }, "node_modules/@types/uuid": { - "version": "9.0.8", - "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz", - "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==", - "dev": true + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", + "dev": true, + "license": "MIT" }, "node_modules/@types/yargs": { "version": "16.0.9", @@ -26807,7 +26808,7 @@ "@types/glob-to-regexp": "^0.4.1", "@types/node": "^14.18.32", "@types/semver": "^7.3.9", - "@types/uuid": "^9.0.0", + "@types/uuid": "^10.0.0", "@vitest/coverage-v8": "^0.34.0", "archiver": "^5.3.1", "chalk": "^4.1.2", diff --git a/packages/edge-bundler/package.json b/packages/edge-bundler/package.json index 7354a048c6..94441ecb19 100644 --- a/packages/edge-bundler/package.json +++ b/packages/edge-bundler/package.json @@ -45,7 +45,7 @@ "@types/glob-to-regexp": "^0.4.1", "@types/node": "^14.18.32", "@types/semver": "^7.3.9", - "@types/uuid": "^9.0.0", + "@types/uuid": "^10.0.0", "@vitest/coverage-v8": "^0.34.0", "archiver": "^5.3.1", "chalk": "^4.1.2", From 905abf3776384e108e514c27ccf2d052be53eef2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:31:01 -0500 Subject: [PATCH 16/43] chore(deps): update codecov/codecov-action action to v5 (#5950) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d99a187e7c..8466e715cc 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -216,7 +216,7 @@ jobs: echo "node=node_${node/.*.*/}" >> $GITHUB_OUTPUT echo "node=node_${node/.*.*/}" >> $env:GITHUB_OUTPUT shell: bash - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v5 if: ${{ !steps.release-check.outputs.IS_RELEASE }} with: files: From d3965d50a47faa397196a594f91e48345dde46ad Mon Sep 17 00:00:00 2001 From: YujohnNattrass <46704329+YujohnNattrass@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:01:39 -0800 Subject: [PATCH 17/43] fix: Revert 5915 yj/fail builds if extension fail to load (#5955) * Revert "fix: fail build when extension failed to be retrieved (#5915)" This reverts commit 20c73593deda6fc4a570fc7b71178687a693e03d. * fix: trigger release please to revert 5915 * chore: trigger release * fix: trigger release please to revert 5915 * fix: update comment --- packages/config/src/api/site_info.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/config/src/api/site_info.ts b/packages/config/src/api/site_info.ts index 4ac6db793e..fe5a286f2d 100644 --- a/packages/config/src/api/site_info.ts +++ b/packages/config/src/api/site_info.ts @@ -136,7 +136,6 @@ const getIntegrations = async function ({ const integrations = await response.json() return Array.isArray(integrations) ? integrations : [] } catch (error) { - // Integrations should not block the build if they fail to load // TODO: We should consider blocking the build as integrations are a critical part of the build process // https://linear.app/netlify/issue/CT-1214/implement-strategy-in-builds-to-deal-with-integrations-that-we-fail-to return [] From 4b431c118f6ccacb882b189f6f7e44d281ef48f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 20:00:37 +0000 Subject: [PATCH 18/43] chore(deps): update node.js to v18.20.5 (#5801) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60e3021494..2c2f33703f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,7 @@ workflows: executors: node: docker: - - image: cimg/node:18.20.3 + - image: cimg/node:18.20.5 windows: machine: image: windows-server-2019-vs2019:stable From 3b598ee45eee25382cdc91f1ff2c3994da0bac2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 20:03:50 +0000 Subject: [PATCH 19/43] fix(deps): update dependency chalk to v5.4.0 (#5956) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2d6449b12..86b792fcc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11173,7 +11173,9 @@ } }, "node_modules/chalk": { - "version": "5.3.0", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.0.tgz", + "integrity": "sha512-ZkD35Mx92acjB2yNJgziGqT9oKHEOxjTBTDRpOsRWtdecL/0jM3z5kM/CTzHWvHIen1GvkM85p6TuFfDGfc8/Q==", "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -18824,6 +18826,19 @@ "url": "https://opencollective.com/lint-staged" } }, + "node_modules/lint-staged/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/lint-staged/node_modules/execa": { "version": "7.2.0", "dev": true, @@ -26352,7 +26367,7 @@ "@netlify/zip-it-and-ship-it": "9.42.1", "@sindresorhus/slugify": "^2.0.0", "ansi-escapes": "^6.0.0", - "chalk": "^5.0.0", + "chalk": "^5.4.0", "clean-stack": "^4.0.0", "execa": "^6.0.0", "fdir": "^6.0.1", @@ -26663,7 +26678,7 @@ "@iarna/toml": "^2.2.5", "@netlify/headers-parser": "^7.3.0", "@netlify/redirect-parser": "^14.5.0", - "chalk": "^5.0.0", + "chalk": "^5.4.0", "cron-parser": "^4.1.0", "deepmerge": "^4.2.2", "dot-prop": "^7.0.0", From 3757b1df917b868e8771a0866d0afc76d437cdf1 Mon Sep 17 00:00:00 2001 From: netlify-circleci <90861860+netlify-circleci@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:21:17 -0600 Subject: [PATCH 20/43] chore: release main (#5957) --- .release-please-manifest.json | 4 ++-- package-lock.json | 6 +++--- packages/build/CHANGELOG.md | 9 +++++++++ packages/build/package.json | 4 ++-- packages/config/CHANGELOG.md | 7 +++++++ packages/config/package.json | 2 +- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 8b99165044..41131936e9 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,9 +1,9 @@ { "packages/build-info": "7.17.0", - "packages/build": "29.58.0", + "packages/build": "29.58.1", "packages/edge-bundler": "12.3.1", "packages/cache-utils": "5.2.0", - "packages/config": "20.21.0", + "packages/config": "20.21.1", "packages/framework-info": "9.9.0", "packages/functions-utils": "5.3.1", "packages/git-utils": "5.2.0", diff --git a/package-lock.json b/package-lock.json index 86b792fcc4..e87280013a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26350,13 +26350,13 @@ }, "packages/build": { "name": "@netlify/build", - "version": "29.58.0", + "version": "29.58.1", "license": "MIT", "dependencies": { "@bugsnag/js": "^7.0.0", "@netlify/blobs": "^7.4.0", "@netlify/cache-utils": "^5.2.0", - "@netlify/config": "^20.21.0", + "@netlify/config": "^20.21.1", "@netlify/edge-bundler": "12.3.1", "@netlify/framework-info": "^9.9.0", "@netlify/functions-utils": "^5.3.1", @@ -26672,7 +26672,7 @@ }, "packages/config": { "name": "@netlify/config", - "version": "20.21.0", + "version": "20.21.1", "license": "MIT", "dependencies": { "@iarna/toml": "^2.2.5", diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md index bd85b6fdbf..e867164d31 100644 --- a/packages/build/CHANGELOG.md +++ b/packages/build/CHANGELOG.md @@ -105,6 +105,15 @@ * dependencies * @netlify/config bumped from ^20.8.0 to ^20.8.1 +## [29.58.1](https://github.com/netlify/build/compare/build-v29.58.0...build-v29.58.1) (2024-12-19) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @netlify/config bumped from ^20.21.0 to ^20.21.1 + ## [29.58.0](https://github.com/netlify/build/compare/build-v29.57.0...build-v29.58.0) (2024-12-14) diff --git a/packages/build/package.json b/packages/build/package.json index 6149aa64df..1bc84d854d 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/build", - "version": "29.58.0", + "version": "29.58.1", "description": "Netlify build module", "type": "module", "exports": "./lib/index.js", @@ -70,7 +70,7 @@ "@bugsnag/js": "^7.0.0", "@netlify/blobs": "^7.4.0", "@netlify/cache-utils": "^5.2.0", - "@netlify/config": "^20.21.0", + "@netlify/config": "^20.21.1", "@netlify/edge-bundler": "12.3.1", "@netlify/framework-info": "^9.9.0", "@netlify/functions-utils": "^5.3.1", diff --git a/packages/config/CHANGELOG.md b/packages/config/CHANGELOG.md index 469d1607c2..b30757c4e7 100644 --- a/packages/config/CHANGELOG.md +++ b/packages/config/CHANGELOG.md @@ -76,6 +76,13 @@ * dependencies * netlify bumped from ^13.1.8 to ^13.1.9 +## [20.21.1](https://github.com/netlify/build/compare/config-v20.21.0...config-v20.21.1) (2024-12-19) + + +### Bug Fixes + +* Revert 5915 yj/fail builds if extension fail to load ([#5955](https://github.com/netlify/build/issues/5955)) ([d3965d5](https://github.com/netlify/build/commit/d3965d50a47faa397196a594f91e48345dde46ad)) + ## [20.21.0](https://github.com/netlify/build/compare/config-v20.20.0...config-v20.21.0) (2024-12-14) diff --git a/packages/config/package.json b/packages/config/package.json index 94b4efec12..6760bce574 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@netlify/config", - "version": "20.21.0", + "version": "20.21.1", "description": "Netlify config module", "type": "module", "exports": "./lib/index.js", From ea093d00a6e5606a878e1965098e4d5a6bfd7e3f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 07:43:06 +0000 Subject: [PATCH 21/43] chore(deps): update dependency chalk to ^5.4.0 (#5959) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 67 +++--------------------------- packages/edge-bundler/package.json | 2 +- 2 files changed, 7 insertions(+), 62 deletions(-) diff --git a/package-lock.json b/package-lock.json index e87280013a..41e74d8f9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11173,9 +11173,9 @@ } }, "node_modules/chalk": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.0.tgz", - "integrity": "sha512-ZkD35Mx92acjB2yNJgziGqT9oKHEOxjTBTDRpOsRWtdecL/0jM3z5kM/CTzHWvHIen1GvkM85p6TuFfDGfc8/Q==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", + "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==", "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -26367,7 +26367,7 @@ "@netlify/zip-it-and-ship-it": "9.42.1", "@sindresorhus/slugify": "^2.0.0", "ansi-escapes": "^6.0.0", - "chalk": "^5.4.0", + "chalk": "^5.0.0", "clean-stack": "^4.0.0", "execa": "^6.0.0", "fdir": "^6.0.1", @@ -26678,7 +26678,7 @@ "@iarna/toml": "^2.2.5", "@netlify/headers-parser": "^7.3.0", "@netlify/redirect-parser": "^14.5.0", - "chalk": "^5.4.0", + "chalk": "^5.0.0", "cron-parser": "^4.1.0", "deepmerge": "^4.2.2", "dot-prop": "^7.0.0", @@ -26826,7 +26826,7 @@ "@types/uuid": "^10.0.0", "@vitest/coverage-v8": "^0.34.0", "archiver": "^5.3.1", - "chalk": "^4.1.2", + "chalk": "^5.4.0", "cpy": "^9.0.1", "cross-env": "^7.0.3", "nock": "^13.2.4", @@ -26838,21 +26838,6 @@ "node": "^14.16.0 || >=16.0.0" } }, - "packages/edge-bundler/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "packages/edge-bundler/node_modules/archiver": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", @@ -26907,34 +26892,6 @@ "util-deprecate": "~1.0.1" } }, - "packages/edge-bundler/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "packages/edge-bundler/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, "packages/edge-bundler/node_modules/compress-commons": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", @@ -27064,18 +27021,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/edge-bundler/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "packages/edge-bundler/node_modules/tar-stream": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", diff --git a/packages/edge-bundler/package.json b/packages/edge-bundler/package.json index 94441ecb19..cd00447bf8 100644 --- a/packages/edge-bundler/package.json +++ b/packages/edge-bundler/package.json @@ -48,7 +48,7 @@ "@types/uuid": "^10.0.0", "@vitest/coverage-v8": "^0.34.0", "archiver": "^5.3.1", - "chalk": "^4.1.2", + "chalk": "^5.4.0", "cpy": "^9.0.1", "cross-env": "^7.0.3", "nock": "^13.2.4", From f3ccfecd4c3261edfbc68961d1e3726143d8507c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 00:54:32 +0000 Subject: [PATCH 22/43] fix(deps): update dependency es-module-lexer to v1.6.0 (#5963) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41e74d8f9e..03ea42ada7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13980,9 +13980,9 @@ } }, "node_modules/es-module-lexer": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", - "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz", + "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==", "license": "MIT" }, "node_modules/es-object-atoms": { @@ -27573,7 +27573,7 @@ "archiver": "^7.0.0", "common-path-prefix": "^3.0.0", "cp-file": "^10.0.0", - "es-module-lexer": "^1.0.0", + "es-module-lexer": "^1.6.0", "esbuild": "0.19.11", "execa": "^6.0.0", "fast-glob": "^3.3.2", From cd0197b026f2f2c08045829838d6377ad467351f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 09:57:06 -0500 Subject: [PATCH 23/43] chore(deps): update dependency @types/archiver to v6 (#5961) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 9 +++++---- packages/zip-it-and-ship-it/package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03ea42ada7..223ea42233 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8640,10 +8640,11 @@ } }, "node_modules/@types/archiver": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-5.3.4.tgz", - "integrity": "sha512-Lj7fLBIMwYFgViVVZHEdExZC3lVYsl+QL0VmdNdIzGZH544jHveYWij6qdnBgJQDnR7pMKliN9z2cPZFEbhyPw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@types/archiver/-/archiver-6.0.3.tgz", + "integrity": "sha512-a6wUll6k3zX6qs5KlxIggs1P1JcYJaTCx2gnlr+f0S1yd2DoaEwoIK10HmBaLnZwWneBz+JBm0dwcZu0zECBcQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/readdir-glob": "*" } @@ -27604,7 +27605,7 @@ "zip-it-and-ship-it": "bin.js" }, "devDependencies": { - "@types/archiver": "5.3.4", + "@types/archiver": "6.0.3", "@types/glob": "8.1.0", "@types/is-ci": "3.0.4", "@types/node": "20.12.11", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index 060b713728..2f655d0b90 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -77,7 +77,7 @@ "zod": "^3.23.8" }, "devDependencies": { - "@types/archiver": "5.3.4", + "@types/archiver": "6.0.3", "@types/glob": "8.1.0", "@types/is-ci": "3.0.4", "@types/node": "20.12.11", From 3774b9b1328c94b539a503765575ac5ad5ffb058 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:52:58 +0000 Subject: [PATCH 24/43] fix(deps): update dependency p-event to v6 (#5966) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 55 +++++++++++++++++++++++++++++++++---- packages/build/package.json | 2 +- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 223ea42233..6d0ef84471 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10354,6 +10354,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/ava/node_modules/p-event": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz", + "integrity": "sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-timeout": "^5.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/ava/node_modules/p-map": { "version": "5.5.0", "dev": true, @@ -12532,6 +12548,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cp-file/node_modules/p-event": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz", + "integrity": "sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==", + "license": "MIT", + "dependencies": { + "p-timeout": "^5.0.2" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cpy": { "version": "9.0.1", "license": "MIT", @@ -21446,13 +21477,27 @@ } }, "node_modules/p-event": { - "version": "5.0.1", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-6.0.1.tgz", + "integrity": "sha512-Q6Bekk5wpzW5qIyUP4gdMEujObYstZl6DMMOSenwBvV0BlE5LkDwkjs5yHbZmdCEq2o4RJx4tE1vwxFVf2FG1w==", "license": "MIT", "dependencies": { - "p-timeout": "^5.0.2" + "p-timeout": "^6.1.2" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-event/node_modules/p-timeout": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.3.tgz", + "integrity": "sha512-UJUyfKbwvr/uZSV6btANfb+0t/mOhKV/KXcCUTp8FcQI+v/0d+wXqH4htrW0E4rR6WiEO/EPvUFiV9D5OI4vlw==", + "license": "MIT", + "engines": { + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -26387,7 +26432,7 @@ "minimatch": "^9.0.4", "node-fetch": "^3.3.2", "os-name": "^5.0.0", - "p-event": "^5.0.0", + "p-event": "^6.0.0", "p-every": "^2.0.0", "p-filter": "^3.0.0", "p-locate": "^6.0.0", @@ -27574,7 +27619,7 @@ "archiver": "^7.0.0", "common-path-prefix": "^3.0.0", "cp-file": "^10.0.0", - "es-module-lexer": "^1.6.0", + "es-module-lexer": "^1.0.0", "esbuild": "0.19.11", "execa": "^6.0.0", "fast-glob": "^3.3.2", diff --git a/packages/build/package.json b/packages/build/package.json index 1bc84d854d..c4fdc7fe5a 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -100,7 +100,7 @@ "minimatch": "^9.0.4", "node-fetch": "^3.3.2", "os-name": "^5.0.0", - "p-event": "^5.0.0", + "p-event": "^6.0.0", "p-every": "^2.0.0", "p-filter": "^3.0.0", "p-locate": "^6.0.0", From bb1d58b3ee2e11888cf7b0151e1cacef7fc522cb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:54:24 +0000 Subject: [PATCH 25/43] fix(deps): update dependency p-map to v7 (#5968) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 39 ++++-------------------- packages/build/package.json | 2 +- packages/zip-it-and-ship-it/package.json | 2 +- 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d0ef84471..3ffcf77e8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21594,10 +21594,12 @@ } }, "node_modules/p-map": { - "version": "6.0.0", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", + "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==", "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -26436,7 +26438,7 @@ "p-every": "^2.0.0", "p-filter": "^3.0.0", "p-locate": "^6.0.0", - "p-map": "^6.0.0", + "p-map": "^7.0.0", "p-reduce": "^3.0.0", "path-exists": "^5.0.0", "path-type": "^5.0.0", @@ -27633,7 +27635,7 @@ "merge-options": "^3.0.4", "minimatch": "^9.0.0", "normalize-path": "^3.0.0", - "p-map": "^5.0.0", + "p-map": "^7.0.0", "path-exists": "^5.0.0", "precinct": "^11.0.0", "require-package-name": "^2.0.1", @@ -28012,21 +28014,6 @@ "@types/yargs-parser": "*" } }, - "packages/zip-it-and-ship-it/node_modules/aggregate-error": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz", - "integrity": "sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==", - "dependencies": { - "clean-stack": "^4.0.0", - "indent-string": "^5.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/zip-it-and-ship-it/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", @@ -28310,20 +28297,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/zip-it-and-ship-it/node_modules/p-map": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz", - "integrity": "sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==", - "dependencies": { - "aggregate-error": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/zip-it-and-ship-it/node_modules/pidtree": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz", diff --git a/packages/build/package.json b/packages/build/package.json index c4fdc7fe5a..927db31af1 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -104,7 +104,7 @@ "p-every": "^2.0.0", "p-filter": "^3.0.0", "p-locate": "^6.0.0", - "p-map": "^6.0.0", + "p-map": "^7.0.0", "p-reduce": "^3.0.0", "path-exists": "^5.0.0", "path-type": "^5.0.0", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index 2f655d0b90..db2e985d8c 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -63,7 +63,7 @@ "merge-options": "^3.0.4", "minimatch": "^9.0.0", "normalize-path": "^3.0.0", - "p-map": "^5.0.0", + "p-map": "^7.0.0", "path-exists": "^5.0.0", "precinct": "^11.0.0", "require-package-name": "^2.0.1", From 58635bee5bcf2074d770f9836faa419e22eb2569 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 15:55:53 +0000 Subject: [PATCH 26/43] fix(deps): update dependency p-wait-for to v5 (#5970) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 22 ++++++++++++++++++---- packages/edge-bundler/package.json | 2 +- packages/js-client/package.json | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3ffcf77e8a..f9bc42b8bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21698,10 +21698,12 @@ } }, "node_modules/p-wait-for": { - "version": "4.1.0", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/p-wait-for/-/p-wait-for-5.0.2.tgz", + "integrity": "sha512-lwx6u1CotQYPVju77R+D0vFomni/AqRfqLmqQ8hekklqZ6gAY9rONh7lBQ0uxWMkC2AuX9b2DVAl8To0NyP1JA==", "license": "MIT", "dependencies": { - "p-timeout": "^5.0.0" + "p-timeout": "^6.0.0" }, "engines": { "node": ">=12" @@ -21710,6 +21712,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/p-wait-for/node_modules/p-timeout": { + "version": "6.1.3", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-6.1.3.tgz", + "integrity": "sha512-UJUyfKbwvr/uZSV6btANfb+0t/mOhKV/KXcCUTp8FcQI+v/0d+wXqH4htrW0E4rR6WiEO/EPvUFiV9D5OI4vlw==", + "license": "MIT", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/p-waterfall": { "version": "2.1.1", "dev": true, @@ -26860,7 +26874,7 @@ "node-fetch": "^3.1.1", "node-stream-zip": "^1.15.0", "p-retry": "^5.1.1", - "p-wait-for": "^4.1.0", + "p-wait-for": "^5.0.0", "path-key": "^4.0.0", "semver": "^7.3.8", "tmp-promise": "^3.0.3", @@ -27298,7 +27312,7 @@ "micro-api-client": "^3.3.0", "node-fetch": "^3.0.0", "omit.js": "^2.0.2", - "p-wait-for": "^4.0.0", + "p-wait-for": "^5.0.0", "qs": "^6.9.6" }, "devDependencies": { diff --git a/packages/edge-bundler/package.json b/packages/edge-bundler/package.json index cd00447bf8..5b5ca92fd4 100644 --- a/packages/edge-bundler/package.json +++ b/packages/edge-bundler/package.json @@ -77,7 +77,7 @@ "node-fetch": "^3.1.1", "node-stream-zip": "^1.15.0", "p-retry": "^5.1.1", - "p-wait-for": "^4.1.0", + "p-wait-for": "^5.0.0", "path-key": "^4.0.0", "semver": "^7.3.8", "tmp-promise": "^3.0.3", diff --git a/packages/js-client/package.json b/packages/js-client/package.json index 3aad981a77..02d7fac910 100644 --- a/packages/js-client/package.json +++ b/packages/js-client/package.json @@ -46,7 +46,7 @@ "micro-api-client": "^3.3.0", "node-fetch": "^3.0.0", "omit.js": "^2.0.2", - "p-wait-for": "^4.0.0", + "p-wait-for": "^5.0.0", "qs": "^6.9.6" }, "devDependencies": { From 3957a0447792f2da84104a7f38ec4a22c2f37347 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 16:08:30 +0000 Subject: [PATCH 27/43] chore(deps): update dependency @types/picomatch to v3 (#5965) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- packages/zip-it-and-ship-it/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f9bc42b8bd..30005cea8e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8810,9 +8810,9 @@ "license": "MIT" }, "node_modules/@types/picomatch": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-2.3.4.tgz", - "integrity": "sha512-0so8lU8O5zatZS/2Fi4zrwks+vZv7e0dygrgEZXljODXBig97l4cPQD+9LabXfGJOWwoRkTVz6Q4edZvD12UOA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-3.0.1.tgz", + "integrity": "sha512-1MRgzpzY0hOp9pW/kLRxeQhUWwil6gnrUYd3oEpeYBqp/FexhaCPv3F8LsYr47gtUU45fO2cm1dbwkSrHEo8Uw==", "dev": true, "license": "MIT" }, @@ -27671,7 +27671,7 @@ "@types/is-ci": "3.0.4", "@types/node": "20.12.11", "@types/normalize-path": "3.0.2", - "@types/picomatch": "2.3.4", + "@types/picomatch": "3.0.1", "@types/resolve": "1.20.6", "@types/semver": "7.5.8", "@types/tmp": "0.2.6", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index db2e985d8c..fea3a4a237 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -82,7 +82,7 @@ "@types/is-ci": "3.0.4", "@types/node": "20.12.11", "@types/normalize-path": "3.0.2", - "@types/picomatch": "2.3.4", + "@types/picomatch": "3.0.1", "@types/resolve": "1.20.6", "@types/semver": "7.5.8", "@types/tmp": "0.2.6", From b5d9d86a86bf4f7bb8cb534b73cc156ed4ca52e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:30:50 -0500 Subject: [PATCH 28/43] fix(deps): update dependency p-filter to v4 (#5967) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 50 +++++++++++++++------------- packages/build/package.json | 2 +- packages/framework-info/package.json | 2 +- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30005cea8e..d6d1d24e4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12868,6 +12868,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cpy/node_modules/p-filter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-3.0.0.tgz", + "integrity": "sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg==", + "license": "MIT", + "dependencies": { + "p-map": "^5.1.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cpy/node_modules/p-map": { "version": "5.5.0", "license": "MIT", @@ -21521,40 +21536,27 @@ } }, "node_modules/p-filter": { - "version": "3.0.0", - "license": "MIT", - "dependencies": { - "p-map": "^5.1.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-filter/node_modules/aggregate-error": { - "version": "4.0.1", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-4.1.0.tgz", + "integrity": "sha512-37/tPdZ3oJwHaS3gNJdenCDB3Tz26i9sjhnguBtvN0vYlRIiDNnvTWkuh+0hETV9rLPdJ3rlL3yVOYPIAnM8rw==", "license": "MIT", "dependencies": { - "clean-stack": "^4.0.0", - "indent-string": "^5.0.0" + "p-map": "^7.0.1" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-filter/node_modules/p-map": { - "version": "5.5.0", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", + "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==", "license": "MIT", - "dependencies": { - "aggregate-error": "^4.0.0" - }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -26450,7 +26452,7 @@ "os-name": "^5.0.0", "p-event": "^6.0.0", "p-every": "^2.0.0", - "p-filter": "^3.0.0", + "p-filter": "^4.0.0", "p-locate": "^6.0.0", "p-map": "^7.0.0", "p-reduce": "^3.0.0", @@ -27144,7 +27146,7 @@ "find-up": "^6.3.0", "is-plain-obj": "^4.0.0", "locate-path": "^7.0.0", - "p-filter": "^3.0.0", + "p-filter": "^4.0.0", "p-locate": "^6.0.0", "process": "^0.11.10", "read-package-up": "^11.0.0", diff --git a/packages/build/package.json b/packages/build/package.json index 927db31af1..d2bfa4f5be 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -102,7 +102,7 @@ "os-name": "^5.0.0", "p-event": "^6.0.0", "p-every": "^2.0.0", - "p-filter": "^3.0.0", + "p-filter": "^4.0.0", "p-locate": "^6.0.0", "p-map": "^7.0.0", "p-reduce": "^3.0.0", diff --git a/packages/framework-info/package.json b/packages/framework-info/package.json index 93471a9f82..bdbe6868f4 100644 --- a/packages/framework-info/package.json +++ b/packages/framework-info/package.json @@ -64,7 +64,7 @@ "find-up": "^6.3.0", "is-plain-obj": "^4.0.0", "locate-path": "^7.0.0", - "p-filter": "^3.0.0", + "p-filter": "^4.0.0", "p-locate": "^6.0.0", "process": "^0.11.10", "read-package-up": "^11.0.0", From 3735d3dadcc3f0d50c5e380425fed9d0c4e78501 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:28:40 -0500 Subject: [PATCH 29/43] chore(deps): update actions/stale action to v9 (#5862) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/stalebot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stalebot.yml b/.github/workflows/stalebot.yml index 9abdf847e5..d1d9ef5cf7 100644 --- a/.github/workflows/stalebot.yml +++ b/.github/workflows/stalebot.yml @@ -7,7 +7,7 @@ jobs: stale: runs-on: ubuntu-24.04 steps: - - uses: actions/stale@v6.0.1 + - uses: actions/stale@v9.0.0 with: exempt-issue-labels: 'WIP,security,action_item,never_stale' days-before-issue-stale: 365 From 8cf6b2194969ae2ff8d75c37cfdf107e7181bc32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:58:38 -0500 Subject: [PATCH 30/43] chore(deps): update dependency @types/yargs to v17 (#5975) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 25 +++++++++++++----------- packages/zip-it-and-ship-it/package.json | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index d6d1d24e4a..bd846dd3f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1807,6 +1807,15 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/@jest/types/node_modules/@types/yargs": { + "version": "16.0.9", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", + "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", + "license": "MIT", + "dependencies": { + "@types/yargs-parser": "*" + } + }, "node_modules/@jest/types/node_modules/ansi-styles": { "version": "4.3.0", "license": "MIT", @@ -8880,7 +8889,10 @@ "license": "MIT" }, "node_modules/@types/yargs": { - "version": "16.0.9", + "version": "17.0.33", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", + "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==", + "dev": true, "license": "MIT", "dependencies": { "@types/yargs-parser": "*" @@ -27678,7 +27690,7 @@ "@types/semver": "7.5.8", "@types/tmp": "0.2.6", "@types/unixify": "1.0.2", - "@types/yargs": "17.0.32", + "@types/yargs": "17.0.33", "@vitest/coverage-v8": "0.34.6", "browserslist": "4.24.3", "cardinal": "2.1.1", @@ -28021,15 +28033,6 @@ "undici-types": "~5.26.4" } }, - "packages/zip-it-and-ship-it/node_modules/@types/yargs": { - "version": "17.0.32", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", - "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, "packages/zip-it-and-ship-it/node_modules/ansi-styles": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index fea3a4a237..5d32161e7f 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -87,7 +87,7 @@ "@types/semver": "7.5.8", "@types/tmp": "0.2.6", "@types/unixify": "1.0.2", - "@types/yargs": "17.0.32", + "@types/yargs": "17.0.33", "@vitest/coverage-v8": "0.34.6", "browserslist": "4.24.3", "cardinal": "2.1.1", From f5651740a572ca92f00579ac172461058e5e0591 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 18:30:13 -0500 Subject: [PATCH 31/43] fix(deps): update dependency yargs-parser to v21 (#5983) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 91 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd846dd3f4..d2f5362e00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2346,6 +2346,16 @@ "node": ">=10" } }, + "node_modules/@lerna/cli/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/@lerna/collect-uncommitted": { "version": "5.6.2", "dev": true, @@ -10936,6 +10946,16 @@ "node": ">=10" } }, + "node_modules/c8/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/c8/node_modules/yocto-queue": { "version": "0.1.0", "dev": true, @@ -12494,6 +12514,16 @@ "node": ">=10" } }, + "node_modules/copyfiles/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/core-util-is": { "version": "1.0.3", "license": "MIT" @@ -12826,6 +12856,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cpy-cli/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/cpy-cli/node_modules/yocto-queue": { "version": "0.1.0", "dev": true, @@ -16410,6 +16450,16 @@ "node": ">=10" } }, + "node_modules/get-pkg-repo/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/get-port": { "version": "6.1.2", "license": "MIT", @@ -19670,6 +19720,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/meow/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/merge-options": { "version": "3.0.4", "license": "MIT", @@ -24874,6 +24934,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/tsd/node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, "node_modules/tslib": { "version": "2.6.2", "dev": true, @@ -26219,11 +26289,12 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "dev": true, + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "license": "ISC", "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/yargs/node_modules/ansi-regex": { @@ -26316,13 +26387,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "21.1.1", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, "node_modules/yarn": { "version": "1.22.22", "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz", @@ -27388,13 +27452,6 @@ "@opentelemetry/api": "~1.8.0" } }, - "packages/opentelemetry-sdk-setup/node_modules/yargs-parser": { - "version": "21.1.1", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, "packages/opentelemetry-utils": { "name": "@netlify/opentelemetry-utils", "version": "1.3.0", From ef21c2b9661c5ec386afe20a69772e1104a6e428 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 11:46:31 -0500 Subject: [PATCH 32/43] chore(deps): update tj-actions/changed-files action to v45 (#5985) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/typescript-nudge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/typescript-nudge.yml b/.github/workflows/typescript-nudge.yml index 36fb1d7a55..7948b44703 100644 --- a/.github/workflows/typescript-nudge.yml +++ b/.github/workflows/typescript-nudge.yml @@ -18,7 +18,7 @@ jobs: - name: 🔎 Get changed JavaScript files id: changed-javascript-files - uses: tj-actions/changed-files@v36 + uses: tj-actions/changed-files@v45 with: base_sha: ${{ github.event.pull_request.base.sha }} files: | From 314ce08201383982f5bbefe196b6d2f465a93bcc Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Thu, 2 Jan 2025 10:18:33 -0500 Subject: [PATCH 33/43] test: rebalance test suite (#5972) * test: glob no longer in use by test suite * test: remove manual balancing of tests * chore: remove tools package * test: match workflow parallelism count to matrix machine count * chore: npm audit fix * chore: update documentation around test balancing --- .github/workflows/workflow.yml | 2 +- CONTRIBUTING.md | 6 - ava.base.js | 20 -- package-lock.json | 427 ++++++++++++++--------------- package.json | 1 - packages/build/ava.config.js | 2 +- packages/build/package.json | 3 +- packages/build/tests-metadata.json | 102 ------- tools/package.json | 15 - tools/tests-duration.js | 65 ----- 10 files changed, 211 insertions(+), 432 deletions(-) delete mode 100644 packages/build/tests-metadata.json delete mode 100644 tools/package.json delete mode 100755 tools/tests-duration.js diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 8466e715cc..f9dee579f8 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -198,7 +198,7 @@ jobs: env: # split tests across multiple machines CI_NODE_INDEX: ${{ matrix.machine }} - CI_NODE_TOTAL: 4 + CI_NODE_TOTAL: 5 with: timeout_minutes: 30 max_attempts: 3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ca17ca38f1..d2cf50b80b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,12 +51,6 @@ See our [testing documentation](packages/build/tests/README.md) to learn about o After submitting the pull request, please make sure the Continuous Integration checks (GitHub actions) are passing. -### Testing in CI - -To speed up CI, we load balance the tests across multiple machines. The information required to load balance the tests -is stored in `tests-metadata.json`, and later used by our test [runner](ava.config.js#L10). To regenerate the data (e.g. -when adding a new test file) run `npm test:measure` and commit the changes to GitHub. - ### Testing locally The `@netlify/testing` package will need to be built regardless of which package you are working on. In order to do this diff --git a/ava.base.js b/ava.base.js index b2cac32a6f..b680051b08 100644 --- a/ava.base.js +++ b/ava.base.js @@ -1,8 +1,5 @@ -import fs, { existsSync } from 'fs' -import path from 'path' import process from 'process' -import { isCI } from 'ci-info' import * as execa from 'execa' const { execaCommand } = execa @@ -10,21 +7,6 @@ if (process.argv.includes('-w')) { execaCommand('tsc -w', { cleanup: true }) } -// `tests-metadata.json` is created by running `npx lerna run test:measure --scope @netlify/build` -const testData = existsSync('tests-metadata.json') ? JSON.parse(fs.readFileSync('tests-metadata.json', 'utf-8')) : {} - -const getOrder = (file) => { - const fileRelative = path.relative(process.cwd(), file).replace(/\\/g, '/') - if (testData[fileRelative]) { - return testData[fileRelative].order - } - - console.warn(`Missing test metadata for ${fileRelative}`) - return Number.MAX_SAFE_INTEGER -} - -const sortTestFiles = (file1, file2) => getOrder(file1) - getOrder(file2) - const config = { files: ['packages/**/tests/*.{cjs,mjs,js}', 'packages/**/tests/**/tests.{cjs,mjs,js}'], verbose: true, @@ -34,8 +16,6 @@ const config = { environmentVariables: { FORCE_COLOR: '1', }, - // we only sort in CI to split efficiently across machines - ...(isCI && { sortTestFiles }), } export default config diff --git a/package-lock.json b/package-lock.json index d2f5362e00..dfcc022bbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,6 @@ "version": "0.0.0", "license": "MIT", "workspaces": [ - "tools", "packages/*" ], "devDependencies": { @@ -1556,11 +1555,12 @@ "license": "MIT" }, "node_modules/@grpc/grpc-js": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.3.tgz", - "integrity": "sha512-qiO9MNgYnwbvZ8MK0YLWbnGrNX3zTcj6/Ef7UHu5ZofER3e2nF3Y35GaPo9qNJJ/UJQKa4KL+z/F4Q8Q+uCdUQ==", + "version": "1.12.5", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.5.tgz", + "integrity": "sha512-d3iiHxdpg5+ZcJ6jnDSOT8Z0O0VMVGy34jAnYLUX8yd36b1qn8f1TwOA/Lc7TsOh03IkPJ38eGI5qD2EjNkoEA==", + "license": "Apache-2.0", "dependencies": { - "@grpc/proto-loader": "^0.7.10", + "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" }, "engines": { @@ -1568,13 +1568,14 @@ } }, "node_modules/@grpc/proto-loader": { - "version": "0.7.10", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz", - "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==", + "version": "0.7.13", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", + "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==", + "license": "Apache-2.0", "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", - "protobufjs": "^7.2.4", + "protobufjs": "^7.2.5", "yargs": "^17.7.2" }, "bin": { @@ -1906,7 +1907,9 @@ "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.20", + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8712,7 +8715,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "license": "MIT" }, "node_modules/@types/glob": { @@ -9415,64 +9420,80 @@ "dev": true }, "node_modules/@webassemblyjs/ast": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz", + "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + "@webassemblyjs/helper-numbers": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2" } }, "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz", + "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==", "dev": true, "license": "MIT", "peer": true }, "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz", + "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==", "dev": true, "license": "MIT", "peer": true }, "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz", + "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==", "dev": true, "license": "MIT", "peer": true }, "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz", + "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/floating-point-hex-parser": "1.13.2", + "@webassemblyjs/helper-api-error": "1.13.2", "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz", + "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==", "dev": true, "license": "MIT", "peer": true }, "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz", + "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/wasm-gen": "1.14.1" } }, "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz", + "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==", "dev": true, "license": "MIT", "peer": true, @@ -9481,7 +9502,9 @@ } }, "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz", + "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==", "dev": true, "license": "Apache-2.0", "peer": true, @@ -9490,84 +9513,100 @@ } }, "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz", + "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==", "dev": true, "license": "MIT", "peer": true }, "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz", + "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-opt": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6", - "@webassemblyjs/wast-printer": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/helper-wasm-section": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-opt": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1", + "@webassemblyjs/wast-printer": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz", + "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz", + "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-buffer": "1.11.6", - "@webassemblyjs/wasm-gen": "1.11.6", - "@webassemblyjs/wasm-parser": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-buffer": "1.14.1", + "@webassemblyjs/wasm-gen": "1.14.1", + "@webassemblyjs/wasm-parser": "1.14.1" } }, "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz", + "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" + "@webassemblyjs/ast": "1.14.1", + "@webassemblyjs/helper-api-error": "1.13.2", + "@webassemblyjs/helper-wasm-bytecode": "1.13.2", + "@webassemblyjs/ieee754": "1.13.2", + "@webassemblyjs/leb128": "1.13.2", + "@webassemblyjs/utf8": "1.13.2" } }, "node_modules/@webassemblyjs/wast-printer": { - "version": "1.11.6", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz", + "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/ast": "1.14.1", "@xtuc/long": "4.2.2" } }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", "dev": true, "license": "BSD-3-Clause", "peer": true }, "node_modules/@xtuc/long": { "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true, "license": "Apache-2.0", "peer": true @@ -9636,7 +9675,9 @@ } }, "node_modules/acorn": { - "version": "8.11.2", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -9752,6 +9793,39 @@ "ajv": "^8.0.1" } }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, "node_modules/all-node-versions": { "version": "9.0.0", "dev": true, @@ -10455,10 +10529,12 @@ } }, "node_modules/axios": { - "version": "1.6.2", + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.6", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -13051,7 +13127,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -13858,7 +13936,9 @@ "license": "MIT" }, "node_modules/ejs": { - "version": "3.1.9", + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -13934,7 +14014,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.15.0", + "version": "5.18.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz", + "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==", "dev": true, "license": "MIT", "peer": true, @@ -15924,7 +16006,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.3", + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", "funding": [ { "type": "individual", @@ -16621,6 +16705,8 @@ }, "node_modules/glob-to-regexp": { "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true, "license": "BSD-2-Clause", "peer": true @@ -17485,7 +17571,9 @@ } }, "node_modules/ip": { - "version": "2.0.0", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz", + "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ==", "dev": true, "license": "MIT" }, @@ -18311,6 +18399,8 @@ }, "node_modules/jest-worker": { "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, "license": "MIT", "peer": true, @@ -18325,6 +18415,8 @@ }, "node_modules/jest-worker/node_modules/supports-color": { "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, "license": "MIT", "peer": true, @@ -20134,7 +20226,9 @@ "optional": true }, "node_modules/nanoid": { - "version": "3.3.7", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "funding": [ { "type": "github", @@ -22023,7 +22117,9 @@ } }, "node_modules/path-to-regexp": { - "version": "1.8.0", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz", + "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==", "dev": true, "license": "MIT", "dependencies": { @@ -22657,6 +22753,8 @@ }, "node_modules/randombytes": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "license": "MIT", "peer": true, @@ -23315,7 +23413,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "devOptional": true, "license": "MIT", "bin": { @@ -23575,7 +23675,9 @@ } }, "node_modules/serialize-javascript": { - "version": "6.0.1", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, "license": "BSD-3-Clause", "peer": true, @@ -24326,6 +24428,8 @@ }, "node_modules/tapable": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, "license": "MIT", "peer": true, @@ -24443,7 +24547,9 @@ } }, "node_modules/terser": { - "version": "5.26.0", + "version": "5.37.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz", + "integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==", "dev": true, "license": "BSD-2-Clause", "peer": true, @@ -24461,16 +24567,18 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.9", + "version": "5.3.11", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz", + "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.17", + "@jridgewell/trace-mapping": "^0.3.25", "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.16.8" + "schema-utils": "^4.3.0", + "serialize-javascript": "^6.0.2", + "terser": "^5.31.1" }, "engines": { "node": ">= 10.13.0" @@ -24494,46 +24602,18 @@ } } }, - "node_modules/terser-webpack-plugin/node_modules/ajv": { - "version": "6.12.6", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { - "version": "3.5.2", - "dev": true, - "license": "MIT", - "peer": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { - "version": "0.4.1", - "dev": true, - "license": "MIT", - "peer": true - }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "3.3.0", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz", + "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" }, "engines": { "node": ">= 10.13.0" @@ -24721,10 +24801,6 @@ "version": "3.0.0", "license": "MIT" }, - "node_modules/tools": { - "resolved": "tools", - "link": true - }, "node_modules/totalist": { "version": "3.0.1", "dev": true, @@ -25580,7 +25656,9 @@ "license": "ISC" }, "node_modules/watchpack": { - "version": "2.4.0", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, "license": "MIT", "peer": true, @@ -25612,34 +25690,35 @@ "license": "BSD-2-Clause" }, "node_modules/webpack": { - "version": "5.89.0", + "version": "5.97.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz", + "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", + "@types/eslint-scope": "^3.7.7", + "@types/estree": "^1.0.6", + "@webassemblyjs/ast": "^1.14.1", + "@webassemblyjs/wasm-edit": "^1.14.1", + "@webassemblyjs/wasm-parser": "^1.14.1", + "acorn": "^8.14.0", + "browserslist": "^4.24.0", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { @@ -28436,96 +28515,6 @@ "engines": { "node": ">=14.17" } - }, - "tools": { - "version": "1.0.0", - "license": "MIT", - "devDependencies": { - "@types/node": "^14.18.53", - "execa": "^6.1.0", - "globby": "^13.1.2", - "typescript": "^5.0.0" - } - }, - "tools/node_modules/execa": { - "version": "6.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^3.0.1", - "is-stream": "^3.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^5.1.0", - "onetime": "^6.0.0", - "signal-exit": "^3.0.7", - "strip-final-newline": "^3.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "tools/node_modules/human-signals": { - "version": "3.0.1", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.20.0" - } - }, - "tools/node_modules/is-stream": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "tools/node_modules/npm-run-path": { - "version": "5.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "path-key": "^4.0.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "tools/node_modules/onetime": { - "version": "6.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "mimic-fn": "^4.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "tools/node_modules/strip-final-newline": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } } } } diff --git a/package.json b/package.json index d8a8edb26a..e1879f01b5 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "format:ci": "prettier --check ." }, "workspaces": [ - "tools", "packages/*" ], "keywords": [ diff --git a/packages/build/ava.config.js b/packages/build/ava.config.js index e6ffc4b66b..bd1721aef1 100644 --- a/packages/build/ava.config.js +++ b/packages/build/ava.config.js @@ -2,7 +2,7 @@ import baseConfig from '../../ava.base.js' const config = { ...baseConfig, - files: ['tests/*.{cjs,mjs,js}', 'tests/**/tests.{cjs,mjs,js}'], + files: ['tests/**/tests.{cjs,mjs,js}'], } export default config diff --git a/packages/build/package.json b/packages/build/package.json index d2bfa4f5be..40954416ca 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -31,8 +31,7 @@ "test:ci": "run-p test:ci:*", "test:ci:types": "tsd", "test:ci:ava": "c8 -r lcovonly -r text -r json ava", - "test:ci:vitest": "vitest run", - "test:measure": "../../tools/tests-duration.js" + "test:ci:vitest": "vitest run" }, "keywords": [ "nodejs", diff --git a/packages/build/tests-metadata.json b/packages/build/tests-metadata.json deleted file mode 100644 index 4f50c2c51e..0000000000 --- a/packages/build/tests-metadata.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "tests/env/tests.js": { - "order": 0, - "machine": 0 - }, - "tests/plugins_list/tests.js": { - "order": 1, - "machine": 0 - }, - "tests/telemetry/tests.js": { - "order": 2, - "machine": 0 - }, - "tests/unit/logger/tests.js": { - "order": 3, - "machine": 0 - }, - "tests/functions/tests.js": { - "order": 4, - "machine": 1 - }, - "tests/monitor/tests.js": { - "order": 5, - "machine": 1 - }, - "tests/mutate_headers_redirects/tests.js": { - "order": 6, - "machine": 1 - }, - "tests/plugins_events/tests.js": { - "order": 7, - "machine": 1 - }, - "tests/stack/tests.js": { - "order": 8, - "machine": 1 - }, - "tests/status/tests.js": { - "order": 9, - "machine": 1 - }, - "tests/time/tests.js": { - "order": 10, - "machine": 1 - }, - "tests/constants/tests.js": { - "order": 11, - "machine": 2 - }, - "tests/deploy/tests.js": { - "order": 12, - "machine": 2 - }, - "tests/error/tests.js": { - "order": 13, - "machine": 2 - }, - "tests/utils_build/tests.js": { - "order": 14, - "machine": 2 - }, - "tests/core/tests.js": { - "order": 15, - "machine": 3 - }, - "tests/edge_functions/tests.js": { - "order": 16, - "machine": 3 - }, - "tests/install/tests.js": { - "order": 17, - "machine": 3 - }, - "tests/log/tests.js": { - "order": 18, - "machine": 3 - }, - "tests/manifest/tests.js": { - "order": 19, - "machine": 3 - }, - "tests/plugins/tests.js": { - "order": 20, - "machine": 3 - }, - "tests/steps/tests.js": { - "order": 21, - "machine": 3 - }, - "tests/secrets_scanning/tests.js": { - "order": 22, - "machine": 4 - }, - "tests/mutate_save/tests.js": { - "order": 23, - "machine": 4 - }, - "tests/mutate/tests.js": { - "order": 24, - "machine": 4 - } -} diff --git a/tools/package.json b/tools/package.json deleted file mode 100644 index 8bcf16cdeb..0000000000 --- a/tools/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "tools", - "version": "1.0.0", - "description": "Mono repository tooling", - "type": "module", - "private": true, - "author": "Lukas Holzer ", - "license": "MIT", - "devDependencies": { - "@types/node": "^14.18.53", - "execa": "^6.1.0", - "globby": "^13.1.2", - "typescript": "^5.0.0" - } -} diff --git a/tools/tests-duration.js b/tools/tests-duration.js deleted file mode 100755 index 27443ae468..0000000000 --- a/tools/tests-duration.js +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env node -import { promises as fs } from 'fs' -import { resolve } from 'path' - -import { execa } from 'execa' -import { globby } from 'globby' - -const CI_MACHINES = 4 - -const measureDurations = async () => { - const { default: config } = await import(resolve('ava.config.js')) - const testFiles = await globby(config.files) - - const durations = new Map() - for (const testFile of testFiles) { - const startTime = performance.now() - const { stdout } = await execa('ava', [testFile], { preferLocal: true, reject: false }) - console.log(stdout) - const endTime = performance.now() - - const duration = endTime - startTime - console.log(`Test file '${testFile}' finished running in ${duration} milliseconds.`) - durations.set(testFile, duration) - } - - return durations -} - -const distributeToMachines = (durations) => { - const filesMachines = new Map() - - // we implement a greedy algorithm to distribute the tests to the CI machines - const descendingDurations = [...durations.entries()].sort(([, duration1], [, duration2]) => duration2 - duration1) - const machinesSums = new Array(CI_MACHINES).fill(0) - for (const [file, duration] of descendingDurations) { - const machine = machinesSums.indexOf(Math.min(...machinesSums)) - machinesSums[machine] += duration - filesMachines.set(file, { machine, duration }) - } - - return filesMachines -} - -const getOrder = (filesMachines) => { - const orderArray = [...filesMachines.entries()] - .sort(([file1, { machine: machine1 }], [file2, { machine: machine2 }]) => { - if (machine1 === machine2) { - return file1.localeCompare(file2) - } - return machine1 - machine2 - }) - .map(([file, { machine }], index) => ({ file, order: index, machine })) - - return Object.fromEntries(orderArray.map(({ file, order, machine }) => [file, { order, machine }])) -} - -const main = async () => { - const durations = await measureDurations() - const filesMachines = distributeToMachines(durations) - const order = getOrder(filesMachines) - - await fs.writeFile('tests-metadata.json', `${JSON.stringify(order, null, 2)}\n`) -} - -main() From 8b7fca68e6c6665e701825beabd7001d39c29a5f Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Thu, 2 Jan 2025 10:32:58 -0500 Subject: [PATCH 34/43] chore: @vitest/coverage-c8 was moved to @vitest/coverage-v8 (#5990) * chore: package coverage-c8 was moved to coverage-v8 * chore: npm audit fix --- package-lock.json | 200 +++++++++++++----- packages/build-info/package.json | 2 +- packages/build/package.json | 2 +- packages/opentelemetry-sdk-setup/package.json | 2 +- packages/opentelemetry-utils/package.json | 2 +- 5 files changed, 155 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfcc022bbc..781a197673 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1903,7 +1903,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { @@ -9143,38 +9145,6 @@ "node": ">=16" } }, - "node_modules/@vitest/coverage-c8": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@vitest/coverage-c8/-/coverage-c8-0.33.0.tgz", - "integrity": "sha512-DaF1zJz4dcOZS4k/neiQJokmOWqsGXwhthfmUdPGorXIQHjdPvV6JQSYhQDI41MyI8c+IieQUdIDs5XAMHtDDw==", - "deprecated": "v8 coverage is moved to @vitest/coverage-v8 package", - "dev": true, - "dependencies": { - "@ampproject/remapping": "^2.2.1", - "c8": "^7.14.0", - "magic-string": "^0.30.1", - "picocolors": "^1.0.0", - "std-env": "^3.3.3" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "vitest": ">=0.30.0 <1" - } - }, - "node_modules/@vitest/coverage-c8/node_modules/magic-string": { - "version": "0.30.7", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", - "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/@vitest/coverage-v8": { "version": "0.34.6", "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.34.6.tgz", @@ -21716,18 +21686,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/p-filter/node_modules/p-map": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", - "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-finally": { "version": "1.0.0", "license": "MIT", @@ -26639,7 +26597,7 @@ "@opentelemetry/api": "~1.8.0", "@opentelemetry/sdk-trace-base": "~1.24.0", "@types/node": "^14.18.53", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "atob": "^2.1.2", "ava": "^4.0.0", "c8": "^7.12.0", @@ -26697,7 +26655,7 @@ "@playwright/test": "^1.30.0", "@types/node": "^14.18.53", "@types/semver": "^7.3.13", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", "execa": "^6.0.0", "memfs": "^3.4.7", @@ -26711,6 +26669,32 @@ "node": "^14.16.0 || >=16.0.0" } }, + "packages/build-info/node_modules/@vitest/coverage-v8": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.33.0.tgz", + "integrity": "sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@bcoe/v8-coverage": "^0.2.3", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.1", + "istanbul-reports": "^3.1.5", + "magic-string": "^0.30.1", + "picocolors": "^1.0.0", + "std-env": "^3.3.3", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": ">=0.32.0 <1" + } + }, "packages/build-info/node_modules/execa": { "version": "6.1.0", "dev": true, @@ -26752,6 +26736,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "packages/build-info/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, "packages/build-info/node_modules/npm-run-path": { "version": "5.1.0", "dev": true, @@ -26791,6 +26785,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "packages/build/node_modules/@vitest/coverage-v8": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.33.0.tgz", + "integrity": "sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@bcoe/v8-coverage": "^0.2.3", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.1", + "istanbul-reports": "^3.1.5", + "magic-string": "^0.30.1", + "picocolors": "^1.0.0", + "std-env": "^3.3.3", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": ">=0.32.0 <1" + } + }, "packages/build/node_modules/execa": { "version": "6.1.0", "license": "MIT", @@ -26829,6 +26849,16 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "packages/build/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, "packages/build/node_modules/npm-run-path": { "version": "5.1.0", "license": "MIT", @@ -27518,7 +27548,7 @@ "devDependencies": { "@opentelemetry/api": "~1.8.0", "@types/node": "^14.18.53", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", "typescript": "^5.0.0", "vite": "^4.0.4", @@ -27531,6 +27561,42 @@ "@opentelemetry/api": "~1.8.0" } }, + "packages/opentelemetry-sdk-setup/node_modules/@vitest/coverage-v8": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.33.0.tgz", + "integrity": "sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@bcoe/v8-coverage": "^0.2.3", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.1", + "istanbul-reports": "^3.1.5", + "magic-string": "^0.30.1", + "picocolors": "^1.0.0", + "std-env": "^3.3.3", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": ">=0.32.0 <1" + } + }, + "packages/opentelemetry-sdk-setup/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, "packages/opentelemetry-utils": { "name": "@netlify/opentelemetry-utils", "version": "1.3.0", @@ -27540,7 +27606,7 @@ "@opentelemetry/sdk-trace-base": "~1.24.0", "@opentelemetry/sdk-trace-node": "~1.24.0", "@types/node": "^14.18.53", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", "typescript": "^5.0.0", "vite": "^4.0.4", @@ -27553,6 +27619,42 @@ "@opentelemetry/api": "~1.8.0" } }, + "packages/opentelemetry-utils/node_modules/@vitest/coverage-v8": { + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-0.33.0.tgz", + "integrity": "sha512-Rj5IzoLF7FLj6yR7TmqsfRDSeaFki6NAJ/cQexqhbWkHEV2htlVGrmuOde3xzvFsCbLCagf4omhcIaVmfU8Okg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@bcoe/v8-coverage": "^0.2.3", + "istanbul-lib-coverage": "^3.2.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.1", + "istanbul-reports": "^3.1.5", + "magic-string": "^0.30.1", + "picocolors": "^1.0.0", + "std-env": "^3.3.3", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": ">=0.32.0 <1" + } + }, + "packages/opentelemetry-utils/node_modules/magic-string": { + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.5.0" + } + }, "packages/redirect-parser": { "name": "@netlify/redirect-parser", "version": "14.5.0", diff --git a/packages/build-info/package.json b/packages/build-info/package.json index a840d87b30..79a8878801 100644 --- a/packages/build-info/package.json +++ b/packages/build-info/package.json @@ -60,7 +60,7 @@ "@playwright/test": "^1.30.0", "@types/node": "^14.18.53", "@types/semver": "^7.3.13", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", "execa": "^6.0.0", "memfs": "^3.4.7", diff --git a/packages/build/package.json b/packages/build/package.json index 40954416ca..9f04159432 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -130,7 +130,7 @@ "@opentelemetry/api": "~1.8.0", "@opentelemetry/sdk-trace-base": "~1.24.0", "@types/node": "^14.18.53", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "atob": "^2.1.2", "ava": "^4.0.0", "c8": "^7.12.0", diff --git a/packages/opentelemetry-sdk-setup/package.json b/packages/opentelemetry-sdk-setup/package.json index 36be62ae15..aaa81a345a 100644 --- a/packages/opentelemetry-sdk-setup/package.json +++ b/packages/opentelemetry-sdk-setup/package.json @@ -43,7 +43,7 @@ "devDependencies": { "@opentelemetry/api": "~1.8.0", "@types/node": "^14.18.53", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", "typescript": "^5.0.0", "vite": "^4.0.4", diff --git a/packages/opentelemetry-utils/package.json b/packages/opentelemetry-utils/package.json index 8cd5391831..3e1b0f919e 100644 --- a/packages/opentelemetry-utils/package.json +++ b/packages/opentelemetry-utils/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@types/node": "^14.18.53", - "@vitest/coverage-c8": "^0.33.0", + "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", "typescript": "^5.0.0", "vite": "^4.0.4", From 15943ef478f0e7550cda1bf623940b10b51f82a3 Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Thu, 2 Jan 2025 11:47:34 -0500 Subject: [PATCH 35/43] test: resolve a few issues with tests causing inconsistent results (#5992) * test: correct the usage of runInstallFixture helper * test: use serial when calling getPort --- .../build/tests/install/snapshots/tests.js.md | 9 +++------ .../tests/install/snapshots/tests.js.snap | Bin 2534 -> 2514 bytes packages/build/tests/install/tests.js | 14 +++++++++----- packages/build/tests/plugins/tests.js | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/build/tests/install/snapshots/tests.js.md b/packages/build/tests/install/snapshots/tests.js.md index 5f3ce01703..c7f5e51fdc 100644 --- a/packages/build/tests/install/snapshots/tests.js.md +++ b/packages/build/tests/install/snapshots/tests.js.md @@ -673,8 +673,7 @@ Generated by [AVA](https://avajs.dev). repositoryRoot: packages/build/tests/install/fixtures/yarn␊ testOpts:␊ pluginsListUrl: test␊ - silentLingeringProcesses: true␊ - useBinary: true␊ + silentLingeringProcesses: 'true'␊ ␊ > Current directory␊ packages/build/tests/install/fixtures/yarn␊ @@ -730,13 +729,11 @@ Generated by [AVA](https://avajs.dev). ␊ > Flags␊ debug: true␊ - flags:␊ - mode: buildbot␊ + mode: buildbot␊ repositoryRoot: packages/build/tests/install/fixtures/yarn_ci␊ testOpts:␊ pluginsListUrl: test␊ - silentLingeringProcesses: true␊ - useBinary: true␊ + silentLingeringProcesses: 'true'␊ ␊ > Current directory␊ packages/build/tests/install/fixtures/yarn_ci␊ diff --git a/packages/build/tests/install/snapshots/tests.js.snap b/packages/build/tests/install/snapshots/tests.js.snap index 490600bcfb5a5706ec8e9f10fdfbf6b8be9f31bc..d25b0349682ec976f344429493e6088d07f41172 100644 GIT binary patch literal 2514 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 diff --git a/packages/build/tests/install/tests.js b/packages/build/tests/install/tests.js index 1a81eb2ac4..0ff3427fce 100644 --- a/packages/build/tests/install/tests.js +++ b/packages/build/tests/install/tests.js @@ -112,14 +112,18 @@ test('Install local plugin dependencies: with npm', async (t) => { }) test('Install local plugin dependencies: with yarn locally', async (t) => { - await runInstallFixture(t, 'yarn', [`${FIXTURES_DIR}/yarn/plugin/node_modules/`], { useBinary: true }) + await runInstallFixture(t, 'yarn', [`${FIXTURES_DIR}/yarn/plugin/node_modules/`], {}, true, true) }) test('Install local plugin dependencies: with yarn in CI', async (t) => { - await runInstallFixture(t, 'yarn_ci', [`${FIXTURES_DIR}/yarn_ci/plugin/node_modules/`], { - useBinary: true, - flags: { mode: 'buildbot' }, - }) + await runInstallFixture( + t, + 'yarn_ci', + [`${FIXTURES_DIR}/yarn_ci/plugin/node_modules/`], + { mode: 'buildbot' }, + true, + true, + ) }) test('Install local plugin dependencies: propagate errors', async (t) => { diff --git a/packages/build/tests/plugins/tests.js b/packages/build/tests/plugins/tests.js index 0ddd21e14d..97f4b9ab46 100644 --- a/packages/build/tests/plugins/tests.js +++ b/packages/build/tests/plugins/tests.js @@ -368,7 +368,7 @@ test('Plugin errors that occur during the loading phase are piped to system logs t.snapshot(normalizeOutput(output)) }) -test('Plugins have a pre-populated Blobs context', async (t) => { +test.serial('Plugins have a pre-populated Blobs context', async (t) => { const serverPort = await getPort() const deployId = 'deploy123' const siteId = 'site321' From 96ef3fa00106b0d5e8427f2a42d399797740cbc9 Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Thu, 2 Jan 2025 12:21:34 -0500 Subject: [PATCH 36/43] chore: remove automatic retries from workflow (#5991) --- .github/workflows/workflow.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f9dee579f8..5c3b64eaaf 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -109,13 +109,8 @@ jobs: run: npx nx affected --target=build if: ${{ !steps.release-check.outputs.IS_RELEASE }} - name: Tests - uses: nick-fields/retry@v3 + run: npx nx affected --target=test:ci --exclude=@netlify/build --parallel=3 if: ${{ !steps.release-check.outputs.IS_RELEASE }} - with: - timeout_minutes: 30 - max_attempts: 3 - retry_on: error - command: npx nx affected --target=test:ci --exclude=@netlify/build --parallel=3 test-build: runs-on: ${{ matrix.os }} @@ -193,17 +188,12 @@ jobs: run: npm run build if: ${{ !steps.release-check.outputs.IS_RELEASE }} - name: Tests - uses: nick-fields/retry@v3 + run: npx lerna run test:ci --scope @netlify/build if: ${{ !steps.release-check.outputs.IS_RELEASE }} env: # split tests across multiple machines CI_NODE_INDEX: ${{ matrix.machine }} CI_NODE_TOTAL: 5 - with: - timeout_minutes: 30 - max_attempts: 3 - retry_on: error - command: npx lerna run test:ci --scope @netlify/build - name: Get test coverage flags id: test-coverage-flags if: ${{ !steps.release-check.outputs.IS_RELEASE }} From 1d3294e58673bafa735dafe638daa4ce468c83a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:06:45 -0500 Subject: [PATCH 37/43] chore(deps): update dependency prettier to v3 (#6000) * chore(deps): update dependency prettier to v3 * chore: run `npm format` --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mateusz Bocian --- package-lock.json | 10 +++--- package.json | 2 +- packages/build-info/e2e/fixture/index.html | 2 +- packages/build-info/index.html | 2 +- .../build-info/src/browser/file-system.ts | 5 ++- packages/build-info/src/project.ts | 6 +++- .../src/workspaces/get-workspace-packages.ts | 4 +-- packages/config/src/env/main.ts | 15 ++++---- packages/edge-bundler/node/bundler.ts | 19 +++++----- packages/framework-info/index.html | 2 +- packages/zip-it-and-ship-it/src/main.ts | 2 +- .../zip-it-and-ship-it/src/runtimes/index.ts | 36 +++++++++++-------- .../src/runtimes/node/parser/exports.ts | 29 ++++++++------- 13 files changed, 79 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 781a197673..0bb718175b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "lerna": "^5.5.2", "lint-staged": "^13.0.3", "nx": "^14.7.13", - "prettier": "^2.8.4" + "prettier": "^3.0.0" }, "engines": { "node": "^14.16.0 || >=16.0.0" @@ -22439,14 +22439,16 @@ } }, "node_modules/prettier": { - "version": "2.8.8", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "dev": true, "license": "MIT", "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" diff --git a/package.json b/package.json index e1879f01b5..af9ca2f668 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "lerna": "^5.5.2", "lint-staged": "^13.0.3", "nx": "^14.7.13", - "prettier": "^2.8.4" + "prettier": "^3.0.0" }, "engines": { "node": "^14.16.0 || >=16.0.0" diff --git a/packages/build-info/e2e/fixture/index.html b/packages/build-info/e2e/fixture/index.html index aaa8a8ddb7..a093835a91 100644 --- a/packages/build-info/e2e/fixture/index.html +++ b/packages/build-info/e2e/fixture/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/build-info/index.html b/packages/build-info/index.html index 02cee41633..bbfee57454 100644 --- a/packages/build-info/index.html +++ b/packages/build-info/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/build-info/src/browser/file-system.ts b/packages/build-info/src/browser/file-system.ts index 7fc854fdbe..27fcef2c46 100644 --- a/packages/build-info/src/browser/file-system.ts +++ b/packages/build-info/src/browser/file-system.ts @@ -2,7 +2,10 @@ import { DirType, Environment, FileSystem } from '../file-system.js' /** A sample implementation of a GitHub provider */ export class GithubProvider { - constructor(public repo: string, public branch?: string) {} + constructor( + public repo: string, + public branch?: string, + ) {} async dir(filePath = ''): Promise<{ path: string; type: 'file' | 'dir' }[]> { let path = `/repos/${this.repo}/contents${filePath}` diff --git a/packages/build-info/src/project.ts b/packages/build-info/src/project.ts index a528c047b4..9f3ca27f8d 100644 --- a/packages/build-info/src/project.ts +++ b/packages/build-info/src/project.ts @@ -103,7 +103,11 @@ export class Project { return await this.fs.fileExists(this.fs.resolve(this.fs.cwd, 'redwood.toml')) } - constructor(public fs: FileSystem, baseDirectory?: string, root?: string) { + constructor( + public fs: FileSystem, + baseDirectory?: string, + root?: string, + ) { this.baseDirectory = fs.resolve(root || '', baseDirectory !== undefined ? baseDirectory : fs.cwd) this.root = root ? fs.resolve(fs.cwd, root) : undefined diff --git a/packages/build-info/src/workspaces/get-workspace-packages.ts b/packages/build-info/src/workspaces/get-workspace-packages.ts index 59d0c163fa..eac0d43f9b 100644 --- a/packages/build-info/src/workspaces/get-workspace-packages.ts +++ b/packages/build-info/src/workspaces/get-workspace-packages.ts @@ -66,8 +66,8 @@ export async function findPackages( const startDir = project.jsWorkspaceRoot ? project.fs.resolve(project.jsWorkspaceRoot, dir) : project.root - ? project.fs.resolve(project.root, dir) - : project.fs.resolve(dir) + ? project.fs.resolve(project.root, dir) + : project.fs.resolve(dir) try { content = await project.fs.readDir(startDir, true) } catch (err) { diff --git a/packages/config/src/env/main.ts b/packages/config/src/env/main.ts index 5ce066ba93..2c6ff08f94 100644 --- a/packages/config/src/env/main.ts +++ b/packages/config/src/env/main.ts @@ -130,12 +130,15 @@ const getGeneralEnv = async function ({ const getInternalEnv = function ( cachedEnv: Record, ): Record { - return Object.entries(cachedEnv).reduce((prev, [key, { sources, value }]) => { - if (sources.includes('internal')) { - prev[key] = value - } - return prev - }, {} as Record) + return Object.entries(cachedEnv).reduce( + (prev, [key, { sources, value }]) => { + if (sources.includes('internal')) { + prev[key] = value + } + return prev + }, + {} as Record, + ) } const getDeployUrls = function ({ diff --git a/packages/edge-bundler/node/bundler.ts b/packages/edge-bundler/node/bundler.ts index 4c001a4e62..6de583622c 100644 --- a/packages/edge-bundler/node/bundler.ts +++ b/packages/edge-bundler/node/bundler.ts @@ -241,14 +241,17 @@ interface CreateFunctionConfigOptions { } const createFunctionConfig = ({ internalFunctionsWithConfig, declarations }: CreateFunctionConfigOptions) => - Object.entries(internalFunctionsWithConfig).reduce((acc, [functionName, config]) => { - const mergedConfigFields = mergeWithDeclarationConfig({ functionName, config, declarations }) - - return { - ...acc, - [functionName]: addGeneratorFallback(mergedConfigFields), - } - }, {} as Record) + Object.entries(internalFunctionsWithConfig).reduce( + (acc, [functionName, config]) => { + const mergedConfigFields = mergeWithDeclarationConfig({ functionName, config, declarations }) + + return { + ...acc, + [functionName]: addGeneratorFallback(mergedConfigFields), + } + }, + {} as Record, + ) interface VendorNPMOptions { basePath: string diff --git a/packages/framework-info/index.html b/packages/framework-info/index.html index 677ac9d101..d1268d76ed 100644 --- a/packages/framework-info/index.html +++ b/packages/framework-info/index.html @@ -1,4 +1,4 @@ - + diff --git a/packages/zip-it-and-ship-it/src/main.ts b/packages/zip-it-and-ship-it/src/main.ts index 9a81132629..8c2acd50ce 100644 --- a/packages/zip-it-and-ship-it/src/main.ts +++ b/packages/zip-it-and-ship-it/src/main.ts @@ -158,7 +158,7 @@ const getListedFunction = function ({ mainFile, name, runtime: runtime.name, - runtimeAPIVersion: staticAnalysisResult ? staticAnalysisResult?.runtimeAPIVersion ?? 1 : undefined, + runtimeAPIVersion: staticAnalysisResult ? (staticAnalysisResult?.runtimeAPIVersion ?? 1) : undefined, schedule: staticAnalysisResult?.config?.schedule ?? config.schedule, inputModuleFormat: staticAnalysisResult?.inputModuleFormat, } diff --git a/packages/zip-it-and-ship-it/src/runtimes/index.ts b/packages/zip-it-and-ship-it/src/runtimes/index.ts index 617a8f8329..c314d548eb 100644 --- a/packages/zip-it-and-ship-it/src/runtimes/index.ts +++ b/packages/zip-it-and-ship-it/src/runtimes/index.ts @@ -104,21 +104,27 @@ export const getFunctionsFromPaths = async ( // through `findFunctionsInRuntime`. For each iteration, we collect all the // functions found plus the list of paths that still need to be evaluated, // using them as the input for the next iteration until the last runtime. - const { functions } = await RUNTIMES.reduce(async (aggregate, runtime) => { - const { functions: aggregateFunctions, remainingPaths: aggregatePaths } = await aggregate - const { functions: runtimeFunctions, remainingPaths: runtimePaths } = await findFunctionsInRuntime({ - cache, - dedupe, - featureFlags, - paths: aggregatePaths, - runtime, - }) - - return { - functions: [...aggregateFunctions, ...runtimeFunctions], - remainingPaths: runtimePaths, - } - }, Promise.resolve({ functions: [], remainingPaths: paths } as { functions: FunctionTupleWithoutConfig[]; remainingPaths: string[] })) + const { functions } = await RUNTIMES.reduce( + async (aggregate, runtime) => { + const { functions: aggregateFunctions, remainingPaths: aggregatePaths } = await aggregate + const { functions: runtimeFunctions, remainingPaths: runtimePaths } = await findFunctionsInRuntime({ + cache, + dedupe, + featureFlags, + paths: aggregatePaths, + runtime, + }) + + return { + functions: [...aggregateFunctions, ...runtimeFunctions], + remainingPaths: runtimePaths, + } + }, + Promise.resolve({ functions: [], remainingPaths: paths } as { + functions: FunctionTupleWithoutConfig[] + remainingPaths: string[] + }), + ) const functionConfigs = await Promise.all( functions.map(([, func]) => getConfigForFunction({ config, configFileDirectories, func })), ) diff --git a/packages/zip-it-and-ship-it/src/runtimes/node/parser/exports.ts b/packages/zip-it-and-ship-it/src/runtimes/node/parser/exports.ts index caf2b7a253..79e320b52a 100644 --- a/packages/zip-it-and-ship-it/src/runtimes/node/parser/exports.ts +++ b/packages/zip-it-and-ship-it/src/runtimes/node/parser/exports.ts @@ -200,23 +200,26 @@ const parseConfigESMExport = (node: Statement) => { * and any others will be ignored and excluded from the resulting object. */ const parseObject = (node: ObjectExpression) => - node.properties.reduce((acc, property): Record => { - if (property.type === 'ObjectProperty' && property.key.type === 'Identifier') { - return { - ...acc, - [property.key.name]: parsePrimitive(property.value), + node.properties.reduce( + (acc, property): Record => { + if (property.type === 'ObjectProperty' && property.key.type === 'Identifier') { + return { + ...acc, + [property.key.name]: parsePrimitive(property.value), + } } - } - if (property.type === 'ObjectProperty' && property.key.type === 'StringLiteral') { - return { - ...acc, - [property.key.value]: parsePrimitive(property.value), + if (property.type === 'ObjectProperty' && property.key.type === 'StringLiteral') { + return { + ...acc, + [property.key.value]: parsePrimitive(property.value), + } } - } - return acc - }, {} as Record) + return acc + }, + {} as Record, + ) /** * Takes an expression and, if it matches a JavaScript primitive type, returns From 7d03e6b139f79c5d630f39aed23fd925fa98662a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:08:06 -0500 Subject: [PATCH 38/43] chore(deps): update dependency eslint-config-prettier to v9 (#5998) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 6 ++++-- package.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0bb718175b..5898f9f2e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@typescript-eslint/eslint-plugin": "^5.39.0", "ci-info": "^3.3.0", "eslint": "^8.24.0", - "eslint-config-prettier": "^8.5.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.26.0", "husky": "^8.0.0", "lerna": "^5.5.2", @@ -14670,7 +14670,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.10.0", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, "license": "MIT", "bin": { diff --git a/package.json b/package.json index af9ca2f668..5011826c60 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@typescript-eslint/eslint-plugin": "^5.39.0", "ci-info": "^3.3.0", "eslint": "^8.24.0", - "eslint-config-prettier": "^8.5.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.26.0", "husky": "^8.0.0", "lerna": "^5.5.2", From 79cce43cacc04cb7b3a40d33cffd3fa4b374610d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:08:20 -0500 Subject: [PATCH 39/43] chore(deps): update dependency is-ci to v4 (#5999) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 32 +++++++++++++++++++++--- packages/config/package.json | 2 +- packages/zip-it-and-ship-it/package.json | 2 +- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5898f9f2e4..1e8a6672cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17639,16 +17639,40 @@ } }, "node_modules/is-ci": { - "version": "3.0.1", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-4.1.0.tgz", + "integrity": "sha512-Ab9bQDQ11lWootZUI5qxgN2ZXwxNI5hTwnsvOc1wyxQ7zQ8OkEDw79mI0+9jI3x432NfwbVRru+3noJfXF6lSQ==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "license": "MIT", "dependencies": { - "ci-info": "^3.2.0" + "ci-info": "^4.1.0" }, "bin": { "is-ci": "bin.js" } }, + "node_modules/is-ci/node_modules/ci-info": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz", + "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/is-core-module": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", @@ -26961,7 +26985,7 @@ "ava": "^4.0.0", "c8": "^7.12.0", "has-ansi": "^5.0.0", - "is-ci": "^3.0.0", + "is-ci": "^4.0.0", "tmp-promise": "^3.0.2", "typescript": "^5.0.0" }, @@ -27940,7 +27964,7 @@ "decompress": "4.2.1", "deepmerge": "^4.3.1", "get-stream": "8.0.1", - "is-ci": "3.0.1", + "is-ci": "4.1.0", "lambda-local": "2.2.0", "npm-run-all2": "5.0.0", "source-map-support": "0.5.21", diff --git a/packages/config/package.json b/packages/config/package.json index 6760bce574..bd3b62a9e1 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -88,7 +88,7 @@ "ava": "^4.0.0", "c8": "^7.12.0", "has-ansi": "^5.0.0", - "is-ci": "^3.0.0", + "is-ci": "^4.0.0", "tmp-promise": "^3.0.2", "typescript": "^5.0.0" }, diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index 5d32161e7f..e9dcb2889b 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -95,7 +95,7 @@ "decompress": "4.2.1", "deepmerge": "^4.3.1", "get-stream": "8.0.1", - "is-ci": "3.0.1", + "is-ci": "4.1.0", "lambda-local": "2.2.0", "npm-run-all2": "5.0.0", "source-map-support": "0.5.21", From 49add3c863441eec2c1b80a94122e14b77d498a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 19:09:00 -0500 Subject: [PATCH 40/43] chore(deps): update dependency ci-info to v4 (#5997) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 54 +++++++++++++++++++++++++++++++---------------- package.json | 2 +- 2 files changed, 37 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1e8a6672cf..bb5b25b405 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@commitlint/cli": "^17.1.2", "@commitlint/config-conventional": "^17.1.0", "@typescript-eslint/eslint-plugin": "^5.39.0", - "ci-info": "^3.3.0", + "ci-info": "^4.0.0", "eslint": "^8.24.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.26.0", @@ -8757,6 +8757,22 @@ "ci-info": "^3.1.0" } }, + "node_modules/@types/is-ci/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", "license": "MIT" @@ -10405,6 +10421,22 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/ava/node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/ava/node_modules/figures": { "version": "4.0.1", "dev": true, @@ -11343,7 +11375,9 @@ "license": "MIT" }, "node_modules/ci-info": { - "version": "3.9.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz", + "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==", "dev": true, "funding": [ { @@ -17657,22 +17691,6 @@ "is-ci": "bin.js" } }, - "node_modules/is-ci/node_modules/ci-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.1.0.tgz", - "integrity": "sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-core-module": { "version": "2.15.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz", diff --git a/package.json b/package.json index 5011826c60..818e2b4cf6 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@commitlint/cli": "^17.1.2", "@commitlint/config-conventional": "^17.1.0", "@typescript-eslint/eslint-plugin": "^5.39.0", - "ci-info": "^3.3.0", + "ci-info": "^4.0.0", "eslint": "^8.24.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-import": "^2.26.0", From b169e3edcfb8ab8b33e54ac9123696263784e8ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 19:09:30 -0500 Subject: [PATCH 41/43] chore(deps): update dependency lint-staged to v15 (#6002) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 391 ++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 276 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb5b25b405..2670e55df2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "eslint-plugin-import": "^2.26.0", "husky": "^8.0.0", "lerna": "^5.5.2", - "lint-staged": "^13.0.3", + "lint-staged": "^15.0.0", "nx": "^14.7.13", "prettier": "^3.0.0" }, @@ -11958,11 +11958,13 @@ } }, "node_modules/commander": { - "version": "11.0.0", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", "dev": true, "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/common-ancestor-path": { @@ -13248,10 +13250,12 @@ } }, "node_modules/debug": { - "version": "4.3.4", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -13262,10 +13266,6 @@ } } }, - "node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "license": "MIT" - }, "node_modules/debuglog": { "version": "1.0.1", "dev": true, @@ -14064,6 +14064,19 @@ "node": ">=4" } }, + "node_modules/environment": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz", + "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/err-code": { "version": "2.0.3", "dev": true, @@ -16309,6 +16322,19 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-east-asian-width": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz", + "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-func-name": { "version": "2.0.2", "dev": true, @@ -19004,11 +19030,16 @@ } }, "node_modules/lilconfig": { - "version": "2.1.0", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", + "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", "dev": true, "license": "MIT", "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antonk52" } }, "node_modules/lines-and-columns": { @@ -19016,76 +19047,84 @@ "license": "MIT" }, "node_modules/lint-staged": { - "version": "13.3.0", + "version": "15.3.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.3.0.tgz", + "integrity": "sha512-vHFahytLoF2enJklgtOtCtIjZrKD/LoxlaUusd5nh7dWv/dkKQJY74ndFSzxCdv7g0ueGg1ORgTSt4Y9LPZn9A==", "dev": true, "license": "MIT", "dependencies": { - "chalk": "5.3.0", - "commander": "11.0.0", - "debug": "4.3.4", - "execa": "7.2.0", - "lilconfig": "2.1.0", - "listr2": "6.6.1", - "micromatch": "4.0.5", - "pidtree": "0.6.0", - "string-argv": "0.3.2", - "yaml": "2.3.1" + "chalk": "~5.4.1", + "commander": "~12.1.0", + "debug": "~4.4.0", + "execa": "~8.0.1", + "lilconfig": "~3.1.3", + "listr2": "~8.2.5", + "micromatch": "~4.0.8", + "pidtree": "~0.6.0", + "string-argv": "~0.3.2", + "yaml": "~2.6.1" }, "bin": { "lint-staged": "bin/lint-staged.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": ">=18.12.0" }, "funding": { "url": "https://opencollective.com/lint-staged" } }, - "node_modules/lint-staged/node_modules/chalk": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", - "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^12.17.0 || ^14.13 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/lint-staged/node_modules/execa": { - "version": "7.2.0", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", "onetime": "^6.0.0", - "signal-exit": "^3.0.7", + "signal-exit": "^4.1.0", "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + "node": ">=16.17" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, + "node_modules/lint-staged/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/lint-staged/node_modules/human-signals": { - "version": "4.3.1", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, "license": "Apache-2.0", "engines": { - "node": ">=14.18.0" + "node": ">=16.17.0" } }, "node_modules/lint-staged/node_modules/is-stream": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, "license": "MIT", "engines": { @@ -19095,22 +19134,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, "node_modules/lint-staged/node_modules/npm-run-path": { - "version": "5.1.0", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dev": true, "license": "MIT", "dependencies": { @@ -19125,6 +19152,8 @@ }, "node_modules/lint-staged/node_modules/onetime": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, "license": "MIT", "dependencies": { @@ -19137,21 +19166,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "node_modules/lint-staged/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "MIT", + "license": "ISC", "engines": { - "node": ">=8.6" + "node": ">=14" }, "funding": { - "url": "https://github.com/sponsors/jonschlinkert" + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/lint-staged/node_modules/strip-final-newline": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, "license": "MIT", "engines": { @@ -19161,49 +19192,79 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lint-staged/node_modules/yaml": { - "version": "2.3.1", + "node_modules/listr2": { + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz", + "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==", "dev": true, - "license": "ISC", + "license": "MIT", + "dependencies": { + "cli-truncate": "^4.0.0", + "colorette": "^2.0.20", + "eventemitter3": "^5.0.1", + "log-update": "^6.1.0", + "rfdc": "^1.4.1", + "wrap-ansi": "^9.0.0" + }, "engines": { - "node": ">= 14" + "node": ">=18.0.0" } }, - "node_modules/listr2": { - "version": "6.6.1", + "node_modules/listr2/node_modules/cli-truncate": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", + "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "dev": true, "license": "MIT", "dependencies": { - "cli-truncate": "^3.1.0", - "colorette": "^2.0.20", - "eventemitter3": "^5.0.1", - "log-update": "^5.0.1", - "rfdc": "^1.3.0", - "wrap-ansi": "^8.1.0" + "slice-ansi": "^5.0.0", + "string-width": "^7.0.0" }, "engines": { - "node": ">=16.0.0" + "node": ">=18" }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/listr2/node_modules/emoji-regex": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/listr2/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, - "peerDependenciesMeta": { - "enquirer": { - "optional": true - } + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/listr2/node_modules/wrap-ansi": { - "version": "8.1.0", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -19498,88 +19559,174 @@ } }, "node_modules/log-update": { - "version": "5.0.1", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz", + "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==", "dev": true, "license": "MIT", "dependencies": { - "ansi-escapes": "^5.0.0", - "cli-cursor": "^4.0.0", - "slice-ansi": "^5.0.0", - "strip-ansi": "^7.0.1", - "wrap-ansi": "^8.0.1" + "ansi-escapes": "^7.0.0", + "cli-cursor": "^5.0.0", + "slice-ansi": "^7.1.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/ansi-escapes": { - "version": "5.0.0", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz", + "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==", "dev": true, "license": "MIT", "dependencies": { - "type-fest": "^1.0.2" + "environment": "^1.0.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/cli-cursor": { - "version": "4.0.0", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz", + "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==", "dev": true, "license": "MIT", "dependencies": { - "restore-cursor": "^4.0.0" + "restore-cursor": "^5.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/emoji-regex": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "dev": true, + "license": "MIT" + }, + "node_modules/log-update/node_modules/is-fullwidth-code-point": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", + "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", + "dev": true, + "license": "MIT", + "dependencies": { + "get-east-asian-width": "^1.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/onetime": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz", + "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-function": "^5.0.0" + }, + "engines": { + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/restore-cursor": { - "version": "4.0.0", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz", + "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==", "dev": true, "license": "MIT", "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "^7.0.0", + "signal-exit": "^4.1.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-update/node_modules/type-fest": { - "version": "1.4.0", + "node_modules/log-update/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "(MIT OR CC0-1.0)", + "license": "ISC", "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/log-update/node_modules/slice-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", + "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/log-update/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/wrap-ansi": { - "version": "8.1.0", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "dev": true, "license": "MIT", "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -19924,6 +20071,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/mimic-function": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", + "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/mimic-response": { "version": "4.0.0", "license": "MIT", @@ -20180,7 +20340,6 @@ }, "node_modules/ms": { "version": "2.1.3", - "dev": true, "license": "MIT" }, "node_modules/multimatch": { diff --git a/package.json b/package.json index 818e2b4cf6..2fa8fa2cd6 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "eslint-plugin-import": "^2.26.0", "husky": "^8.0.0", "lerna": "^5.5.2", - "lint-staged": "^13.0.3", + "lint-staged": "^15.0.0", "nx": "^14.7.13", "prettier": "^3.0.0" }, From 92a3f827f44c87c87f5564e50efe559722d065dd Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Fri, 3 Jan 2025 07:51:41 -0500 Subject: [PATCH 42/43] chore: upgrade execa to v7 (#6004) --- package-lock.json | 140 ++++++++++++++--------- packages/build-info/package.json | 2 +- packages/build/package.json | 2 +- packages/config/package.json | 2 +- packages/edge-bundler/package.json | 2 +- packages/git-utils/package.json | 2 +- packages/run-utils/package.json | 2 +- packages/testing/package.json | 2 +- packages/zip-it-and-ship-it/package.json | 2 +- 9 files changed, 92 insertions(+), 64 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2670e55df2..c39c0527ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26751,7 +26751,7 @@ "ansi-escapes": "^6.0.0", "chalk": "^5.0.0", "clean-stack": "^4.0.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "fdir": "^6.0.1", "figures": "^5.0.0", "filter-obj": "^5.0.0", @@ -26862,7 +26862,7 @@ "@types/semver": "^7.3.13", "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "memfs": "^3.4.7", "node-fetch": "^3.3.1", "typescript": "^5.0.0", @@ -26901,13 +26901,15 @@ } }, "packages/build-info/node_modules/execa": { - "version": "6.1.0", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "dev": true, "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -26916,18 +26918,20 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/build-info/node_modules/human-signals": { - "version": "3.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "dev": true, "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/build-info/node_modules/is-stream": { @@ -27017,12 +27021,14 @@ } }, "packages/build/node_modules/execa": { - "version": "6.1.0", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -27031,17 +27037,19 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/build/node_modules/human-signals": { - "version": "3.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/build/node_modules/is-stream": { @@ -27136,7 +27144,7 @@ "cron-parser": "^4.1.0", "deepmerge": "^4.2.2", "dot-prop": "^7.0.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "fast-safe-stringify": "^2.0.7", "figures": "^5.0.0", "filter-obj": "^5.0.0", @@ -27171,12 +27179,14 @@ } }, "packages/config/node_modules/execa": { - "version": "6.1.0", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -27185,17 +27195,19 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/config/node_modules/human-signals": { - "version": "3.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/config/node_modules/is-stream": { @@ -27257,7 +27269,7 @@ "common-path-prefix": "^3.0.0", "env-paths": "^3.0.0", "esbuild": "0.21.2", - "execa": "^6.0.0", + "execa": "^7.0.0", "find-up": "^6.3.0", "get-package-name": "^2.2.0", "get-port": "^6.1.2", @@ -27375,13 +27387,14 @@ } }, "packages/edge-bundler/node_modules/execa": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", - "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -27390,18 +27403,19 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/edge-bundler/node_modules/human-signals": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", - "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/edge-bundler/node_modules/is-stream": { @@ -27584,7 +27598,7 @@ "version": "5.2.0", "license": "MIT", "dependencies": { - "execa": "^6.0.0", + "execa": "^7.0.0", "map-obj": "^5.0.0", "micromatch": "^4.0.2", "moize": "^6.1.3", @@ -27600,12 +27614,14 @@ } }, "packages/git-utils/node_modules/execa": { - "version": "6.1.0", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -27614,17 +27630,19 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/git-utils/node_modules/human-signals": { - "version": "3.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/git-utils/node_modules/is-stream": { @@ -27886,7 +27904,7 @@ "version": "5.2.0", "license": "MIT", "dependencies": { - "execa": "^6.0.0" + "execa": "^7.0.0" }, "devDependencies": { "@types/node": "^14.18.53", @@ -27899,12 +27917,14 @@ } }, "packages/run-utils/node_modules/execa": { - "version": "6.1.0", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -27913,17 +27933,19 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/run-utils/node_modules/human-signals": { - "version": "3.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/run-utils/node_modules/is-stream": { @@ -27982,7 +28004,7 @@ "ava": "^4.0.0", "c8": "^7.12.0", "cpy": "^9.0.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "fast-safe-stringify": "^2.0.7", "figures": "^5.0.0", "get-bin-path": "^11.0.0", @@ -28000,13 +28022,15 @@ } }, "packages/testing/node_modules/execa": { - "version": "6.1.0", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", "dev": true, "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -28015,18 +28039,20 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "packages/testing/node_modules/human-signals": { - "version": "3.0.1", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", "dev": true, "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/testing/node_modules/is-stream": { @@ -28094,7 +28120,7 @@ "cp-file": "^10.0.0", "es-module-lexer": "^1.0.0", "esbuild": "0.19.11", - "execa": "^6.0.0", + "execa": "^7.0.0", "fast-glob": "^3.3.2", "filter-obj": "^5.0.0", "find-up": "^6.0.0", @@ -28543,13 +28569,14 @@ } }, "packages/zip-it-and-ship-it/node_modules/execa": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz", - "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", + "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.1", - "human-signals": "^3.0.1", + "human-signals": "^4.3.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", @@ -28558,7 +28585,7 @@ "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^14.18.0 || ^16.14.0 || >=18.0.0" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" @@ -28624,11 +28651,12 @@ "license": "ISC" }, "packages/zip-it-and-ship-it/node_modules/human-signals": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", - "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", + "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "license": "Apache-2.0", "engines": { - "node": ">=12.20.0" + "node": ">=14.18.0" } }, "packages/zip-it-and-ship-it/node_modules/is-stream": { diff --git a/packages/build-info/package.json b/packages/build-info/package.json index 79a8878801..c7f0963bfb 100644 --- a/packages/build-info/package.json +++ b/packages/build-info/package.json @@ -62,7 +62,7 @@ "@types/semver": "^7.3.13", "@vitest/coverage-v8": "^0.33.0", "@vitest/ui": "^0.34.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "memfs": "^3.4.7", "node-fetch": "^3.3.1", "typescript": "^5.0.0", diff --git a/packages/build/package.json b/packages/build/package.json index 9f04159432..665dfb818e 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -82,7 +82,7 @@ "ansi-escapes": "^6.0.0", "chalk": "^5.0.0", "clean-stack": "^4.0.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "fdir": "^6.0.1", "figures": "^5.0.0", "filter-obj": "^5.0.0", diff --git a/packages/config/package.json b/packages/config/package.json index bd3b62a9e1..02328ae574 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -63,7 +63,7 @@ "cron-parser": "^4.1.0", "deepmerge": "^4.2.2", "dot-prop": "^7.0.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "fast-safe-stringify": "^2.0.7", "figures": "^5.0.0", "filter-obj": "^5.0.0", diff --git a/packages/edge-bundler/package.json b/packages/edge-bundler/package.json index 5b5ca92fd4..c6909d2962 100644 --- a/packages/edge-bundler/package.json +++ b/packages/edge-bundler/package.json @@ -68,7 +68,7 @@ "common-path-prefix": "^3.0.0", "env-paths": "^3.0.0", "esbuild": "0.21.2", - "execa": "^6.0.0", + "execa": "^7.0.0", "find-up": "^6.3.0", "get-package-name": "^2.2.0", "get-port": "^6.1.2", diff --git a/packages/git-utils/package.json b/packages/git-utils/package.json index 6ca9f0c030..2193a8c965 100644 --- a/packages/git-utils/package.json +++ b/packages/git-utils/package.json @@ -50,7 +50,7 @@ }, "license": "MIT", "dependencies": { - "execa": "^6.0.0", + "execa": "^7.0.0", "map-obj": "^5.0.0", "micromatch": "^4.0.2", "moize": "^6.1.3", diff --git a/packages/run-utils/package.json b/packages/run-utils/package.json index d1b4a9d699..91d5971b1f 100644 --- a/packages/run-utils/package.json +++ b/packages/run-utils/package.json @@ -50,7 +50,7 @@ }, "license": "MIT", "dependencies": { - "execa": "^6.0.0" + "execa": "^7.0.0" }, "devDependencies": { "@types/node": "^14.18.53", diff --git a/packages/testing/package.json b/packages/testing/package.json index ee9008fb1e..94ea4668ae 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -23,7 +23,7 @@ "ava": "^4.0.0", "c8": "^7.12.0", "cpy": "^9.0.0", - "execa": "^6.0.0", + "execa": "^7.0.0", "fast-safe-stringify": "^2.0.7", "figures": "^5.0.0", "get-bin-path": "^11.0.0", diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json index e9dcb2889b..58965a8600 100644 --- a/packages/zip-it-and-ship-it/package.json +++ b/packages/zip-it-and-ship-it/package.json @@ -51,7 +51,7 @@ "cp-file": "^10.0.0", "es-module-lexer": "^1.0.0", "esbuild": "0.19.11", - "execa": "^6.0.0", + "execa": "^7.0.0", "fast-glob": "^3.3.2", "filter-obj": "^5.0.0", "find-up": "^6.0.0", From 8b0215a133e4ace5698cc6dec48bab4308711c71 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:15:58 +0000 Subject: [PATCH 43/43] fix(deps): update dependency @netlify/blobs to v8 --- package-lock.json | 8 ++++---- packages/build/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index c39c0527ea..7eb54e5431 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6630,9 +6630,9 @@ "license": "Apache 2" }, "node_modules/@netlify/blobs": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-7.4.0.tgz", - "integrity": "sha512-7rdPzo8bggt3D2CVO+U1rmEtxxs8X7cLusDbHZRJaMlxqxBD05mXgThj5DUJMFOvmfVjhEH/S/3AyiLUbDQGDg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-8.1.0.tgz", + "integrity": "sha512-9hIbusvAZjSGBJ42OyFC2AxsEph1LuKQahMWFcPGEIsOqIYHhMRkYA7wSUMhH7naydjNmllpcp3pJLOK4RhFaQ==", "license": "MIT", "engines": { "node": "^14.16.0 || >=16.0.0" @@ -26736,7 +26736,7 @@ "license": "MIT", "dependencies": { "@bugsnag/js": "^7.0.0", - "@netlify/blobs": "^7.4.0", + "@netlify/blobs": "^8.1.0", "@netlify/cache-utils": "^5.2.0", "@netlify/config": "^20.21.1", "@netlify/edge-bundler": "12.3.1", diff --git a/packages/build/package.json b/packages/build/package.json index 665dfb818e..44f1b5cedc 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -67,7 +67,7 @@ "license": "MIT", "dependencies": { "@bugsnag/js": "^7.0.0", - "@netlify/blobs": "^7.4.0", + "@netlify/blobs": "^8.1.0", "@netlify/cache-utils": "^5.2.0", "@netlify/config": "^20.21.1", "@netlify/edge-bundler": "12.3.1",