Skip to content

Commit 164a039

Browse files
committed
New npm publish implementation
1 parent 4d7f18f commit 164a039

File tree

4 files changed

+27
-13
lines changed

4 files changed

+27
-13
lines changed

buildtools/cli.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -934,9 +934,18 @@ func NpmPublishCmd(c *cli.Context) (err error) {
934934
if npmCmd.GetXrayScan() {
935935
commandsUtils.ConditionalUploadScanFunc = scan.ConditionalUploadDefaultScanFunc
936936
}
937-
printDeploymentView, detailedSummary := log.IsStdErrTerminal(), npmCmd.IsDetailedSummary()
938-
if !detailedSummary {
939-
npmCmd.SetDetailedSummary(printDeploymentView)
937+
938+
var printDeploymentView, detailedSummary bool
939+
940+
// we do not support deployment view and detailed summary when using npmrc for publishing since
941+
// TransferDetails is not available to us
942+
if npmCmd.ShouldUseNpmRc() {
943+
printDeploymentView, detailedSummary = false, false
944+
} else {
945+
printDeploymentView, detailedSummary = log.IsStdErrTerminal(), npmCmd.IsDetailedSummary()
946+
if !detailedSummary {
947+
npmCmd.SetDetailedSummary(printDeploymentView)
948+
}
940949
}
941950
err = commands.Exec(npmCmd)
942951
result := npmCmd.Result()

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ require (
189189
sigs.k8s.io/yaml v1.4.0 // indirect
190190
)
191191

192-
replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.2.2-0.20250410102841-59bd5d8732de
192+
replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250413215316-ce90420bab9a
193193

194-
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250410085750-f34f5feea93e
194+
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb
195195

196-
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250406105605-ee90d11546f9
196+
replace github.com/jfrog/jfrog-client-go => github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6
197197

198198
replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.16.3-0.20250402121228-12cce9f88504
199199

go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
9292
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
9393
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
9494
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
95+
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250413215316-ce90420bab9a h1:NqAlg7P7JS77u4aDPUxGj8cGJIEUZta/dBK3OqJNsnQ=
96+
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250413215316-ce90420bab9a/go.mod h1:hUbpFNaZACv/dLJWsQ4C1Tl20PpJ0yLwfyoaE7lODEU=
97+
github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb h1:StUinFdDlk+8eY6jJ1qX5o9eAHSL7ub7gJGwQZFaIyo=
98+
github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250413215109-294edb8594bb/go.mod h1:eV3CTP/F4nEYE7p4WojZc4ruU1/3sXj0o/ctnjmO5fw=
99+
github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6 h1:krAN+7hGggGDXfAlcC8eni2QxWfW7I5JVNPvhI3vS4U=
100+
github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250413214704-1b6cdf0520c6/go.mod h1:uRmT8Q1SJymIzId01v0W1o8mGqrRfrwUF53CgEMsH0U=
95101
github.com/forPelevin/gomoji v1.3.0 h1:WPIOLWB1bvRYlKZnSSEevLt3IfKlLs+tK+YA9fFYlkE=
96102
github.com/forPelevin/gomoji v1.3.0/go.mod h1:mM6GtmCgpoQP2usDArc6GjbXrti5+FffolyQfGgPboQ=
97103
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -186,16 +192,10 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
186192
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
187193
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
188194
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
189-
github.com/jfrog/jfrog-cli-artifactory v0.2.2-0.20250410102841-59bd5d8732de h1:D4MGEbZkGie9HfmClRlvp3iqWX7LQRWGhgvRj5f462Q=
190-
github.com/jfrog/jfrog-cli-artifactory v0.2.2-0.20250410102841-59bd5d8732de/go.mod h1:8qrGaRb162a4NWGr7R1rj8P80s8NU8KRTs69NMkQENA=
191-
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250410085750-f34f5feea93e h1:N+7gJdZmwggKqrTbrEvAFxxXQziFbJ4zHI/sXa8vR1A=
192-
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250410085750-f34f5feea93e/go.mod h1:4S7yztLwWq4yA+k9j9s5gvIqr7xC/6EjJQ+0ENCHTFc=
193195
github.com/jfrog/jfrog-cli-platform-services v1.9.0 h1:r/ETgJuMUOUu12w20ydsF6paqEaj0khH6bxMRsdNz1Y=
194196
github.com/jfrog/jfrog-cli-platform-services v1.9.0/go.mod h1:pMZMSwhj7yA4VKyj0Skr2lObIyGpZUxNJ40DSLKXU38=
195197
github.com/jfrog/jfrog-cli-security v1.16.3-0.20250402121228-12cce9f88504 h1:mnU8PtDaCmU1ZC8Wcy0VKj1gJEZnnyjgAc3rJLCcMjs=
196198
github.com/jfrog/jfrog-cli-security v1.16.3-0.20250402121228-12cce9f88504/go.mod h1:tJyLh4KI4qoF/AVBy0wC9s8DVxV/hoyKK4LIzpxL590=
197-
github.com/jfrog/jfrog-client-go v1.28.1-0.20250406105605-ee90d11546f9 h1:pEBTHYeyuDa+w0oJNCYFq1wD2O2NqWdDTAtDRFy7s3w=
198-
github.com/jfrog/jfrog-client-go v1.28.1-0.20250406105605-ee90d11546f9/go.mod h1:uRmT8Q1SJymIzId01v0W1o8mGqrRfrwUF53CgEMsH0U=
199199
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
200200
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
201201
github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI=

utils/cliutils/commandsflags.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ const (
363363
// Unique npm flags
364364
npmPrefix = "npm-"
365365
npmDetailedSummary = npmPrefix + detailedSummary
366+
useNpmRc = "use-npmrc"
366367

367368
// Unique nuget/dotnet config flags
368369
nugetV2 = "nuget-v2"
@@ -1704,6 +1705,10 @@ var flagsMap = map[string]cli.Flag{
17041705
Name: ApplicationKey,
17051706
Usage: "[Optional] JFrog ApplicationKey Key` ` ",
17061707
},
1708+
useNpmRc: cli.BoolFlag{
1709+
Name: useNpmRc,
1710+
Usage: "[Default: false] Set to true if you'd like to use the .npmrc file for configurations. Note: This flag would invoke npm native client behind the scenes, has performance implications and does not support deployment view and detailed summary` `",
1711+
},
17071712
}
17081713

17091714
var commandFlags = map[string][]string{
@@ -1853,7 +1858,7 @@ var commandFlags = map[string][]string{
18531858
BuildName, BuildNumber, module, Project,
18541859
},
18551860
NpmPublish: {
1856-
BuildName, BuildNumber, module, Project, npmDetailedSummary, xrayScan, xrOutput,
1861+
BuildName, BuildNumber, module, Project, npmDetailedSummary, xrayScan, xrOutput, useNpmRc,
18571862
},
18581863
PnpmConfig: {
18591864
global, serverIdResolve, repoResolve,

0 commit comments

Comments
 (0)