Infrastructure/verdaccio
0
Fork 0
mirror of https://github.com/verdaccio/verdaccio.git synced 2025-01-20 22:52:46 -05:00
Code Issues Activity

chore(release): 5.0.0-alpha.0

Browse source
This commit is contained in:
Juan Picado 2021-03-29 20:26:38 +02:00
parent ece56ee9d2
commit e7c5033a8f
3 changed files with 366 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CHANGELOG.md
View file

@ -2,6 +2,21 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
## [5.0.0-alpha.0](https://github.com/verdaccio/verdaccio/compare/v4.12.0...v5.0.0-alpha.0) (2021-03-29)
### ⚠ BREAKING CHANGES
* npm token support revisited and enabled by default (#2145)
* drop node 8 and node 10 (#2142)
### Features
* drop node 8 and node 10 ([#2142](https://github.com/verdaccio/verdaccio/issues/2142)) ([43f7043](https://github.com/verdaccio/verdaccio/commit/43f70437af7a196f23d2a951f857ecc809131e02))
* improve url_prefix behavior ([#2122](https://github.com/verdaccio/verdaccio/issues/2122)) ([15bb350](https://github.com/verdaccio/verdaccio/commit/15bb350ae47b822f385e329d13d2574c31beed1f))
* npm token support revisited and enabled by default ([#2145](https://github.com/verdaccio/verdaccio/issues/2145)) ([8cc6393](https://github.com/verdaccio/verdaccio/commit/8cc6393d866126912ad1db457dadc0d3ef596333))
* upgrade to commander v7 ([#2143](https://github.com/verdaccio/verdaccio/issues/2143)) ([3a1f608](https://github.com/verdaccio/verdaccio/commit/3a1f608f0b78561bb1c06e3b54a58e21f72940d5))
## [4.12.0](https://github.com/verdaccio/verdaccio/compare/v4.11.3...v4.12.0) (2021-03-17)

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "verdaccio",
"version": "4.12.0",
"version": "5.0.0-alpha.0",
"description": "A lightweight private npm proxy registry",
"author": {
"name": "Verdaccio Maintainers",

365
yarn.lock
View file

@ -3259,6 +3259,16 @@ __metadata:
languageName: node
linkType: hard
"@verdaccio/commons-api@npm:9.7.1, @verdaccio/commons-api@npm:^9.7.1":
version: 9.7.1
resolution: "@verdaccio/commons-api@npm:9.7.1"
dependencies:
http-errors: 1.8.0
http-status-codes: 1.4.0
checksum: c5794f8cf00b88b25a4515bb069c002e8d599a83031a019f5ec972ef92796d9c1b2122646498305ad9b00325521d5d31a3e9822360f8016d848988728566ffae
languageName: node
linkType: hard
"@verdaccio/eslint-config@npm:^8.5.0":
version: 8.5.0
resolution: "@verdaccio/eslint-config@npm:8.5.0"
@ -3289,6 +3299,15 @@ __metadata:
languageName: node
linkType: hard
"@verdaccio/file-locking@npm:^9.7.2":
version: 9.7.2
resolution: "@verdaccio/file-locking@npm:9.7.2"
dependencies:
lockfile: 1.0.4
checksum: e0dbc6c9c47309c8104456683edc41da8fc8efac0dd4ace643f9c4be6f8200381706959f9eb92571e11b2b6f78a6b3692252a1b691ef742735a5848abd85b201
languageName: node
linkType: hard
"@verdaccio/local-storage@npm:10.0.1":
version: 10.0.1
resolution: "@verdaccio/local-storage@npm:10.0.1"
@ -3305,6 +3324,21 @@ __metadata:
languageName: node
linkType: hard
"@verdaccio/local-storage@npm:9.7.5":
version: 9.7.5
resolution: "@verdaccio/local-storage@npm:9.7.5"
dependencies:
"@verdaccio/commons-api": ^9.7.1
"@verdaccio/file-locking": ^9.7.2
"@verdaccio/streams": ^9.7.2
async: 3.2.0
level: 5.0.1
lodash: 4.17.21
mkdirp: 0.5.5
checksum: 98989ecf635a68dcac2debbcd5bbede41f25a82dd090426031c74bb99eee783a2dcc25e81055ab040da8f52e07131b2a3cd1b0db6e78d290353ea9b78dde728a
languageName: node
linkType: hard
"@verdaccio/readme@npm:10.0.0":
version: 10.0.0
resolution: "@verdaccio/readme@npm:10.0.0"
@ -3316,6 +3350,17 @@ __metadata:
languageName: node
linkType: hard
"@verdaccio/readme@npm:9.7.5":
version: 9.7.5
resolution: "@verdaccio/readme@npm:9.7.5"
dependencies:
dompurify: ^2.2.6
jsdom: 15.2.1
marked: ^2.0.1
checksum: 177bb41a3ae339df067abac744b1c4fea7edb632bcb9b05dbe9ed6db5116f49c6daf52aeb06615340af6b8fc13da2e51cb54f7b01772eb5419c4a7bd1d2849a5
languageName: node
linkType: hard
"@verdaccio/streams@npm:10.0.0, @verdaccio/streams@npm:^10.0.0":
version: 10.0.0
resolution: "@verdaccio/streams@npm:10.0.0"
@ -3323,6 +3368,13 @@ __metadata:
languageName: node
linkType: hard
"@verdaccio/streams@npm:9.7.2, @verdaccio/streams@npm:^9.7.2":
version: 9.7.2
resolution: "@verdaccio/streams@npm:9.7.2"
checksum: 6df3c0e44887d657b7190453c1cf7de6bd0c48f83432902cc6b4877bdbe59f5ed7836b0c34a81b58da78aaa024b1b53d53788adeb32ae69534587f363d23e5fb
languageName: node
linkType: hard
"@verdaccio/types@npm:^9.7.2":
version: 9.7.2
resolution: "@verdaccio/types@npm:9.7.2"
@ -3330,6 +3382,13 @@ __metadata:
languageName: node
linkType: hard
"@verdaccio/ui-theme@npm:1.15.1":
version: 1.15.1
resolution: "@verdaccio/ui-theme@npm:1.15.1"
checksum: e6dfeaae7043daa639042345f62ba4d872a7457984b751ae39694f504c33b09d875c42d72b58df9968bed80cf8e49c6554cc6062a0884dd0c1869a2ae40722aa
languageName: node
linkType: hard
"@verdaccio/ui-theme@npm:3.0.0":
version: 3.0.0
resolution: "@verdaccio/ui-theme@npm:3.0.0"
@ -3370,6 +3429,29 @@ __metadata:
languageName: node
linkType: hard
"abstract-leveldown@npm:^6.2.1, abstract-leveldown@npm:~6.2.1":
version: 6.2.3
resolution: "abstract-leveldown@npm:6.2.3"
dependencies:
buffer: ^5.5.0
immediate: ^3.2.3
level-concat-iterator: ~2.0.0
level-supports: ~1.0.0
xtend: ~4.0.0
checksum: 193fd90d2110b63bf46aa761f18b3cb8c6e774d5b969c4b5ff8230d215b8982eac9edb8e10dcda7d9ccef361a845bcaa99e6a510d4ba7215a709b3d3ffffee8a
languageName: node
linkType: hard
"abstract-leveldown@npm:~6.0.1":
version: 6.0.3
resolution: "abstract-leveldown@npm:6.0.3"
dependencies:
level-concat-iterator: ~2.0.0
xtend: ~4.0.0
checksum: 02992285f88f56c379b240caeab26c95350673fa204d73174a9cf1ba7459393b67e4c88fd820b1afb722e2139c83150f1c4bf40c9cdbaa2ebfdc98f26fa9debc
languageName: node
linkType: hard
"accepts@npm:^1.3.7, accepts@npm:~1.3.5, accepts@npm:~1.3.7":
version: 1.3.7
resolution: "accepts@npm:1.3.7"
@ -4438,7 +4520,7 @@ __metadata:
languageName: node
linkType: hard
"buffer@npm:^5.2.1, buffer@npm:^5.5.0":
"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.6.0":
version: 5.6.0
resolution: "buffer@npm:5.6.0"
dependencies:
@ -4888,6 +4970,13 @@ __metadata:
languageName: node
linkType: hard
"commander@npm:3.0.2":
version: 3.0.2
resolution: "commander@npm:3.0.2"
checksum: 28071a49d23606c1e31f1f275d2aac9c03833cb3442e04b798ffbcd5f7fb7a1fbfc6b5bc6a69b862df83f475378665623788118d189c254a173248c452bd77a2
languageName: node
linkType: hard
"commander@npm:7.2.0":
version: 7.2.0
resolution: "commander@npm:7.2.0"
@ -5628,6 +5717,16 @@ __metadata:
languageName: node
linkType: hard
"deferred-leveldown@npm:~5.3.0":
version: 5.3.0
resolution: "deferred-leveldown@npm:5.3.0"
dependencies:
abstract-leveldown: ~6.2.1
inherits: ^2.0.3
checksum: 2d2dbff3db68635a872218145b6c88f37358d26e31cf9e1efda229a68a56b420f82278794915c4ceb7129a651facfad4e44c8b6740d43733da6f808d981ac014
languageName: node
linkType: hard
"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3":
version: 1.1.3
resolution: "define-properties@npm:1.1.3"
@ -5925,6 +6024,18 @@ __metadata:
languageName: node
linkType: hard
"encoding-down@npm:^6.3.0":
version: 6.3.0
resolution: "encoding-down@npm:6.3.0"
dependencies:
abstract-leveldown: ^6.2.1
inherits: ^2.0.3
level-codec: ^9.0.0
level-errors: ^2.0.0
checksum: 002e025e623647585f410e9184840bbdec3451e7473b27dba75d89e7c031b8aef51b16aa21bd3955ef2f5f57ead57a477715d7234b677885c14f5f3af69a8873
languageName: node
linkType: hard
"end-of-stream@npm:^1.1.0":
version: 1.4.1
resolution: "end-of-stream@npm:1.4.1"
@ -5968,7 +6079,7 @@ __metadata:
languageName: node
linkType: hard
"errno@npm:^0.1.3":
"errno@npm:^0.1.3, errno@npm:~0.1.1":
version: 0.1.7
resolution: "errno@npm:0.1.7"
dependencies:
@ -7879,6 +7990,13 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"immediate@npm:^3.2.3, immediate@npm:~3.2.3":
version: 3.2.3
resolution: "immediate@npm:3.2.3"
checksum: 580a913c69aae4d9cf919b12655aafcb097438832381eb8bb575c949f1129904ba3d11e029cc13d0823fa1993a0933caea57b444f98c812aa18d2eab96dc94f1
languageName: node
linkType: hard
"import-fresh@npm:^2.0.0":
version: 2.0.0
resolution: "import-fresh@npm:2.0.0"
@ -9168,6 +9286,18 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"js-yaml@npm:3.14.1":
version: 3.14.1
resolution: "js-yaml@npm:3.14.1"
dependencies:
argparse: ^1.0.7
esprima: ^4.0.0
bin:
js-yaml: bin/js-yaml.js
checksum: 46b61f889796a20d16b0b64580a01b6a02b2e45c1a2744906346da54d07e14cde764e887ab6d1512d8b2541c63711bd4b75859c28eb99605baf59fa173fc38c2
languageName: node
linkType: hard
"js-yaml@npm:4.0.0":
version: 4.0.0
resolution: "js-yaml@npm:4.0.0"
@ -9487,6 +9617,111 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"level-codec@npm:^9.0.0":
version: 9.0.2
resolution: "level-codec@npm:9.0.2"
dependencies:
buffer: ^5.6.0
checksum: 3474cadde6f6221caff2e464c8ffd50761ee05dbb9d3d1259eca9bcca2a733f1de839cf2ea3ed7e2dbc5b01436096a6fc5606b9df2a0b796f96f53dce27b9105
languageName: node
linkType: hard
"level-concat-iterator@npm:~2.0.0":
version: 2.0.1
resolution: "level-concat-iterator@npm:2.0.1"
checksum: d5ac362a950bcf63bc19c4e8d397055c9bbd335eea2c56f7de372d38c66147d6db2430596025861d99820f890a9881aef9a192ee62b109ccf0885c0b5c5c2586
languageName: node
linkType: hard
"level-errors@npm:^2.0.0, level-errors@npm:~2.0.0":
version: 2.0.1
resolution: "level-errors@npm:2.0.1"
dependencies:
errno: ~0.1.1
checksum: 74dbf642313f4ccd8736092daad482c133bfba2a1ded8e622be5b75c8d358627daab2f7684c404ded7147b16caa8bbc2509772c95f86b2fddcaa75651e0ac665
languageName: node
linkType: hard
"level-iterator-stream@npm:~4.0.0":
version: 4.0.2
resolution: "level-iterator-stream@npm:4.0.2"
dependencies:
inherits: ^2.0.4
readable-stream: ^3.4.0
xtend: ^4.0.2
checksum: 795cdbbf856b58fffaf19e0d0b294f65fd4d8feb22bdee8563408f739107ce88b03b8b36ecc60be95c736ea676d611f95dabfbbb15346a9005ed627ae644dfb5
languageName: node
linkType: hard
"level-js@npm:^4.0.0":
version: 4.0.2
resolution: "level-js@npm:4.0.2"
dependencies:
abstract-leveldown: ~6.0.1
immediate: ~3.2.3
inherits: ^2.0.3
ltgt: ^2.1.2
typedarray-to-buffer: ~3.1.5
checksum: 9047b2c5cf5cf83da7f7a39f631b28e5449d202bc45c04ae5149f6f06056cd1292fe571fed9c800df9ae9d216d547ae4d86bbbb055854534ddb003103799aaab
languageName: node
linkType: hard
"level-packager@npm:^5.0.0":
version: 5.1.1
resolution: "level-packager@npm:5.1.1"
dependencies:
encoding-down: ^6.3.0
levelup: ^4.3.2
checksum: bf36e98c6dcb1f35c6e05b6fee9e505feb0ca5b88d88206e96bfd328da5ed6c2e52d8b0c5ba53d283f74d8a9e9ab634697c4f7de69339ad26a4e302d8299b98e
languageName: node
linkType: hard
"level-supports@npm:~1.0.0":
version: 1.0.1
resolution: "level-supports@npm:1.0.1"
dependencies:
xtend: ^4.0.2
checksum: 73c845921516d38ea57d6574908e86fedbdf3a069938f14f72e221e3f9dc04adc93b0b484fc9d7591c3baab7405f33292d90250b4239a75c6afc7f37bc5b3540
languageName: node
linkType: hard
"level@npm:5.0.1":
version: 5.0.1
resolution: "level@npm:5.0.1"
dependencies:
level-js: ^4.0.0
level-packager: ^5.0.0
leveldown: ^5.0.0
opencollective-postinstall: ^2.0.0
checksum: acd7f8aa61f5fe2654b4e46b8b0e80385e512df7df1ecbcf718f4ea8c6eec640da74e8a0b5e27ea064c395c33ffa0c18bc5b3a396ae6ab99da6bc88de7876985
languageName: node
linkType: hard
"leveldown@npm:^5.0.0":
version: 5.6.0
resolution: "leveldown@npm:5.6.0"
dependencies:
abstract-leveldown: ~6.2.1
napi-macros: ~2.0.0
node-gyp: latest
node-gyp-build: ~4.1.0
checksum: 3c7fc9455e7d3232a50658b7ee94f043e7649800e6ff671d32fc5305390359bc9ba5a76bba692c79e9d5ccf99baafd882b6408fb58fb944c9b01074745b2d9dc
languageName: node
linkType: hard
"levelup@npm:^4.3.2":
version: 4.4.0
resolution: "levelup@npm:4.4.0"
dependencies:
deferred-leveldown: ~5.3.0
level-errors: ~2.0.0
level-iterator-stream: ~4.0.0
level-supports: ~1.0.0
xtend: ~4.0.0
checksum: 7cc5b84c29baeae52ee81c5d6f56a03557ec0eed4b95b1a7f22c82d8a0ebe4cea537166d2823e0cf45125dff86f119c058ccd824b5c5f2c2c8041df745b6dd39
languageName: node
linkType: hard
"leven@npm:^3.1.0":
version: 3.1.0
resolution: "leven@npm:3.1.0"
@ -9955,6 +10190,13 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"ltgt@npm:^2.1.2":
version: 2.2.1
resolution: "ltgt@npm:2.2.1"
checksum: 680494cb8f5ff63432f9802bac743cf6798b494dc3ea46b704e69c0c0655018eb83f0c25d76220f0877bda8aabf6f3d107f173597c98f22c6977422bb29fbc93
languageName: node
linkType: hard
"lunr-mutable-indexes@npm:2.3.2":
version: 2.3.2
resolution: "lunr-mutable-indexes@npm:2.3.2"
@ -10381,16 +10623,7 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"mkdirp@npm:1.0.4, mkdirp@npm:^1.0.3":
version: 1.0.4
resolution: "mkdirp@npm:1.0.4"
bin:
mkdirp: bin/cmd.js
checksum: 1aa3a6a2d7514f094a91329ec09994f5d32d2955a4985ecbb3d86f2aaeafc4aa11521f98d606144c1d49cd9835004d9a73342709b8c692c92e59eacf37412468
languageName: node
linkType: hard
"mkdirp@npm:^0.5.1, mkdirp@npm:~0.5.1":
"mkdirp@npm:0.5.5, mkdirp@npm:^0.5.1, mkdirp@npm:~0.5.1":
version: 0.5.5
resolution: "mkdirp@npm:0.5.5"
dependencies:
@ -10401,6 +10634,15 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"mkdirp@npm:1.0.4, mkdirp@npm:^1.0.3":
version: 1.0.4
resolution: "mkdirp@npm:1.0.4"
bin:
mkdirp: bin/cmd.js
checksum: 1aa3a6a2d7514f094a91329ec09994f5d32d2955a4985ecbb3d86f2aaeafc4aa11521f98d606144c1d49cd9835004d9a73342709b8c692c92e59eacf37412468
languageName: node
linkType: hard
"modify-values@npm:^1.0.0":
version: 1.0.1
resolution: "modify-values@npm:1.0.1"
@ -10482,6 +10724,13 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"napi-macros@npm:~2.0.0":
version: 2.0.0
resolution: "napi-macros@npm:2.0.0"
checksum: 1b67e5271e6688d7801a5bfa49c50c097ead038ed552af5f4b1e849255f711581b389cbeb8d746ee14803612dbdf205c086e75606f8ff7d354bc9d4b5863912c
languageName: node
linkType: hard
"natural-compare@npm:^1.4.0":
version: 1.4.0
resolution: "natural-compare@npm:1.4.0"
@ -10555,6 +10804,17 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"node-gyp-build@npm:~4.1.0":
version: 4.1.1
resolution: "node-gyp-build@npm:4.1.1"
bin:
node-gyp-build: ./bin.js
node-gyp-build-optional: ./optional.js
node-gyp-build-test: ./build-test.js
checksum: b63416498b98ac05b297cc6582744a76ff24e0e549dd619563e0edacd07526a27ded68e6ba11730aa0a7601bf04881a74d1f326475403cebc437b3767bafb531
languageName: node
linkType: hard
"node-gyp@npm:latest":
version: 7.1.0
resolution: "node-gyp@npm:7.1.0"
@ -10963,6 +11223,15 @@ fsevents@~2.1.2:
languageName: node
linkType: hard
"opencollective-postinstall@npm:^2.0.0":
version: 2.0.3
resolution: "opencollective-postinstall@npm:2.0.3"
bin:
opencollective-postinstall: index.js
checksum: d75b06b80eb426aaf099307ca4398f3119c8c86ff3806a95cfe234b979b80c07080040734fe2dc3c51fed5b15bd98dae88340807980bdc74aa1ebf045c74ef06
languageName: node
linkType: hard
"optionator@npm:^0.8.1":
version: 0.8.3
resolution: "optionator@npm:0.8.3"
@ -13756,7 +14025,7 @@ resolve@1.1.7:
languageName: node
linkType: hard
"typedarray-to-buffer@npm:^3.1.5":
"typedarray-to-buffer@npm:^3.1.5, typedarray-to-buffer@npm:~3.1.5":
version: 3.1.5
resolution: "typedarray-to-buffer@npm:3.1.5"
dependencies:
@ -14046,6 +14315,16 @@ typescript@3.9.9:
languageName: node
linkType: hard
"verdaccio-audit@npm:9.7.3":
version: 9.7.3
resolution: "verdaccio-audit@npm:9.7.3"
dependencies:
express: 4.17.1
request: 2.88.2
checksum: b2fc062f19584fb5a43363d1d5cbb70a34440229619a24f7d7dc4acae3516d9d78a6c71353958900e2b0a49f9efd049f852f7f2ff9a73aa382484e29758c05c6
languageName: node
linkType: hard
"verdaccio-auth-memory@npm:10.0.0":
version: 10.0.0
resolution: "verdaccio-auth-memory@npm:10.0.0"
@ -14068,6 +14347,19 @@ typescript@3.9.9:
languageName: node
linkType: hard
"verdaccio-htpasswd@npm:9.7.2":
version: 9.7.2
resolution: "verdaccio-htpasswd@npm:9.7.2"
dependencies:
"@verdaccio/file-locking": ^9.7.2
apache-md5: 1.1.2
bcryptjs: 2.4.3
http-errors: 1.8.0
unix-crypt-td-js: 1.1.4
checksum: 527c630fe7ac4f2d2e0d08659d5ddf7d53e4304ec2cf2459395302bdb81c95d4c8702ae4a387e2f48fb750b547722d9b814968a3372153c6c6f8eeb66f48e59d
languageName: node
linkType: hard
"verdaccio-memory@npm:10.0.0":
version: 10.0.0
resolution: "verdaccio-memory@npm:10.0.0"
@ -14079,7 +14371,50 @@ typescript@3.9.9:
languageName: node
linkType: hard
"verdaccio@^4.5.1, verdaccio@workspace:.":
"verdaccio@npm:^4.5.1":
version: 4.12.0
resolution: "verdaccio@npm:4.12.0"
dependencies:
"@verdaccio/commons-api": 9.7.1
"@verdaccio/local-storage": 9.7.5
"@verdaccio/readme": 9.7.5
"@verdaccio/streams": 9.7.2
"@verdaccio/ui-theme": 1.15.1
JSONStream: 1.3.5
async: 3.2.0
body-parser: 1.19.0
bunyan: 1.8.15
commander: 3.0.2
compression: 1.7.4
cookies: 0.8.0
cors: 2.8.5
dayjs: 1.10.4
envinfo: 7.7.4
express: 4.17.1
handlebars: 4.7.7
http-errors: 1.8.0
js-yaml: 3.14.1
jsonwebtoken: 8.5.1
kleur: 4.1.4
lodash: 4.17.21
lunr-mutable-indexes: 2.3.2
marked: 2.0.1
mime: 2.5.2
minimatch: 3.0.4
mkdirp: 0.5.5
mv: 2.1.1
pkginfo: 0.4.1
request: 2.88.0
semver: 7.3.4
verdaccio-audit: 9.7.3
verdaccio-htpasswd: 9.7.2
bin:
verdaccio: bin/verdaccio
checksum: 61c067f4d6b9df3972a254f0a1cc7ce12b71285e414db0d2292792907fe150c6cb0864ec469c76fe9b65971175da0d412a087f3f8dabe79d9e9cb362d3a52cb7
languageName: node
linkType: hard
"verdaccio@workspace:.":
version: 0.0.0-use.local
resolution: "verdaccio@workspace:."
dependencies:
@ -14465,7 +14800,7 @@ typescript@3.9.9:
languageName: node
linkType: hard
"xtend@npm:~4.0.1":
"xtend@npm:^4.0.2, xtend@npm:~4.0.0, xtend@npm:~4.0.1":
version: 4.0.2
resolution: "xtend@npm:4.0.2"
checksum: 37ee522a3e9fb9b143a400c30b21dc122aa8c9c9411c6afae1005a4617dc20a21765c114d544e37a6bb60c2733dd8ee0a44ed9e80d884ac78cccd30b5e0ab0da