Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/sorbet-8162282187
Browse files Browse the repository at this point in the history
  • Loading branch information
@thavaahariharangit
thavaahariharangit authored Apr 19, 2024
2 parents 807e50e + 823417b commit ebe9c37
Show file tree
Hide file tree
Showing 12 changed files with 269 additions and 116 deletions.
80 changes: 40 additions & 40 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
PATH
remote: bundler
specs:
dependabot-bundler (0.252.0)
dependabot-common (= 0.252.0)
dependabot-bundler (0.253.0)
dependabot-common (= 0.253.0)
parallel (~> 1.24)

PATH
remote: cargo
specs:
dependabot-cargo (0.252.0)
dependabot-common (= 0.252.0)
dependabot-cargo (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: common
specs:
dependabot-common (0.252.0)
dependabot-common (0.253.0)
aws-sdk-codecommit (~> 1.28)
aws-sdk-ecr (~> 1.5)
bundler (>= 1.16, < 3.0.0)
Expand All @@ -37,107 +37,107 @@ PATH
PATH
remote: composer
specs:
dependabot-composer (0.252.0)
dependabot-common (= 0.252.0)
dependabot-composer (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: devcontainers
specs:
dependabot-devcontainers (0.252.0)
dependabot-common (= 0.252.0)
dependabot-devcontainers (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: docker
specs:
dependabot-docker (0.252.0)
dependabot-common (= 0.252.0)
dependabot-docker (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: elm
specs:
dependabot-elm (0.252.0)
dependabot-common (= 0.252.0)
dependabot-elm (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: git_submodules
specs:
dependabot-git_submodules (0.252.0)
dependabot-common (= 0.252.0)
dependabot-git_submodules (0.253.0)
dependabot-common (= 0.253.0)
parseconfig (~> 1.0, < 1.1.0)

PATH
remote: github_actions
specs:
dependabot-github_actions (0.252.0)
dependabot-common (= 0.252.0)
dependabot-github_actions (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: go_modules
specs:
dependabot-go_modules (0.252.0)
dependabot-common (= 0.252.0)
dependabot-go_modules (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: gradle
specs:
dependabot-gradle (0.252.0)
dependabot-common (= 0.252.0)
dependabot-maven (= 0.252.0)
dependabot-gradle (0.253.0)
dependabot-common (= 0.253.0)
dependabot-maven (= 0.253.0)

PATH
remote: hex
specs:
dependabot-hex (0.252.0)
dependabot-common (= 0.252.0)
dependabot-hex (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: maven
specs:
dependabot-maven (0.252.0)
dependabot-common (= 0.252.0)
dependabot-maven (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: npm_and_yarn
specs:
dependabot-npm_and_yarn (0.252.0)
dependabot-common (= 0.252.0)
dependabot-npm_and_yarn (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: nuget
specs:
dependabot-nuget (0.252.0)
dependabot-common (= 0.252.0)
dependabot-nuget (0.253.0)
dependabot-common (= 0.253.0)
rubyzip (>= 2.3.2, < 3.0)

PATH
remote: pub
specs:
dependabot-pub (0.252.0)
dependabot-common (= 0.252.0)
dependabot-pub (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: python
specs:
dependabot-python (0.252.0)
dependabot-common (= 0.252.0)
dependabot-python (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: silent
specs:
dependabot-silent (0.252.0)
dependabot-common (= 0.252.0)
dependabot-silent (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: swift
specs:
dependabot-swift (0.252.0)
dependabot-common (= 0.252.0)
dependabot-swift (0.253.0)
dependabot-common (= 0.253.0)

PATH
remote: terraform
specs:
dependabot-terraform (0.252.0)
dependabot-common (= 0.252.0)
dependabot-terraform (0.253.0)
dependabot-common (= 0.253.0)

GEM
remote: https://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion common/lib/dependabot.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# frozen_string_literal: true

module Dependabot
VERSION = "0.252.0"
VERSION = "0.253.0"
end
2 changes: 1 addition & 1 deletion npm_and_yarn/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ghcr.io/dependabot/dependabot-updater-core
ARG COREPACK_VERSION=0.24.0

# Check for updates at https://github.com/pnpm/pnpm/releases
ARG PNPM_VERSION=8.15.5
ARG PNPM_VERSION=8.15.6

# Check for updates at https://github.com/yarnpkg/berry/releases
ARG YARN_VERSION=3.8.1
Expand Down
26 changes: 19 additions & 7 deletions npm_and_yarn/helpers/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion npm_and_yarn/helpers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"postinstall": "patch-package"
},
"dependencies": {
"@dependabot/yarn-lib": "^1.22.19",
"@dependabot/yarn-lib": "^1.22.22",
"@npmcli/arborist": "^7.4.2",
"detect-indent": "^6.1.0",
"nock": "^13.5.4",
Expand Down
41 changes: 26 additions & 15 deletions npm_and_yarn/helpers/test/yarn/fixtures/conflicting-dependency-parser/nested/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,17 @@ d@1, d@^1.0.1:
es5-ext "^0.10.50"
type "^1.0.1"

es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
version "0.10.53"
resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
es5-ext@^0.10.35, es5-ext@^0.10.45, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.62, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
version "0.10.63"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.63.tgz#9c222a63b6a332ac80b1e373b426af723b895bd6"
integrity sha512-hUCZd2Byj/mNKjfP9jXrdVZ62B8KuA/VoK7X8nUh5qT+AxDmcbvZz041oDVZdbIN1qW6XY9VDNwzkvKnZvK2TQ==
dependencies:
es6-iterator "~2.0.3"
es6-symbol "~3.1.3"
next-tick "~1.0.0"
es6-iterator "^2.0.3"
es6-symbol "^3.1.3"
esniff "^2.0.1"
next-tick "^1.1.0"

es6-iterator@^2.0.3, es6-iterator@~2.0.3:
es6-iterator@^2.0.3:
version "2.0.3"
resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
Expand All @@ -66,7 +67,7 @@ es6-iterator@^2.0.3, es6-iterator@~2.0.3:
es5-ext "^0.10.35"
es6-symbol "^3.1.1"

es6-symbol@^3.1.1, es6-symbol@~3.1.3:
es6-symbol@^3.1.1, es6-symbol@^3.1.3:
version "3.1.3"
resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
Expand All @@ -84,6 +85,16 @@ es6-weak-map@^2.0.2:
es6-iterator "^2.0.3"
es6-symbol "^3.1.1"

esniff@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
dependencies:
d "^1.0.1"
es5-ext "^0.10.62"
event-emitter "^0.3.5"
type "^2.7.2"

event-emitter@^0.3.5:
version "0.3.5"
resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
Expand Down Expand Up @@ -135,16 +146,11 @@ memoizee@^0.4.14:
next-tick "1"
timers-ext "^0.1.5"

next-tick@1:
next-tick@1, next-tick@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==

next-tick@~1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=

objnest@^5.0.6:
version "5.0.10"
resolved "https://registry.npmjs.org/objnest/-/objnest-5.0.10.tgz#90e43b11870502fcb445e97fcf402499f5f75c75"
Expand All @@ -170,3 +176,8 @@ type@^2.0.0:
version "2.1.0"
resolved "https://registry.npmjs.org/type/-/type-2.1.0.tgz#9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"
integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==

type@^2.7.2:
version "2.7.2"
resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
Loading

0 comments on commit ebe9c37

Please sign in to comment.