Fix external dependency import paths in packages and stdio modules

jdalton · jdalton · commit e30b88ed2de6 · 2025-10-21T10:58:07.000-04:00
diff --git a/src/packages/editable.ts b/src/packages/editable.ts
@@ -165,11 +165,11 @@ function getUtil() {
 export function getEditablePackageJsonClass(): EditablePackageJsonConstructor {
   if (_EditablePackageJsonClass === undefined) {
     const EditablePackageJsonBase =
-      /*@__PURE__*/ require('../../external/@npmcli/package-json')
+      /*@__PURE__*/ require('../external/@npmcli/package-json')
     const { parse, read } =
-      /*@__PURE__*/ require('../../external/@npmcli/package-json/lib/read-package')
+      /*@__PURE__*/ require('../external/@npmcli/package-json/lib/read-package')
     const { packageSort } =
-      /*@__PURE__*/ require('../../external/@npmcli/package-json/lib/sort')
+      /*@__PURE__*/ require('../external/@npmcli/package-json/lib/sort')
     _EditablePackageJsonClass =
       class EditablePackageJson extends (EditablePackageJsonBase as EditablePackageJsonConstructor) {
         static override fixSteps = EditablePackageJsonBase.fixSteps
diff --git a/src/packages/isolation.ts b/src/packages/isolation.ts
@@ -128,7 +128,7 @@ export async function isolatePackage(
     packageName = pkgJson.name as string
   } else {
     // Parse as npm package spec.
-    const npa = /*@__PURE__*/ require('../../external/npm-package-arg')
+    const npa = /*@__PURE__*/ require('../external/npm-package-arg')
     const parsed = npa(packageSpec)
 
     packageName = parsed.name
diff --git a/src/packages/licenses.ts b/src/packages/licenses.ts
@@ -36,7 +36,7 @@ let _spdxCorrect: typeof import('spdx-correct') | undefined
 function getSpdxCorrect() {
   if (_spdxCorrect === undefined) {
     // The 'spdx-correct' package is browser safe.
-    _spdxCorrect = /*@__PURE__*/ require('../../external/spdx-correct')
+    _spdxCorrect = /*@__PURE__*/ require('../external/spdx-correct')
   }
   return _spdxCorrect as typeof import('spdx-correct')
 }
@@ -46,7 +46,7 @@ let _spdxExpParse: typeof import('spdx-expression-parse') | undefined
 function getSpdxExpParse() {
   if (_spdxExpParse === undefined) {
     // The 'spdx-expression-parse' package is browser safe.
-    _spdxExpParse = /*@__PURE__*/ require('../../external/spdx-expression-parse')
+    _spdxExpParse = /*@__PURE__*/ require('../external/spdx-expression-parse')
   }
   return _spdxExpParse as typeof import('spdx-expression-parse')
 }
diff --git a/src/packages/manifest.ts b/src/packages/manifest.ts
@@ -27,7 +27,7 @@ let _npmPackageArg: typeof import('npm-package-arg') | undefined
 /*@__NO_SIDE_EFFECTS__*/
 function getNpmPackageArg() {
   if (_npmPackageArg === undefined) {
-    _npmPackageArg = /*@__PURE__*/ require('../../external/npm-package-arg')
+    _npmPackageArg = /*@__PURE__*/ require('../external/npm-package-arg')
   }
   return _npmPackageArg as typeof import('npm-package-arg')
 }
@@ -36,7 +36,7 @@ let _pacote: typeof import('pacote') | undefined
 /*@__NO_SIDE_EFFECTS__*/
 function getPacote() {
   if (_pacote === undefined) {
-    _pacote = /*@__PURE__*/ require('../../external/pacote')
+    _pacote = /*@__PURE__*/ require('../external/pacote')
   }
   return _pacote as typeof import('pacote')
 }
@@ -46,7 +46,7 @@ let _semver: typeof import('semver') | undefined
 function getSemver() {
   if (_semver === undefined) {
     // The 'semver' package is browser safe.
-    _semver = /*@__PURE__*/ require('../../external/semver')
+    _semver = /*@__PURE__*/ require('../external/semver')
   }
   return _semver as typeof import('semver')
 }
diff --git a/src/packages/normalize.ts b/src/packages/normalize.ts
@@ -53,7 +53,7 @@ let _normalizePackageData: typeof import('normalize-package-data') | undefined
 function getNormalizePackageData() {
   if (_normalizePackageData === undefined) {
     _normalizePackageData =
-      /*@__PURE__*/ require('../../external/normalize-package-data')
+      /*@__PURE__*/ require('../external/normalize-package-data')
   }
   return _normalizePackageData as typeof import('normalize-package-data')
 }
diff --git a/src/packages/operations.ts b/src/packages/operations.ts
@@ -38,7 +38,7 @@ let _cacache: typeof import('cacache') | undefined
 /*@__NO_SIDE_EFFECTS__*/
 function getCacache() {
   if (_cacache === undefined) {
-    _cacache = /*@__PURE__*/ require('../../external/cacache')
+    _cacache = /*@__PURE__*/ require('../external/cacache')
   }
   return _cacache as typeof import('cacache')
 }
@@ -57,7 +57,7 @@ let _fetcher: MakeFetchHappenFetcher | undefined
 function getFetcher() {
   if (_fetcher === undefined) {
     const makeFetchHappen =
-      /*@__PURE__*/ require('../../external/make-fetch-happen')
+      /*@__PURE__*/ require('../external/make-fetch-happen')
     _fetcher = makeFetchHappen.defaults({
       cachePath: pacoteCachePath,
       // Prefer-offline: Staleness checks for cached data will be bypassed, but
@@ -73,7 +73,7 @@ let _npmPackageArg: typeof import('npm-package-arg') | undefined
 /*@__NO_SIDE_EFFECTS__*/
 function getNpmPackageArg() {
   if (_npmPackageArg === undefined) {
-    _npmPackageArg = /*@__PURE__*/ require('../../external/npm-package-arg')
+    _npmPackageArg = /*@__PURE__*/ require('../external/npm-package-arg')
   }
   return _npmPackageArg as typeof import('npm-package-arg')
 }
@@ -95,7 +95,7 @@ function getPackageURL() {
   if (_PackageURL === undefined) {
     // The 'packageurl-js' package is browser safe.
     const packageUrlJs =
-      /*@__PURE__*/ require('../../external/@socketregistry/packageurl-js')
+      /*@__PURE__*/ require('../external/@socketregistry/packageurl-js')
     _PackageURL = packageUrlJs.PackageURL
   }
   return _PackageURL as typeof import('@socketregistry/packageurl-js').PackageURL
@@ -105,7 +105,7 @@ let _pacote: typeof import('pacote') | undefined
 /*@__NO_SIDE_EFFECTS__*/
 function getPacote() {
   if (_pacote === undefined) {
-    _pacote = /*@__PURE__*/ require('../../external/pacote')
+    _pacote = /*@__PURE__*/ require('../external/pacote')
   }
   return _pacote as typeof import('pacote')
 }
@@ -115,7 +115,7 @@ let _semver: typeof import('semver') | undefined
 function getSemver() {
   if (_semver === undefined) {
     // The 'semver' package is browser safe.
-    _semver = /*@__PURE__*/ require('../../external/semver')
+    _semver = /*@__PURE__*/ require('../external/semver')
   }
   return _semver as typeof import('semver')
 }
diff --git a/src/packages/provenance.ts b/src/packages/provenance.ts
@@ -22,7 +22,7 @@ let _fetcher: typeof import('make-fetch-happen') | undefined
 function getFetcher() {
   if (_fetcher === undefined) {
     const makeFetchHappen =
-      /*@__PURE__*/ require('../../external/make-fetch-happen')
+      /*@__PURE__*/ require('../external/make-fetch-happen')
     // Lazy load constants to avoid circular dependencies.
     const { getPacoteCachePath } =
       /*@__PURE__*/ require('../../constants/packages')
diff --git a/src/packages/specs.ts b/src/packages/specs.ts
@@ -12,7 +12,7 @@ let _npmPackageArg: typeof import('npm-package-arg') | undefined
 /*@__NO_SIDE_EFFECTS__*/
 function getNpmPackageArg() {
   if (_npmPackageArg === undefined) {
-    _npmPackageArg = /*@__PURE__*/ require('../../external/npm-package-arg')
+    _npmPackageArg = /*@__PURE__*/ require('../external/npm-package-arg')
   }
   return _npmPackageArg as typeof import('npm-package-arg')
 }
diff --git a/src/packages/validation.ts b/src/packages/validation.ts
@@ -12,7 +12,7 @@ let _validateNpmPackageName:
 function getValidateNpmPackageName() {
   if (_validateNpmPackageName === undefined) {
     _validateNpmPackageName =
-      /*@__PURE__*/ require('../../external/validate-npm-package-name')
+      /*@__PURE__*/ require('../external/validate-npm-package-name')
   }
   return _validateNpmPackageName as typeof import('validate-npm-package-name')
 }
diff --git a/src/stdio/prompts.ts b/src/stdio/prompts.ts
@@ -88,11 +88,11 @@ export function wrapPrompt<T = unknown>(
 }
 
 // c8 ignore start - Third-party inquirer library requires and exports not testable in isolation.
-const confirmExport = /*@__PURE__*/ require('../../external/@inquirer/confirm')
-const inputExport = /*@__PURE__*/ require('../../external/@inquirer/input')
-const passwordExport = /*@__PURE__*/ require('../../external/@inquirer/password')
-const searchExport = /*@__PURE__*/ require('../../external/@inquirer/search')
-const selectExport = /*@__PURE__*/ require('../../external/@inquirer/select')
+const confirmExport = /*@__PURE__*/ require('../external/@inquirer/confirm')
+const inputExport = /*@__PURE__*/ require('../external/@inquirer/input')
+const passwordExport = /*@__PURE__*/ require('../external/@inquirer/password')
+const searchExport = /*@__PURE__*/ require('../external/@inquirer/search')
+const selectExport = /*@__PURE__*/ require('../external/@inquirer/select')
 const confirmRaw = confirmExport.default ?? confirmExport
 const inputRaw = inputExport.default ?? inputExport
 const passwordRaw = passwordExport.default ?? passwordExport

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ let _spdxCorrect: typeof import('spdx-correct') \| undefined`
`36`	`36`	`function getSpdxCorrect() {`
`37`	`37`	`if (_spdxCorrect === undefined) {`
`38`	`38`	`// The 'spdx-correct' package is browser safe.`
`39`		`- _spdxCorrect = /@__PURE__/ require('../../external/spdx-correct')`
	`39`	`+ _spdxCorrect = /@__PURE__/ require('../external/spdx-correct')`
`40`	`40`	`}`
`41`	`41`	`return _spdxCorrect as typeof import('spdx-correct')`
`42`	`42`	`}`
`@@ -46,7 +46,7 @@ let _spdxExpParse: typeof import('spdx-expression-parse') \| undefined`
`46`	`46`	`function getSpdxExpParse() {`
`47`	`47`	`if (_spdxExpParse === undefined) {`
`48`	`48`	`// The 'spdx-expression-parse' package is browser safe.`
`49`		`- _spdxExpParse = /@__PURE__/ require('../../external/spdx-expression-parse')`
	`49`	`+ _spdxExpParse = /@__PURE__/ require('../external/spdx-expression-parse')`
`50`	`50`	`}`
`51`	`51`	`return _spdxExpParse as typeof import('spdx-expression-parse')`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ let _npmPackageArg: typeof import('npm-package-arg') \| undefined`
`27`	`27`	`/@__NO_SIDE_EFFECTS__/`
`28`	`28`	`function getNpmPackageArg() {`
`29`	`29`	`if (_npmPackageArg === undefined) {`
`30`		`- _npmPackageArg = /@__PURE__/ require('../../external/npm-package-arg')`
	`30`	`+ _npmPackageArg = /@__PURE__/ require('../external/npm-package-arg')`
`31`	`31`	`}`
`32`	`32`	`return _npmPackageArg as typeof import('npm-package-arg')`
`33`	`33`	`}`
`@@ -36,7 +36,7 @@ let _pacote: typeof import('pacote') \| undefined`
`36`	`36`	`/@__NO_SIDE_EFFECTS__/`
`37`	`37`	`function getPacote() {`
`38`	`38`	`if (_pacote === undefined) {`
`39`		`- _pacote = /@__PURE__/ require('../../external/pacote')`
	`39`	`+ _pacote = /@__PURE__/ require('../external/pacote')`
`40`	`40`	`}`
`41`	`41`	`return _pacote as typeof import('pacote')`
`42`	`42`	`}`
`@@ -46,7 +46,7 @@ let _semver: typeof import('semver') \| undefined`
`46`	`46`	`function getSemver() {`
`47`	`47`	`if (_semver === undefined) {`
`48`	`48`	`// The 'semver' package is browser safe.`
`49`		`- _semver = /@__PURE__/ require('../../external/semver')`
	`49`	`+ _semver = /@__PURE__/ require('../external/semver')`
`50`	`50`	`}`
`51`	`51`	`return _semver as typeof import('semver')`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ let _normalizePackageData: typeof import('normalize-package-data') \| undefined`
`53`	`53`	`function getNormalizePackageData() {`
`54`	`54`	`if (_normalizePackageData === undefined) {`
`55`	`55`	`_normalizePackageData =`
`56`		`- /@__PURE__/ require('../../external/normalize-package-data')`
	`56`	`+ /@__PURE__/ require('../external/normalize-package-data')`
`57`	`57`	`}`
`58`	`58`	`return _normalizePackageData as typeof import('normalize-package-data')`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ let _cacache: typeof import('cacache') \| undefined`
`38`	`38`	`/@__NO_SIDE_EFFECTS__/`
`39`	`39`	`function getCacache() {`
`40`	`40`	`if (_cacache === undefined) {`
`41`		`- _cacache = /@__PURE__/ require('../../external/cacache')`
	`41`	`+ _cacache = /@__PURE__/ require('../external/cacache')`
`42`	`42`	`}`
`43`	`43`	`return _cacache as typeof import('cacache')`
`44`	`44`	`}`
`@@ -57,7 +57,7 @@ let _fetcher: MakeFetchHappenFetcher \| undefined`
`57`	`57`	`function getFetcher() {`
`58`	`58`	`if (_fetcher === undefined) {`
`59`	`59`	`const makeFetchHappen =`
`60`		`- /@__PURE__/ require('../../external/make-fetch-happen')`
	`60`	`+ /@__PURE__/ require('../external/make-fetch-happen')`
`61`	`61`	`_fetcher = makeFetchHappen.defaults({`
`62`	`62`	`cachePath: pacoteCachePath,`
`63`	`63`	`// Prefer-offline: Staleness checks for cached data will be bypassed, but`
`@@ -73,7 +73,7 @@ let _npmPackageArg: typeof import('npm-package-arg') \| undefined`
`73`	`73`	`/@__NO_SIDE_EFFECTS__/`
`74`	`74`	`function getNpmPackageArg() {`
`75`	`75`	`if (_npmPackageArg === undefined) {`
`76`		`- _npmPackageArg = /@__PURE__/ require('../../external/npm-package-arg')`
	`76`	`+ _npmPackageArg = /@__PURE__/ require('../external/npm-package-arg')`
`77`	`77`	`}`
`78`	`78`	`return _npmPackageArg as typeof import('npm-package-arg')`
`79`	`79`	`}`
`@@ -95,7 +95,7 @@ function getPackageURL() {`
`95`	`95`	`if (_PackageURL === undefined) {`
`96`	`96`	`// The 'packageurl-js' package is browser safe.`
`97`	`97`	`const packageUrlJs =`
`98`		`- /@__PURE__/ require('../../external/@socketregistry/packageurl-js')`
	`98`	`+ /@__PURE__/ require('../external/@socketregistry/packageurl-js')`
`99`	`99`	`_PackageURL = packageUrlJs.PackageURL`
`100`	`100`	`}`
`101`	`101`	`return _PackageURL as typeof import('@socketregistry/packageurl-js').PackageURL`
`@@ -105,7 +105,7 @@ let _pacote: typeof import('pacote') \| undefined`
`105`	`105`	`/@__NO_SIDE_EFFECTS__/`
`106`	`106`	`function getPacote() {`
`107`	`107`	`if (_pacote === undefined) {`
`108`		`- _pacote = /@__PURE__/ require('../../external/pacote')`
	`108`	`+ _pacote = /@__PURE__/ require('../external/pacote')`
`109`	`109`	`}`
`110`	`110`	`return _pacote as typeof import('pacote')`
`111`	`111`	`}`
`@@ -115,7 +115,7 @@ let _semver: typeof import('semver') \| undefined`
`115`	`115`	`function getSemver() {`
`116`	`116`	`if (_semver === undefined) {`
`117`	`117`	`// The 'semver' package is browser safe.`
`118`		`- _semver = /@__PURE__/ require('../../external/semver')`
	`118`	`+ _semver = /@__PURE__/ require('../external/semver')`
`119`	`119`	`}`
`120`	`120`	`return _semver as typeof import('semver')`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ let _npmPackageArg: typeof import('npm-package-arg') \| undefined`
`12`	`12`	`/@__NO_SIDE_EFFECTS__/`
`13`	`13`	`function getNpmPackageArg() {`
`14`	`14`	`if (_npmPackageArg === undefined) {`
`15`		`- _npmPackageArg = /@__PURE__/ require('../../external/npm-package-arg')`
	`15`	`+ _npmPackageArg = /@__PURE__/ require('../external/npm-package-arg')`
`16`	`16`	`}`
`17`	`17`	`return _npmPackageArg as typeof import('npm-package-arg')`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ let _validateNpmPackageName:`
`12`	`12`	`function getValidateNpmPackageName() {`
`13`	`13`	`if (_validateNpmPackageName === undefined) {`
`14`	`14`	`_validateNpmPackageName =`
`15`		`- /@__PURE__/ require('../../external/validate-npm-package-name')`
	`15`	`+ /@__PURE__/ require('../external/validate-npm-package-name')`
`16`	`16`	`}`
`17`	`17`	`return _validateNpmPackageName as typeof import('validate-npm-package-name')`
`18`	`18`	`}`