Merge branch 'main' into jake/dynamic-function-import-ts

JakeChampion · web-flow · commit 9ec6cf21a6d6 · 2025-05-16T09:24:06.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -110,15 +110,15 @@
     "pkg-dir": "^7.0.0",
     "pretty-ms": "^8.0.0",
     "ps-list": "^8.0.0",
-    "read-pkg-up": "^9.0.0",
+    "read-package-up": "^11.0.0",
     "readdirp": "^3.4.0",
     "resolve": "^2.0.0-next.5",
     "rfdc": "^1.3.0",
     "safe-json-stringify": "^1.2.0",
     "semver": "^7.3.8",
     "string-width": "^5.0.0",
     "strip-ansi": "^7.0.0",
-    "supports-color": "^9.0.0",
+    "supports-color": "^10.0.0",
     "terminal-link": "^3.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.0",
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/edge-bundler/package.json b/packages/edge-bundler/package.json
@@ -46,7 +46,7 @@
     "@types/semver": "^7.3.9",
     "@types/uuid": "^10.0.0",
     "@vitest/coverage-v8": "^0.34.0",
-    "archiver": "^5.3.1",
+    "archiver": "^7.0.0",
     "chalk": "^5.4.0",
     "nock": "^13.2.4",
     "tar": "^6.1.11",
diff --git a/packages/framework-info/package.json b/packages/framework-info/package.json
@@ -66,7 +66,7 @@
     "locate-path": "^7.0.0",
     "p-filter": "^4.0.0",
     "p-locate": "^6.0.0",
-    "read-pkg-up": "^9.0.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
@@ -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
@@ -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
@@ -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
@@ -38,7 +38,7 @@
     "@opentelemetry/core": "~1.24.0",
     "@opentelemetry/resources": "~1.24.0",
     "@opentelemetry/semantic-conventions": "~1.24.0",
-    "read-pkg-up": "^9",
+    "read-package-up": "^11.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
@@ -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
@@ -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
diff --git a/packages/zip-it-and-ship-it/package.json b/packages/zip-it-and-ship-it/package.json
@@ -46,7 +46,7 @@
     "@netlify/binary-info": "^1.0.0",
     "@netlify/serverless-functions-api": "^1.41.2",
     "@vercel/nft": "0.27.7",
-    "archiver": "^5.3.1",
+    "archiver": "^7.0.0",
     "common-path-prefix": "^3.0.0",
     "cp-file": "^10.0.0",
     "es-module-lexer": "^1.0.0",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { PackageJson } from 'read-pkg-up'`
	`1`	`+import { PackageJson } from 'read-package-up'`
`2`	`2`	`import semver from 'semver'`
`3`	`3`
`4`	`4`	`import { FeatureFlags } from '../core/feature_flags.js'`