Add support for npm bundleDependencies (#30751)

diff --git a/modules/packages/npm/creator.go b/modules/packages/npm/creator.go
index 9e636757aff6a3a1928b8b41f125dad976cfeefd..7d3d7cd6b55f377f6c79f5b4cb1b00e4840157e9 100644 (file)
--- a/modules/packages/npm/creator.go
+++ b/modules/packages/npm/creator.go
@@ -78,6 +78,7 @@ type PackageMetadataVersion struct {
        Repository           Repository          `json:"repository,omitempty"`
        Keywords             []string            `json:"keywords,omitempty"`
        Dependencies         map[string]string   `json:"dependencies,omitempty"`
+       BundleDependencies   []string            `json:"bundleDependencies,omitempty"`
        DevDependencies      map[string]string   `json:"devDependencies,omitempty"`
        PeerDependencies     map[string]string   `json:"peerDependencies,omitempty"`
        Bin                  map[string]string   `json:"bin,omitempty"`
@@ -218,6 +219,7 @@ func ParsePackage(r io.Reader) (*Package, error) {
                                ProjectURL:              meta.Homepage,
                                Keywords:                meta.Keywords,
                                Dependencies:            meta.Dependencies,
+                               BundleDependencies:      meta.BundleDependencies,
                                DevelopmentDependencies: meta.DevDependencies,
                                PeerDependencies:        meta.PeerDependencies,
                                OptionalDependencies:    meta.OptionalDependencies,

diff --git a/modules/packages/npm/metadata.go b/modules/packages/npm/metadata.go
index 77b77472a7a2cc069972f2f60da27224c65aca59..6bb77f302bb16819a7557193a385c499191a7d94 100644 (file)
--- a/modules/packages/npm/metadata.go
+++ b/modules/packages/npm/metadata.go
@@ -16,6 +16,7 @@ type Metadata struct {
        ProjectURL              string            `json:"project_url,omitempty"`
        Keywords                []string          `json:"keywords,omitempty"`
        Dependencies            map[string]string `json:"dependencies,omitempty"`
+       BundleDependencies      []string          `json:"bundleDependencies,omitempty"`
        DevelopmentDependencies map[string]string `json:"development_dependencies,omitempty"`
        PeerDependencies        map[string]string `json:"peer_dependencies,omitempty"`
        OptionalDependencies    map[string]string `json:"optional_dependencies,omitempty"`

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index fb591be393159968a001b05270cbcdbadaa86e9e..eef4f5696a7f1704bab53c30fcaa4bea0fc75920 100644 (file)
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -3495,6 +3495,7 @@ npm.install = To install the package using npm, run the following command:
 npm.install2 = or add it to the package.json file:
 npm.dependencies = Dependencies
 npm.dependencies.development = Development Dependencies
+npm.dependencies.bundle = Bundled Dependencies
 npm.dependencies.peer = Peer Dependencies
 npm.dependencies.optional = Optional Dependencies
 npm.details.tag = Tag

diff --git a/routers/api/packages/npm/api.go b/routers/api/packages/npm/api.go
index f8e839c42412e0ab27d8d71ad49509e068f62187..b4379f3f49702cd23b593c22d4da9318670dde2b 100644 (file)
--- a/routers/api/packages/npm/api.go
+++ b/routers/api/packages/npm/api.go
@@ -64,6 +64,7 @@ func createPackageMetadataVersion(registryURL string, pd *packages_model.Package
                Homepage:             metadata.ProjectURL,
                License:              metadata.License,
                Dependencies:         metadata.Dependencies,
+               BundleDependencies:   metadata.BundleDependencies,
                DevDependencies:      metadata.DevelopmentDependencies,
                PeerDependencies:     metadata.PeerDependencies,
                OptionalDependencies: metadata.OptionalDependencies,

diff --git a/templates/package/content/npm.tmpl b/templates/package/content/npm.tmpl
index a78a07d8746730e70845f7e4cabd8d9c78f03f22..01298a664c734238d7896e29fd9ab46b20b4160d 100644 (file)
--- a/templates/package/content/npm.tmpl
+++ b/templates/package/content/npm.tmpl
@@ -45,6 +45,15 @@
                </div>
        {{end}}
 
+       {{if .PackageDescriptor.Metadata.BundleDependencies}}
+               <h4 class="ui top attached header">{{ctx.Locale.Tr "packages.npm.dependencies.bundle"}}</h4>
+               <div class="ui attached segment">
+                       {{range .PackageDescriptor.Metadata.BundleDependencies}}
+                               {{.}}
+                       {{end}}
+               </div>
+       {{end}}
+
        {{if .PackageDescriptor.Metadata.Keywords}}
                <h4 class="ui top attached header">{{ctx.Locale.Tr "packages.keywords"}}</h4>
                <div class="ui attached segment">