Skip to content

Commit 1e1feb8

Browse files
authored
Merge branch 'main' into smaller-truncated-menu
2 parents 2d6e39a + 38dd399 commit 1e1feb8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1472
-1097
lines changed

Cargo.lock

Lines changed: 133 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/.sqlx/query-6bcee848fcbb540b0c59c0755643352a37352bff3bfd7c7a3dc338bf83248408.json renamed to api/.sqlx/query-0e6dd3ede4bdfce988312da85903bff95d7aaa36df839fe59cbb12a2752f67b1.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/.sqlx/query-ad72a71d4ed7fe4d4e9857af1713051e7d068026c35eb136034cd465af54ddd1.json renamed to api/.sqlx/query-47e5a593181b18d95c8db1d4fdc79bf88965488b43f3b72becaefec2aea64ba2.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/.sqlx/query-c0bee504ba48a093f7777d900bff140c6323d2d53554fa9c80a5bfe24cbb1f81.json renamed to api/.sqlx/query-550c1ad3db389ecf92d8ef177537afb949ca1a2fc78e7e1456db4582108585ca.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/.sqlx/query-5bb6821b0440eafed6005ecb6073b0b332edd91109da403e973d321c13aec550.json renamed to api/.sqlx/query-8ef29f5232895fb9ba149de2dade639b865d5f6208bc4d2d3838cc251d938ae8.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/.sqlx/query-04eafde708f62d2b24b0561d41f4b24401f167fd5c56e2d29a5d48b96dda88d9.json renamed to api/.sqlx/query-9c0ca21173e6b3ef3cb7d75177ffb67340c698556b534aec3ef63b0756b02684.json

Lines changed: 13 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/.sqlx/query-92e4033d0a82242fbf61c4c7fe716c78bb364d62c460aec1f36aaf66cba69afb.json renamed to api/.sqlx/query-ffae1c91f5fe90290d9ac7cd911011a8dcf923811cda3571e5e3405ab655cfaf.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ deno_semver = "0.5.2"
7777
flate2 = "1"
7878
thiserror = "1"
7979
async-tar = "0.4.2"
80-
deno_graph = "0.69.6"
81-
deno_ast = "0.34.1"
82-
deno_doc = { version = "0.117.0", features = ["tree-sitter"] }
80+
deno_graph = "0.70.0"
81+
deno_ast = "0.35.0"
82+
deno_doc = { version = "0.123.0", features = ["tree-sitter"] }
8383
comrak = { version = "0.20.0", default-features = false }
8484
async-trait = "0.1.73"
8585
jsonwebkey = { version = "0.3.5", features = ["jsonwebtoken", "jwt-convert"] }

api/src/analysis.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,14 @@ async fn analyze_package_inner(
153153
},
154154
BuildOptions {
155155
is_dynamic: false,
156-
module_analyzer: Some(&module_analyzer),
156+
module_analyzer: &module_analyzer,
157157
workspace_members: &workspace_members,
158158
imports: Default::default(),
159159
// todo: use the data in the package for the file system
160-
file_system: Some(&NullFileSystem),
161-
jsr_url_provider: Some(&url_provider),
160+
file_system: &NullFileSystem,
161+
jsr_url_provider: &url_provider,
162162
resolver: Some(&capturing_resolver),
163163
npm_resolver: None,
164-
module_parser: Some(&module_analyzer.analyzer),
165164
reporter: None,
166165
executor: Default::default(),
167166
},
@@ -635,15 +634,14 @@ async fn rebuild_npm_tarball_inner(
635634
},
636635
BuildOptions {
637636
is_dynamic: false,
638-
module_analyzer: Some(&module_analyzer),
637+
module_analyzer: &module_analyzer,
639638
workspace_members: &workspace_members,
640639
imports: Default::default(),
641640
// todo: use the data in the package for the file system
642-
file_system: Some(&NullFileSystem),
643-
jsr_url_provider: Some(&url_provider),
641+
file_system: &NullFileSystem,
642+
jsr_url_provider: &url_provider,
644643
resolver: Default::default(),
645644
npm_resolver: Default::default(),
646-
module_parser: Some(&module_analyzer.analyzer),
647645
reporter: Default::default(),
648646
executor: Default::default(),
649647
},

api/src/api/errors.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ errors!(
132132
status: NOT_FOUND,
133133
"The requested scope invite was not found.",
134134
},
135+
GithubSamlEnforcement {
136+
status: BAD_REQUEST,
137+
"To access this repository, GitHub requires SAML SSO. Please follow this guide to be able to link this repository to JSR: https://docs.github.com/en/enterprise-cloud@latest/apps/using-github-apps/saml-and-github-apps",
138+
},
135139
GithubRepositoryNotFound {
136140
status: NOT_FOUND,
137141
"The requested GitHub repository was not found. Make sure the repository exists and is public.",

0 commit comments

Comments
 (0)