Skip to content

Remove dependence on deprecated library #8317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 3, 2025
Merged

Remove dependence on deprecated library #8317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8904892
deps: remove normalize-package-data
owlstronaut Jun 3, 2025
ed6ae33
fix(libnpmpublish): Remove dependence on deprecated library
owlstronaut Jun 3, 2025
18b15e5
deps: @npmcli/package-json@6.2.0
owlstronaut May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPENDENCIES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ graph LR;
libnpmpack-->npmcli-run-script["@npmcli/run-script"];
libnpmpack-->npmcli-template-oss["@npmcli/template-oss"];
libnpmpack-->pacote;
libnpmpublish-->normalize-package-data;
libnpmpublish-->npm-package-arg;
libnpmpublish-->npm-registry-fetch;
libnpmpublish-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmpublish-->npmcli-mock-globals["@npmcli/mock-globals"];
libnpmpublish-->npmcli-mock-registry["@npmcli/mock-registry"];
libnpmpublish-->npmcli-package-json["@npmcli/package-json"];
libnpmpublish-->npmcli-template-oss["@npmcli/template-oss"];
libnpmpublish-->proc-log;
libnpmpublish-->semver;
Expand Down Expand Up @@ -375,12 +375,12 @@ graph LR;
libnpmpack-->spawk;
libnpmpack-->tap;
libnpmpublish-->ci-info;
libnpmpublish-->normalize-package-data;
libnpmpublish-->npm-package-arg;
libnpmpublish-->npm-registry-fetch;
libnpmpublish-->npmcli-eslint-config["@npmcli/eslint-config"];
libnpmpublish-->npmcli-mock-globals["@npmcli/mock-globals"];
libnpmpublish-->npmcli-mock-registry["@npmcli/mock-registry"];
libnpmpublish-->npmcli-package-json["@npmcli/package-json"];
libnpmpublish-->npmcli-template-oss["@npmcli/template-oss"];
libnpmpublish-->proc-log;
libnpmpublish-->semver;
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"@npmcli/config": "^10.3.0",
"@npmcli/fs": "^4.0.0",
"@npmcli/map-workspaces": "^4.0.2",
"@npmcli/package-json": "^6.1.1",
"@npmcli/package-json": "^6.2.0",
"@npmcli/promise-spawn": "^8.0.2",
"@npmcli/redact": "^3.1.1",
"@npmcli/run-script": "^9.1.0",
Expand Down Expand Up @@ -19132,8 +19132,8 @@
"version": "11.0.0",
"license": "ISC",
"dependencies": {
"@npmcli/package-json": "^6.2.0",
"ci-info": "^4.0.0",
"normalize-package-data": "^7.0.0",
"npm-package-arg": "^12.0.0",
"npm-registry-fetch": "^18.0.1",
"proc-log": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@npmcli/config": "^10.3.0",
"@npmcli/fs": "^4.0.0",
"@npmcli/map-workspaces": "^4.0.2",
"@npmcli/package-json": "^6.1.1",
"@npmcli/package-json": "^6.2.0",
"@npmcli/promise-spawn": "^8.0.2",
"@npmcli/redact": "^3.1.1",
"@npmcli/run-script": "^9.1.0",
Expand Down
21 changes: 11 additions & 10 deletions workspaces/libnpmpublish/lib/publish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { fixer } = require('normalize-package-data')
const npmFetch = require('npm-registry-fetch')
const npa = require('npm-package-arg')
const PackageJson = require('@npmcli/package-json')
const { log } = require('proc-log')
const semver = require('semver')
const { URL } = require('node:url')
Expand Down Expand Up @@ -31,7 +31,7 @@ Remove the 'private' field from the package.json to publish it.`),
}

const reg = npmFetch.pickRegistry(spec, opts)
const pubManifest = patchManifest(manifest, opts)
const pubManifest = await patchManifest(manifest, opts)

// registry-frontdoor cares about the access level,
// which is only configurable for scoped packages
Expand Down Expand Up @@ -62,17 +62,18 @@ Remove the 'private' field from the package.json to publish it.`),
return res
}

const patchManifest = (_manifest, opts) => {
const patchManifest = async (_manifest, opts) => {
const { npmVersion } = opts
// we only update top-level fields, so a shallow clone is fine
const manifest = { ..._manifest }

manifest._nodeVersion = process.versions.node
if (npmVersion) {
manifest._npmVersion = npmVersion
const steps = ['fixName']
const manifestInput = { ..._manifest, _nodeVersion: process.versions.node }
if (npmVersion != null) {
manifestInput._npmVersion = npmVersion
}
const manifest = await new PackageJson()
.fromContent(manifestInput)
.normalize({ steps })
.then(p => p.content)

fixer.fixNameField(manifest, { strict: true, allowLegacyCase: true })
const version = semver.clean(manifest.version)
if (!version) {
throw Object.assign(
Expand Down
2 changes: 1 addition & 1 deletion workspaces/libnpmpublish/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"bugs": "https://github.com/npm/cli/issues",
"homepage": "https://npmjs.com/package/libnpmpublish",
"dependencies": {
"@npmcli/package-json": "^6.2.0",
"ci-info": "^4.0.0",
"normalize-package-data": "^7.0.0",
"npm-package-arg": "^12.0.0",
"npm-registry-fetch": "^18.0.1",
"proc-log": "^5.0.0",
Expand Down
Loading