Support npm publish using native npm client with .npmrc via --use-npmrc flag #2952
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "name": "jfrog-cli-tests", | ||
| "version": "1.0.0", | ||
| "description": "test package", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "test": "echo \"Error: no test specified\" && exit 1" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "dependencies": { | ||
| "xml": "1.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "json": "9.0.6" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "name": "@jscope/jfrog-cli-tests", | ||
| "version": "1.0.0", | ||
| "description": "test package", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "test": "echo \"Error: no test specified\" && exit 1" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "dependencies": { | ||
| "xml": "1.0.1" | ||
| }, | ||
| "devDependencies": { | ||
| "json": "9.0.6" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "key": "${NPM_SCOPED_REPO}", | ||
| "rclass": "local", | ||
| "packageType": "npm" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -363,6 +363,7 @@ const ( | |||||||||||||||||
| // Unique npm flags | ||||||||||||||||||
| npmPrefix = "npm-" | ||||||||||||||||||
| npmDetailedSummary = npmPrefix + detailedSummary | ||||||||||||||||||
| useNpmRc = "use-npmrc" | ||||||||||||||||||
|
|
||||||||||||||||||
| // Unique nuget/dotnet config flags | ||||||||||||||||||
| nugetV2 = "nuget-v2" | ||||||||||||||||||
|
|
@@ -1704,6 +1705,10 @@ var flagsMap = map[string]cli.Flag{ | |||||||||||||||||
| Name: ApplicationKey, | ||||||||||||||||||
| Usage: "[Optional] JFrog ApplicationKey Key` ` ", | ||||||||||||||||||
| }, | ||||||||||||||||||
| useNpmRc: cli.BoolFlag{ | ||||||||||||||||||
| Name: useNpmRc, | ||||||||||||||||||
| 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` `", | ||||||||||||||||||
| }, | ||||||||||||||||||
|
Comment on lines
+1708
to
+1711
There was a problem hiding this comment.
Suggested change
|
||||||||||||||||||
| } | ||||||||||||||||||
|
|
||||||||||||||||||
| var commandFlags = map[string][]string{ | ||||||||||||||||||
|
|
@@ -1853,7 +1858,7 @@ var commandFlags = map[string][]string{ | |||||||||||||||||
| BuildName, BuildNumber, module, Project, | ||||||||||||||||||
| }, | ||||||||||||||||||
| NpmPublish: { | ||||||||||||||||||
| BuildName, BuildNumber, module, Project, npmDetailedSummary, xrayScan, xrOutput, useNpmRc, | ||||||||||||||||||
| }, | ||||||||||||||||||
| PnpmConfig: { | ||||||||||||||||||
| global, serverIdResolve, repoResolve, | ||||||||||||||||||
|
|
||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,6 +88,7 @@ const ( | |
| MavenWithoutDeployerConfig = "maven_without_deployer.yaml" | ||
| MoveCopySpecExclusions = "move_copy_spec_exclusions.json" | ||
| NpmLocalRepositoryConfig = "npm_local_repository_config.json" | ||
| NpmLocalScopedRespositoryConfig = "npm_local_scoped_repository_config.json" | ||
| NpmRemoteRepositoryConfig = "npm_remote_repository_config.json" | ||
| NugetRemoteRepositoryConfig = "nuget_remote_repository_config.json" | ||
| Out = "out" | ||
|
|
@@ -165,6 +166,7 @@ const ( | |
| XrayEndpoint = "xray/" | ||
| YarnRemoteRepositoryConfig = "yarn_remote_repository_config.json" | ||
| ReleaseLifecycleImportDependencySpec = "import_bundle_repo_dependency.json" | ||
| UseNpmRcFlag = "--use-npmrc" | ||
| ) | ||
|
|
||
| var ( | ||
|
|
@@ -181,6 +183,7 @@ var ( | |
| MvnRepo1 = "cli-mvn1" | ||
| MvnRepo2 = "cli-mvn2" | ||
| NpmRepo = "cli-npm" | ||
| NpmScopedRepo = "cli-npm-scoped" | ||
| NpmRemoteRepo = "cli-npm-remote" | ||
| NugetRemoteRepo = "cli-nuget-remote" | ||
| YarnRemoteRepo = "cli-yarn-remote" | ||
|
|
@@ -1797,8 +1800,8 @@ func GetGradleDeployedArtifacts() []string { | |
| } | ||
| } | ||
|
|
||
| func GetNpmDeployedScopedArtifacts(npmRepo string, isNpm7 bool) []string { | ||
|
There was a problem hiding this comment. Why is this change required? |
||
| path := npmRepo + "/@jscope/jfrog-cli-tests/-/@jscope/" | ||
| path += GetNpmArtifactName(isNpm7, true) | ||
| return []string{ | ||
| path, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -262,6 +262,7 @@ var reposConfigMap = map[*string]string{ | |
| &MvnRemoteRepo: MavenRemoteRepositoryConfig, | ||
| &GradleRemoteRepo: GradleRemoteRepositoryConfig, | ||
| &NpmRepo: NpmLocalRepositoryConfig, | ||
| &NpmScopedRepo: NpmLocalScopedRespositoryConfig, | ||
| &NpmRemoteRepo: NpmRemoteRepositoryConfig, | ||
| &NugetRemoteRepo: NugetRemoteRepositoryConfig, | ||
| &YarnRemoteRepo: YarnRemoteRepositoryConfig, | ||
|
|
@@ -325,7 +326,7 @@ func GetNonVirtualRepositories() map[*string]string { | |
| TestGo: {&GoRepo, &GoRemoteRepo}, | ||
| TestGradle: {&GradleRepo, &GradleRemoteRepo}, | ||
| TestMaven: {&MvnRepo1, &MvnRepo2, &MvnRemoteRepo}, | ||
| TestNpm: {&NpmRepo, &NpmScopedRepo, &NpmRemoteRepo}, | ||
| TestNuget: {&NugetRemoteRepo}, | ||
| TestPip: {&PypiLocalRepo, &PypiRemoteRepo}, | ||
| TestPipenv: {&PipenvRemoteRepo}, | ||
|
|
@@ -419,6 +420,7 @@ func getSubstitutionMap() map[string]string { | |
| "${GRADLE_REMOTE_REPO}": GradleRemoteRepo, | ||
| "${GRADLE_REPO}": GradleRepo, | ||
| "${NPM_REPO}": NpmRepo, | ||
| "${NPM_SCOPED_REPO}": NpmScopedRepo, | ||
| "${NPM_REMOTE_REPO}": NpmRemoteRepo, | ||
| "${NUGET_REMOTE_REPO}": NugetRemoteRepo, | ||
| "${YARN_REMOTE_REPO}": YarnRemoteRepo, | ||
|
|
@@ -488,6 +490,7 @@ func AddTimestampToGlobalVars() { | |
| MvnRepo1 += uniqueSuffix | ||
| MvnRepo2 += uniqueSuffix | ||
| NpmRepo += uniqueSuffix | ||
| NpmScopedRepo += uniqueSuffix | ||
| NpmRemoteRepo += uniqueSuffix | ||
| NugetRemoteRepo += uniqueSuffix | ||
| YarnRemoteRepo += uniqueSuffix | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.