Skip to content
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

Jump to bottom

feat(clojure): Enhanced support for deps.edn files #15530

Merged
merged 2 commits into from
May 10, 2022
Merged

feat(clojure): Enhanced support for deps.edn files #15530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
871860c
feat(clojure): Enhanced support for `deps.edn` files
zharinov May 10, 2022
dbee9c3
Revert unnecessary
zharinov May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/modules/datasource/clojure/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const CLOJARS_REPO = 'https://clojars.org/repo';
6 changes: 2 additions & 4 deletions lib/modules/datasource/clojure/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { MavenDatasource } from '../maven';
import { MAVEN_REPO } from '../maven/common';
import { CLOJARS_REPO } from './common';

export class ClojureDatasource extends MavenDatasource {
static override readonly id = 'clojure';
Expand All @@ -10,8 +11,5 @@ export class ClojureDatasource extends MavenDatasource {

override readonly registryStrategy = 'merge';

override readonly defaultRegistryUrls = [
'https://clojars.org/repo',
MAVEN_REPO,
];
override readonly defaultRegistryUrls = [CLOJARS_REPO, MAVEN_REPO];
}
41 changes: 39 additions & 2 deletions lib/modules/manager/deps-edn/__fixtures__/deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
:deps {
,,,,persistent-sorted-set,{:mvn/version,"0.1.2"}
invalid/package! {:mvn/version "1.2.3"}
invalid/version nil
}

:aliases {
Expand All @@ -26,8 +28,36 @@
:extra-paths ["test"]
:extra-deps {
org.clojure/clojurescript {:mvn/version "1.10.520"}
lambdaisland/kaocha {:mvn/version "0.0-389"}
lambdaisland/kaocha-cljs {:mvn/version "0.0-21"}
lambdaisland/kaocha {:git/url "https://github.com/lambdaisland/kaocha.git"
:git/tag "0.0-389"}
io.github.lambdaisland/kaocha-cljs {:git/tag "0.0-21"}
}
}

:test-gitlab {
:extra-paths ["test"]
:extra-deps {
lambdaisland/kaocha {:git/url "https://gitlab.com/lambdaisland/kaocha.git"
:git/tag "0.0-389"}
com.gitlab.lambdaisland/kaocha-cljs {:git/tag "0.0-21"}
}
}

:test-bitbucket {
:extra-paths ["test"]
:extra-deps {
lambdaisland/kaocha {:git/url "https://bitbucket.org/lambdaisland/kaocha.git"
:git/tag "0.0-389"}
org.bitbucket.lambdaisland/kaocha-cljs {:git/tag "0.0-21"}
}
}

:test-git {
:extra-paths ["test"]
:extra-deps {
foo/foo {:git/url "git@example.com/foo.git" :git/sha "123"}
bar/bar {:git/url "https://example.com/bar.git"}
baz/baz {}
}
}

Expand All @@ -48,4 +78,11 @@
}
}
}

:mvn/repos {
"my-auth-repo" {:url "https://my.auth.com/repo"}
"central" nil
"my-private-repo" {:url "s3://my-bucket/maven/releases"}
"clojars" {:url "https://deps.com/foo/bar"}
}
}
184 changes: 157 additions & 27 deletions lib/modules/manager/deps-edn/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,208 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`modules/manager/deps-edn/extract extractPackageFile 1`] = `
exports[`modules/manager/deps-edn/extract extractPackageFile extractPackageFile 1`] = `
Array [
Object {
"currentValue": "0.1.2",
"datasource": "clojure",
"depName": "persistent-sorted-set:persistent-sorted-set",
"registryUrls": Array [],
"depName": "persistent-sorted-set",
"packageName": "persistent-sorted-set:persistent-sorted-set",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version,\\"0.1.2\\"}",
},
Object {
"currentValue": "1.9.0",
"datasource": "clojure",
"depName": "org.clojure:clojure",
"registryUrls": Array [],
"depName": "org.clojure/clojure",
"depType": "1.9",
"packageName": "org.clojure:clojure",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"1.9.0\\"}",
},
Object {
"currentValue": "1.10.0",
"datasource": "clojure",
"depName": "org.clojure:clojure",
"registryUrls": Array [],
"depName": "org.clojure/clojure",
"depType": "1.10",
"packageName": "org.clojure:clojure",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"1.10.0\\"}",
},
Object {
"currentValue": "1.10.520",
"datasource": "clojure",
"depName": "org.clojure:clojurescript",
"registryUrls": Array [],
"depName": "org.clojure/clojurescript",
"depType": "dev",
"packageName": "org.clojure:clojurescript",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"1.10.520\\"}",
},
Object {
"currentValue": "0.2.11",
"datasource": "clojure",
"depName": "org.clojure:tools.namespace",
"registryUrls": Array [],
"depName": "org.clojure/tools.namespace",
"depType": "dev",
"packageName": "org.clojure:tools.namespace",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"0.2.11\\"}",
},
Object {
"currentValue": "1.10.520",
"datasource": "clojure",
"depName": "org.clojure:clojurescript",
"registryUrls": Array [],
"depName": "org.clojure/clojurescript",
"depType": "test",
"packageName": "org.clojure:clojurescript",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"1.10.520\\"}",
},
Object {
"currentValue": "0.0-389",
"datasource": "clojure",
"depName": "lambdaisland:kaocha",
"registryUrls": Array [],
"datasource": "github-tags",
"depName": "lambdaisland/kaocha",
"depType": "test",
"packageName": "lambdaisland/kaocha",
"replaceString": "{:git/url \\"https://github.com/lambdaisland/kaocha.git\\"
:git/tag \\"0.0-389\\"}",
"sourceUrl": "https://github.com/lambdaisland/kaocha",
},
Object {
"currentValue": "0.0-21",
"datasource": "clojure",
"depName": "lambdaisland:kaocha-cljs",
"registryUrls": Array [],
"datasource": "github-tags",
"depName": "io.github.lambdaisland/kaocha-cljs",
"depType": "test",
"packageName": "lambdaisland/kaocha-cljs",
"replaceString": "{:git/tag \\"0.0-21\\"}",
},
Object {
"currentValue": "0.0-389",
"datasource": "gitlab-tags",
"depName": "lambdaisland/kaocha",
"depType": "test-gitlab",
"packageName": "lambdaisland/kaocha",
"replaceString": "{:git/url \\"https://gitlab.com/lambdaisland/kaocha.git\\"
:git/tag \\"0.0-389\\"}",
"sourceUrl": "https://gitlab.com/lambdaisland/kaocha",
},
Object {
"currentValue": "0.0-21",
"datasource": "gitlab-tags",
"depName": "com.gitlab.lambdaisland/kaocha-cljs",
"depType": "test-gitlab",
"packageName": "lambdaisland/kaocha-cljs",
"replaceString": "{:git/tag \\"0.0-21\\"}",
},
Object {
"currentValue": "0.0-389",
"datasource": "gitlab-tags",
"depName": "lambdaisland/kaocha",
"depType": "test-bitbucket",
"packageName": "lambdaisland/kaocha",
"replaceString": "{:git/url \\"https://bitbucket.org/lambdaisland/kaocha.git\\"
:git/tag \\"0.0-389\\"}",
"sourceUrl": "https://bitbucket.org/lambdaisland/kaocha",
},
Object {
"currentValue": "0.0-21",
"datasource": "bitbucket-tags",
"depName": "org.bitbucket.lambdaisland/kaocha-cljs",
"depType": "test-bitbucket",
"packageName": "lambdaisland/kaocha-cljs",
"replaceString": "{:git/tag \\"0.0-21\\"}",
},
Object {
"currentDigest": "123",
"currentDigestShort": "123",
"currentValue": null,
"datasource": "git-refs",
"depName": "foo/foo",
"depType": "test-git",
"packageName": "git@example.com/foo.git",
"replaceString": "{:git/url \\"git@example.com/foo.git\\" :git/sha \\"123\\"}",
},
Object {
"currentValue": null,
"datasource": "git-refs",
"depName": "bar/bar",
"depType": "test-git",
"packageName": "https://example.com/bar.git",
"replaceString": "{:git/url \\"https://example.com/bar.git\\"}",
"sourceUrl": "https://example.com/bar",
},
Object {
"currentValue": "0.21.1",
"datasource": "clojure",
"depName": "cider:cider-nrepl",
"registryUrls": Array [],
"depName": "cider/cider-nrepl",
"depType": "repl",
"packageName": "cider:cider-nrepl",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"0.21.1\\"}",
},
Object {
"currentValue": "0.6.0",
"datasource": "clojure",
"depName": "nrepl:nrepl",
"registryUrls": Array [],
"depName": "nrepl/nrepl",
"depType": "repl",
"packageName": "nrepl:nrepl",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"0.6.0\\"}",
},
Object {
"currentValue": "0.2.11",
"datasource": "clojure",
"depName": "org.clojure:tools.namespace",
"registryUrls": Array [],
"depName": "org.clojure/tools.namespace",
"depType": "repl",
"packageName": "org.clojure:tools.namespace",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"0.2.11\\"}",
},
Object {
"currentValue": "0.9.5703",
"datasource": "clojure",
"depName": "com.datomic:datomic-free",
"registryUrls": Array [],
"depName": "com.datomic/datomic-free",
"depType": "datomic",
"packageName": "com.datomic:datomic-free",
"registryUrls": Array [
"https://deps.com/foo/bar",
"https://my.auth.com/repo",
"s3://my-bucket/maven/releases",
],
"replaceString": "{:mvn/version \\"0.9.5703\\"}",
},
]
`;