diff --git a/package-lock.json b/package-lock.json index 8fec592a76..7e198eacf1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15819,6 +15819,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/find-up-simple": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.0.tgz", + "integrity": "sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/flat": { "version": "5.0.2", "dev": true, @@ -17143,6 +17154,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/index-to-position": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-0.1.2.tgz", + "integrity": "sha512-MWDKS3AS1bGCHLBA2VLImJz42f7bJh8wQsTGCzI3j519/CASStoDONUBVz2I/VID0MpiX3SGSnbOD2xUalbE5g==", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/infer-owner": { "version": "1.0.4", "dev": true, @@ -22919,6 +22941,100 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/read-package-up": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz", + "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==", + "dependencies": { + "find-up-simple": "^1.0.0", + "read-pkg": "^9.0.0", + "type-fest": "^4.6.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-package-up/node_modules/hosted-git-info": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", + "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", + "dependencies": { + "lru-cache": "^10.0.1" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/read-package-up/node_modules/lru-cache": { + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", + "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/read-package-up/node_modules/normalize-package-data": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz", + "integrity": "sha512-6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==", + "dependencies": { + "hosted-git-info": "^7.0.0", + "is-core-module": "^2.8.1", + "semver": "^7.3.5", + "validate-npm-package-license": "^3.0.4" + }, + "engines": { + "node": "^16.14.0 || >=18.0.0" + } + }, + "node_modules/read-package-up/node_modules/parse-json": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.1.0.tgz", + "integrity": "sha512-rum1bPifK5SSar35Z6EKZuYPJx85pkNaFrxBK3mwdfSJ1/WKbYrjoW/zTPSjRRamfmVX1ACBIdFAO0VRErW/EA==", + "dependencies": { + "@babel/code-frame": "^7.22.13", + "index-to-position": "^0.1.2", + "type-fest": "^4.7.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-package-up/node_modules/read-pkg": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz", + "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==", + "dependencies": { + "@types/normalize-package-data": "^2.4.3", + "normalize-package-data": "^6.0.0", + "parse-json": "^8.0.0", + "type-fest": "^4.6.0", + "unicorn-magic": "^0.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-package-up/node_modules/type-fest": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.18.2.tgz", + "integrity": "sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/read-pkg": { "version": "7.1.0", "license": "MIT", @@ -25203,6 +25319,17 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "dev": true }, + "node_modules/unicorn-magic": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", + "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/unionfs": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/unionfs/-/unionfs-4.5.4.tgz", @@ -26571,7 +26698,7 @@ "pkg-dir": "^7.0.0", "pretty-ms": "^8.0.0", "ps-list": "^8.0.0", - "read-pkg-up": "^9.1.0", + "read-package-up": "^11.0.0", "readdirp": "^3.4.0", "resolve": "^2.0.0-next.1", "rfdc": "^1.3.0", @@ -26810,22 +26937,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/build/node_modules/read-pkg-up": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz", - "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==", - "dependencies": { - "find-up": "^6.3.0", - "read-pkg": "^7.1.0", - "type-fest": "^2.5.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/build/node_modules/strip-final-newline": { "version": "3.0.0", "license": "MIT", @@ -26836,17 +26947,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/build/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/cache-utils": { "name": "@netlify/cache-utils", "version": "5.1.5", @@ -27341,7 +27441,7 @@ "p-filter": "^3.0.0", "p-locate": "^6.0.0", "process": "^0.11.10", - "read-pkg-up": "^9.1.0", + "read-package-up": "^11.0.0", "semver": "^7.3.8" }, "devDependencies": { @@ -27361,33 +27461,6 @@ "node": "^14.14.0 || >=16.0.0" } }, - "packages/framework-info/node_modules/read-pkg-up": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.1.0.tgz", - "integrity": "sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg==", - "dependencies": { - "find-up": "^6.3.0", - "read-pkg": "^7.1.0", - "type-fest": "^2.5.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/framework-info/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/functions-utils": { "name": "@netlify/functions-utils", "version": "5.2.59", @@ -27574,7 +27647,6 @@ "@opentelemetry/core": "~1.24.0", "@opentelemetry/resources": "~1.24.0", "@opentelemetry/semantic-conventions": "~1.24.0", - "read-pkg-up": "^9.0.0", "yargs-parser": "^21.1.1" }, "bin": { @@ -27596,33 +27668,6 @@ "@opentelemetry/api": "~1.8.0" } }, - "packages/opentelemetry-sdk-setup/node_modules/read-pkg-up": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-9.0.0.tgz", - "integrity": "sha512-7dNMZVru/9QQYnYYjboVqpaqT/e24MuhovJWjZHFBmUnCKVz5ZVFNLbd+fJCUsH7uIgkYbX9yQJvab2nc6P7Nw==", - "dependencies": { - "find-up": "^6.2.0", - "read-pkg": "^7.0.0", - "type-fest": "^2.5.0" - }, - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/opentelemetry-sdk-setup/node_modules/type-fest": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/opentelemetry-sdk-setup/node_modules/yargs-parser": { "version": "21.1.1", "license": "ISC", diff --git a/packages/build/package.json b/packages/build/package.json index ad2fdfe70c..71908ef1f1 100644 --- a/packages/build/package.json +++ b/packages/build/package.json @@ -111,7 +111,7 @@ "pkg-dir": "^7.0.0", "pretty-ms": "^8.0.0", "ps-list": "^8.0.0", - "read-pkg-up": "^9.1.0", + "read-package-up": "^11.0.0", "readdirp": "^3.4.0", "resolve": "^2.0.0-next.1", "rfdc": "^1.3.0", diff --git a/packages/build/src/plugins/compatibility.ts b/packages/build/src/plugins/compatibility.ts index 2fbfd96d5b..79e80b6e47 100644 --- a/packages/build/src/plugins/compatibility.ts +++ b/packages/build/src/plugins/compatibility.ts @@ -1,6 +1,6 @@ import _pEvery from 'p-every' import pLocate from 'p-locate' -import { PackageJson } from 'read-pkg-up' +import { PackageJson } from 'read-package-up' import semver from 'semver' import { FeatureFlags } from '../core/feature_flags.js' diff --git a/packages/build/src/plugins/expected_version.ts b/packages/build/src/plugins/expected_version.ts index a747af56fd..47d9f7897c 100644 --- a/packages/build/src/plugins/expected_version.ts +++ b/packages/build/src/plugins/expected_version.ts @@ -1,4 +1,4 @@ -import { PackageJson } from 'read-pkg-up' +import { PackageJson } from 'read-package-up' import semver from 'semver' import { FeatureFlags } from '../core/feature_flags.js' diff --git a/packages/build/src/plugins/manifest/main.ts b/packages/build/src/plugins/manifest/main.ts index 522c5d1f2f..74d825cd8c 100644 --- a/packages/build/src/plugins/manifest/main.ts +++ b/packages/build/src/plugins/manifest/main.ts @@ -1,4 +1,4 @@ -import { PackageJson } from 'read-pkg-up' +import { PackageJson } from 'read-package-up' import { addPluginLoadErrorStatus } from '../../status/load_error.js' diff --git a/packages/build/src/plugins/options.ts b/packages/build/src/plugins/options.ts index a55b8ee2c5..f895006514 100644 --- a/packages/build/src/plugins/options.ts +++ b/packages/build/src/plugins/options.ts @@ -1,6 +1,6 @@ import { dirname } from 'path' -import { PackageJson } from 'read-pkg-up' +import { PackageJson } from 'read-package-up' import semver from 'semver' import { addErrorInfo } from '../error/info.js' diff --git a/packages/build/src/plugins/plugin_conditions.ts b/packages/build/src/plugins/plugin_conditions.ts index 68c12baf6a..53d7bf54da 100644 --- a/packages/build/src/plugins/plugin_conditions.ts +++ b/packages/build/src/plugins/plugin_conditions.ts @@ -1,7 +1,7 @@ import { join } from 'path' import _pEvery from 'p-every' -import { PackageJson } from 'read-pkg-up' +import { PackageJson } from 'read-package-up' import semver from 'semver' import { importJsonFile } from '../utils/json.js' diff --git a/packages/build/src/utils/json.ts b/packages/build/src/utils/json.ts index cfe8d212ca..7476b256a8 100644 --- a/packages/build/src/utils/json.ts +++ b/packages/build/src/utils/json.ts @@ -1,7 +1,7 @@ import { readFile } from 'fs/promises' import { fileURLToPath } from 'url' -import type { PackageJson } from 'read-pkg-up' +import type { PackageJson } from 'read-package-up' // We know how our package.json looks like, so we can be very specific with the type // and only add the properties we want to use diff --git a/packages/build/src/utils/package.ts b/packages/build/src/utils/package.ts index e5d3ba43ec..b8c81a1057 100644 --- a/packages/build/src/utils/package.ts +++ b/packages/build/src/utils/package.ts @@ -1,6 +1,6 @@ import { dirname } from 'path' -import { Options, PackageJson, readPackageUp } from 'read-pkg-up' +import { Options, PackageJson, readPackageUp } from 'read-package-up' type PackageResult = { packageJson: PackageJson diff --git a/packages/framework-info/package.json b/packages/framework-info/package.json index 5e5a659de4..8f5a5d689a 100644 --- a/packages/framework-info/package.json +++ b/packages/framework-info/package.json @@ -67,7 +67,7 @@ "p-filter": "^3.0.0", "p-locate": "^6.0.0", "process": "^0.11.10", - "read-pkg-up": "^9.1.0", + "read-package-up": "^11.0.0", "semver": "^7.3.8" }, "devDependencies": { diff --git a/packages/framework-info/src/context.ts b/packages/framework-info/src/context.ts index 1d074b9e81..7e14acf102 100644 --- a/packages/framework-info/src/context.ts +++ b/packages/framework-info/src/context.ts @@ -1,7 +1,7 @@ import { cwd, version as nodejsVersion } from 'process' import { locatePath } from 'locate-path' -import { PackageJson, readPackageUp } from 'read-pkg-up' +import { PackageJson, readPackageUp } from 'read-package-up' interface PackageJsonInfo { packageJson?: PackageJson diff --git a/packages/framework-info/src/core.ts b/packages/framework-info/src/core.ts index 278393ff09..a4a39523d3 100644 --- a/packages/framework-info/src/core.ts +++ b/packages/framework-info/src/core.ts @@ -1,5 +1,5 @@ import pFilter from 'p-filter' -import type { PackageJson } from 'read-pkg-up' +import type { PackageJson } from 'read-package-up' import type { Context, PathExists } from './context.js' import { usesFramework } from './detect.js' diff --git a/packages/framework-info/src/package.ts b/packages/framework-info/src/package.ts index de8fc057c2..3201d9dc48 100644 --- a/packages/framework-info/src/package.ts +++ b/packages/framework-info/src/package.ts @@ -1,6 +1,6 @@ import { includeKeys } from 'filter-obj' import isPlainObj from 'is-plain-obj' -import type { PackageJson } from 'read-pkg-up' +import type { PackageJson } from 'read-package-up' export const getPackageJsonContent = function (packageJson: PackageJson | undefined) { if (packageJson === undefined) { diff --git a/packages/opentelemetry-sdk-setup/package.json b/packages/opentelemetry-sdk-setup/package.json index e766f5ef0a..f566e04beb 100644 --- a/packages/opentelemetry-sdk-setup/package.json +++ b/packages/opentelemetry-sdk-setup/package.json @@ -38,7 +38,6 @@ "@opentelemetry/core": "~1.24.0", "@opentelemetry/resources": "~1.24.0", "@opentelemetry/semantic-conventions": "~1.24.0", - "read-pkg-up": "^9.0.0", "yargs-parser": "^21.1.1" }, "devDependencies": { diff --git a/packages/opentelemetry-sdk-setup/src/sdk-setup.ts b/packages/opentelemetry-sdk-setup/src/sdk-setup.ts index d85935e479..2058c65ce3 100644 --- a/packages/opentelemetry-sdk-setup/src/sdk-setup.ts +++ b/packages/opentelemetry-sdk-setup/src/sdk-setup.ts @@ -3,7 +3,7 @@ import { setMultiSpanAttributes } from '@netlify/opentelemetry-utils' import { DiagLogLevel, TraceFlags, context, diag, trace } from '@opentelemetry/api' import { Resource } from '@opentelemetry/resources' import { SEMRESATTRS_SERVICE_NAME, SEMRESATTRS_SERVICE_VERSION } from '@opentelemetry/semantic-conventions' -import type { PackageJson } from 'read-pkg-up' +import type { PackageJson } from 'read-package-up' import { getDiagLogger, loadBaggageFromFile } from './util.js' diff --git a/packages/opentelemetry-sdk-setup/src/util.ts b/packages/opentelemetry-sdk-setup/src/util.ts index e0db855eaf..f454872afb 100644 --- a/packages/opentelemetry-sdk-setup/src/util.ts +++ b/packages/opentelemetry-sdk-setup/src/util.ts @@ -3,7 +3,7 @@ import { readFile, realpath } from 'node:fs/promises' import { diag, DiagLogger } from '@opentelemetry/api' import { parseKeyPairsIntoRecord } from '@opentelemetry/core/build/src/baggage/utils.js' -import { PackageJson, readPackageUp } from 'read-pkg-up' +import { PackageJson, readPackageUp } from 'read-package-up' /** * Builds a function for logging data to a provided fileDescriptor (i.e. hidden from