From dd23846059cc2d4ee7282858750ccf687836ef5a Mon Sep 17 00:00:00 2001 From: the-superpirate Date: Mon, 28 Mar 2022 17:39:36 +0300 Subject: [PATCH] - [nexus] Refactoring - [nexus] Switch bot - [bot] Added extra receivers functionality GitOrigin-RevId: 68fc32d3e79ff411758f54f435fe8680fc42dead --- WORKSPACE | 144 +- idm/api/BUILD.bazel | 9 +- idm/api/aioclient/BUILD.bazel | 4 +- idm/api/aioclient/aioclient.py | 16 - idm/api/configs/base.yaml | 12 +- idm/api/configs/logging.yaml | 4 +- idm/api/daemons/admin_log_reader.py | 86 - idm/api/main.py | 22 +- idm/api/proto/BUILD.bazel | 12 +- idm/api/proto/chat_manager_service.proto | 2 +- idm/api/services/chat_manager.py | 16 +- images/install.bzl | 4 +- library/aiogrpctools/base.py | 7 +- library/aiopostgres/BUILD.bazel | 4 +- library/aiopostgres/pool_holder.py | 65 +- library/configurator/__init__.py | 8 +- library/telegram/base.py | 32 +- nexus/actions/BUILD.bazel | 4 +- nexus/actions/__init__.py | 27 - nexus/actions/common.py | 10 +- nexus/actions/crossref_api.py | 15 +- .../document_operations_pb}/__init__.py | 0 .../store_telegram_file_id_pb.py | 41 + .../update_document_scimag_pb.py} | 33 +- .../update_document_scitech_pb.py} | 42 +- .../update_document_sharience_pb.py} | 14 +- .../vote_pb.py} | 12 +- nexus/actions/exceptions.py | 4 +- nexus/actions/golden_postgres.py | 8 - nexus/actions/libgen_api.py | 9 +- nexus/actions/postgres.py | 34 + nexus/actions/{scimag.py => scimag_pb.py} | 6 +- nexus/actions/{scitech.py => scitech_pb.py} | 6 +- nexus/actions/update_document.py | 31 - nexus/bot/BUILD.bazel | 7 +- nexus/bot/application.py | 6 +- nexus/bot/configs/base.yaml | 20 +- nexus/bot/configs/logging.yaml | 1 + nexus/bot/exceptions.py | 4 +- nexus/bot/handlers/base.py | 52 +- nexus/bot/handlers/download.py | 13 +- nexus/bot/handlers/roll.py | 2 +- nexus/bot/handlers/search.py | 8 +- nexus/bot/handlers/shortlink.py | 2 +- nexus/bot/handlers/submit.py | 1 + nexus/bot/handlers/view.py | 14 +- nexus/bot/handlers/vote.py | 12 +- nexus/bot/widgets/search_widget.py | 14 +- .../cognitron/{schema => configs}/BUILD.bazel | 0 .../cognitron/{schema => configs}/scimag.yaml | 28 +- .../{schema => configs}/scitech.yaml | 31 +- nexus/cognitron/configs/summa.yaml | 16 - nexus/cognitron/installer/BUILD.bazel | 20 - nexus/cognitron/installer/main.py | 11 - nexus/cognitron/installer/scripts/common.py | 9 - nexus/cognitron/installer/scripts/iterate.py | 46 - nexus/cognitron/web/BUILD.bazel | 55 +- nexus/cognitron/web/README.md | 33 +- nexus/cognitron/web/app.vue | 4 + nexus/cognitron/web/assets/css/app.scss | 41 - nexus/cognitron/web/assets/css/terminal.css | 1 - nexus/cognitron/web/components/document.vue | 6 +- .../cognitron/web/components/search-list.vue | 8 +- nexus/cognitron/web/components/v-footer.vue | 16 +- nexus/cognitron/web/components/v-header.vue | 12 +- .../web/components/v-scimag-search-item.vue | 23 +- nexus/cognitron/web/components/v-scimag.vue | 30 +- .../web/components/v-scitech-search-item.vue | 22 +- nexus/cognitron/web/components/v-scitech.vue | 30 +- .../web/components/v-tr-multi-link.vue | 8 +- nexus/cognitron/web/components/v-tr.vue | 12 +- nexus/cognitron/web/layouts/default.vue | 7 - nexus/cognitron/web/nuxt.config.js | 90 - nexus/cognitron/web/nuxt.config.ts | 33 + .../web/pages/documents/_schema/_id.vue | 22 - nexus/cognitron/web/pages/index.vue | 101 - nexus/cognitron/web/plugins/meta-api.js | 20 +- .../web/static/android-chrome-192x192.png | Bin 58698 -> 0 bytes .../web/static/android-chrome-512x512.png | Bin 375558 -> 0 bytes .../cognitron/web/static/apple-touch-icon.png | Bin 51987 -> 0 bytes nexus/cognitron/web/static/browserconfig.xml | 9 - nexus/cognitron/web/static/favicon-16x16.png | Bin 1385 -> 0 bytes nexus/cognitron/web/static/favicon-32x32.png | Bin 2319 -> 0 bytes nexus/cognitron/web/static/favicon.ico | Bin 12014 -> 0 bytes nexus/cognitron/web/static/mstile-150x150.png | Bin 32108 -> 0 bytes .../web/static/safari-pinned-tab.svg | 932 -- nexus/cognitron/web/static/site.webmanifest | 19 - nexus/cognitron/web/tsconfig.json | 4 + nexus/hub/BUILD.bazel | 15 +- nexus/hub/aioclient/BUILD.bazel | 8 +- nexus/hub/aioclient/aioclient.py | 8 +- nexus/hub/configs/base.yaml | 35 +- nexus/hub/main.py | 33 +- nexus/hub/proto/BUILD.bazel | 16 +- nexus/hub/proto/delivery_service.proto | 1 + nexus/hub/proto/delivery_service_pb2.py | 184 - nexus/hub/proto/delivery_service_pb2_grpc.py | 66 - nexus/hub/proto/submitter_service.proto | 1 + nexus/hub/proto/submitter_service_pb2.py | 148 - nexus/hub/proto/submitter_service_pb2_grpc.py | 67 - nexus/hub/services/base.py | 29 +- nexus/hub/services/delivery.py | 121 +- nexus/hub/services/submitter.py | 53 +- nexus/ingest/BUILD.bazel | 7 +- nexus/ingest/jobs/__init__.py | 3 +- nexus/ingest/jobs/base.py | 3 +- nexus/ingest/jobs/crossref_api.py | 2 +- nexus/ingest/jobs/libgen_api.py | 2 +- nexus/ingest/jobs/postgres.py | 80 + nexus/ingest/jobs/self_feed.py | 10 +- nexus/ingest/main.py | 35 +- nexus/meta_api/BUILD.bazel | 68 +- nexus/meta_api/aioclient/BUILD.bazel | 6 +- nexus/meta_api/aioclient/aioclient.py | 27 +- nexus/meta_api/cli.py | 6 +- nexus/meta_api/configs/base.yaml | 9 +- nexus/meta_api/js/client/BUILD.bazel | 2 +- nexus/meta_api/js/client/index.js | 8 +- nexus/meta_api/main.py | 9 +- nexus/meta_api/proto/BUILD.bazel | 22 +- nexus/meta_api/proto/documents_service.proto | 2 +- nexus/meta_api/proto/documents_service_pb2.py | 308 - .../proto/documents_service_pb2_grpc.py | 135 - nexus/meta_api/proto/search_service.proto | 2 +- nexus/meta_api/proto/search_service_pb2.py | 230 - .../meta_api/proto/search_service_pb2_grpc.py | 66 - nexus/meta_api/providers/data.py | 29 +- nexus/meta_api/providers/stat.py | 2 +- .../query_extensionner/tests/__init__.py | 0 .../BUILD.bazel | 2 +- .../__init__.py | 2 +- .../checks.py | 0 .../grammar/__init__.py | 0 .../grammar/parser.py | 0 .../grammar/tree.py | 0 .../grammar/tree_transformer.py | 6 +- .../tests/BUILD.bazel | 2 +- .../query_extensions/tests}/__init__.py | 0 .../tests/test.py | 0 .../tests/test_grammar.py | 2 +- .../tests/test_query_extensionner.py | 4 +- nexus/meta_api/rescorers/classic_rescorer.py | 64 +- nexus/meta_api/services/base.py | 15 - nexus/meta_api/services/documents.py | 59 +- nexus/meta_api/services/search.py | 144 +- nexus/models/proto/BUILD.bazel | 10 +- nexus/models/proto/operation.proto | 7 + nexus/models/proto/operation_pb2.py | 88 +- nexus/models/proto/scimag.proto | 7 +- nexus/models/proto/scimag_pb2.py | 21 +- nexus/models/proto/scitech.proto | 7 +- nexus/models/proto/scitech_pb2.py | 19 +- nexus/models/proto/sharience.proto | 1 - nexus/nlptools/BUILD.bazel | 2 - nexus/nlptools/morph.py | 21 - nexus/pipe/BUILD.bazel | 4 +- nexus/pipe/configs/base.yaml | 39 +- nexus/pipe/consumers/base.py | 6 - .../processors/cross_references_processor.py | 22 +- nexus/pylon/client.py | 8 +- nexus/pylon/sources/__init__.py | 4 +- nexus/pylon/sources/base.py | 17 +- nexus/pylon/sources/libgen_doi.py | 6 +- nexus/pylon/sources/libgen_md5.py | 10 +- nexus/pylon/sources/libgen_new.py | 6 +- nexus/pylon/sources/scihub.py | 11 +- nexus/pylon/sources/specific/__init__.py | 4 + nexus/pylon/sources/specific/nature.py | 27 + nexus/pylon/sources/specific/pnas.py | 42 + nexus/translations/translations.yaml | 22 +- nexus/views/js/base.js | 2 +- nexus/views/js/scimag.js | 2 +- nexus/views/js/scitech.js | 2 +- nexus/views/telegram/BUILD.bazel | 2 +- nexus/views/telegram/base.py | 28 +- nexus/views/telegram/common.py | 6 +- nexus/views/telegram/scimag.py | 6 +- nexus/views/telegram/scitech.py | 6 +- postgres/sql/scimag.sql | 8 - postgres/sql/scitech.sql | 8 - postgres/sql/sharience.sql | 3 +- repository/install-packages.sh | 11 +- .../__init__.py => rules/go/BUILD.bazel | 0 rules/go/install.bzl | 11 + rules/go/setup.bzl | 24 + rules/misc/setup.bzl | 48 +- rules/nodejs/package.json | 85 +- rules/nodejs/yarn.lock | 11129 ++++------------ rules/packaging/packaging.bzl | 7 +- rules/python/requirements-lock.txt | 114 + rules/python/requirements.txt | 193 +- rules/rust/BUILD.bazel | 1 + rules/rust/Cargo.lock | 2458 ++++ rules/rust/Cargo.raze.lock | 4027 ++---- rules/rust/Cargo.toml | 201 +- rules/rust/cargo/BUILD.bazel | 886 +- rules/rust/crates.bzl | 3830 ++---- rules/rust/remote/BUILD.actix-0.10.0.bazel | 108 - .../rust/remote/BUILD.actix-codec-0.2.0.bazel | 60 - .../rust/remote/BUILD.actix-codec-0.3.0.bazel | 61 - .../remote/BUILD.actix-connect-2.0.0.bazel | 71 - .../rust/remote/BUILD.actix-cors-0.5.4.bazel | 65 - .../rust/remote/BUILD.actix-http-2.2.0.bazel | 115 - .../remote/BUILD.actix-router-0.2.7.bazel | 60 - .../remote/BUILD.actix-server-1.0.4.bazel | 68 - .../remote/BUILD.actix-service-1.0.6.bazel | 59 - .../remote/BUILD.actix-testing-1.0.1.bazel | 61 - .../rust/remote/BUILD.actix-utils-1.0.6.bazel | 63 - .../rust/remote/BUILD.actix-utils-2.0.0.bazel | 65 - rules/rust/remote/BUILD.actix-web-3.3.2.bazel | 104 - .../remote/BUILD.actix_derive-0.5.0.bazel | 58 - .../rust/remote/BUILD.addr2line-0.14.1.bazel | 62 - rules/rust/remote/BUILD.adler-1.0.2.bazel | 55 - rules/rust/remote/BUILD.ahash-0.4.7.bazel | 5 +- ...is-0.9.1.bazel => BUILD.ahash-0.7.6.bazel} | 105 +- ....bazel => BUILD.aho-corasick-0.7.18.bazel} | 11 +- ...azel => BUILD.alloc-no-stdlib-2.0.3.bazel} | 10 +- .../remote/BUILD.alloc-stdlib-0.2.1.bazel | 10 +- ...1.0.bazel => BUILD.ansi_term-0.12.1.bazel} | 13 +- ...-0.3.2.bazel => BUILD.anyhow-1.0.56.bazel} | 56 +- rules/rust/remote/BUILD.arc-swap-0.4.8.bazel | 59 - rules/rust/remote/BUILD.arc-swap-1.2.0.bazel | 63 - ...3.bazel => BUILD.async-stream-0.3.3.bazel} | 26 +- ...el => BUILD.async-stream-impl-0.3.3.bazel} | 15 +- ...0.bazel => BUILD.async-trait-0.1.52.bazel} | 17 +- .../remote/BUILD.atomicwrites-0.2.5.bazel | 67 - rules/rust/remote/BUILD.atty-0.2.14.bazel | 7 +- ...-1.0.1.bazel => BUILD.autocfg-1.1.0.bazel} | 7 +- rules/rust/remote/BUILD.awc-2.0.3.bazel | 81 - .../rust/remote/BUILD.backtrace-0.3.56.bazel | 81 - rules/rust/remote/BUILD.base-x-0.2.8.bazel | 57 - rules/rust/remote/BUILD.base64-0.12.3.bazel | 67 - rules/rust/remote/BUILD.base64-0.13.0.bazel | 5 +- rules/rust/remote/BUILD.base64-0.9.3.bazel | 67 - .../remote/BUILD.bb8-postgres-0.4.0.bazel | 68 - rules/rust/remote/BUILD.bincode-1.3.3.bazel | 57 - ...0.7.0.bazel => BUILD.bitflags-1.3.2.bazel} | 14 +- ...8.2.bazel => BUILD.bitpacking-0.8.4.bazel} | 7 +- ...3.bazel => BUILD.block-buffer-0.7.3.bazel} | 16 +- ....bazel => BUILD.block-padding-0.1.5.bazel} | 10 +- ...i-3.3.0.bazel => BUILD.brotli-3.3.3.bazel} | 28 +- ... => BUILD.brotli-decompressor-2.3.2.bazel} | 14 +- rules/rust/remote/BUILD.bstr-0.2.15.bazel | 81 - rules/rust/remote/BUILD.bumpalo-3.6.1.bazel | 80 - ...-0.2.0.bazel => BUILD.bumpalo-3.9.1.bazel} | 14 +- ...4.2.bazel => BUILD.byte-tools-0.3.1.bazel} | 11 +- rules/rust/remote/BUILD.byteorder-1.4.3.bazel | 5 +- rules/rust/remote/BUILD.bytes-1.0.1.bazel | 83 - ...es-0.5.6.bazel => BUILD.bytes-1.1.0.bazel} | 7 +- .../rust/remote/BUILD.bytestring-1.0.0.bazel | 54 - ....cc-1.0.67.bazel => BUILD.cc-1.0.73.bazel} | 10 +- rules/rust/remote/BUILD.census-0.4.0.bazel | 5 +- rules/rust/remote/BUILD.cfg-if-0.1.10.bazel | 55 - rules/rust/remote/BUILD.cfg-if-1.0.0.bazel | 5 +- rules/rust/remote/BUILD.chrono-0.4.19.bazel | 11 +- rules/rust/remote/BUILD.clap-2.33.3.bazel | 77 - rules/rust/remote/BUILD.clap-3.1.6.bazel | 175 + rules/rust/remote/BUILD.cloudabi-0.0.3.bazel | 56 - rules/rust/remote/BUILD.colored-2.0.0.bazel | 5 +- ...-4.5.2.bazel => BUILD.combine-4.6.3.bazel} | 9 +- rules/rust/remote/BUILD.config-0.10.1.bazel | 84 - ...0.11.0.bazel => BUILD.config-0.12.0.bazel} | 60 +- ....2.1.bazel => BUILD.crc32fast-1.3.2.bazel} | 9 +- rules/rust/remote/BUILD.criterion-0.3.4.bazel | 79 - .../remote/BUILD.criterion-plot-0.4.3.bazel | 55 - ....7.3.bazel => BUILD.crossbeam-0.8.1.bazel} | 23 +- .../BUILD.crossbeam-channel-0.4.4.bazel | 91 - ...el => BUILD.crossbeam-channel-0.5.4.bazel} | 9 +- .../remote/BUILD.crossbeam-deque-0.7.3.bazel | 64 - ...azel => BUILD.crossbeam-deque-0.8.1.bazel} | 11 +- .../remote/BUILD.crossbeam-epoch-0.9.3.bazel | 71 - ...azel => BUILD.crossbeam-epoch-0.9.8.bazel} | 30 +- .../remote/BUILD.crossbeam-queue-0.2.3.bazel | 62 - ...azel => BUILD.crossbeam-queue-0.3.5.bazel} | 28 +- .../remote/BUILD.crossbeam-utils-0.7.2.bazel | 106 - ...azel => BUILD.crossbeam-utils-0.8.8.bazel} | 10 +- rules/rust/remote/BUILD.crunchy-0.2.2.bazel | 5 +- .../rust/remote/BUILD.crypto-mac-0.9.1.bazel | 55 - rules/rust/remote/BUILD.csv-1.1.6.bazel | 134 - ...d5-0.7.0.bazel => BUILD.ctor-0.1.22.bazel} | 19 +- ...-0.8.0.bazel => BUILD.dashmap-4.0.2.bazel} | 13 +- rules/rust/remote/BUILD.deadpool-0.5.2.bazel | 81 - .../BUILD.deadpool-postgres-0.5.6.bazel | 72 - .../remote/BUILD.derive_more-0.99.13.bazel | 133 - ...me-1.3.0.bazel => BUILD.diff-0.1.12.bazel} | 16 +- ...t-0.5.2.bazel => BUILD.digest-0.8.1.bazel} | 13 +- rules/rust/remote/BUILD.dirs-next-2.0.0.bazel | 55 - .../remote/BUILD.dirs-sys-next-0.1.2.bazel | 64 - rules/rust/remote/BUILD.discard-1.0.4.bazel | 53 - ...0.4.0.bazel => BUILD.dlv-list-0.2.3.bazel} | 10 +- rules/rust/remote/BUILD.dotenv-0.15.0.bazel | 99 - .../rust/remote/BUILD.downcast-rs-1.2.0.bazel | 5 +- rules/rust/remote/BUILD.either-1.6.1.bazel | 5 +- .../remote/BUILD.encoding_rs-0.8.28.bazel | 84 - .../remote/BUILD.enum-as-inner-0.3.3.bazel | 69 - .../rust/remote/BUILD.env_logger-0.8.3.bazel | 71 - ...ail-0.4.0.bazel => BUILD.fail-0.5.0.bazel} | 9 +- rules/rust/remote/BUILD.failure-0.1.8.bazel | 76 - .../remote/BUILD.failure_derive-0.1.8.bazel | 97 - ....1.0.bazel => BUILD.fake-simd-0.1.2.bazel} | 9 +- .../rust/remote/BUILD.fancy-regex-0.3.5.bazel | 67 - ...3.0.bazel => BUILD.fastdivide-0.4.0.bazel} | 9 +- ...zel => BUILD.fastfield_codecs-0.1.0.bazel} | 36 +- rules/rust/remote/BUILD.fastrand-1.7.0.bazel | 60 + ....3.bazel => BUILD.fixedbitset-0.4.1.bazel} | 11 +- rules/rust/remote/BUILD.flate2-1.0.20.bazel | 116 - rules/rust/remote/BUILD.fnv-1.0.7.bazel | 5 +- .../remote/BUILD.form_urlencoded-1.0.1.bazel | 55 - rules/rust/remote/BUILD.fs2-0.4.3.bazel | 7 +- rules/rust/remote/BUILD.fst-0.3.5.bazel | 60 - rules/rust/remote/BUILD.fst-0.4.5.bazel | 87 - .../remote/BUILD.fuchsia-cprng-0.1.1.bazel | 53 - .../remote/BUILD.fuchsia-zircon-0.3.3.bazel | 55 - .../BUILD.fuchsia-zircon-sys-0.3.3.bazel | 55 - ....3.14.bazel => BUILD.futures-0.3.21.bazel} | 27 +- .../remote/BUILD.futures-channel-0.3.14.bazel | 70 - ...zel => BUILD.futures-channel-0.3.21.bazel} | 48 +- .../remote/BUILD.futures-core-0.3.14.bazel | 56 - ....bazel => BUILD.futures-core-0.3.21.bazel} | 18 +- ...el => BUILD.futures-executor-0.3.21.bazel} | 16 +- ...14.bazel => BUILD.futures-io-0.3.21.bazel} | 8 +- .../remote/BUILD.futures-macro-0.3.14.bazel | 59 - ...bazel => BUILD.futures-macro-0.3.21.bazel} | 15 +- ....bazel => BUILD.futures-sink-0.3.21.bazel} | 7 +- .../remote/BUILD.futures-task-0.3.14.bazel | 55 - ....bazel => BUILD.futures-task-0.3.21.bazel} | 18 +- .../remote/BUILD.futures-util-0.3.14.bazel | 85 - ....bazel => BUILD.futures-util-0.3.21.bazel} | 89 +- rules/rust/remote/BUILD.fxhash-0.2.1.bazel | 56 - ...bazel => BUILD.generic-array-0.12.4.bazel} | 22 +- .../remote/BUILD.generic-array-0.14.4.bazel | 97 - ...2.14.bazel => BUILD.getrandom-0.2.5.bazel} | 20 +- rules/rust/remote/BUILD.grpc-0.8.3.bazel | 68 - ...D.h2-0.2.7.bazel => BUILD.h2-0.3.12.bazel} | 28 +- rules/rust/remote/BUILD.half-1.7.1.bazel | 57 - ...3.0.bazel => BUILD.hashbrown-0.11.2.bazel} | 31 +- rules/rust/remote/BUILD.hashbrown-0.9.1.bazel | 6 +- ...eck-0.3.2.bazel => BUILD.heck-0.3.3.bazel} | 9 +- ...18.bazel => BUILD.hermit-abi-0.1.19.bazel} | 9 +- rules/rust/remote/BUILD.hmac-0.10.1.bazel | 57 - rules/rust/remote/BUILD.hostname-0.3.1.bazel | 70 - .../rust/remote/BUILD.htmlescape-0.3.1.bazel | 5 +- ...ttp-0.2.4.bazel => BUILD.http-0.2.6.bazel} | 11 +- ....4.2.bazel => BUILD.http-body-0.4.4.bazel} | 19 +- ...el => BUILD.http-range-header-0.3.0.bazel} | 10 +- ...1.4.0.bazel => BUILD.httparse-1.6.0.bazel} | 9 +- ...0.1.7.bazel => BUILD.httpdate-1.0.2.bazel} | 13 +- rules/rust/remote/BUILD.hyper-0.14.17.bazel | 133 + ....bazel => BUILD.hyper-timeout-0.4.1.bazel} | 22 +- rules/rust/remote/BUILD.idna-0.2.3.bazel | 62 - ...1.6.2.bazel => BUILD.indexmap-1.8.0.bazel} | 16 +- ...0.1.9.bazel => BUILD.instant-0.1.12.bazel} | 7 +- ...0.0.bazel => BUILD.itertools-0.10.3.bazel} | 9 +- rules/rust/remote/BUILD.itertools-0.9.0.bazel | 90 - ...toa-0.4.7.bazel => BUILD.itoa-1.0.1.bazel} | 11 +- ...0.3.50.bazel => BUILD.js-sys-0.3.56.bazel} | 9 +- ...r-0.11.1.bazel => BUILD.json5-0.4.1.bazel} | 40 +- .../remote/BUILD.kernel32-sys-0.2.2.bazel | 94 - .../rust/remote/BUILD.lazy_static-1.4.0.bazel | 5 +- ...=> BUILD.levenshtein_automata-0.2.1.bazel} | 9 +- ...-0.2.93.bazel => BUILD.libc-0.2.121.bazel} | 17 +- ...1.2.1.bazel => BUILD.libz-sys-1.1.5.bazel} | 23 +- .../remote/BUILD.linked-hash-map-0.5.4.bazel | 5 +- ...0.4.3.bazel => BUILD.lock_api-0.4.6.bazel} | 7 +- rules/rust/remote/BUILD.log-0.4.14.bazel | 9 +- rules/rust/remote/BUILD.log4rs-0.10.0.bazel | 117 - ....lru-0.6.5.bazel => BUILD.lru-0.7.3.bazel} | 9 +- rules/rust/remote/BUILD.lru-cache-0.1.2.bazel | 54 - rules/rust/remote/BUILD.lz4-sys-1.9.2.bazel | 85 - rules/rust/remote/BUILD.lz4_flex-0.9.2.bazel | 58 + rules/rust/remote/BUILD.maplit-1.0.2.bazel | 5 +- rules/rust/remote/BUILD.match_cfg-0.1.0.bazel | 55 - ...0.8.0.bazel => BUILD.matchers-0.1.0.bazel} | 13 +- rules/rust/remote/BUILD.matches-0.1.8.bazel | 55 - .../remote/BUILD.maybe-uninit-2.0.0.bazel | 85 - ...0.bazel => BUILD.measure_time-0.8.0.bazel} | 13 +- ...r-2.3.4.bazel => BUILD.memchr-2.4.1.bazel} | 15 +- ...-0.7.0.bazel => BUILD.memmap2-0.5.3.bazel} | 13 +- rules/rust/remote/BUILD.memoffset-0.6.3.bazel | 86 - ....5.6.bazel => BUILD.memoffset-0.6.5.bazel} | 11 +- ...azel => BUILD.minimal-lexical-0.2.1.bazel} | 41 +- .../rust/remote/BUILD.miniz_oxide-0.4.4.bazel | 85 - rules/rust/remote/BUILD.mio-0.6.23.bazel | 73 - ...mio-0.7.11.bazel => BUILD.mio-0.8.2.bazel} | 15 +- rules/rust/remote/BUILD.mio-uds-0.6.8.bazel | 66 - rules/rust/remote/BUILD.miow-0.2.2.bazel | 57 - rules/rust/remote/BUILD.miow-0.3.7.bazel | 5 +- ...0.7.0.bazel => BUILD.multimap-0.8.3.bazel} | 9 +- .../remote/BUILD.murmurhash32-0.2.0.bazel | 5 +- rules/rust/remote/BUILD.net2-0.2.37.bazel | 67 - rules/rust/remote/BUILD.nix-0.14.1.bazel | 113 - ....nom-5.1.2.bazel => BUILD.nom-7.1.1.bazel} | 69 +- ...pi-0.3.6.bazel => BUILD.ntapi-0.3.7.bazel} | 9 +- .../remote/BUILD.num-integer-0.1.44.bazel | 11 +- .../rust/remote/BUILD.num-traits-0.1.43.bazel | 54 - .../rust/remote/BUILD.num-traits-0.2.14.bazel | 13 +- rules/rust/remote/BUILD.num_cpus-1.13.0.bazel | 56 - ....1.4.bazel => BUILD.num_cpus-1.13.1.bazel} | 15 +- ...0.2.3.bazel => BUILD.num_enum-0.5.7.bazel} | 34 +- .../remote/BUILD.num_enum_derive-0.5.7.bazel | 60 + ....0.bazel => BUILD.num_threads-0.1.5.bazel} | 14 +- rules/rust/remote/BUILD.object-0.23.0.bazel | 76 - ...7.2.bazel => BUILD.once_cell-1.10.0.bazel} | 7 +- ...3.bazel => BUILD.opaque-debug-0.2.3.bazel} | 8 +- .../remote/BUILD.opaque-debug-0.3.0.bazel | 55 - .../remote/BUILD.opentelemetry-0.17.0.bazel | 86 + ...ILD.opentelemetry-prometheus-0.10.0.bazel} | 16 +- .../remote/BUILD.ordered-float-1.1.1.bazel | 60 - .../remote/BUILD.ordered-multimap-0.3.1.bazel | 56 + ...3.bazel => BUILD.os_str_bytes-6.0.0.bazel} | 16 +- .../remote/BUILD.output_vt100-0.1.3.bazel | 57 + ...4.1.bazel => BUILD.ownedbytes-0.2.0.bazel} | 9 +- .../rust/remote/BUILD.owning_ref-0.4.1.bazel | 54 - ...2.bazel => BUILD.parking_lot-0.11.2.bazel} | 21 +- ...1.bazel => BUILD.parking_lot-0.12.0.bazel} | 13 +- .../remote/BUILD.parking_lot_core-0.8.3.bazel | 67 - ...zel => BUILD.parking_lot_core-0.8.5.bazel} | 31 +- ...zel => BUILD.parking_lot_core-0.9.1.bazel} | 26 +- ...0.1.2.bazel => BUILD.pathdiff-0.2.1.bazel} | 9 +- .../remote/BUILD.percent-encoding-2.1.0.bazel | 5 +- ...me-0.3.16.bazel => BUILD.pest-2.1.3.bazel} | 20 +- ....0.bazel => BUILD.pest_derive-2.1.0.bazel} | 25 +- .../remote/BUILD.pest_generator-2.1.3.bazel | 59 + ....0.0.bazel => BUILD.pest_meta-2.1.3.bazel} | 11 +- rules/rust/remote/BUILD.petgraph-0.6.0.bazel | 102 + .../remote/BUILD.pin-project-0.4.28.bazel | 104 - ...7.bazel => BUILD.pin-project-1.0.10.bazel} | 9 +- .../BUILD.pin-project-internal-0.4.28.bazel | 86 - .../BUILD.pin-project-internal-1.0.10.bazel | 57 + ...zel => BUILD.pin-project-lite-0.2.8.bazel} | 7 +- rules/rust/remote/BUILD.pin-utils-0.1.0.bazel | 5 +- ....8.bazel => BUILD.pkg-config-0.3.24.bazel} | 11 +- rules/rust/remote/BUILD.plotters-0.3.0.bazel | 112 - rules/rust/remote/BUILD.postgres-0.17.5.bazel | 61 - .../remote/BUILD.postgres-derive-0.4.0.bazel | 56 - .../BUILD.postgres-protocol-0.5.3.bazel | 63 - .../BUILD.postgres-protocol-0.6.1.bazel | 63 - .../remote/BUILD.postgres-types-0.1.3.bazel | 70 - .../remote/BUILD.postgres-types-0.2.1.bazel | 56 - ...10.bazel => BUILD.ppv-lite86-0.2.16.bazel} | 7 +- ...el => BUILD.pretty_assertions-1.2.0.bazel} | 20 +- ...zel => BUILD.proc-macro-crate-1.1.3.bazel} | 14 +- .../BUILD.proc-macro-nested-0.1.7.bazel | 83 - ...6.bazel => BUILD.proc-macro2-1.0.36.bazel} | 13 +- .../rust/remote/BUILD.prometheus-0.13.0.bazel | 121 + rules/rust/remote/BUILD.proptest-0.10.1.bazel | 88 - rules/rust/remote/BUILD.prost-0.9.0.bazel | 63 + ....4.bazel => BUILD.prost-build-0.9.0.bazel} | 36 +- ...0.bazel => BUILD.prost-derive-0.9.0.bazel} | 20 +- ....0.bazel => BUILD.prost-types-0.9.0.bazel} | 14 +- ...18.2.bazel => BUILD.protobuf-2.27.1.bazel} | 14 +- .../BUILD.protobuf-codegen-2.18.2.bazel | 104 - ...e-1.0.9.bazel => BUILD.quote-1.0.16.bazel} | 9 +- rules/rust/remote/BUILD.r2d2-0.8.9.bazel | 56 - .../remote/BUILD.r2d2_postgres-0.16.0.bazel | 55 - rules/rust/remote/BUILD.rand-0.4.6.bazel | 73 - rules/rust/remote/BUILD.rand-0.5.6.bazel | 84 - rules/rust/remote/BUILD.rand-0.7.3.bazel | 86 - ...and-0.8.3.bazel => BUILD.rand-0.8.5.bazel} | 15 +- .../rust/remote/BUILD.rand_chacha-0.3.0.bazel | 56 - ....2.bazel => BUILD.rand_chacha-0.3.1.bazel} | 11 +- rules/rust/remote/BUILD.rand_core-0.3.1.bazel | 56 - rules/rust/remote/BUILD.rand_core-0.6.2.bazel | 57 - ....5.1.bazel => BUILD.rand_core-0.6.3.bazel} | 9 +- rules/rust/remote/BUILD.rand_hc-0.2.0.bazel | 54 - rules/rust/remote/BUILD.rand_hc-0.3.0.bazel | 54 - .../remote/BUILD.rand_xorshift-0.2.0.bazel | 56 - ...on-1.5.0.bazel => BUILD.rayon-1.5.1.bazel} | 15 +- ...9.0.bazel => BUILD.rayon-core-1.9.1.bazel} | 40 +- rules/rust/remote/BUILD.rdkafka-0.28.0.bazel | 102 + .../BUILD.rdkafka-sys-4.2.0+1.8.2.bazel | 97 + rules/rust/remote/BUILD.rdrand-0.4.0.bazel | 62 - .../remote/BUILD.redox_syscall-0.1.57.bazel | 62 - ...bazel => BUILD.redox_syscall-0.2.11.bazel} | 9 +- .../rust/remote/BUILD.redox_users-0.4.0.bazel | 55 - ...ex-1.4.5.bazel => BUILD.regex-1.5.5.bazel} | 15 +- ...azel => BUILD.regex-automata-0.1.10.bazel} | 12 +- .../remote/BUILD.regex-syntax-0.4.2.bazel | 5 +- ....bazel => BUILD.regex-syntax-0.6.25.bazel} | 9 +- .../remote/BUILD.remove_dir_all-0.5.3.bazel | 5 +- rules/rust/remote/BUILD.reopen-1.0.2.bazel | 96 - .../rust/remote/BUILD.resolv-conf-0.7.0.bazel | 61 - rules/rust/remote/BUILD.ron-0.7.0.bazel | 109 + ...13.0.bazel => BUILD.rust-ini-0.17.0.bazel} | 12 +- .../remote/BUILD.rust-stemmers-1.2.0.bazel | 9 +- .../remote/BUILD.rustc-serialize-0.3.24.bazel | 59 - .../rust/remote/BUILD.rustversion-1.0.4.bazel | 91 - .../rust/remote/BUILD.rusty-fork-0.3.0.bazel | 59 - ....ryu-1.0.5.bazel => BUILD.ryu-1.0.9.bazel} | 37 +- rules/rust/remote/BUILD.safemem-0.3.3.bazel | 55 - rules/rust/remote/BUILD.same-file-1.0.6.bazel | 57 - .../BUILD.scheduled-thread-pool-0.2.5.bazel | 54 - .../rust/remote/BUILD.scopeguard-1.1.0.bazel | 5 +- rules/rust/remote/BUILD.semver-0.9.0.bazel | 61 - rules/rust/remote/BUILD.serde-0.8.23.bazel | 56 - ....0.125.bazel => BUILD.serde-1.0.136.bazel} | 12 +- .../rust/remote/BUILD.serde-value-0.6.0.bazel | 55 - ...bazel => BUILD.serde_derive-1.0.136.bazel} | 17 +- .../rust/remote/BUILD.serde_json-1.0.79.bazel | 105 + rules/rust/remote/BUILD.serde_qs-0.8.3.bazel | 71 - .../remote/BUILD.serde_urlencoded-0.7.0.bazel | 61 - ...17.bazel => BUILD.serde_yaml-0.8.23.bazel} | 15 +- ...-5-0.9.1.bazel => BUILD.sha-1-0.8.2.bazel} | 26 +- rules/rust/remote/BUILD.sha-1-0.9.4.bazel | 85 - rules/rust/remote/BUILD.sha1-0.6.0.bazel | 53 - rules/rust/remote/BUILD.sha2-0.9.3.bazel | 80 - ...0.bazel => BUILD.sharded-slab-0.1.4.bazel} | 14 +- ...8.bazel => BUILD.signal-hook-0.3.13.bazel} | 13 +- ...=> BUILD.signal-hook-registry-1.4.0.bazel} | 9 +- rules/rust/remote/BUILD.siphasher-0.3.5.bazel | 55 - ...lab-0.4.2.bazel => BUILD.slab-0.4.5.bazel} | 13 +- rules/rust/remote/BUILD.slog-2.7.0.bazel | 98 - .../rust/remote/BUILD.slog-async-2.6.0.bazel | 58 - rules/rust/remote/BUILD.slog-json-2.3.0.bazel | 60 - .../rust/remote/BUILD.slog-scope-4.4.0.bazel | 58 - .../rust/remote/BUILD.slog-stdlog-4.1.0.bazel | 56 - rules/rust/remote/BUILD.slog-term-2.8.0.bazel | 72 - .../rust/remote/BUILD.slog_derive-0.2.0.bazel | 56 - ...1.6.1.bazel => BUILD.smallvec-1.8.0.bazel} | 7 +- rules/rust/remote/BUILD.smawk-0.3.1.bazel | 5 +- rules/rust/remote/BUILD.snap-1.0.4.bazel | 89 - ...-0.4.0.bazel => BUILD.socket2-0.4.4.bazel} | 10 +- .../BUILD.stable_deref_trait-1.2.0.bazel | 5 +- .../BUILD.static_assertions-1.1.0.bazel | 5 +- rules/rust/remote/BUILD.stdweb-0.4.20.bazel | 90 - .../remote/BUILD.stdweb-derive-0.5.3.bazel | 60 - .../BUILD.stdweb-internal-macros-0.2.9.bazel | 63 - .../BUILD.stdweb-internal-runtime-0.1.5.bazel | 85 - .../rust/remote/BUILD.stringprep-0.1.2.bazel | 61 - ...-0.8.0.bazel => BUILD.strsim-0.10.0.bazel} | 7 +- .../remote/BUILD.strum_macros-0.20.1.bazel | 57 - ...yn-1.0.69.bazel => BUILD.syn-1.0.89.bazel} | 17 +- rules/rust/remote/BUILD.take_mut-0.2.2.bazel | 53 - rules/rust/remote/BUILD.tantivy-0.17.0.bazel | 151 + ...el => BUILD.tantivy-bitpacker-0.1.1.bazel} | 14 +- .../remote/BUILD.tantivy-common-0.1.0.bazel | 55 + .../remote/BUILD.tantivy-common-0.2.0.bazel | 56 + .../rust/remote/BUILD.tantivy-fst-0.3.0.bazel | 5 +- .../BUILD.tantivy-query-grammar-0.15.0.bazel | 55 + rules/rust/remote/BUILD.tar-0.4.33.bazel | 80 - rules/rust/remote/BUILD.tempdir-0.3.7.bazel | 57 - ...3.2.0.bazel => BUILD.tempfile-3.3.0.bazel} | 13 +- ....1.2.bazel => BUILD.termcolor-1.1.3.bazel} | 7 +- rules/rust/remote/BUILD.textwrap-0.11.0.bazel | 62 - ...13.4.bazel => BUILD.textwrap-0.15.0.bazel} | 29 +- ....24.bazel => BUILD.thiserror-1.0.30.bazel} | 13 +- ...azel => BUILD.thiserror-impl-1.0.30.bazel} | 15 +- ...3.bazel => BUILD.thread_local-1.1.4.bazel} | 9 +- .../rust/remote/BUILD.threadpool-1.8.1.bazel | 54 - ...e-0.1.43.bazel => BUILD.time-0.1.44.bazel} | 10 +- ...t2-0.3.19.bazel => BUILD.time-0.3.7.bazel} | 22 +- .../rust/remote/BUILD.time-macros-0.1.1.bazel | 57 - .../remote/BUILD.time-macros-impl-0.1.1.bazel | 60 - .../remote/BUILD.tinytemplate-1.2.1.bazel | 57 - rules/rust/remote/BUILD.tinyvec-1.2.0.bazel | 63 - .../remote/BUILD.tinyvec_macros-0.1.0.bazel | 53 - rules/rust/remote/BUILD.tls-api-0.4.0.bazel | 55 - .../remote/BUILD.tls-api-stub-0.4.0.bazel | 56 - rules/rust/remote/BUILD.tokio-0.2.25.bazel | 310 - ...o-1.5.0.bazel => BUILD.tokio-1.17.0.bazel} | 118 +- ...zel => BUILD.tokio-io-timeout-1.2.0.bazel} | 15 +- ...6.bazel => BUILD.tokio-macros-1.7.0.bazel} | 15 +- .../remote/BUILD.tokio-pg-mapper-0.2.0.bazel | 54 - .../BUILD.tokio-pg-mapper-derive-0.2.0.bazel | 56 - .../remote/BUILD.tokio-postgres-0.5.5.bazel | 75 - .../remote/BUILD.tokio-postgres-0.7.1.bazel | 76 - .../remote/BUILD.tokio-stream-0.1.8.bazel | 85 + ...6.6.bazel => BUILD.tokio-util-0.6.9.bazel} | 23 +- ...3.1.bazel => BUILD.tokio-util-0.7.0.bazel} | 48 +- rules/rust/remote/BUILD.toml-0.5.8.bazel | 7 +- rules/rust/remote/BUILD.tonic-0.6.2.bazel | 97 + ....3.bazel => BUILD.tonic-build-0.6.2.bazel} | 22 +- rules/rust/remote/BUILD.tower-0.4.12.bazel | 114 + ...2.4.bazel => BUILD.tower-http-0.2.5.bazel} | 28 +- ....0.bazel => BUILD.tower-layer-0.3.1.bazel} | 9 +- ....bazel => BUILD.tower-service-0.3.1.bazel} | 9 +- ....1.25.bazel => BUILD.tracing-0.1.32.bazel} | 25 +- ...zel => BUILD.tracing-appender-0.2.2.bazel} | 14 +- ... => BUILD.tracing-attributes-0.1.20.bazel} | 41 +- ....bazel => BUILD.tracing-core-0.1.23.bazel} | 9 +- .../remote/BUILD.tracing-futures-0.2.5.bazel | 11 +- ....1.bazel => BUILD.tracing-log-0.1.2.bazel} | 22 +- .../remote/BUILD.tracing-serde-0.1.3.bazel | 56 + .../BUILD.tracing-subscriber-0.3.9.bazel | 129 + .../rust/remote/BUILD.traitobject-0.1.0.bazel | 53 - .../remote/BUILD.trust-dns-proto-0.19.7.bazel | 73 - .../BUILD.trust-dns-resolver-0.19.7.bazel | 72 - ...1.0.2.bazel => BUILD.try-lock-0.2.3.bazel} | 11 +- ...23.2.bazel => BUILD.twox-hash-1.6.2.bazel} | 28 +- ....13.0.bazel => BUILD.typenum-1.15.0.bazel} | 11 +- ....1.17.bazel => BUILD.ucd-trie-0.1.3.bazel} | 10 +- .../remote/BUILD.unicode-bidi-0.3.5.bazel | 55 - ...el => BUILD.unicode-linebreak-0.1.2.bazel} | 18 +- ...=> BUILD.unicode-segmentation-1.9.0.bazel} | 13 +- ....bazel => BUILD.unicode-width-0.1.9.bazel} | 7 +- ....1.bazel => BUILD.unicode-xid-0.2.2.bazel} | 9 +- .../rust/remote/BUILD.unix_socket-0.5.0.bazel | 55 - .../rust/remote/BUILD.unsafe-any-0.4.2.bazel | 54 - rules/rust/remote/BUILD.url-2.2.1.bazel | 63 - rules/rust/remote/BUILD.urlparse-0.7.3.bazel | 61 - .../rust/remote/BUILD.utf8-ranges-1.0.4.bazel | 5 +- rules/rust/remote/BUILD.uuid-0.8.2.bazel | 9 +- rules/rust/remote/BUILD.valuable-0.1.0.bazel | 96 + ...-0.1.18.bazel => BUILD.vcpkg-0.2.15.bazel} | 9 +- rules/rust/remote/BUILD.vec_map-0.8.2.bazel | 53 - ....bazel => BUILD.version_check-0.9.4.bazel} | 7 +- .../remote/BUILD.wait-timeout-0.2.0.bazel | 171 - rules/rust/remote/BUILD.walkdir-2.3.2.bazel | 54 - rules/rust/remote/BUILD.want-0.3.0.bazel | 58 + ....wasi-0.10.0+wasi-snapshot-preview1.bazel} | 7 +- ....wasi-0.11.0+wasi-snapshot-preview1.bazel} | 7 +- ....bazel => BUILD.wasm-bindgen-0.2.79.bazel} | 11 +- ...> BUILD.wasm-bindgen-backend-0.2.79.bazel} | 17 +- ... => BUILD.wasm-bindgen-macro-0.2.79.bazel} | 13 +- ...D.wasm-bindgen-macro-support-0.2.79.bazel} | 17 +- ...=> BUILD.wasm-bindgen-shared-0.2.79.bazel} | 10 +- rules/rust/remote/BUILD.web-sys-0.3.50.bazel | 67 - rules/rust/remote/BUILD.which-4.2.5.bazel | 58 + .../rust/remote/BUILD.widestring-0.4.3.bazel | 56 - rules/rust/remote/BUILD.winapi-0.2.8.bazel | 53 - rules/rust/remote/BUILD.winapi-0.3.9.bazel | 25 +- .../remote/BUILD.winapi-build-0.1.1.bazel | 62 - ...ILD.winapi-i686-pc-windows-gnu-0.4.0.bazel | 5 +- .../rust/remote/BUILD.winapi-util-0.1.5.bazel | 5 +- ...D.winapi-x86_64-pc-windows-gnu-0.4.0.bazel | 5 +- ...0.bazel => BUILD.windows-sys-0.32.0.bazel} | 19 +- ...> BUILD.windows_aarch64_msvc-0.32.0.bazel} | 17 +- ...el => BUILD.windows_i686_gnu-0.32.0.bazel} | 17 +- .../BUILD.windows_i686_msvc-0.32.0.bazel | 84 + .../BUILD.windows_x86_64_gnu-0.32.0.bazel | 84 + .../BUILD.windows_x86_64_msvc-0.32.0.bazel | 84 + rules/rust/remote/BUILD.winreg-0.6.2.bazel | 64 - .../rust/remote/BUILD.ws2_32-sys-0.2.1.bazel | 94 - rules/rust/remote/BUILD.xattr-0.2.2.bazel | 58 - rules/rust/remote/BUILD.yaml-rust-0.4.5.bazel | 5 +- rules/rust/rustfmt.toml | 1 + 636 files changed, 14016 insertions(+), 33784 deletions(-) delete mode 100644 idm/api/daemons/admin_log_reader.py rename {idm/api/daemons => nexus/actions/document_operations_pb}/__init__.py (100%) create mode 100644 nexus/actions/document_operations_pb/store_telegram_file_id_pb.py rename nexus/actions/{update_document_scimag.py => document_operations_pb/update_document_scimag_pb.py} (88%) rename nexus/actions/{update_document_scitech.py => document_operations_pb/update_document_scitech_pb.py} (84%) rename nexus/actions/{update_document_sharience.py => document_operations_pb/update_document_sharience_pb.py} (86%) rename nexus/actions/{vote.py => document_operations_pb/vote_pb.py} (83%) delete mode 100644 nexus/actions/golden_postgres.py create mode 100644 nexus/actions/postgres.py rename nexus/actions/{scimag.py => scimag_pb.py} (95%) rename nexus/actions/{scitech.py => scitech_pb.py} (93%) delete mode 100644 nexus/actions/update_document.py rename nexus/cognitron/{schema => configs}/BUILD.bazel (100%) rename nexus/cognitron/{schema => configs}/scimag.yaml (82%) rename nexus/cognitron/{schema => configs}/scitech.yaml (82%) delete mode 100644 nexus/cognitron/configs/summa.yaml delete mode 100644 nexus/cognitron/installer/BUILD.bazel delete mode 100644 nexus/cognitron/installer/main.py delete mode 100644 nexus/cognitron/installer/scripts/common.py delete mode 100644 nexus/cognitron/installer/scripts/iterate.py create mode 100644 nexus/cognitron/web/app.vue delete mode 100644 nexus/cognitron/web/assets/css/app.scss delete mode 100644 nexus/cognitron/web/assets/css/terminal.css delete mode 100644 nexus/cognitron/web/layouts/default.vue delete mode 100644 nexus/cognitron/web/nuxt.config.js create mode 100644 nexus/cognitron/web/nuxt.config.ts delete mode 100644 nexus/cognitron/web/pages/documents/_schema/_id.vue delete mode 100644 nexus/cognitron/web/pages/index.vue mode change 100755 => 100644 nexus/cognitron/web/plugins/meta-api.js delete mode 100644 nexus/cognitron/web/static/android-chrome-192x192.png delete mode 100644 nexus/cognitron/web/static/android-chrome-512x512.png delete mode 100644 nexus/cognitron/web/static/apple-touch-icon.png delete mode 100644 nexus/cognitron/web/static/browserconfig.xml delete mode 100644 nexus/cognitron/web/static/favicon-16x16.png delete mode 100644 nexus/cognitron/web/static/favicon-32x32.png delete mode 100644 nexus/cognitron/web/static/favicon.ico delete mode 100644 nexus/cognitron/web/static/mstile-150x150.png delete mode 100644 nexus/cognitron/web/static/safari-pinned-tab.svg delete mode 100644 nexus/cognitron/web/static/site.webmanifest create mode 100644 nexus/cognitron/web/tsconfig.json delete mode 100644 nexus/hub/proto/delivery_service_pb2.py delete mode 100644 nexus/hub/proto/delivery_service_pb2_grpc.py delete mode 100644 nexus/hub/proto/submitter_service_pb2.py delete mode 100644 nexus/hub/proto/submitter_service_pb2_grpc.py create mode 100644 nexus/ingest/jobs/postgres.py delete mode 100644 nexus/meta_api/proto/documents_service_pb2.py delete mode 100644 nexus/meta_api/proto/documents_service_pb2_grpc.py delete mode 100644 nexus/meta_api/proto/search_service_pb2.py delete mode 100644 nexus/meta_api/proto/search_service_pb2_grpc.py delete mode 100644 nexus/meta_api/query_extensionner/tests/__init__.py rename nexus/meta_api/{query_extensionner => query_extensions}/BUILD.bazel (92%) rename nexus/meta_api/{query_extensionner => query_extensions}/__init__.py (93%) rename nexus/meta_api/{query_extensionner => query_extensions}/checks.py (100%) rename nexus/meta_api/{query_extensionner => query_extensions}/grammar/__init__.py (100%) rename nexus/meta_api/{query_extensionner => query_extensions}/grammar/parser.py (100%) rename nexus/meta_api/{query_extensionner => query_extensions}/grammar/tree.py (100%) rename nexus/meta_api/{query_extensionner => query_extensions}/grammar/tree_transformer.py (98%) rename nexus/meta_api/{query_extensionner => query_extensions}/tests/BUILD.bazel (83%) rename nexus/{cognitron/installer => meta_api/query_extensions/tests}/__init__.py (100%) rename nexus/meta_api/{query_extensionner => query_extensions}/tests/test.py (100%) rename nexus/meta_api/{query_extensionner => query_extensions}/tests/test_grammar.py (96%) rename nexus/meta_api/{query_extensionner => query_extensions}/tests/test_query_extensionner.py (95%) delete mode 100644 nexus/meta_api/services/base.py create mode 100644 nexus/pylon/sources/specific/nature.py create mode 100644 nexus/pylon/sources/specific/pnas.py rename nexus/cognitron/installer/scripts/__init__.py => rules/go/BUILD.bazel (100%) create mode 100644 rules/go/install.bzl create mode 100644 rules/go/setup.bzl create mode 100644 rules/python/requirements-lock.txt create mode 100644 rules/rust/Cargo.lock delete mode 100644 rules/rust/remote/BUILD.actix-0.10.0.bazel delete mode 100644 rules/rust/remote/BUILD.actix-codec-0.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.actix-codec-0.3.0.bazel delete mode 100644 rules/rust/remote/BUILD.actix-connect-2.0.0.bazel delete mode 100644 rules/rust/remote/BUILD.actix-cors-0.5.4.bazel delete mode 100644 rules/rust/remote/BUILD.actix-http-2.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.actix-router-0.2.7.bazel delete mode 100644 rules/rust/remote/BUILD.actix-server-1.0.4.bazel delete mode 100644 rules/rust/remote/BUILD.actix-service-1.0.6.bazel delete mode 100644 rules/rust/remote/BUILD.actix-testing-1.0.1.bazel delete mode 100644 rules/rust/remote/BUILD.actix-utils-1.0.6.bazel delete mode 100644 rules/rust/remote/BUILD.actix-utils-2.0.0.bazel delete mode 100644 rules/rust/remote/BUILD.actix-web-3.3.2.bazel delete mode 100644 rules/rust/remote/BUILD.actix_derive-0.5.0.bazel delete mode 100644 rules/rust/remote/BUILD.addr2line-0.14.1.bazel delete mode 100644 rules/rust/remote/BUILD.adler-1.0.2.bazel rename rules/rust/remote/{BUILD.httpbis-0.9.1.bazel => BUILD.ahash-0.7.6.bazel} (52%) rename rules/rust/remote/{BUILD.aho-corasick-0.7.15.bazel => BUILD.aho-corasick-0.7.18.bazel} (84%) rename rules/rust/remote/{BUILD.alloc-no-stdlib-2.0.1.bazel => BUILD.alloc-no-stdlib-2.0.3.bazel} (89%) rename rules/rust/remote/{BUILD.ansi_term-0.11.0.bazel => BUILD.ansi_term-0.12.1.bazel} (75%) rename rules/rust/remote/{BUILD.num-bigint-0.3.2.bazel => BUILD.anyhow-1.0.56.bazel} (58%) delete mode 100644 rules/rust/remote/BUILD.arc-swap-0.4.8.bazel delete mode 100644 rules/rust/remote/BUILD.arc-swap-1.2.0.bazel rename rules/rust/remote/{BUILD.actix-threadpool-0.3.3.bazel => BUILD.async-stream-0.3.3.bazel} (63%) rename rules/rust/remote/{BUILD.typemap-0.3.3.bazel => BUILD.async-stream-impl-0.3.3.bazel} (75%) rename rules/rust/remote/{BUILD.async-trait-0.1.50.bazel => BUILD.async-trait-0.1.52.bazel} (85%) delete mode 100644 rules/rust/remote/BUILD.atomicwrites-0.2.5.bazel rename rules/rust/remote/{BUILD.autocfg-1.0.1.bazel => BUILD.autocfg-1.1.0.bazel} (91%) delete mode 100644 rules/rust/remote/BUILD.awc-2.0.3.bazel delete mode 100644 rules/rust/remote/BUILD.backtrace-0.3.56.bazel delete mode 100644 rules/rust/remote/BUILD.base-x-0.2.8.bazel delete mode 100644 rules/rust/remote/BUILD.base64-0.12.3.bazel delete mode 100644 rules/rust/remote/BUILD.base64-0.9.3.bazel delete mode 100644 rules/rust/remote/BUILD.bb8-postgres-0.4.0.bazel delete mode 100644 rules/rust/remote/BUILD.bincode-1.3.3.bazel rename rules/rust/remote/{BUILD.term-0.7.0.bazel => BUILD.bitflags-1.3.2.bazel} (79%) rename rules/rust/remote/{BUILD.bitpacking-0.8.2.bazel => BUILD.bitpacking-0.8.4.bazel} (90%) rename rules/rust/remote/{BUILD.bit-vec-0.6.3.bazel => BUILD.block-buffer-0.7.3.bazel} (72%) rename rules/rust/remote/{BUILD.copyless-0.1.5.bazel => BUILD.block-padding-0.1.5.bazel} (82%) rename rules/rust/remote/{BUILD.brotli-3.3.0.bazel => BUILD.brotli-3.3.3.bazel} (79%) rename rules/rust/remote/{BUILD.brotli-decompressor-2.3.1.bazel => BUILD.brotli-decompressor-2.3.2.bazel} (85%) delete mode 100644 rules/rust/remote/BUILD.bstr-0.2.15.bazel delete mode 100644 rules/rust/remote/BUILD.bumpalo-3.6.1.bazel rename rules/rust/remote/{BUILD.fallible-iterator-0.2.0.bazel => BUILD.bumpalo-3.9.1.bazel} (79%) rename rules/rust/remote/{BUILD.rand_core-0.4.2.bazel => BUILD.byte-tools-0.3.1.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.bytes-1.0.1.bazel rename rules/rust/remote/{BUILD.bytes-0.5.6.bazel => BUILD.bytes-1.1.0.bazel} (94%) delete mode 100644 rules/rust/remote/BUILD.bytestring-1.0.0.bazel rename rules/rust/remote/{BUILD.cc-1.0.67.bazel => BUILD.cc-1.0.73.bazel} (91%) delete mode 100644 rules/rust/remote/BUILD.cfg-if-0.1.10.bazel delete mode 100644 rules/rust/remote/BUILD.clap-2.33.3.bazel create mode 100644 rules/rust/remote/BUILD.clap-3.1.6.bazel delete mode 100644 rules/rust/remote/BUILD.cloudabi-0.0.3.bazel rename rules/rust/remote/{BUILD.combine-4.5.2.bazel => BUILD.combine-4.6.3.bazel} (91%) delete mode 100644 rules/rust/remote/BUILD.config-0.10.1.bazel rename rules/rust/remote/{BUILD.config-0.11.0.bazel => BUILD.config-0.12.0.bazel} (57%) rename rules/rust/remote/{BUILD.crc32fast-1.2.1.bazel => BUILD.crc32fast-1.3.2.bazel} (92%) delete mode 100644 rules/rust/remote/BUILD.criterion-0.3.4.bazel delete mode 100644 rules/rust/remote/BUILD.criterion-plot-0.4.3.bazel rename rules/rust/remote/{BUILD.crossbeam-0.7.3.bazel => BUILD.crossbeam-0.8.1.bazel} (67%) delete mode 100644 rules/rust/remote/BUILD.crossbeam-channel-0.4.4.bazel rename rules/rust/remote/{BUILD.crossbeam-channel-0.5.1.bazel => BUILD.crossbeam-channel-0.5.4.bazel} (92%) delete mode 100644 rules/rust/remote/BUILD.crossbeam-deque-0.7.3.bazel rename rules/rust/remote/{BUILD.crossbeam-deque-0.8.0.bazel => BUILD.crossbeam-deque-0.8.1.bazel} (84%) delete mode 100644 rules/rust/remote/BUILD.crossbeam-epoch-0.9.3.bazel rename rules/rust/remote/{BUILD.crossbeam-epoch-0.8.2.bazel => BUILD.crossbeam-epoch-0.9.8.bazel} (79%) delete mode 100644 rules/rust/remote/BUILD.crossbeam-queue-0.2.3.bazel rename rules/rust/remote/{BUILD.serde_json-1.0.64.bazel => BUILD.crossbeam-queue-0.3.5.bazel} (74%) delete mode 100644 rules/rust/remote/BUILD.crossbeam-utils-0.7.2.bazel rename rules/rust/remote/{BUILD.crossbeam-utils-0.8.3.bazel => BUILD.crossbeam-utils-0.8.8.bazel} (93%) delete mode 100644 rules/rust/remote/BUILD.crypto-mac-0.9.1.bazel delete mode 100644 rules/rust/remote/BUILD.csv-1.1.6.bazel rename rules/rust/remote/{BUILD.md5-0.7.0.bazel => BUILD.ctor-0.1.22.bazel} (74%) rename rules/rust/remote/{BUILD.phf_shared-0.8.0.bazel => BUILD.dashmap-4.0.2.bazel} (80%) delete mode 100644 rules/rust/remote/BUILD.deadpool-0.5.2.bazel delete mode 100644 rules/rust/remote/BUILD.deadpool-postgres-0.5.6.bazel delete mode 100644 rules/rust/remote/BUILD.derive_more-0.99.13.bazel rename rules/rust/remote/{BUILD.humantime-1.3.0.bazel => BUILD.diff-0.1.12.bazel} (75%) rename rules/rust/remote/{BUILD.bit-set-0.5.2.bazel => BUILD.digest-0.8.1.bazel} (83%) delete mode 100644 rules/rust/remote/BUILD.dirs-next-2.0.0.bazel delete mode 100644 rules/rust/remote/BUILD.dirs-sys-next-0.1.2.bazel delete mode 100644 rules/rust/remote/BUILD.discard-1.0.4.bazel rename rules/rust/remote/{BUILD.convert_case-0.4.0.bazel => BUILD.dlv-list-0.2.3.bazel} (84%) delete mode 100644 rules/rust/remote/BUILD.dotenv-0.15.0.bazel delete mode 100644 rules/rust/remote/BUILD.encoding_rs-0.8.28.bazel delete mode 100644 rules/rust/remote/BUILD.enum-as-inner-0.3.3.bazel delete mode 100644 rules/rust/remote/BUILD.env_logger-0.8.3.bazel rename rules/rust/remote/{BUILD.fail-0.4.0.bazel => BUILD.fail-0.5.0.bazel} (88%) delete mode 100644 rules/rust/remote/BUILD.failure-0.1.8.bazel delete mode 100644 rules/rust/remote/BUILD.failure_derive-0.1.8.bazel rename rules/rust/remote/{BUILD.log-mdc-0.1.0.bazel => BUILD.fake-simd-0.1.2.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.fancy-regex-0.3.5.bazel rename rules/rust/remote/{BUILD.fastdivide-0.3.0.bazel => BUILD.fastdivide-0.4.0.bazel} (88%) rename rules/rust/remote/{BUILD.grpc-compiler-0.8.3.bazel => BUILD.fastfield_codecs-0.1.0.bazel} (60%) create mode 100644 rules/rust/remote/BUILD.fastrand-1.7.0.bazel rename rules/rust/remote/{BUILD.quick-error-1.2.3.bazel => BUILD.fixedbitset-0.4.1.bazel} (82%) delete mode 100644 rules/rust/remote/BUILD.flate2-1.0.20.bazel delete mode 100644 rules/rust/remote/BUILD.form_urlencoded-1.0.1.bazel delete mode 100644 rules/rust/remote/BUILD.fst-0.3.5.bazel delete mode 100644 rules/rust/remote/BUILD.fst-0.4.5.bazel delete mode 100644 rules/rust/remote/BUILD.fuchsia-cprng-0.1.1.bazel delete mode 100644 rules/rust/remote/BUILD.fuchsia-zircon-0.3.3.bazel delete mode 100644 rules/rust/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel rename rules/rust/remote/{BUILD.futures-0.3.14.bazel => BUILD.futures-0.3.21.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.futures-channel-0.3.14.bazel rename rules/rust/remote/{BUILD.lexical-core-0.7.5.bazel => BUILD.futures-channel-0.3.21.bazel} (66%) delete mode 100644 rules/rust/remote/BUILD.futures-core-0.3.14.bazel rename rules/rust/remote/{BUILD.cast-0.2.5.bazel => BUILD.futures-core-0.3.21.bazel} (84%) rename rules/rust/remote/{BUILD.futures-executor-0.3.14.bazel => BUILD.futures-executor-0.3.21.bazel} (76%) rename rules/rust/remote/{BUILD.futures-io-0.3.14.bazel => BUILD.futures-io-0.3.21.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.futures-macro-0.3.14.bazel rename rules/rust/remote/{BUILD.block-buffer-0.9.0.bazel => BUILD.futures-macro-0.3.21.bazel} (75%) rename rules/rust/remote/{BUILD.futures-sink-0.3.14.bazel => BUILD.futures-sink-0.3.21.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.futures-task-0.3.14.bazel rename rules/rust/remote/{BUILD.standback-0.2.17.bazel => BUILD.futures-task-0.3.21.bazel} (84%) delete mode 100644 rules/rust/remote/BUILD.futures-util-0.3.14.bazel rename rules/rust/remote/{BUILD.time-0.2.26.bazel => BUILD.futures-util-0.3.21.bazel} (52%) delete mode 100644 rules/rust/remote/BUILD.fxhash-0.2.1.bazel rename rules/rust/remote/{BUILD.subtle-2.4.0.bazel => BUILD.generic-array-0.12.4.bazel} (64%) delete mode 100644 rules/rust/remote/BUILD.generic-array-0.14.4.bazel rename rules/rust/remote/{BUILD.filetime-0.2.14.bazel => BUILD.getrandom-0.2.5.bazel} (74%) delete mode 100644 rules/rust/remote/BUILD.grpc-0.8.3.bazel rename rules/rust/remote/{BUILD.h2-0.2.7.bazel => BUILD.h2-0.3.12.bazel} (65%) delete mode 100644 rules/rust/remote/BUILD.half-1.7.1.bazel rename rules/rust/remote/{BUILD.gimli-0.23.0.bazel => BUILD.hashbrown-0.11.2.bazel} (66%) rename rules/rust/remote/{BUILD.heck-0.3.2.bazel => BUILD.heck-0.3.3.bazel} (84%) rename rules/rust/remote/{BUILD.hermit-abi-0.1.18.bazel => BUILD.hermit-abi-0.1.19.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.hmac-0.10.1.bazel delete mode 100644 rules/rust/remote/BUILD.hostname-0.3.1.bazel rename rules/rust/remote/{BUILD.http-0.2.4.bazel => BUILD.http-0.2.6.bazel} (88%) rename rules/rust/remote/{BUILD.bb8-0.4.2.bazel => BUILD.http-body-0.4.4.bazel} (73%) rename rules/rust/remote/{BUILD.plotters-svg-0.3.0.bazel => BUILD.http-range-header-0.3.0.bazel} (83%) rename rules/rust/remote/{BUILD.httparse-1.4.0.bazel => BUILD.httparse-1.6.0.bazel} (92%) rename rules/rust/remote/{BUILD.mio-named-pipes-0.1.7.bazel => BUILD.httpdate-1.0.2.bazel} (82%) create mode 100644 rules/rust/remote/BUILD.hyper-0.14.17.bazel rename rules/rust/remote/{BUILD.actix-web-codegen-0.4.0.bazel => BUILD.hyper-timeout-0.4.1.bazel} (69%) delete mode 100644 rules/rust/remote/BUILD.idna-0.2.3.bazel rename rules/rust/remote/{BUILD.indexmap-1.6.2.bazel => BUILD.indexmap-1.8.0.bazel} (88%) rename rules/rust/remote/{BUILD.instant-0.1.9.bazel => BUILD.instant-0.1.12.bazel} (90%) rename rules/rust/remote/{BUILD.itertools-0.10.0.bazel => BUILD.itertools-0.10.3.bazel} (92%) delete mode 100644 rules/rust/remote/BUILD.itertools-0.9.0.bazel rename rules/rust/remote/{BUILD.itoa-0.4.7.bazel => BUILD.itoa-1.0.1.bazel} (88%) rename rules/rust/remote/{BUILD.js-sys-0.3.50.bazel => BUILD.js-sys-0.3.56.bazel} (86%) rename rules/rust/remote/{BUILD.serde_cbor-0.11.1.bazel => BUILD.json5-0.4.1.bazel} (56%) delete mode 100644 rules/rust/remote/BUILD.kernel32-sys-0.2.2.bazel rename rules/rust/remote/{BUILD.oorandom-11.1.3.bazel => BUILD.levenshtein_automata-0.2.1.bazel} (85%) rename rules/rust/remote/{BUILD.libc-0.2.93.bazel => BUILD.libc-0.2.121.bazel} (83%) rename rules/rust/remote/{BUILD.bitflags-1.2.1.bazel => BUILD.libz-sys-1.1.5.bazel} (77%) rename rules/rust/remote/{BUILD.lock_api-0.4.3.bazel => BUILD.lock_api-0.4.6.bazel} (90%) delete mode 100644 rules/rust/remote/BUILD.log4rs-0.10.0.bazel rename rules/rust/remote/{BUILD.lru-0.6.5.bazel => BUILD.lru-0.7.3.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.lru-cache-0.1.2.bazel delete mode 100644 rules/rust/remote/BUILD.lz4-sys-1.9.2.bazel create mode 100644 rules/rust/remote/BUILD.lz4_flex-0.9.2.bazel delete mode 100644 rules/rust/remote/BUILD.match_cfg-0.1.0.bazel rename rules/rust/remote/{BUILD.phf-0.8.0.bazel => BUILD.matchers-0.1.0.bazel} (82%) delete mode 100644 rules/rust/remote/BUILD.matches-0.1.8.bazel delete mode 100644 rules/rust/remote/BUILD.maybe-uninit-2.0.0.bazel rename rules/rust/remote/{BUILD.log-ndc-0.2.0.bazel => BUILD.measure_time-0.8.0.bazel} (79%) rename rules/rust/remote/{BUILD.memchr-2.3.4.bazel => BUILD.memchr-2.4.1.bazel} (89%) rename rules/rust/remote/{BUILD.memmap-0.7.0.bazel => BUILD.memmap2-0.5.3.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.memoffset-0.6.3.bazel rename rules/rust/remote/{BUILD.memoffset-0.5.6.bazel => BUILD.memoffset-0.6.5.bazel} (89%) rename rules/rust/remote/{BUILD.actix-rt-1.1.1.bazel => BUILD.minimal-lexical-0.2.1.bazel} (54%) delete mode 100644 rules/rust/remote/BUILD.miniz_oxide-0.4.4.bazel delete mode 100644 rules/rust/remote/BUILD.mio-0.6.23.bazel rename rules/rust/remote/{BUILD.mio-0.7.11.bazel => BUILD.mio-0.8.2.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.mio-uds-0.6.8.bazel delete mode 100644 rules/rust/remote/BUILD.miow-0.2.2.bazel rename rules/rust/remote/{BUILD.semver-parser-0.7.0.bazel => BUILD.multimap-0.8.3.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.net2-0.2.37.bazel delete mode 100644 rules/rust/remote/BUILD.nix-0.14.1.bazel rename rules/rust/remote/{BUILD.nom-5.1.2.bazel => BUILD.nom-7.1.1.bazel} (55%) rename rules/rust/remote/{BUILD.ntapi-0.3.6.bazel => BUILD.ntapi-0.3.7.bazel} (92%) delete mode 100644 rules/rust/remote/BUILD.num-traits-0.1.43.bazel delete mode 100644 rules/rust/remote/BUILD.num_cpus-1.13.0.bazel rename rules/rust/remote/{BUILD.iovec-0.1.4.bazel => BUILD.num_cpus-1.13.1.bazel} (81%) rename rules/rust/remote/{BUILD.signal-hook-0.2.3.bazel => BUILD.num_enum-0.5.7.bazel} (55%) create mode 100644 rules/rust/remote/BUILD.num_enum_derive-0.5.7.bazel rename rules/rust/remote/{BUILD.thread-id-3.3.0.bazel => BUILD.num_threads-0.1.5.bazel} (80%) delete mode 100644 rules/rust/remote/BUILD.object-0.23.0.bazel rename rules/rust/remote/{BUILD.once_cell-1.7.2.bazel => BUILD.once_cell-1.10.0.bazel} (93%) rename rules/rust/remote/{BUILD.rustc_version-0.2.3.bazel => BUILD.opaque-debug-0.2.3.bazel} (88%) delete mode 100644 rules/rust/remote/BUILD.opaque-debug-0.3.0.bazel create mode 100644 rules/rust/remote/BUILD.opentelemetry-0.17.0.bazel rename rules/rust/remote/{BUILD.crypto-mac-0.10.0.bazel => BUILD.opentelemetry-prometheus-0.10.0.bazel} (67%) delete mode 100644 rules/rust/remote/BUILD.ordered-float-1.1.1.bazel create mode 100644 rules/rust/remote/BUILD.ordered-multimap-0.3.1.bazel rename rules/rust/remote/{BUILD.erased-serde-0.3.13.bazel => BUILD.os_str_bytes-6.0.0.bazel} (80%) create mode 100644 rules/rust/remote/BUILD.output_vt100-0.1.3.bazel rename rules/rust/remote/{BUILD.owned-read-0.4.1.bazel => BUILD.ownedbytes-0.2.0.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.owning_ref-0.4.1.bazel rename rules/rust/remote/{BUILD.pin-project-lite-0.1.12.bazel => BUILD.parking_lot-0.11.2.bazel} (71%) rename rules/rust/remote/{BUILD.parking_lot-0.11.1.bazel => BUILD.parking_lot-0.12.0.bazel} (80%) delete mode 100644 rules/rust/remote/BUILD.parking_lot_core-0.8.3.bazel rename rules/rust/remote/{BUILD.getrandom-0.2.2.bazel => BUILD.parking_lot_core-0.8.5.bazel} (77%) rename rules/rust/remote/{BUILD.getrandom-0.1.16.bazel => BUILD.parking_lot_core-0.9.1.bazel} (81%) rename rules/rust/remote/{BUILD.cpuid-bool-0.1.2.bazel => BUILD.pathdiff-0.2.1.bazel} (87%) rename rules/rust/remote/{BUILD.mime-0.3.16.bazel => BUILD.pest-2.1.3.bazel} (73%) rename rules/rust/remote/{BUILD.humantime-2.1.0.bazel => BUILD.pest_derive-2.1.0.bazel} (65%) create mode 100644 rules/rust/remote/BUILD.pest_generator-2.1.3.bazel rename rules/rust/remote/{BUILD.antidote-1.0.0.bazel => BUILD.pest_meta-2.1.3.bazel} (81%) create mode 100644 rules/rust/remote/BUILD.petgraph-0.6.0.bazel delete mode 100644 rules/rust/remote/BUILD.pin-project-0.4.28.bazel rename rules/rust/remote/{BUILD.pin-project-1.0.7.bazel => BUILD.pin-project-1.0.10.bazel} (92%) delete mode 100644 rules/rust/remote/BUILD.pin-project-internal-0.4.28.bazel create mode 100644 rules/rust/remote/BUILD.pin-project-internal-1.0.10.bazel rename rules/rust/remote/{BUILD.pin-project-lite-0.2.6.bazel => BUILD.pin-project-lite-0.2.8.bazel} (91%) rename rules/rust/remote/{BUILD.dtoa-0.4.8.bazel => BUILD.pkg-config-0.3.24.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.plotters-0.3.0.bazel delete mode 100644 rules/rust/remote/BUILD.postgres-0.17.5.bazel delete mode 100644 rules/rust/remote/BUILD.postgres-derive-0.4.0.bazel delete mode 100644 rules/rust/remote/BUILD.postgres-protocol-0.5.3.bazel delete mode 100644 rules/rust/remote/BUILD.postgres-protocol-0.6.1.bazel delete mode 100644 rules/rust/remote/BUILD.postgres-types-0.1.3.bazel delete mode 100644 rules/rust/remote/BUILD.postgres-types-0.2.1.bazel rename rules/rust/remote/{BUILD.ppv-lite86-0.2.10.bazel => BUILD.ppv-lite86-0.2.16.bazel} (89%) rename rules/rust/remote/{BUILD.arrayvec-0.5.2.bazel => BUILD.pretty_assertions-1.2.0.bazel} (68%) rename rules/rust/remote/{BUILD.pin-project-internal-1.0.7.bazel => BUILD.proc-macro-crate-1.1.3.bazel} (78%) delete mode 100644 rules/rust/remote/BUILD.proc-macro-nested-0.1.7.bazel rename rules/rust/remote/{BUILD.proc-macro2-1.0.26.bazel => BUILD.proc-macro2-1.0.36.bazel} (89%) create mode 100644 rules/rust/remote/BUILD.prometheus-0.13.0.bazel delete mode 100644 rules/rust/remote/BUILD.proptest-0.10.1.bazel create mode 100644 rules/rust/remote/BUILD.prost-0.9.0.bazel rename rules/rust/remote/{BUILD.cookie-0.14.4.bazel => BUILD.prost-build-0.9.0.bazel} (63%) rename rules/rust/remote/{BUILD.hmac-0.9.0.bazel => BUILD.prost-derive-0.9.0.bazel} (67%) rename rules/rust/remote/{BUILD.digest-0.9.0.bazel => BUILD.prost-types-0.9.0.bazel} (76%) rename rules/rust/remote/{BUILD.protobuf-2.18.2.bazel => BUILD.protobuf-2.27.1.bazel} (88%) delete mode 100644 rules/rust/remote/BUILD.protobuf-codegen-2.18.2.bazel rename rules/rust/remote/{BUILD.quote-1.0.9.bazel => BUILD.quote-1.0.16.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.r2d2-0.8.9.bazel delete mode 100644 rules/rust/remote/BUILD.r2d2_postgres-0.16.0.bazel delete mode 100644 rules/rust/remote/BUILD.rand-0.4.6.bazel delete mode 100644 rules/rust/remote/BUILD.rand-0.5.6.bazel delete mode 100644 rules/rust/remote/BUILD.rand-0.7.3.bazel rename rules/rust/remote/{BUILD.rand-0.8.3.bazel => BUILD.rand-0.8.5.bazel} (83%) delete mode 100644 rules/rust/remote/BUILD.rand_chacha-0.3.0.bazel rename rules/rust/remote/{BUILD.rand_chacha-0.2.2.bazel => BUILD.rand_chacha-0.3.1.bazel} (82%) delete mode 100644 rules/rust/remote/BUILD.rand_core-0.3.1.bazel delete mode 100644 rules/rust/remote/BUILD.rand_core-0.6.2.bazel rename rules/rust/remote/{BUILD.rand_core-0.5.1.bazel => BUILD.rand_core-0.6.3.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.rand_hc-0.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.rand_hc-0.3.0.bazel delete mode 100644 rules/rust/remote/BUILD.rand_xorshift-0.2.0.bazel rename rules/rust/remote/{BUILD.rayon-1.5.0.bazel => BUILD.rayon-1.5.1.bazel} (89%) rename rules/rust/remote/{BUILD.rayon-core-1.9.0.bazel => BUILD.rayon-core-1.9.1.bazel} (69%) create mode 100644 rules/rust/remote/BUILD.rdkafka-0.28.0.bazel create mode 100644 rules/rust/remote/BUILD.rdkafka-sys-4.2.0+1.8.2.bazel delete mode 100644 rules/rust/remote/BUILD.rdrand-0.4.0.bazel delete mode 100644 rules/rust/remote/BUILD.redox_syscall-0.1.57.bazel rename rules/rust/remote/{BUILD.redox_syscall-0.2.6.bazel => BUILD.redox_syscall-0.2.11.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.redox_users-0.4.0.bazel rename rules/rust/remote/{BUILD.regex-1.4.5.bazel => BUILD.regex-1.5.5.bazel} (89%) rename rules/rust/remote/{BUILD.regex-automata-0.1.9.bazel => BUILD.regex-automata-0.1.10.bazel} (81%) rename rules/rust/remote/{BUILD.regex-syntax-0.6.23.bazel => BUILD.regex-syntax-0.6.25.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.reopen-1.0.2.bazel delete mode 100644 rules/rust/remote/BUILD.resolv-conf-0.7.0.bazel create mode 100644 rules/rust/remote/BUILD.ron-0.7.0.bazel rename rules/rust/remote/{BUILD.rust-ini-0.13.0.bazel => BUILD.rust-ini-0.17.0.bazel} (81%) delete mode 100644 rules/rust/remote/BUILD.rustc-serialize-0.3.24.bazel delete mode 100644 rules/rust/remote/BUILD.rustversion-1.0.4.bazel delete mode 100644 rules/rust/remote/BUILD.rusty-fork-0.3.0.bazel rename rules/rust/remote/{BUILD.ryu-1.0.5.bazel => BUILD.ryu-1.0.9.bazel} (68%) delete mode 100644 rules/rust/remote/BUILD.safemem-0.3.3.bazel delete mode 100644 rules/rust/remote/BUILD.same-file-1.0.6.bazel delete mode 100644 rules/rust/remote/BUILD.scheduled-thread-pool-0.2.5.bazel delete mode 100644 rules/rust/remote/BUILD.semver-0.9.0.bazel delete mode 100644 rules/rust/remote/BUILD.serde-0.8.23.bazel rename rules/rust/remote/{BUILD.serde-1.0.125.bazel => BUILD.serde-1.0.136.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.serde-value-0.6.0.bazel rename rules/rust/remote/{BUILD.serde_derive-1.0.125.bazel => BUILD.serde_derive-1.0.136.bazel} (84%) create mode 100644 rules/rust/remote/BUILD.serde_json-1.0.79.bazel delete mode 100644 rules/rust/remote/BUILD.serde_qs-0.8.3.bazel delete mode 100644 rules/rust/remote/BUILD.serde_urlencoded-0.7.0.bazel rename rules/rust/remote/{BUILD.serde_yaml-0.8.17.bazel => BUILD.serde_yaml-0.8.23.bazel} (81%) rename rules/rust/remote/{BUILD.md-5-0.9.1.bazel => BUILD.sha-1-0.8.2.bazel} (70%) delete mode 100644 rules/rust/remote/BUILD.sha-1-0.9.4.bazel delete mode 100644 rules/rust/remote/BUILD.sha1-0.6.0.bazel delete mode 100644 rules/rust/remote/BUILD.sha2-0.9.3.bazel rename rules/rust/remote/{BUILD.csv-core-0.1.10.bazel => BUILD.sharded-slab-0.1.4.bazel} (79%) rename rules/rust/remote/{BUILD.signal-hook-0.3.8.bazel => BUILD.signal-hook-0.3.13.bazel} (88%) rename rules/rust/remote/{BUILD.signal-hook-registry-1.3.0.bazel => BUILD.signal-hook-registry-1.4.0.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.siphasher-0.3.5.bazel rename rules/rust/remote/{BUILD.slab-0.4.2.bazel => BUILD.slab-0.4.5.bazel} (81%) delete mode 100644 rules/rust/remote/BUILD.slog-2.7.0.bazel delete mode 100644 rules/rust/remote/BUILD.slog-async-2.6.0.bazel delete mode 100644 rules/rust/remote/BUILD.slog-json-2.3.0.bazel delete mode 100644 rules/rust/remote/BUILD.slog-scope-4.4.0.bazel delete mode 100644 rules/rust/remote/BUILD.slog-stdlog-4.1.0.bazel delete mode 100644 rules/rust/remote/BUILD.slog-term-2.8.0.bazel delete mode 100644 rules/rust/remote/BUILD.slog_derive-0.2.0.bazel rename rules/rust/remote/{BUILD.smallvec-1.6.1.bazel => BUILD.smallvec-1.8.0.bazel} (90%) delete mode 100644 rules/rust/remote/BUILD.snap-1.0.4.bazel rename rules/rust/remote/{BUILD.socket2-0.4.0.bazel => BUILD.socket2-0.4.4.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.stdweb-0.4.20.bazel delete mode 100644 rules/rust/remote/BUILD.stdweb-derive-0.5.3.bazel delete mode 100644 rules/rust/remote/BUILD.stdweb-internal-macros-0.2.9.bazel delete mode 100644 rules/rust/remote/BUILD.stdweb-internal-runtime-0.1.5.bazel delete mode 100644 rules/rust/remote/BUILD.stringprep-0.1.2.bazel rename rules/rust/remote/{BUILD.strsim-0.8.0.bazel => BUILD.strsim-0.10.0.bazel} (90%) delete mode 100644 rules/rust/remote/BUILD.strum_macros-0.20.1.bazel rename rules/rust/remote/{BUILD.syn-1.0.69.bazel => BUILD.syn-1.0.89.bazel} (91%) delete mode 100644 rules/rust/remote/BUILD.take_mut-0.2.2.bazel create mode 100644 rules/rust/remote/BUILD.tantivy-0.17.0.bazel rename rules/rust/remote/{BUILD.levenshtein_automata-0.1.1.bazel => BUILD.tantivy-bitpacker-0.1.1.bazel} (81%) create mode 100644 rules/rust/remote/BUILD.tantivy-common-0.1.0.bazel create mode 100644 rules/rust/remote/BUILD.tantivy-common-0.2.0.bazel create mode 100644 rules/rust/remote/BUILD.tantivy-query-grammar-0.15.0.bazel delete mode 100644 rules/rust/remote/BUILD.tar-0.4.33.bazel delete mode 100644 rules/rust/remote/BUILD.tempdir-0.3.7.bazel rename rules/rust/remote/{BUILD.tempfile-3.2.0.bazel => BUILD.tempfile-3.3.0.bazel} (86%) rename rules/rust/remote/{BUILD.termcolor-1.1.2.bazel => BUILD.termcolor-1.1.3.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.textwrap-0.11.0.bazel rename rules/rust/remote/{BUILD.textwrap-0.13.4.bazel => BUILD.textwrap-0.15.0.bazel} (72%) rename rules/rust/remote/{BUILD.thiserror-1.0.24.bazel => BUILD.thiserror-1.0.30.bazel} (87%) rename rules/rust/remote/{BUILD.thiserror-impl-1.0.24.bazel => BUILD.thiserror-impl-1.0.30.bazel} (78%) rename rules/rust/remote/{BUILD.thread_local-1.1.3.bazel => BUILD.thread_local-1.1.4.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.threadpool-1.8.1.bazel rename rules/rust/remote/{BUILD.time-0.1.43.bazel => BUILD.time-0.1.44.bazel} (86%) rename rules/rust/remote/{BUILD.socket2-0.3.19.bazel => BUILD.time-0.3.7.bazel} (73%) delete mode 100644 rules/rust/remote/BUILD.time-macros-0.1.1.bazel delete mode 100644 rules/rust/remote/BUILD.time-macros-impl-0.1.1.bazel delete mode 100644 rules/rust/remote/BUILD.tinytemplate-1.2.1.bazel delete mode 100644 rules/rust/remote/BUILD.tinyvec-1.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.tinyvec_macros-0.1.0.bazel delete mode 100644 rules/rust/remote/BUILD.tls-api-0.4.0.bazel delete mode 100644 rules/rust/remote/BUILD.tls-api-stub-0.4.0.bazel delete mode 100644 rules/rust/remote/BUILD.tokio-0.2.25.bazel rename rules/rust/remote/{BUILD.tokio-1.5.0.bazel => BUILD.tokio-1.17.0.bazel} (79%) rename rules/rust/remote/{BUILD.actix-macros-0.1.3.bazel => BUILD.tokio-io-timeout-1.2.0.bazel} (78%) rename rules/rust/remote/{BUILD.tokio-macros-0.2.6.bazel => BUILD.tokio-macros-1.7.0.bazel} (77%) delete mode 100644 rules/rust/remote/BUILD.tokio-pg-mapper-0.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.tokio-pg-mapper-derive-0.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.tokio-postgres-0.5.5.bazel delete mode 100644 rules/rust/remote/BUILD.tokio-postgres-0.7.1.bazel create mode 100644 rules/rust/remote/BUILD.tokio-stream-0.1.8.bazel rename rules/rust/remote/{BUILD.tokio-util-0.6.6.bazel => BUILD.tokio-util-0.6.9.bazel} (77%) rename rules/rust/remote/{BUILD.tokio-util-0.3.1.bazel => BUILD.tokio-util-0.7.0.bazel} (54%) create mode 100644 rules/rust/remote/BUILD.tonic-0.6.2.bazel rename rules/rust/remote/{BUILD.integer-encoding-2.1.3.bazel => BUILD.tonic-build-0.6.2.bazel} (70%) create mode 100644 rules/rust/remote/BUILD.tower-0.4.12.bazel rename rules/rust/remote/{BUILD.synstructure-0.12.4.bazel => BUILD.tower-http-0.2.5.bazel} (55%) rename rules/rust/remote/{BUILD.plotters-backend-0.3.0.bazel => BUILD.tower-layer-0.3.1.bazel} (86%) rename rules/rust/remote/{BUILD.strum-0.20.0.bazel => BUILD.tower-service-0.3.1.bazel} (86%) rename rules/rust/remote/{BUILD.tracing-0.1.25.bazel => BUILD.tracing-0.1.32.bazel} (74%) rename rules/rust/remote/{BUILD.language-tags-0.2.2.bazel => BUILD.tracing-appender-0.2.2.bazel} (74%) rename rules/rust/remote/{BUILD.tokio-util-0.2.0.bazel => BUILD.tracing-attributes-0.1.20.bazel} (51%) rename rules/rust/remote/{BUILD.tracing-core-0.1.17.bazel => BUILD.tracing-core-0.1.23.bazel} (88%) rename rules/rust/remote/{BUILD.serde-hjson-0.9.1.bazel => BUILD.tracing-log-0.1.2.bazel} (69%) create mode 100644 rules/rust/remote/BUILD.tracing-serde-0.1.3.bazel create mode 100644 rules/rust/remote/BUILD.tracing-subscriber-0.3.9.bazel delete mode 100644 rules/rust/remote/BUILD.traitobject-0.1.0.bazel delete mode 100644 rules/rust/remote/BUILD.trust-dns-proto-0.19.7.bazel delete mode 100644 rules/rust/remote/BUILD.trust-dns-resolver-0.19.7.bazel rename rules/rust/remote/{BUILD.void-1.0.2.bazel => BUILD.try-lock-0.2.3.bazel} (87%) rename rules/rust/remote/{BUILD.lz4-1.23.2.bazel => BUILD.twox-hash-1.6.2.bazel} (72%) rename rules/rust/remote/{BUILD.typenum-1.13.0.bazel => BUILD.typenum-1.15.0.bazel} (89%) rename rules/rust/remote/{BUILD.unicode-normalization-0.1.17.bazel => BUILD.ucd-trie-0.1.3.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.unicode-bidi-0.3.5.bazel rename rules/rust/remote/{BUILD.const_fn-0.4.7.bazel => BUILD.unicode-linebreak-0.1.2.bazel} (79%) rename rules/rust/remote/{BUILD.unicode-segmentation-1.7.1.bazel => BUILD.unicode-segmentation-1.9.0.bazel} (78%) rename rules/rust/remote/{BUILD.unicode-width-0.1.8.bazel => BUILD.unicode-width-0.1.9.bazel} (89%) rename rules/rust/remote/{BUILD.unicode-xid-0.2.1.bazel => BUILD.unicode-xid-0.2.2.bazel} (86%) delete mode 100644 rules/rust/remote/BUILD.unix_socket-0.5.0.bazel delete mode 100644 rules/rust/remote/BUILD.unsafe-any-0.4.2.bazel delete mode 100644 rules/rust/remote/BUILD.url-2.2.1.bazel delete mode 100644 rules/rust/remote/BUILD.urlparse-0.7.3.bazel create mode 100644 rules/rust/remote/BUILD.valuable-0.1.0.bazel rename rules/rust/remote/{BUILD.rustc-demangle-0.1.18.bazel => BUILD.vcpkg-0.2.15.bazel} (87%) delete mode 100644 rules/rust/remote/BUILD.vec_map-0.8.2.bazel rename rules/rust/remote/{BUILD.version_check-0.9.3.bazel => BUILD.version_check-0.9.4.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.wait-timeout-0.2.0.bazel delete mode 100644 rules/rust/remote/BUILD.walkdir-2.3.2.bazel create mode 100644 rules/rust/remote/BUILD.want-0.3.0.bazel rename rules/rust/remote/{BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel => BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel} (88%) rename rules/rust/remote/{BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel => BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel} (88%) rename rules/rust/remote/{BUILD.wasm-bindgen-0.2.73.bazel => BUILD.wasm-bindgen-0.2.79.bazel} (91%) rename rules/rust/remote/{BUILD.wasm-bindgen-backend-0.2.73.bazel => BUILD.wasm-bindgen-backend-0.2.79.bazel} (74%) rename rules/rust/remote/{BUILD.wasm-bindgen-macro-0.2.73.bazel => BUILD.wasm-bindgen-macro-0.2.79.bazel} (80%) rename rules/rust/remote/{BUILD.wasm-bindgen-macro-support-0.2.73.bazel => BUILD.wasm-bindgen-macro-support-0.2.79.bazel} (71%) rename rules/rust/remote/{BUILD.wasm-bindgen-shared-0.2.73.bazel => BUILD.wasm-bindgen-shared-0.2.79.bazel} (89%) delete mode 100644 rules/rust/remote/BUILD.web-sys-0.3.50.bazel create mode 100644 rules/rust/remote/BUILD.which-4.2.5.bazel delete mode 100644 rules/rust/remote/BUILD.widestring-0.4.3.bazel delete mode 100644 rules/rust/remote/BUILD.winapi-0.2.8.bazel delete mode 100644 rules/rust/remote/BUILD.winapi-build-0.1.1.bazel rename rules/rust/remote/{BUILD.actix-tls-2.0.0.bazel => BUILD.windows-sys-0.32.0.bazel} (74%) rename rules/rust/remote/{BUILD.proc-macro-hack-0.5.19.bazel => BUILD.windows_aarch64_msvc-0.32.0.bazel} (83%) rename rules/rust/remote/{BUILD.ipconfig-0.2.2.bazel => BUILD.windows_i686_gnu-0.32.0.bazel} (84%) create mode 100644 rules/rust/remote/BUILD.windows_i686_msvc-0.32.0.bazel create mode 100644 rules/rust/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel create mode 100644 rules/rust/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel delete mode 100644 rules/rust/remote/BUILD.winreg-0.6.2.bazel delete mode 100644 rules/rust/remote/BUILD.ws2_32-sys-0.2.1.bazel delete mode 100644 rules/rust/remote/BUILD.xattr-0.2.2.bazel create mode 100644 rules/rust/rustfmt.toml diff --git a/WORKSPACE b/WORKSPACE index a2a0ca5..fc73047 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -17,34 +17,34 @@ http_archive( # ToDo: wait for https://github.com/bazelbuild/rules_docker/pull/1638 http_archive( name = "io_bazel_rules_docker", - sha256 = "5aa15ff7a83f8de8ff0346bd8274fb82eec52c947106a066dc190c2624ec1cb4", - strip_prefix = "rules_docker-aefbc69e5f758403d50f789eee55b30a3d947418", + sha256 = "c2a283bea1ea30a3ceb9e5388a4c8c8eef68a815ac86f1d381f9d35cdee57f1b", + strip_prefix = "rules_docker-46d29e34399a992087c857b13d8dcb8ec80dfd85", urls = [ - "https://github.com/the-superpirate/rules_docker/archive/aefbc69e5f758403d50f789eee55b30a3d947418.tar.gz", + "https://github.com/the-superpirate/rules_docker/archive/46d29e34399a992087c857b13d8dcb8ec80dfd85.tar.gz", ], ) http_archive( name = "build_bazel_rules_nodejs", - sha256 = "a160d9ac88f2aebda2aa995de3fa3171300c076f06ad1d7c2e1385728b8442fa", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.4.1/rules_nodejs-3.4.1.tar.gz"], + sha256 = "f7037c8e295fdc921f714962aee7c496110052511e2b14076bd8e2d46bc9819c", + urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.4.5/rules_nodejs-4.4.5.tar.gz"], ) http_archive( name = "io_bazel_rules_k8s", - sha256 = "c1c5a692ec994e99e9e7e77ae693086074d6dedfe72e6930efbcc66d30264032", - strip_prefix = "rules_k8s-f1c6399cdd691b7aca90073398e8f690ec8992c6", + sha256 = "a08850199d6900328ef899906717fb1dfcc6cde62701c63725748b2e6ca1d5d9", + strip_prefix = "rules_k8s-d05cbea5c56738ef02c667c10951294928a1d64a", urls = [ - "https://github.com/bazelbuild/rules_k8s/archive/f1c6399cdd691b7aca90073398e8f690ec8992c6.tar.gz", + "https://github.com/bazelbuild/rules_k8s/archive/d05cbea5c56738ef02c667c10951294928a1d64a.tar.gz", ], ) http_archive( name = "rules_rust", - sha256 = "d10dd5581f66ee169071ee06d52c52c8c7ca7467ac6266e301c0820d289b0f0b", - strip_prefix = "rules_rust-336e1934b07211fb8736c19749919ef94df4df68", + sha256 = "30c1b40d77a262e3f7dba6e4267fe4695b5eb1e68debc6aa06c3e09d429ae19a", + strip_prefix = "rules_rust-0.1.0", urls = [ - "https://github.com/bazelbuild/rules_rust/archive/336e1934b07211fb8736c19749919ef94df4df68.tar.gz", + "https://github.com/bazelbuild/rules_rust/archive/0.1.0.tar.gz", ], ) @@ -67,40 +67,17 @@ http_archive( ) http_archive( - name = "rules_proto", - sha256 = "aa1ee19226f707d44bee44c720915199c20c84a23318bb0597ed4e5c873ccbd5", - strip_prefix = "rules_proto-40298556293ae502c66579620a7ce867d5f57311", - urls = [ - "https://github.com/bazelbuild/rules_proto/archive/40298556293ae502c66579620a7ce867d5f57311.tar.gz", - ], + name = "rules_proto_grpc", + sha256 = "507e38c8d95c7efa4f3b1c0595a8e8f139c885cb41a76cab7e20e4e67ae87731", + strip_prefix = "rules_proto_grpc-4.1.1", + urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/archive/4.1.1.tar.gz"], ) http_archive( name = "rules_python", - sha256 = "b228318a786d99b665bc83bd6cdb81512cae5f8eb15e8cd19f9956604b8939f5", - strip_prefix = "rules_python-a4a1ccffc666db5376342789ad021a943fb84256", - urls = [ - "https://github.com/bazelbuild/rules_python/archive/a4a1ccffc666db5376342789ad021a943fb84256.tar.gz", - ], -) - -http_archive( - name = "subpar", - sha256 = "481233d60c547e0902d381cd4fb85b63168130379600f330821475ad234d9336", - strip_prefix = "subpar-9fae6b63cfeace2e0fb93c9c1ebdc28d3991b16f", - urls = [ - "https://github.com/google/subpar/archive/9fae6b63cfeace2e0fb93c9c1ebdc28d3991b16f.tar.gz", - ], -) - -http_archive( - name = "cython", - build_file = "@com_github_grpc_grpc//third_party:cython.BUILD", - sha256 = "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079", - strip_prefix = "cython-0.29.21", - urls = [ - "https://github.com/cython/cython/archive/0.29.21.tar.gz", - ], + sha256 = "15f84594af9da06750ceb878abbf129241421e3abbd6e36893041188db67f2fb", + strip_prefix = "rules_python-0.7.0", + urls = ["https://github.com/bazelbuild/rules_python/archive/0.7.0.tar.gz"], ) # Images Install @@ -109,37 +86,38 @@ load("//images:install.bzl", "images_install") images_install() +# Go + +load("//rules/go:setup.bzl", "go_setup") + +go_setup() + +load("//rules/go:install.bzl", "go_install") + +go_install() + # Python register_toolchains("//rules/python:py_toolchain") -load("@rules_python//python:pip.bzl", "pip_install") +load("@rules_python//python:pip.bzl", "pip_parse") -pip_install( +pip_parse( name = "pip_modules", - requirements = "//rules/python:requirements.txt", + requirements_lock = "//rules/python:requirements-lock.txt", ) +load("@pip_modules//:requirements.bzl", "install_deps") + +install_deps() + # Proto / gRPC -http_archive( - name = "rules_proto_grpc", - sha256 = "7954abbb6898830cd10ac9714fbcacf092299fda00ed2baf781172f545120419", - strip_prefix = "rules_proto_grpc-3.1.1", - urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/archive/3.1.1.tar.gz"], -) - load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains") rules_proto_grpc_toolchains() rules_proto_grpc_repos() -load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") - -rules_proto_dependencies() - -rules_proto_toolchains() - load("@rules_proto_grpc//js:repositories.bzl", "js_repos") js_repos() @@ -160,28 +138,11 @@ maven_fetch_remote_artifacts() # Rust -load("@rules_rust//rust:repositories.bzl", "rust_repository_set") +load("@rules_rust//rust:repositories.bzl", "rust_repositories") -rust_version = "1.51.0" - -rustfmt_version = "1.4.20" - -rust_repository_set( - name = "rust_linux_x86_64", - edition = "2018", - exec_triple = "x86_64-unknown-linux-gnu", - extra_target_triples = ["wasm32-unknown-unknown"], - rustfmt_version = rustfmt_version, - version = rust_version, -) - -rust_repository_set( - name = "rust_darwin_x86_64", - edition = "2018", - exec_triple = "x86_64-apple-darwin", - extra_target_triples = ["wasm32-unknown-unknown"], - rustfmt_version = rustfmt_version, - version = rust_version, +rust_repositories( + edition = "2021", + version = "1.59.0", ) load("//rules/rust:crates.bzl", "raze_fetch_remote_crates") @@ -192,17 +153,8 @@ raze_fetch_remote_crates() load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") node_repositories( - node_repositories = { - "15.5.1-darwin_amd64": ("node-v15.5.1-darwin-x64.tar.gz", "node-v15.5.1-darwin-x64", "4507dab0481b0b5374b5758b1eba7d105c8cbcb173548119b04d9ef7d9f1d40f"), - "15.5.1-linux_amd64": ("node-v15.5.1-linux-x64.tar.xz", "node-v15.5.1-linux-x64", "dbc41a611d99aedf2cfd3d0acc50759a6b9084c7447862e990f51958d4a7aa41"), - "15.5.1-windows_amd64": ("node-v15.5.1-win-x64.zip", "node-v15.5.1-win-x64", "e1f826f9647fc7058b48c669991956a427fe4b6ccefa415a18b41715483f958d"), - "15.5.1-linux_s390x": ("node-v15.5.1-linux-s390x.tar.gz", "node-v15.5.1-linux-s390x", "e05f949ea11e2aafc08a7972c0f41a11a3628762e857d44965e0605d3bcd143f"), - "15.5.1-linux_arm64": ("node-v15.5.1-linux-arm64.tar.gz", "node-v15.5.1-linux-arm64", "a2d14db86c6f8a070f227940ea44a3409966f6bed14df0ec6f676fe2e2f601c9"), - }, - node_version = "15.5.1", package_json = ["//rules/nodejs:package.json"], preserve_symlinks = True, - yarn_version = "1.22.4", ) yarn_install( @@ -227,17 +179,6 @@ container_repositories() load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps") -# ToDo: temorary fix as registry was broken at 24.04.2021 -load("@bazel_gazelle//:deps.bzl", "go_repository") - -go_repository( - name = "com_github_google_go_containerregistry", - importpath = "github.com/google/go-containerregistry", - strip_prefix = "google-go-containerregistry-8a28419", - type = "tar.gz", - urls = ["https://api.github.com/repos/google/go-containerregistry/tarball/8a2841911ffee4f6892ca0083e89752fb46c48dd"], # v0.1.4 -) - container_deps() load("@io_bazel_rules_docker//repositories:py_repositories.bzl", "py_deps") @@ -259,7 +200,7 @@ rust_image_repos() # K8s -load("@io_bazel_rules_k8s//k8s:k8s.bzl", "k8s_repositories") +load("@io_bazel_rules_k8s//k8s:k8s.bzl", "k8s_defaults", "k8s_repositories") k8s_repositories() @@ -267,6 +208,11 @@ load("@io_bazel_rules_k8s//k8s:k8s_go_deps.bzl", k8s_go_deps = "deps") k8s_go_deps() +k8s_defaults( + name = "k8s_deploy", + image_chroot = "registry.infra.svc.cluster.local", +) + # Miscellaneous load("//rules/misc:setup.bzl", "rules_misc_setup_internal") diff --git a/idm/api/BUILD.bazel b/idm/api/BUILD.bazel index 1b52bcb..ca755b8 100644 --- a/idm/api/BUILD.bazel +++ b/idm/api/BUILD.bazel @@ -15,7 +15,6 @@ py3_image( "*.py", "configs/**/*.py", "daemons/**/*.py", - "models/**", "proto/**", "services/**", ], @@ -36,8 +35,8 @@ py3_image( requirement("grpcio"), requirement("pypika"), requirement("uvloop"), - "//idm/api/proto:idm_grpc_py", - "//idm/api/proto:idm_proto_py", + "//idm/api/proto:grpc_py", + "//idm/api/proto:proto_py", "//library/aiogrpctools", requirement("aiokit"), "//library/aiopostgres", @@ -54,7 +53,7 @@ container_push( name = "push-testing", format = "Docker", image = ":image", - registry = "registry.example.com", + registry = "registry.infra.svc.cluster.local", repository = "idm-api", tag = "testing", ) @@ -63,7 +62,7 @@ container_push( name = "push-latest", format = "Docker", image = ":image", - registry = "registry.example.com", + registry = "registry.infra.svc.cluster.local", repository = "idm-api", tag = "latest", ) diff --git a/idm/api/aioclient/BUILD.bazel b/idm/api/aioclient/BUILD.bazel index 49ae8ee..74248ed 100644 --- a/idm/api/aioclient/BUILD.bazel +++ b/idm/api/aioclient/BUILD.bazel @@ -7,8 +7,8 @@ py_library( visibility = ["//visibility:public"], deps = [ requirement("tenacity"), - "//idm/api/proto:idm_grpc_py", - "//idm/api/proto:idm_proto_py", + "//idm/api/proto:grpc_py", + "//idm/api/proto:proto_py", requirement("aiogrpcclient"), ], ) diff --git a/idm/api/aioclient/aioclient.py b/idm/api/aioclient/aioclient.py index 19ce5f8..9005730 100644 --- a/idm/api/aioclient/aioclient.py +++ b/idm/api/aioclient/aioclient.py @@ -1,8 +1,6 @@ from typing import Optional from aiogrpcclient import BaseGrpcClient -from grpc import StatusCode -from grpc.experimental.aio import AioRpcError from idm.api.proto.chat_manager_service_pb2 import Chat as ChatPb from idm.api.proto.chat_manager_service_pb2 import Chats as ChatsPb from idm.api.proto.chat_manager_service_pb2 import ( @@ -12,12 +10,6 @@ from idm.api.proto.chat_manager_service_pb2 import ( UpdateChatRequest, ) from idm.api.proto.chat_manager_service_pb2_grpc import ChatManagerStub -from tenacity import ( - retry, - retry_if_exception, - stop_after_attempt, - wait_fixed, -) class IdmApiGrpcClient(BaseGrpcClient): @@ -44,14 +36,6 @@ class IdmApiGrpcClient(BaseGrpcClient): ) return response - @retry( - retry=retry_if_exception( - lambda e: isinstance(e, AioRpcError) and e.code() == StatusCode.UNAVAILABLE - ), - reraise=True, - stop=stop_after_attempt(10), - wait=wait_fixed(5), - ) async def get_chat( self, chat_id: int, diff --git a/idm/api/configs/base.yaml b/idm/api/configs/base.yaml index fc64164..8b3178f 100644 --- a/idm/api/configs/base.yaml +++ b/idm/api/configs/base.yaml @@ -6,13 +6,5 @@ database: port: 5432 grpc: address: 0.0.0.0 - port: 9090 -log_path: '/var/log/idm-api/{{ ENV_TYPE }}' -telegram: - # Telegram App Hash from https://my.telegram.org/ - app_hash: '{{ APP_HASH }}' - # Telegram App ID from https://my.telegram.org/ - app_id: 00000 - database: - session_id: '/usr/lib/idm-api/{{ ENV_TYPE }}/session.db' - related_channel: '@nexus_search' + port: 82 +log_path: '/var/log/idm-api' diff --git a/idm/api/configs/logging.yaml b/idm/api/configs/logging.yaml index ee477ba..3b0cdd2 100644 --- a/idm/api/configs/logging.yaml +++ b/idm/api/configs/logging.yaml @@ -13,10 +13,10 @@ logging: class: library.logging.formatters.TracebackFormatter handlers: debug: - class: logging.StreamHandler + class: library.logging.handlers.BaseFileHandler formatter: default + filename: '{{ log_path }}/debug.log' level: DEBUG - stream: 'ext://sys.stderr' error: class: library.logging.handlers.BaseFileHandler filename: '{{ log_path }}/error.log' diff --git a/idm/api/daemons/admin_log_reader.py b/idm/api/daemons/admin_log_reader.py deleted file mode 100644 index 53bd51e..0000000 --- a/idm/api/daemons/admin_log_reader.py +++ /dev/null @@ -1,86 +0,0 @@ -import asyncio -import logging -import string - -from aiokit import AioThing -from library.telegram.base import BaseTelegramClient -from telethon.tl.functions.channels import GetParticipantsRequest -from telethon.tl.types import ChannelParticipantsSearch - - -class AdminLogReader(AioThing): - def __init__(self, telegram_config): - super().__init__() - self.subscriptors = set() - self.loading = False - self.telegram_client = BaseTelegramClient( - app_id=telegram_config['app_id'], - app_hash=telegram_config['app_hash'], - database=telegram_config['database'], - flood_sleep_threshold=25, - ) - self.channel_name = telegram_config['related_channel'] - self.last_max_id = 0 - - def statbox(self, **kwargs): - logging.getLogger('statbox').info({'mode': 'admin_log_reader', **kwargs}) - - async def skip_admin_log(self): - async for event in self.telegram_client.iter_admin_log(self.channel_name, limit=1): - self.last_max_id = event.id - self.statbox(action='skipped_admin_log', max_id=self.last_max_id) - - async def process_admin_log(self, sleep=1.0): - self.loading = True - try: - while 1: - async for event in self.telegram_client.iter_admin_log( - self.channel_name, join=True, invite=True, leave=True, min_id=self.last_max_id - ): - is_subscribed = event.joined or event.joined_invite - if is_subscribed: - self.subscriptors.add(event.user_id) - elif event.user_id in self.subscriptors: - self.subscriptors.remove(event.user_id) - self.last_max_id = event.id - await asyncio.sleep(sleep) - except asyncio.CancelledError: - pass - finally: - self.loading = False - - async def _fetch_users(self, query): - max_batch_size = 200 - - participants = await self.telegram_client( - GetParticipantsRequest( - channel=self.channel_name, - filter=ChannelParticipantsSearch(query), - offset=0, - limit=max_batch_size, - hash=0, - ) - ) - - for user in participants.users: - self.subscriptors.add(user.id) - - # There is a possibility that more users exist if we hit maximum count of users - # So, we are making a recursion to reveal it - if len(participants.users) == max_batch_size: - for new_letter in string.ascii_lowercase + string.digits: - await self._fetch_users(query + new_letter) - - async def load_channel_users(self): - self.statbox(action='load_channel_users') - await self._fetch_users('') - self.statbox(action='loaded_channel_users', subscriptors=len(self.subscriptors)) - - async def start(self): - await self.telegram_client.start_and_wait() - await self.skip_admin_log() - await self.load_channel_users() - asyncio.create_task(self.process_admin_log()) - - def is_subscribed(self, user_id): - return not self.loading or user_id in self.subscriptors diff --git a/idm/api/main.py b/idm/api/main.py index 6ff9c8e..5ce6444 100644 --- a/idm/api/main.py +++ b/idm/api/main.py @@ -1,9 +1,7 @@ import asyncio import uvloop -from aiopg.sa import create_engine from idm.api.configs import get_config -from idm.api.daemons.admin_log_reader import AdminLogReader from idm.api.services.chat_manager import ChatManagerService from library.aiogrpctools import AioGrpcServer from library.aiopostgres.pool_holder import AioPostgresPoolHolder @@ -14,27 +12,21 @@ from library.logging import configure_logging class GrpcServer(AioGrpcServer): def __init__(self, config: Configurator): super().__init__(address=config['grpc']['address'], port=config['grpc']['port']) + database = config['database'] self.pool_holder = AioPostgresPoolHolder( - fn=create_engine, - database=config['database']['database'], - user=config['database']['username'], - password=config['database']['password'], - host=config['database']['host'], - port=config['database']['port'], + conninfo=f'dbname={database["database"]} ' + f'user={database["username"]} ' + f'password={database["password"]} ' + f'host={database["host"]}' + f'port={database["port"]}', timeout=30, - pool_recycle=60, - maxsize=4, - ) - self.admin_log_reader = AdminLogReader( - telegram_config=config['telegram'], + max_size=4, ) self.chat_manager_service = ChatManagerService( server=self.server, service_name=config['application']['service_name'], pool_holder=self.pool_holder, - admin_log_reader=self.admin_log_reader, ) - self.starts.append(self.admin_log_reader) self.waits.extend([self.chat_manager_service, self.pool_holder]) diff --git a/idm/api/proto/BUILD.bazel b/idm/api/proto/BUILD.bazel index 977f5c5..92b316e 100644 --- a/idm/api/proto/BUILD.bazel +++ b/idm/api/proto/BUILD.bazel @@ -4,7 +4,7 @@ load("@rules_proto//proto:defs.bzl", "proto_library") package(default_visibility = ["//visibility:public"]) proto_library( - name = "idm_proto", + name = "proto", srcs = [ "chat_manager_service.proto", ], @@ -14,12 +14,12 @@ proto_library( ) py_proto_library( - name = "idm_proto_py", - deps = [":idm_proto"], + name = "proto_py", + deps = [":proto"], ) py_grpc_library( - name = "idm_grpc_py", - srcs = [":idm_proto"], - deps = [":idm_proto_py"], + name = "grpc_py", + srcs = [":proto"], + deps = [":proto_py"], ) diff --git a/idm/api/proto/chat_manager_service.proto b/idm/api/proto/chat_manager_service.proto index e801160..2244820 100644 --- a/idm/api/proto/chat_manager_service.proto +++ b/idm/api/proto/chat_manager_service.proto @@ -10,8 +10,8 @@ message Chat { int32 ban_until = 6; string ban_message = 7; bool is_admin = 8; - bool is_subscribed = 9; int64 created_at = 10; + int64 updated_at = 11; } message Chats { diff --git a/idm/api/services/chat_manager.py b/idm/api/services/chat_manager.py index 3d2b4e6..1858d34 100644 --- a/idm/api/services/chat_manager.py +++ b/idm/api/services/chat_manager.py @@ -1,3 +1,5 @@ +import logging + from grpc import StatusCode from idm.api.proto.chat_manager_service_pb2 import Chat as ChatPb from idm.api.proto.chat_manager_service_pb2 import Chats as ChatsPb @@ -5,6 +7,7 @@ from idm.api.proto.chat_manager_service_pb2_grpc import ( ChatManagerServicer, add_ChatManagerServicer_to_server, ) +from izihawa_utils.pb_to_json import MessageToDict from library.aiogrpctools.base import ( BaseService, aiogrpc_request_wrapper, @@ -18,19 +21,14 @@ from pypika import ( class ChatManagerService(ChatManagerServicer, BaseService): chats_table = Table('chats') - def __init__(self, server, service_name, pool_holder, admin_log_reader): + def __init__(self, server, service_name, pool_holder): super().__init__(service_name=service_name) self.server = server self.pool_holder = pool_holder - self.admin_log_reader = admin_log_reader async def start(self): add_ChatManagerServicer_to_server(self, self.server) - def enrich_chat(self, chat_pb: ChatPb): - chat_pb.is_subscribed = self.admin_log_reader.is_subscribed(chat_pb.chat_id) - return chat_pb - @aiogrpc_request_wrapper() async def create_chat(self, request, context, metadata): chat = ChatPb( @@ -75,7 +73,7 @@ class ChatManagerService(ChatManagerServicer, BaseService): chat = await result.fetchone() if chat is None: await context.abort(StatusCode.NOT_FOUND, 'not_found') - return self.enrich_chat(ChatPb(**chat)) + return ChatPb(**chat) @aiogrpc_request_wrapper() async def get_chat(self, request, context, metadata): @@ -95,7 +93,7 @@ class ChatManagerService(ChatManagerServicer, BaseService): results = await session.execute(query) chats = await results.fetchall() return ChatsPb( - chats=list(map(lambda x: self.enrich_chat(ChatPb(**x)), chats)) + chats=list(map(lambda x: ChatPb(**x), chats)) ) @aiogrpc_request_wrapper() @@ -109,4 +107,4 @@ class ChatManagerService(ChatManagerServicer, BaseService): async with self.pool_holder.pool.acquire() as session: result = await session.execute(query) chat = await result.fetchone() - return self.enrich_chat(ChatPb(**chat)) + return ChatPb(**chat) diff --git a/images/install.bzl b/images/install.bzl index 9ec5089..e3347b0 100644 --- a/images/install.bzl +++ b/images/install.bzl @@ -11,8 +11,8 @@ def images_install(): container_pull( name = "ubuntu", - digest = "sha256:45ff0162921e61c004010a67db1bee7d039a677bed0cb294e61f2b47346d42b3", + digest = "sha256:d0b4808a158b42b6efb3ae93abb567b1cb6ee097221813c0315390de0fa320b9", registry = "index.docker.io", repository = "library/ubuntu", - tag = "20.10", + tag = "21.10", ) diff --git a/library/aiogrpctools/base.py b/library/aiogrpctools/base.py index ce94f61..0b908fa 100644 --- a/library/aiogrpctools/base.py +++ b/library/aiogrpctools/base.py @@ -26,6 +26,7 @@ class AioGrpcServer(AioRootThing): 'address': self.address, 'mode': 'grpc', 'port': self.port, + 'extras': [x.__class__.__name__ for x in self.starts + self.waits] }) await self.server.start() await self.server.wait_for_termination() @@ -80,6 +81,8 @@ def aiogrpc_request_wrapper(log=True): return r except aio.AbortError: raise + except aio.AioRpcError as e: + await context.abort(e.code(), e.details()) except Exception as e: serialized_request = MessageToDict(request, preserving_proto_field_name=True) error_log(e, request=serialized_request, request_id=metadata.get('request-id')) @@ -107,8 +110,8 @@ def aiogrpc_streaming_request_wrapper(func): mode=func.__name__, request_id=metadata.get('request-id'), ) - except aio.AbortError: - raise + except aio.AioRpcError as e: + await context.abort(e.code(), e.details()) except Exception as e: serialized_request = MessageToDict(request, preserving_proto_field_name=True) error_log(e, request=serialized_request, request_id=metadata.get('request-id')) diff --git a/library/aiopostgres/BUILD.bazel b/library/aiopostgres/BUILD.bazel index 5a728f6..d48de8e 100644 --- a/library/aiopostgres/BUILD.bazel +++ b/library/aiopostgres/BUILD.bazel @@ -10,7 +10,9 @@ py_library( srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ - requirement("aiopg"), + requirement("psycopg"), + requirement("psycopg-pool"), + requirement("psycopg-binary"), requirement("tenacity"), requirement("aiokit"), ], diff --git a/library/aiopostgres/pool_holder.py b/library/aiopostgres/pool_holder.py index 76edf62..9965527 100644 --- a/library/aiopostgres/pool_holder.py +++ b/library/aiopostgres/pool_holder.py @@ -1,42 +1,51 @@ -import aiopg -import psycopg2.extras +from typing import Optional + from aiokit import AioThing -from psycopg2 import OperationalError -from tenacity import ( - retry, - retry_if_exception_type, - stop_after_attempt, - wait_fixed, -) +from psycopg.rows import tuple_row +from psycopg_pool import AsyncConnectionPool class AioPostgresPoolHolder(AioThing): - def __init__(self, fn=aiopg.create_pool, *args, **kwargs): + def __init__(self, conninfo, timeout=30, min_size=1, max_size=4): super().__init__() - self.fn = fn - self.args = args - self.kwargs = kwargs self.pool = None + self.fn = lambda: AsyncConnectionPool( + conninfo=conninfo, + timeout=timeout, + min_size=min_size, + max_size=max_size, + ) - @retry( - retry=retry_if_exception_type(OperationalError), - stop=stop_after_attempt(3), - wait=wait_fixed(1.0), - ) async def start(self): if not self.pool: - self.pool = await self.fn(*self.args, **self.kwargs) + self.pool = self.fn() async def stop(self): if self.pool: - self.pool.close() - await self.pool.wait_closed() + await self.pool.close() self.pool = None - async def execute(self, stmt, values=None, fetch=False, timeout=None, cursor_factory=psycopg2.extras.DictCursor): - async with self.pool.acquire() as conn: - async with conn.cursor(cursor_factory=cursor_factory) as cur: - await cur.execute(stmt, values, timeout=timeout) - if fetch: - return await cur.fetchall() - return cur.rowcount + async def iterate( + self, + stmt: str, + values=None, + row_factory=tuple_row, + cursor_name: Optional[str] = None, + itersize: Optional[int] = None, + ): + if not self.pool: + raise RuntimeError('AioPostgresPoolHolder has not been started') + async with self.pool.connection() as conn: + async with conn.cursor(name=cursor_name, row_factory=row_factory) as cur: + if itersize is not None: + cur.itersize = itersize + await cur.execute(stmt, values) + async for row in cur: + yield row + + async def execute(self, stmt: str, values=None, cursor_name: Optional[str] = None, row_factory=tuple_row): + if not self.pool: + raise RuntimeError('AioPostgresPoolHolder has not been started') + async with self.pool.connection() as conn: + async with conn.cursor(name=cursor_name, row_factory=row_factory) as cur: + await cur.execute(stmt, values) diff --git a/library/configurator/__init__.py b/library/configurator/__init__.py index c77e523..3c77143 100644 --- a/library/configurator/__init__.py +++ b/library/configurator/__init__.py @@ -86,8 +86,14 @@ class Configurator(RichDict): elif isinstance(c, list): return [self.walk_and_render(e) for e in c] elif isinstance(c, dict): - for key in c: + for key in list(c.keys()): c[key] = self.walk_and_render(c[key]) + if key.endswith('_filepath'): + with open(c[key]) as f: + if c[key].endswith('.json'): + c[key.replace('_filepath', '')] = json.loads(f.read()) + elif c[key].endswith('.yaml'): + c[key.replace('_filepath', '')] = yaml.safe_load(f.read()) return c def update(self, new_config, basename=None, **kwargs): diff --git a/library/telegram/base.py b/library/telegram/base.py index dffb61a..c50c4fd 100644 --- a/library/telegram/base.py +++ b/library/telegram/base.py @@ -1,12 +1,14 @@ +import asyncio import datetime import logging +import os.path from typing import ( Optional, Union, ) from aiokit import AioThing -from izihawa_utils.random import random_string +from izihawa_utils.random import generate_request_id from library.logging import error_log from telethon import ( TelegramClient, @@ -16,6 +18,7 @@ from telethon import ( from tenacity import ( # noqa retry, retry_if_exception_type, + stop_after_attempt, wait_fixed, ) @@ -28,6 +31,8 @@ class BaseTelegramClient(AioThing): app_id: Union[int, str], app_hash: str, database: dict, + phone: Optional[str] = None, + password: Optional[str] = None, bot_token: Optional[str] = None, mtproxy: Optional[dict] = None, flood_sleep_threshold: int = 60, @@ -44,6 +49,8 @@ class BaseTelegramClient(AioThing): flood_sleep_threshold=flood_sleep_threshold, **self._get_proxy(mtproxy=mtproxy), ) + self.phone = phone + self.password = password self.bot_token = bot_token def _get_session(self, database): @@ -71,9 +78,23 @@ class BaseTelegramClient(AioThing): } return {} - @retry(retry=retry_if_exception_type(ConnectionError), wait=wait_fixed(5)) + @retry(retry=retry_if_exception_type(ConnectionError), stop=stop_after_attempt(3), wait=wait_fixed(5)) async def start(self): - await self._telegram_client.start(bot_token=self.bot_token) + logging.getLogger('debug').info({'mode': 'telegram', 'action': 'starting'}) + await self._telegram_client.start( + phone=lambda: self.phone, + bot_token=self.bot_token, + password=self.password, + code_callback=self.polling_file, + ) + logging.getLogger('debug').info({'mode': 'telegram', 'action': 'started'}) + + async def polling_file(self): + fname = '/tmp/telegram_code' + while not os.path.exists(fname): + await asyncio.sleep(5.0) + with open(fname, 'r') as code_file: + return code_file.read().strip() async def stop(self): return await self.disconnect() @@ -119,6 +140,9 @@ class BaseTelegramClient(AioThing): def get_input_entity(self, *args, **kwargs): return self._telegram_client.get_input_entity(*args, **kwargs) + def get_permissions(self, *args, **kwargs): + return self._telegram_client.get_permissions(*args, **kwargs) + def iter_admin_log(self, *args, **kwargs): return self._telegram_client.iter_admin_log(*args, **kwargs) @@ -158,7 +182,7 @@ class RequestContext: @staticmethod def generate_request_id(length): - return random_string(length) + return generate_request_id(length) def add_default_fields(self, **fields): self.default_fields.update(fields) diff --git a/nexus/actions/BUILD.bazel b/nexus/actions/BUILD.bazel index f1e2616..3621500 100644 --- a/nexus/actions/BUILD.bazel +++ b/nexus/actions/BUILD.bazel @@ -18,8 +18,8 @@ py_library( requirement("aiocrossref"), requirement("aiolibgen"), "//library/aiopostgres", - "//nexus/models/proto:models_proto_py", + requirement("izihawa_types"), + "//nexus/models/proto:proto_py", "//nexus/nlptools", - requirement("aiosumma"), ], ) diff --git a/nexus/actions/__init__.py b/nexus/actions/__init__.py index 641b6ed..e69de29 100644 --- a/nexus/actions/__init__.py +++ b/nexus/actions/__init__.py @@ -1,27 +0,0 @@ -from .update_document import SendDocumentOperationUpdateDocumentPbToSummaAction -from .update_document_scimag import ( - CleanDocumentOperationUpdateDocumentScimagPbAction, - FillDocumentOperationUpdateDocumentScimagPbFromExternalSourceAction, - SendDocumentOperationUpdateDocumentScimagPbReferencesToKafkaAction, - SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction, -) -from .update_document_scitech import ( - CleanDocumentOperationUpdateDocumentScitechPbAction, - SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction, -) -from .update_document_sharience import ( - SendDocumentOperationUpdateDocumentShariencePbToGoldenPostgresAction, -) -from .vote import SendDocumentOperationVotePbToGoldenPostgresAction - -__all__ = [ - 'CleanDocumentOperationUpdateDocumentScimagPbAction', - 'CleanDocumentOperationUpdateDocumentScitechPbAction', - 'FillDocumentOperationUpdateDocumentScimagPbFromExternalSourceAction', - 'SendDocumentOperationUpdateDocumentPbToSummaAction', - 'SendDocumentOperationUpdateDocumentScimagPbReferencesToKafkaAction', - 'SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction', - 'SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction', - 'SendDocumentOperationUpdateDocumentShariencePbToGoldenPostgresAction', - 'SendDocumentOperationVotePbToGoldenPostgresAction', -] diff --git a/nexus/actions/common.py b/nexus/actions/common.py index 54bfade..7a9e338 100644 --- a/nexus/actions/common.py +++ b/nexus/actions/common.py @@ -2,4 +2,12 @@ from urllib.parse import unquote def canonize_doi(doi): - return unquote(doi.lower()) + return ( + unquote(doi.lower()) + .replace('\\n', '\n') + .replace('\n', '') + .replace('\\', '') + .strip('\'"') + .replace('\x00', '') + .strip() + ) diff --git a/nexus/actions/crossref_api.py b/nexus/actions/crossref_api.py index 65f315c..7ebcac6 100644 --- a/nexus/actions/crossref_api.py +++ b/nexus/actions/crossref_api.py @@ -4,6 +4,7 @@ from datetime import date from nexus.models.proto.scimag_pb2 import Scimag as ScimagPb from .base import BaseAction +from .exceptions import InterruptProcessing def extract_authors(authors): @@ -17,7 +18,7 @@ def extract_authors(authors): def extract_dates(date_parts): if not date_parts or not date_parts[0]: - return '', None + return 0, None year, month, day = date_parts[0] + [0] * (3 - len(date_parts[0])) if year: issued_at = int(time.mktime(date( @@ -25,8 +26,8 @@ def extract_dates(date_parts): month=month if month else 1, day=day if day else 1, ).timetuple())) - return str(year), issued_at - return '', None + return year, issued_at + return 0, None def extract_first(arr, default=''): @@ -74,13 +75,17 @@ def extract_title(title, subtitle): return ': '.join(filter(lambda x: bool(x), [title.strip(), subtitle.strip()])) -class CrossrefApiToThinScimagPbAction(BaseAction): +class ToThinScimagPbAction(BaseAction): async def do(self, item: dict) -> ScimagPb: + if 'DOI' not in item: + raise InterruptProcessing(document_id=None, reason='no_doi') return ScimagPb(doi=item['DOI']) -class CrossrefApiToScimagPbAction(BaseAction): +class ToScimagPbAction(BaseAction): async def do(self, item: dict) -> ScimagPb: + if 'DOI' not in item: + raise InterruptProcessing(document_id=None, reason='no_doi') scimag_pb = ScimagPb( abstract=item.get('abstract'), container_title=extract_first(item.get('container-title')), diff --git a/idm/api/daemons/__init__.py b/nexus/actions/document_operations_pb/__init__.py similarity index 100% rename from idm/api/daemons/__init__.py rename to nexus/actions/document_operations_pb/__init__.py diff --git a/nexus/actions/document_operations_pb/store_telegram_file_id_pb.py b/nexus/actions/document_operations_pb/store_telegram_file_id_pb.py new file mode 100644 index 0000000..f1961e5 --- /dev/null +++ b/nexus/actions/document_operations_pb/store_telegram_file_id_pb.py @@ -0,0 +1,41 @@ +from library.aiopostgres.pool_holder import AioPostgresPoolHolder +from nexus.models.proto.operation_pb2 import \ + DocumentOperation as DocumentOperationPb +from pypika import ( + PostgreSQLQuery, + Table, +) + +from ..base import BaseAction + + +class ToPostgresAction(BaseAction): + telegram_files_table = Table('telegram_files') + + def __init__(self, database): + super().__init__() + self.pool_holder = AioPostgresPoolHolder( + conninfo=f'dbname={database["database"]} ' + f'user={database["username"]} ' + f'password={database["password"]} ' + f'host={database["host"]}', + ) + self.waits.append(self.pool_holder) + + async def do(self, document_operation_pb: DocumentOperationPb) -> DocumentOperationPb: + store_telegram_file_id_pb = document_operation_pb.store_telegram_file_id + + query = ( + PostgreSQLQuery + .into(self.telegram_files_table) + .columns('bot_name', 'document_id', 'telegram_file_id') + .insert( + store_telegram_file_id_pb.bot_name, + store_telegram_file_id_pb.document_id, + store_telegram_file_id_pb.telegram_file_id, + ) + .on_conflict('bot_name', 'document_id') + .do_nothing() + ) + await self.pool_holder.execute(query.get_sql()) + return document_operation_pb diff --git a/nexus/actions/update_document_scimag.py b/nexus/actions/document_operations_pb/update_document_scimag_pb.py similarity index 88% rename from nexus/actions/update_document_scimag.py rename to nexus/actions/document_operations_pb/update_document_scimag_pb.py index 54b8f56..01f1f75 100644 --- a/nexus/actions/update_document_scimag.py +++ b/nexus/actions/document_operations_pb/update_document_scimag_pb.py @@ -4,7 +4,6 @@ from typing import ( Set, ) -import aiopg from aiocrossref import CrossrefClient from aiocrossref.exceptions import ( NotFoundError, @@ -23,13 +22,13 @@ from pypika import ( ) from pypika.terms import Array -from .base import BaseAction -from .crossref_api import CrossrefApiToScimagPbAction -from .exceptions import InterruptProcessing -from .scimag import CleanScimagPbAction +from .. import scimag_pb +from ..base import BaseAction +from ..crossref_api import ToScimagPbAction +from ..exceptions import InterruptProcessing -class SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction(BaseAction): +class ToPostgresAction(BaseAction): scimag_table = Table('scimag') db_multi_fields = { 'authors', @@ -55,7 +54,6 @@ class SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction(BaseActi 'md5', 'ref_by_count', 'scimag_bulk_id', - 'telegram_file_id', 'title', 'type', 'updated_at', @@ -66,14 +64,10 @@ class SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction(BaseActi def __init__(self, database): super().__init__() self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={database["database"]} ' + conninfo=f'dbname={database["database"]} ' f'user={database["username"]} ' f'password={database["password"]} ' f'host={database["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, ) self.waits.append(self.pool_holder) @@ -153,12 +147,12 @@ class SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction(BaseActi scimag_pb=scimag_pb, fields=fields, ) - result = await self.pool_holder.execute(sql, fetch=True) + result = [row async for row in self.pool_holder.iterate(sql)] scimag_pb.id = result[0][0] return document_operation_pb -class SendDocumentOperationUpdateDocumentScimagPbReferencesToKafkaAction(BaseAction): +class ReferencesToKafkaAction(BaseAction): def __init__(self, topic, brokers): super().__init__() self.topic = topic @@ -194,7 +188,7 @@ class SendDocumentOperationUpdateDocumentScimagPbReferencesToKafkaAction(BaseAct return document_operation_pb -class FillDocumentOperationUpdateDocumentScimagPbFromExternalSourceAction(BaseAction): +class FillFromExternalSourceAction(BaseAction): def __init__(self, crossref): super().__init__() self.crossref_client = CrossrefClient( @@ -204,8 +198,9 @@ class FillDocumentOperationUpdateDocumentScimagPbFromExternalSourceAction(BaseAc retry_delay=crossref.get('retry_delay', 0.5), timeout=crossref.get('timeout'), user_agent=crossref.get('user_agent'), + ttl_dns_cache=crossref.get('ttl_dns_cache'), ) - self.crossref_api_to_scimag_pb_action = CrossrefApiToScimagPbAction() + self.crossref_api_to_scimag_pb_action = ToScimagPbAction() self.waits.append(self.crossref_client) async def do(self, document_operation_pb: DocumentOperationPb) -> DocumentOperationPb: @@ -216,16 +211,16 @@ class FillDocumentOperationUpdateDocumentScimagPbFromExternalSourceAction(BaseAc try: crossref_api_response = await self.crossref_client.works(doi=scimag_pb.doi) except (WrongContentTypeError, NotFoundError) as e: - raise InterruptProcessing(doc_id=scimag_pb.doi, reason=str(e)) + raise InterruptProcessing(document_id=scimag_pb.doi, reason=str(e)) new_scimag_pb = await self.crossref_api_to_scimag_pb_action.do(crossref_api_response) scimag_pb.MergeFrom(new_scimag_pb) return document_operation_pb -class CleanDocumentOperationUpdateDocumentScimagPbAction(BaseAction): +class CleanAction(BaseAction): def __init__(self): super().__init__() - self.cleaner = CleanScimagPbAction() + self.cleaner = scimag_pb.CleanAction() self.waits.append(self.cleaner) async def do(self, document_operation_pb: DocumentOperationPb) -> DocumentOperationPb: diff --git a/nexus/actions/update_document_scitech.py b/nexus/actions/document_operations_pb/update_document_scitech_pb.py similarity index 84% rename from nexus/actions/update_document_scitech.py rename to nexus/actions/document_operations_pb/update_document_scitech_pb.py index af3cb19..2d44d5a 100644 --- a/nexus/actions/update_document_scitech.py +++ b/nexus/actions/document_operations_pb/update_document_scitech_pb.py @@ -1,4 +1,6 @@ -import aiopg +import logging + +from izihawa_utils.pb_to_json import MessageToDict from library.aiopostgres.pool_holder import AioPostgresPoolHolder from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb @@ -10,17 +12,17 @@ from pypika import ( ) from pypika.terms import Array -from .base import BaseAction -from .exceptions import ConflictError -from .scitech import CleanScitechAction +from .. import scitech_pb +from ..base import BaseAction +from ..exceptions import ConflictError class UuidFunction(functions.Function): - def __init__(self, uuid, alias=None): - super(UuidFunction, self).__init__('UUID', uuid, alias=alias) + def __init__(self, uuid, name=None): + super(UuidFunction, self).__init__('UUID', uuid, name=name) -class SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction(BaseAction): +class ToPostgresAction(BaseAction): scitech_table = Table('scitech') db_single_fields = { 'id', @@ -41,7 +43,6 @@ class SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction(BaseAct 'original_id', 'pages', 'series', - 'telegram_file_id', 'title', 'updated_at', 'volume', @@ -57,25 +58,23 @@ class SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction(BaseAct def __init__(self, database): super().__init__() self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={database["database"]} ' + conninfo=f'dbname={database["database"]} ' f'user={database["username"]} ' f'password={database["password"]} ' f'host={database["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, ) self.waits.append(self.pool_holder) def cast_field_value(self, field_name, field_value): if field_name in self.db_multi_fields: field_value = Array(*field_value) + if field_name in {'title', }: + field_value = field_value.replace('\0', '').strip() return field_name, field_value def is_field_set(self, scitech_pb: ScitechPb, field_name: str): field_value = getattr(scitech_pb, field_name) - if field_name in {'issued_at'}: + if field_name in {'issued_at', }: return scitech_pb.HasField(field_name) return field_value @@ -107,10 +106,7 @@ class SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction(BaseAct .where(casted_conditions) .get_sql() ) - result = await self.pool_holder.execute( - sql, - fetch=True - ) + result = [row async for row in self.pool_holder.iterate(sql)] count = result[0][0] if count > 1: @@ -144,15 +140,19 @@ class SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction(BaseAct query = query.do_update(col, val) sql = query.returning('id', 'original_id').get_sql() - result = await self.pool_holder.execute(sql, fetch=True) + try: + result = [row async for row in self.pool_holder.iterate(sql)] + except: + logging.getLogger('error').error({'sql': sql, 'scitech': MessageToDict(scitech_pb)}) + raise scitech_pb.id, scitech_pb.original_id = result[0][0], result[0][1] or 0 return document_operation_pb -class CleanDocumentOperationUpdateDocumentScitechPbAction(BaseAction): +class CleanAction(BaseAction): def __init__(self): super().__init__() - self.cleaner = CleanScitechAction() + self.cleaner = scitech_pb.CleanAction() self.waits.append(self.cleaner) async def do(self, document_operation_pb: DocumentOperationPb) -> DocumentOperationPb: diff --git a/nexus/actions/update_document_sharience.py b/nexus/actions/document_operations_pb/update_document_sharience_pb.py similarity index 86% rename from nexus/actions/update_document_sharience.py rename to nexus/actions/document_operations_pb/update_document_sharience_pb.py index e0f8a3e..8d15732 100644 --- a/nexus/actions/update_document_sharience.py +++ b/nexus/actions/document_operations_pb/update_document_sharience_pb.py @@ -3,7 +3,6 @@ from typing import ( Set, ) -import aiopg from library.aiopostgres.pool_holder import AioPostgresPoolHolder from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb @@ -14,10 +13,10 @@ from pypika import ( ) from pypika.terms import Array -from .base import BaseAction +from ..base import BaseAction -class SendDocumentOperationUpdateDocumentShariencePbToGoldenPostgresAction(BaseAction): +class ToPostgresAction(BaseAction): sharience_table = Table('sharience') db_multi_fields = { 'ipfs_multihashes', @@ -28,7 +27,6 @@ class SendDocumentOperationUpdateDocumentShariencePbToGoldenPostgresAction(BaseA 'uploader_id', 'filesize', 'md5', - 'telegram_file_id', 'updated_at', } db_fields = db_single_fields | db_multi_fields @@ -36,14 +34,10 @@ class SendDocumentOperationUpdateDocumentShariencePbToGoldenPostgresAction(BaseA def __init__(self, database): super().__init__() self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={database["database"]} ' + conninfo=f'dbname={database["database"]} ' f'user={database["username"]} ' f'password={database["password"]} ' f'host={database["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, ) self.waits.append(self.pool_holder) @@ -80,7 +74,7 @@ class SendDocumentOperationUpdateDocumentShariencePbToGoldenPostgresAction(BaseA sharience_pb=sharience_pb, fields=fields, ) - result = await self.pool_holder.execute(sql, fetch=True) + result = [row async for row in self.pool_holder.iterate(sql)] sharience_pb.id = result[0][0] return document_operation_pb diff --git a/nexus/actions/vote.py b/nexus/actions/document_operations_pb/vote_pb.py similarity index 83% rename from nexus/actions/vote.py rename to nexus/actions/document_operations_pb/vote_pb.py index 6ae8df7..e7a6b33 100644 --- a/nexus/actions/vote.py +++ b/nexus/actions/document_operations_pb/vote_pb.py @@ -1,4 +1,3 @@ -import aiopg from library.aiopostgres.pool_holder import AioPostgresPoolHolder from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb @@ -7,23 +6,20 @@ from pypika import ( Table, ) -from .base import BaseAction +from ..base import BaseAction -class SendDocumentOperationVotePbToGoldenPostgresAction(BaseAction): +class ToPostgresAction(BaseAction): votes_table = Table('votes') def __init__(self, database): super().__init__() self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={database["database"]} ' + conninfo=f'dbname={database["database"]} ' f'user={database["username"]} ' f'password={database["password"]} ' f'host={database["host"]}', - timeout=30, - pool_recycle=60, - maxsize=2, + max_size=2, ) self.waits.append(self.pool_holder) diff --git a/nexus/actions/exceptions.py b/nexus/actions/exceptions.py index 1dd5050..ce2862d 100644 --- a/nexus/actions/exceptions.py +++ b/nexus/actions/exceptions.py @@ -6,8 +6,8 @@ from izihawa_utils.exceptions import BaseError class InterruptProcessing(BaseError): code = 'interrupt_processing' - def __init__(self, doc_id, reason): - super().__init__(doc_id=doc_id, reason=reason) + def __init__(self, document_id, reason): + super().__init__(document_id=document_id, reason=reason) class ConflictError(BaseError): diff --git a/nexus/actions/golden_postgres.py b/nexus/actions/golden_postgres.py deleted file mode 100644 index e4f3acf..0000000 --- a/nexus/actions/golden_postgres.py +++ /dev/null @@ -1,8 +0,0 @@ -from nexus.models.proto.scimag_pb2 import Scimag as ScimagPb - -from .base import BaseAction - - -class GoldenPostgresToThinScimagPbAction(BaseAction): - async def do(self, item: dict) -> ScimagPb: - return ScimagPb(doi=item['doi']) diff --git a/nexus/actions/libgen_api.py b/nexus/actions/libgen_api.py index bd3b00d..3ac4b34 100644 --- a/nexus/actions/libgen_api.py +++ b/nexus/actions/libgen_api.py @@ -84,7 +84,7 @@ def create_cu(libgen_id, coverurl, md5): return coverurl, cu_suf -class LibgenApiToScitechPbAction(BaseAction): +class ToScitechPbAction(BaseAction): async def do(self, item: dict) -> ScitechPb: scitech_pb = ScitechPb( authors=(item.get('author') or '').split('; '), @@ -113,7 +113,7 @@ class LibgenApiToScitechPbAction(BaseAction): item['tags'].split(';') ), )), - title=item['title'], + title=item['title'].replace('\0', '').strip(), ) scitech_pb.cu, scitech_pb.cu_suf = create_cu( @@ -123,6 +123,7 @@ class LibgenApiToScitechPbAction(BaseAction): ) year = safe_int(item['year']) if year and year < 9999: - scitech_pb.year = str(year) - scitech_pb.issued_at = np.datetime64(scitech_pb.year).astype(' ScimagPb: + return ScimagPb(doi=item['doi']) + + +class ScitechToIndexOperationBytesAction(BaseAction): + restricted_column_set = [ + 'extension', + 'fiction_id', + 'filesize', + 'has_duplicates', + 'ipfs_multihashes', + 'libgen_id', + 'md5', + 'original_id', + ] + + async def do(self, item: dict) -> bytes: + # if item['original_id'] is not None: + # item = {rc: item[rc] for rc in self.restricted_column_set} + return index_pb.IndexOperation( + index_document=index_pb.IndexDocumentOperation( + document=json.dumps(filter_none(item)), + reindex=True, + ), + ).SerializeToString() diff --git a/nexus/actions/scimag.py b/nexus/actions/scimag_pb.py similarity index 95% rename from nexus/actions/scimag.py rename to nexus/actions/scimag_pb.py index 6b8c8c7..4ceeeee 100644 --- a/nexus/actions/scimag.py +++ b/nexus/actions/scimag_pb.py @@ -1,7 +1,6 @@ from html import unescape from bs4 import BeautifulSoup -from nexus.actions.common import canonize_doi from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb from nexus.models.proto.operation_pb2 import UpdateDocument as UpdateDocumentPb @@ -15,9 +14,10 @@ from nexus.nlptools.utils import ( ) from .base import BaseAction +from .common import canonize_doi -class CleanScimagPbAction(BaseAction): +class CleanAction(BaseAction): async def do(self, scimag_pb: ScimagPb) -> ScimagPb: if scimag_pb.abstract: abstract_soup = BeautifulSoup(unescape(scimag_pb.abstract), 'lxml') @@ -61,7 +61,7 @@ class CleanScimagPbAction(BaseAction): return scimag_pb -class ScimagPbToDocumentOperationBytesAction(BaseAction): +class ToDocumentOperationAction(BaseAction): async def do(self, item: ScimagPb) -> bytes: document_operation_pb = DocumentOperationPb( update_document=UpdateDocumentPb( diff --git a/nexus/actions/scitech.py b/nexus/actions/scitech_pb.py similarity index 93% rename from nexus/actions/scitech.py rename to nexus/actions/scitech_pb.py index f4ac23f..4acf075 100644 --- a/nexus/actions/scitech.py +++ b/nexus/actions/scitech_pb.py @@ -1,7 +1,6 @@ from html import unescape from bs4 import BeautifulSoup -from nexus.actions.common import canonize_doi from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb from nexus.models.proto.operation_pb2 import UpdateDocument as UpdateDocumentPb @@ -15,9 +14,10 @@ from nexus.nlptools.utils import ( ) from .base import BaseAction +from .common import canonize_doi -class CleanScitechAction(BaseAction): +class CleanAction(BaseAction): async def do(self, scitech_pb: ScitechPb) -> ScitechPb: if scitech_pb.authors: for i, author in enumerate(scitech_pb.authors): @@ -47,7 +47,7 @@ class CleanScitechAction(BaseAction): return scitech_pb -class ScitechPbToDocumentOperationBytesAction(BaseAction): +class ToDocumentOperationPbAction(BaseAction): async def do(self, item: ScitechPb) -> bytes: document_operation_pb = DocumentOperationPb( update_document=UpdateDocumentPb( diff --git a/nexus/actions/update_document.py b/nexus/actions/update_document.py deleted file mode 100644 index 726fdd1..0000000 --- a/nexus/actions/update_document.py +++ /dev/null @@ -1,31 +0,0 @@ -from aiosumma import SummaHttpClient -from izihawa_utils.pb_to_json import MessageToDict -from nexus.models.proto.operation_pb2 import \ - DocumentOperation as DocumentOperationPb - -from .base import BaseAction - - -class SendDocumentOperationUpdateDocumentPbToSummaAction(BaseAction): - def __init__(self, summa): - super().__init__() - self.summa_client = SummaHttpClient(**summa) - self.waits.append(self.summa_client) - - async def do(self, document_operation_pb: DocumentOperationPb) -> DocumentOperationPb: - update_document_pb = document_operation_pb.update_document - schema = update_document_pb.typed_document.WhichOneof('document') - document = getattr(update_document_pb.typed_document, schema) - original_id = getattr(document, 'original_id', None) - if not update_document_pb.reindex or original_id: - return document_operation_pb - casted_document = MessageToDict(document, preserving_proto_field_name=True) - # ToDo: Required to rework checking for extra fields in document - # ToDo: It is needed to go to actual schema and load real fields and then check against them - casted_document.pop('is_deleted', None) - casted_document.pop('meta_language', None) - casted_document.pop('type', None) - await self.summa_client.put_document(schema, casted_document) - if update_document_pb.commit: - await self.summa_client.commit(schema) - return document_operation_pb diff --git a/nexus/bot/BUILD.bazel b/nexus/bot/BUILD.bazel index 69555ac..6f6d5b2 100644 --- a/nexus/bot/BUILD.bazel +++ b/nexus/bot/BUILD.bazel @@ -25,7 +25,6 @@ py3_image( requirement("aiodns"), requirement("aiohttp"), requirement("aiohttp_socks"), - requirement("psycopg2-binary"), requirement("pytimeparse"), requirement("python_socks"), requirement("tenacity"), @@ -39,7 +38,7 @@ py3_image( "//library/telegram", "//nexus/hub/aioclient", "//nexus/meta_api/aioclient", - "//nexus/models/proto:models_proto_py", + "//nexus/models/proto:proto_py", "//nexus/nlptools", "//nexus/views/telegram", requirement("izihawa_utils"), @@ -50,7 +49,7 @@ container_push( name = "push-testing", format = "Docker", image = ":image", - registry = "registry.example.com", + registry = "registry.infra.svc.cluster.local", repository = "nexus-bot", tag = "testing", ) @@ -59,7 +58,7 @@ container_push( name = "push-latest", format = "Docker", image = ":image", - registry = "registry.example.com", + registry = "registry.infra.svc.cluster.local", repository = "nexus-bot", tag = "latest", ) diff --git a/nexus/bot/application.py b/nexus/bot/application.py index 856b4e0..5d70234 100644 --- a/nexus/bot/application.py +++ b/nexus/bot/application.py @@ -20,13 +20,13 @@ class TelegramApplication(AioRootThing): mtproxy=self.config['telegram'].get('mtproxy'), ) - self.hub_client = HubGrpcClient(base_url=self.config['hub']['url']) + self.hub_client = HubGrpcClient(endpoint=self.config['hub']['endpoint']) self.starts.append(self.hub_client) self.idm_client = None if self.config['idm']['enabled']: - self.idm_client = IdmApiGrpcClient(base_url=self.config['idm']['url']) + self.idm_client = IdmApiGrpcClient(endpoint=self.config['idm']['endpoint']) self.starts.append(self.idm_client) - self.meta_api_client = MetaApiGrpcClient(base_url=self.config['meta_api']['url']) + self.meta_api_client = MetaApiGrpcClient(endpoint=self.config['meta_api']['endpoint']) self.starts.append(self.meta_api_client) self.promotioner = Promotioner(promotions=self.config['promotions']) diff --git a/nexus/bot/configs/base.yaml b/nexus/bot/configs/base.yaml index 4d8b0b9..ea7137e 100644 --- a/nexus/bot/configs/base.yaml +++ b/nexus/bot/configs/base.yaml @@ -12,13 +12,16 @@ application: bypass_maintenance: [] # Debugging mode debug: true + # Enabled indices (passed to Nexus Meta API) + index_aliases: + - scitech # All users (except `bypass_maintenance` ones) will get UPGRADE_MAINTENANCE message in response is_maintenance_mode: false # Disable /settings, uploading new articles (can be used while vacuuming backend Postgres) # and preventing creation of new users is_read_only_mode: false # Require subscription to `related_channel` before allowing to use the bot - is_subscription_required: false + is_subscription_required: true # Libera Pay URL in /donate message libera_pay_url: maintenance_picture_url: @@ -27,9 +30,6 @@ application: page_size: 5 # Length of generated Request-Id used for tracking requests across all backends request_id_length: 12 - # Enabled schemas (passed to Nexus Meta API) - schemas: - - scitech # Length of generated Session-ID used in commands to clue user sessions session_id_length: 8 too_difficult_picture_url: @@ -41,13 +41,13 @@ application: has_language_buttons: true has_system_messaging_button: true hub: - url: + endpoint: idm: - enabled: false - url: + enabled: true + endpoint: log_path: '/var/log/nexus-bot' meta_api: - url: + endpoint: metrics: enabled: false telegram: @@ -56,9 +56,7 @@ telegram: # Telegram App ID from https://my.telegram.org/ app_id: 00000 # External bot name shown in messages to users - bot_external_name: libgen_scihub_bot - # Internal bot name used in logging - bot_name: nexus-bot + bot_name: libgen_scihub_1_bot bot_token: # WARNING! Potentially buggy telethon option. Sometimes it goes mad and overload users with tons of messages # Collect missed messages at startup time and answer to them diff --git a/nexus/bot/configs/logging.yaml b/nexus/bot/configs/logging.yaml index 38de28b..cbf78a8 100644 --- a/nexus/bot/configs/logging.yaml +++ b/nexus/bot/configs/logging.yaml @@ -12,6 +12,7 @@ logging: handlers: debug: class: library.logging.handlers.BaseFileHandler + formatter: default filename: '{{ log_path }}/debug.log' level: DEBUG error: diff --git a/nexus/bot/exceptions.py b/nexus/bot/exceptions.py index 2dc5786..2d44d6d 100644 --- a/nexus/bot/exceptions.py +++ b/nexus/bot/exceptions.py @@ -21,5 +21,5 @@ class UnknownFileFormatError(BaseError): code = 'unknown_file_format_error' -class UnknownSchemaError(BaseError): - code = 'unknown_schema_error' +class UnknownIndexAliasError(BaseError): + code = 'unknown_index_alias_error' diff --git a/nexus/bot/handlers/base.py b/nexus/bot/handlers/base.py index f7e8a76..979c66f 100644 --- a/nexus/bot/handlers/base.py +++ b/nexus/bot/handlers/base.py @@ -13,7 +13,7 @@ from library.logging import error_log from library.telegram.base import RequestContext from library.telegram.utils import safe_execution from nexus.bot.application import TelegramApplication -from nexus.bot.exceptions import UnknownSchemaError +from nexus.bot.exceptions import UnknownIndexAliasError from nexus.models.proto.typed_document_pb2 import \ TypedDocument as TypedDocumentPb from nexus.translations import t @@ -24,7 +24,10 @@ from telethon import ( TelegramClient, events, ) -from telethon.errors import QueryIdInvalidError +from telethon.errors import ( + QueryIdInvalidError, + UserNotParticipantError, +) def get_username(event: events.ChatAction, chat): @@ -44,10 +47,6 @@ def is_banned(chat: ChatPb) -> bool: return chat.ban_until is not None and datetime.utcnow().timestamp() < chat.ban_until -def is_subscribed(chat: ChatPb) -> bool: - return chat.is_subscribed or chat.chat_id < 0 or chat.created_at > time.time() - 10 * 60 - - class ReadOnlyModeError(BaseError): level = logging.WARNING code = 'read_only_mode_error' @@ -68,11 +67,11 @@ class BaseHandler(ABC): def __init__(self, application: TelegramApplication): self.application = application - self.schema_to_resolver = { + self.index_alias_to_resolver = { 'scimag': self.resolve_scimag, 'scitech': self.resolve_scitech, } - self.short_schema_to_schema_dict = { + self.short_index_alias_to_index_alias_dict = { 'a': 'scimag', 'b': 'scitech', } @@ -80,19 +79,19 @@ class BaseHandler(ABC): def generate_session_id(self) -> str: return random_string(self.application.config['application']['session_id_length']) - def short_schema_to_schema(self, short_schema: str) -> str: - return self.short_schema_to_schema_dict[short_schema] + def short_index_alias_to_index_alias(self, short_index_alias: str) -> str: + return self.short_index_alias_to_index_alias_dict[short_index_alias] async def get_typed_document_pb( self, - schema: str, + index_alias: str, document_id: int, request_context: RequestContext, session_id: str, position: int, ) -> TypedDocumentPb: return await self.application.meta_api_client.get( - schema=schema, + index_alias=index_alias, document_id=document_id, session_id=session_id, position=position, @@ -108,7 +107,7 @@ class BaseHandler(ABC): session_id: str, ) -> ScimagView: typed_document_pb = await self.get_typed_document_pb( - schema='scimag', + index_alias='scimag', document_id=document_id, position=position, request_context=request_context, @@ -124,14 +123,14 @@ class BaseHandler(ABC): session_id: str, ) -> ScitechView: typed_document_pb = await self.get_typed_document_pb( - schema='scitech', + index_alias='scitech', document_id=document_id, position=position, request_context=request_context, session_id=session_id, ) search_response_duplicates = await self.application.meta_api_client.search( - schemas=('scitech',), + index_aliases=('scitech',), query=f'original_id:{document_id}', page_size=16, request_id=request_context.request_id, @@ -149,16 +148,16 @@ class BaseHandler(ABC): async def resolve_document( self, - schema: str, + index_alias: str, document_id: int, position: int, session_id: str, request_context: RequestContext ) -> Union[ScimagView, ScitechView]: - if schema not in self.schema_to_resolver: - raise UnknownSchemaError() + if index_alias not in self.index_alias_to_resolver: + raise UnknownIndexAliasError(index_alias=index_alias) - resolver = self.schema_to_resolver[schema] + resolver = self.index_alias_to_resolver[index_alias] return await resolver( document_id=document_id, position=position, @@ -251,11 +250,23 @@ class BaseHandler(ABC): ) raise events.StopPropagation() + async def is_subscribed(self, chat: ChatPb) -> bool: + if chat.chat_id < 0 or chat.created_at > time.time() - 10 * 60: + return True + try: + await self.application.telegram_client.get_permissions( + self.application.config['telegram']['related_channel'], + chat.chat_id, + ) + except UserNotParticipantError: + return False + return True + async def _check_subscription(self, event: events.ChatAction, request_context: RequestContext, chat: ChatPb): if ( self.application.config['application']['is_subscription_required'] and self.is_subscription_required_for_handler - and not is_subscribed(chat) + and not await self.is_subscribed(chat) ): async with safe_execution( request_context=request_context, @@ -284,7 +295,6 @@ class BaseHandler(ABC): language='en', username=username, is_admin=False, - is_subscribed=True, ) return chat diff --git a/nexus/bot/handlers/download.py b/nexus/bot/handlers/download.py index 64072cf..4cefde4 100644 --- a/nexus/bot/handlers/download.py +++ b/nexus/bot/handlers/download.py @@ -13,24 +13,24 @@ class DownloadHandler(BaseCallbackQueryHandler): is_group_handler = True def parse_pattern(self, event: events.ChatAction): - short_schema = event.pattern_match.group(1).decode() - schema = self.short_schema_to_schema(short_schema) + short_index_alias = event.pattern_match.group(1).decode() + index_alias = self.short_index_alias_to_index_alias(short_index_alias) session_id = event.pattern_match.group(2).decode() document_id = int(event.pattern_match.group(3)) position = int(event.pattern_match.group(4).decode()) - return short_schema, schema, session_id, document_id, position + return short_index_alias, index_alias, session_id, document_id, position async def handler(self, event: events.ChatAction, request_context: RequestContext): - short_schema, schema, session_id, document_id, position = self.parse_pattern(event) + short_index_alias, index_alias, session_id, document_id, position = self.parse_pattern(event) self.application.user_manager.last_widget[request_context.chat.chat_id] = None request_context.add_default_fields(mode='download', session_id=session_id) - request_context.statbox(action='get', document_id=document_id, position=position, schema=schema) + request_context.statbox(action='get', document_id=document_id, position=position, index_alias=index_alias) typed_document_pb = await self.get_typed_document_pb( - schema=schema, + index_alias=index_alias, document_id=document_id, request_context=request_context, session_id=session_id, @@ -41,6 +41,7 @@ class DownloadHandler(BaseCallbackQueryHandler): chat=request_context.chat, request_id=request_context.request_id, session_id=session_id, + bot_name=request_context.bot_name, ) if start_delivery_response_pb.status == StartDeliveryResponsePb.Status.ALREADY_DOWNLOADING: await event.answer( diff --git a/nexus/bot/handlers/roll.py b/nexus/bot/handlers/roll.py index e06fad0..a23ecf2 100644 --- a/nexus/bot/handlers/roll.py +++ b/nexus/bot/handlers/roll.py @@ -31,7 +31,7 @@ class RollHandler(BaseHandler): view, buttons = scitech_view.get_view( language=request_context.chat.language, session_id=session_id, - bot_external_name=self.application.config['telegram']['bot_external_name'], + bot_name=self.application.config['telegram']['bot_name'], ) actions = [ self.application.telegram_client.send_message( diff --git a/nexus/bot/handlers/search.py b/nexus/bot/handlers/search.py index 2899944..9043a67 100644 --- a/nexus/bot/handlers/search.py +++ b/nexus/bot/handlers/search.py @@ -27,7 +27,7 @@ from .base import ( class BaseSearchHandler(BaseHandler, ABC): def preprocess_query(self, query): - return query.replace(f'@{self.application.config["telegram"]["bot_external_name"]}', '').strip() + return query.replace(f'@{self.application.config["telegram"]["bot_name"]}', '').strip() async def do_search( self, @@ -109,7 +109,7 @@ class BaseSearchHandler(BaseHandler, ABC): document_view = parse_typed_document_to_view(scored_document.typed_document) # Second (re-)fetching is required to retrieve duplicates document_view = await self.resolve_document( - schema=scored_document.typed_document.WhichOneof('document'), + index_alias=scored_document.typed_document.WhichOneof('document'), document_id=document_view.id, position=0, session_id=session_id, @@ -118,7 +118,7 @@ class BaseSearchHandler(BaseHandler, ABC): view, buttons = document_view.get_view( language=request_context.chat.language, session_id=session_id, - bot_external_name=self.application.config['telegram']['bot_external_name'], + bot_name=self.application.config['telegram']['bot_name'], with_buttons=not is_group_mode, ) return await asyncio.gather( @@ -254,7 +254,7 @@ class SearchPagingHandler(BaseCallbackQueryHandler): should_reset_last_widget = False def preprocess_query(self, query): - return query.replace(f'@{self.application.config["telegram"]["bot_external_name"]}', '').strip() + return query.replace(f'@{self.application.config["telegram"]["bot_name"]}', '').strip() def parse_pattern(self, event: events.ChatAction): session_id = event.pattern_match.group(1).decode() diff --git a/nexus/bot/handlers/shortlink.py b/nexus/bot/handlers/shortlink.py index a33573b..664d256 100644 --- a/nexus/bot/handlers/shortlink.py +++ b/nexus/bot/handlers/shortlink.py @@ -17,7 +17,7 @@ class ShortlinkHandler(BaseHandler): request_context.statbox(action='start', mode='shortlink', query=query) try: - bot_name = self.application.config["telegram"]["bot_external_name"] + bot_name = self.application.config["telegram"]["bot_name"] text = encode_query_to_deep_link(query, bot_name) except TooLongQueryError: text = t('TOO_LONG_QUERY_FOR_SHORTLINK', language=request_context.chat.language), diff --git a/nexus/bot/handlers/submit.py b/nexus/bot/handlers/submit.py index fc77ecb..2cc8702 100644 --- a/nexus/bot/handlers/submit.py +++ b/nexus/bot/handlers/submit.py @@ -38,6 +38,7 @@ class SubmitHandler(BaseHandler): chat=request_context.chat, request_id=request_context.request_id, session_id=session_id, + bot_name=request_context.bot_name, ), event.delete(), ) diff --git a/nexus/bot/handlers/view.py b/nexus/bot/handlers/view.py index ca4d402..847c12d 100644 --- a/nexus/bot/handlers/view.py +++ b/nexus/bot/handlers/view.py @@ -18,8 +18,8 @@ class ViewHandler(BaseHandler): should_reset_last_widget = False def parse_pattern(self, event: events.ChatAction): - short_schema = event.pattern_match.group(1) - schema = self.short_schema_to_schema(short_schema) + short_index_alias = event.pattern_match.group(1) + index_alias = self.short_index_alias_to_index_alias(short_index_alias) session_id = event.pattern_match.group(3) old_message_id = int(event.pattern_match.group(4)) document_id = int(event.pattern_match.group(5)) @@ -27,7 +27,7 @@ class ViewHandler(BaseHandler): page = int(position / self.application.config['application']['page_size']) - return schema, session_id, old_message_id, document_id, position, page + return index_alias, session_id, old_message_id, document_id, position, page async def process_widgeting(self, has_found_old_widget, old_message_id, request_context: RequestContext): if has_found_old_widget: @@ -56,10 +56,10 @@ class ViewHandler(BaseHandler): return f'/search_{session_id}_{message_id}_{page}' async def handler(self, event: events.ChatAction, request_context: RequestContext): - schema, session_id, old_message_id, document_id, position, page = self.parse_pattern(event) + index_alias, session_id, old_message_id, document_id, position, page = self.parse_pattern(event) request_context.add_default_fields(mode='view', session_id=session_id) - request_context.statbox(action='view', document_id=document_id, position=position, schema=schema) + request_context.statbox(action='view', document_id=document_id, position=position, index_alias=index_alias) has_found_old_widget = old_message_id == self.application.user_manager.last_widget.get(request_context.chat.chat_id) @@ -71,7 +71,7 @@ class ViewHandler(BaseHandler): ) document_view = await self.resolve_document( - schema, + index_alias, document_id, position, session_id, @@ -91,7 +91,7 @@ class ViewHandler(BaseHandler): view, buttons = document_view.get_view( language=request_context.chat.language, session_id=session_id, - bot_external_name=self.application.config['telegram']['bot_external_name'], + bot_name=self.application.config['telegram']['bot_name'], position=position, back_command=back_command, ) diff --git a/nexus/bot/handlers/vote.py b/nexus/bot/handlers/vote.py index da39355..3210178 100644 --- a/nexus/bot/handlers/vote.py +++ b/nexus/bot/handlers/vote.py @@ -16,24 +16,24 @@ class VoteHandler(BaseCallbackQueryHandler): filter = events.CallbackQuery(pattern='^/vote([ab])?_([A-Za-z0-9]+)_([0-9]+)_([bo])$') def parse_pattern(self, event: events.ChatAction): - short_schema = event.pattern_match.group(1) - schema = self.short_schema_to_schema(short_schema.decode()) if short_schema else None + short_index_alias = event.pattern_match.group(1) + index_alias = self.short_index_alias_to_index_alias(short_index_alias.decode()) if short_index_alias else None session_id = event.pattern_match.group(2).decode() document_id = int(event.pattern_match.group(3).decode()) vote = event.pattern_match.group(4).decode() vote_value = {'b': -1, 'o': 1}[vote] - return schema, session_id, document_id, vote, vote_value + return index_alias, session_id, document_id, vote, vote_value async def handler(self, event: events.ChatAction, request_context: RequestContext): - schema, session_id, document_id, vote, vote_value = self.parse_pattern(event) + index_alias, session_id, document_id, vote, vote_value = self.parse_pattern(event) request_context.add_default_fields(mode='vote', session_id=session_id) request_context.statbox( action='vote', document_id=document_id, query=vote, - schema=schema, + index_alias=index_alias, ) document_operation_pb = DocumentOperationPb( @@ -44,7 +44,7 @@ class VoteHandler(BaseCallbackQueryHandler): ), ) logging.getLogger('operation').info( - msg=MessageToDict(document_operation_pb), + msg=MessageToDict(document_operation_pb, preserving_proto_field_name=True), ) message = await event.get_message() diff --git a/nexus/bot/widgets/search_widget.py b/nexus/bot/widgets/search_widget.py index 9b81257..4b654f5 100644 --- a/nexus/bot/widgets/search_widget.py +++ b/nexus/bot/widgets/search_widget.py @@ -64,7 +64,7 @@ class SearchWidget: async def _acquire_documents(self): self._search_response = await self.application.meta_api_client.search( - schemas=self.application.config['application']['schemas'], + index_aliases=self.application.config['application']['index_aliases'], query=self.query, page=self.page, page_size=self.application.config['application']['page_size'], @@ -87,7 +87,7 @@ class SearchWidget: return t('COULD_NOT_FIND_ANYTHING', language=self.chat.language), [close_button(self.session_id)] serp_elements = [] - bot_external_name = self.application.config['telegram']['bot_external_name'] + bot_name = self.application.config['telegram']['bot_name'] for scored_document in self.scored_documents: view = parse_typed_document_to_view(scored_document.typed_document) @@ -98,7 +98,7 @@ class SearchWidget: position=scored_document.position, ) else: - view_command = view.get_deep_link(bot_external_name, text='⬇️') + view_command = view.get_deep_link(bot_name, text='⬇️') serp_elements.append( view.get_snippet( language=self.chat.language, @@ -112,18 +112,18 @@ class SearchWidget: try: encoded_query = encode_query_to_deep_link( self.query, - bot_external_name, + bot_name, ) serp = ( f"{serp}\n\n**{t('DOWNLOAD_AND_SEARCH_MORE', language=self.chat.language)}: **" - f'[@{bot_external_name}]' + f'[@{bot_name}]' f'({encoded_query})' ) except TooLongQueryError: serp = ( f"{serp}\n\n**{t('DOWNLOAD_AND_SEARCH_MORE', language=self.chat.language)}: **" - f'[@{bot_external_name}]' - f'(https://t.me/{bot_external_name})' + f'[@{bot_name}]' + f'(https://t.me/{bot_name})' ) if not self.is_group_mode: diff --git a/nexus/cognitron/schema/BUILD.bazel b/nexus/cognitron/configs/BUILD.bazel similarity index 100% rename from nexus/cognitron/schema/BUILD.bazel rename to nexus/cognitron/configs/BUILD.bazel diff --git a/nexus/cognitron/schema/scimag.yaml b/nexus/cognitron/configs/scimag.yaml similarity index 82% rename from nexus/cognitron/schema/scimag.yaml rename to nexus/cognitron/configs/scimag.yaml index 98d68b6..7895b9a 100644 --- a/nexus/cognitron/schema/scimag.yaml +++ b/nexus/cognitron/configs/scimag.yaml @@ -1,21 +1,21 @@ --- # yamllint disable rule:key-ordering -default_fields: ["abstract", "authors", "language", "title", "tags", "year"] -enabled: true +default_fields: ["abstract", "authors", "language", "title", "tags"] key_field: "id" multi_fields: ["authors", "ipfs_multihashes", "issns", "references", "tags"] -name: scimag schema: - name: id type: i64 options: fast: single + fieldnorms: false indexed: true stored: true - name: abstract type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -23,6 +23,7 @@ schema: type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -30,18 +31,21 @@ schema: type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: true - name: first_page type: i64 options: + fieldnorms: false indexed: false stored: true - name: container_title type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -58,41 +62,48 @@ schema: - name: issued_at type: i64 options: + fieldnorms: false indexed: true stored: true - name: language type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: true - name: last_page type: i64 options: + fieldnorms: false indexed: false stored: true - name: ref_by_count type: i64 options: + fieldnorms: false indexed: false stored: true - name: references type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: false - name: scimag_bulk_id type: i64 options: + fieldnorms: false indexed: false stored: true - name: tags type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -100,12 +111,14 @@ schema: type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true - name: updated_at type: i64 options: + fieldnorms: false indexed: true stored: true - name: volume @@ -114,9 +127,8 @@ schema: indexing: null stored: true - name: year - type: text + type: i64 options: - indexing: - record: basic - tokenizer: raw - stored: false + fieldnorms: true + indexed: true + stored: true diff --git a/nexus/cognitron/schema/scitech.yaml b/nexus/cognitron/configs/scitech.yaml similarity index 82% rename from nexus/cognitron/schema/scitech.yaml rename to nexus/cognitron/configs/scitech.yaml index 1ac788d..025ce35 100644 --- a/nexus/cognitron/schema/scitech.yaml +++ b/nexus/cognitron/configs/scitech.yaml @@ -1,21 +1,21 @@ --- # yamllint disable rule:key-ordering -default_fields: ["authors", "description", "doi", "tags", "title", "year"] -enabled: true +default_fields: ["authors", "description", "tags", "title"] key_field: "id" multi_fields: ["authors", "ipfs_multihashes", "isbns", "tags"] -name: scitech schema: - name: id type: i64 options: fast: single + fieldnorms: false indexed: true stored: true - name: authors type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -33,6 +33,7 @@ schema: type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -40,6 +41,7 @@ schema: type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: true @@ -47,28 +49,33 @@ schema: type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: true - name: fiction_id type: i64 options: + fieldnorms: false indexed: false stored: true - name: filesize type: i64 options: + fieldnorms: false indexed: false stored: true - name: ipfs_multihashes type: text options: + fieldnorms: false indexed: false stored: true - name: isbns type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: true @@ -76,28 +83,33 @@ schema: type: i64 options: fast: single + fieldnorms: false indexed: true stored: true - name: has_duplicates type: i64 options: + fieldnorms: false indexed: false stored: true - name: language type: text options: indexing: + fieldnorms: true record: basic tokenizer: raw stored: true - name: libgen_id type: i64 options: + fieldnorms: false indexed: false stored: true - name: original_id type: i64 options: + fieldnorms: false indexed: true stored: true - name: pages @@ -119,6 +131,7 @@ schema: type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -126,6 +139,7 @@ schema: type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -133,6 +147,7 @@ schema: type: text options: indexing: + fieldnorms: true record: position tokenizer: summa stored: true @@ -140,6 +155,7 @@ schema: type: i64 options: fast: single + fieldnorms: false indexed: true stored: true - name: volume @@ -148,9 +164,8 @@ schema: indexing: null stored: true - name: year - type: text + type: i64 options: - indexing: - record: basic - tokenizer: raw - stored: false + fieldnorms: true + indexed: true + stored: true diff --git a/nexus/cognitron/configs/summa.yaml b/nexus/cognitron/configs/summa.yaml deleted file mode 100644 index 96285bc..0000000 --- a/nexus/cognitron/configs/summa.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- - -http: - address: 0.0.0.0 - keep_alive_secs: 75 - max_body_size_mb: 32 - port: 80 - workers: 48 -log_path: /var/log/nexus-cognitron -search_engine: - auto_commit: false - data_path: /nexus-cognitron/summa - default_page_size: 5 - timeout_secs: 15 - writer_memory_mb: 1024 - writer_threads: 4 diff --git a/nexus/cognitron/installer/BUILD.bazel b/nexus/cognitron/installer/BUILD.bazel deleted file mode 100644 index 1a78d5b..0000000 --- a/nexus/cognitron/installer/BUILD.bazel +++ /dev/null @@ -1,20 +0,0 @@ -load("@pip_modules//:requirements.bzl", "requirement") -load("@rules_python//python:defs.bzl", "py_binary") - -py_binary( - name = "installer", - srcs = glob([ - "**/*.py", - ]), - imports = ["."], - main = "main.py", - srcs_version = "PY3", - visibility = ["//visibility:public"], - deps = [ - requirement("aioipfs"), - requirement("fire"), - requirement("pyyaml"), - requirement("tantipy"), - requirement("izihawa_utils"), - ], -) diff --git a/nexus/cognitron/installer/main.py b/nexus/cognitron/installer/main.py deleted file mode 100644 index 66391d8..0000000 --- a/nexus/cognitron/installer/main.py +++ /dev/null @@ -1,11 +0,0 @@ -import time - -import fire -from nexus.cognitron.installer.scripts.iterate import iterate - -if __name__ == '__main__': - start = time.time() - fire.Fire({ - 'iterate': iterate, - }) - print(f'Elapsed {time.time() - start:.2f} secs') diff --git a/nexus/cognitron/installer/scripts/common.py b/nexus/cognitron/installer/scripts/common.py deleted file mode 100644 index daa8412..0000000 --- a/nexus/cognitron/installer/scripts/common.py +++ /dev/null @@ -1,9 +0,0 @@ -import os - - -def resolve_path(filepath): - if os.path.isabs(filepath): - return filepath - cwd = os.environ.get('BUILD_WORKING_DIRECTORY', os.getcwd()) - filepath = os.path.join(cwd, filepath) - return filepath diff --git a/nexus/cognitron/installer/scripts/iterate.py b/nexus/cognitron/installer/scripts/iterate.py deleted file mode 100644 index 209cea7..0000000 --- a/nexus/cognitron/installer/scripts/iterate.py +++ /dev/null @@ -1,46 +0,0 @@ -import glob -import multiprocessing -import os -from functools import partial - -import yaml -from izihawa_utils.itertools import ichunks -from tantipy import ( - TantivyCoder, - TantivyReader, -) - -from .common import resolve_path - - -def work(document): - # ToDo: Replace this function to what you want to do with document - print(document) - - -def _do_work(coder, chunk_size, limit, store_filepath): - with open(store_filepath, 'rb') as file: - data = file.read() - print(f'Processing segment {store_filepath}, size: {len(data) / (1024 * 1024):.2f} Mb ...') - tr = TantivyReader(data, coder=coder) - for chunk_num, documents in enumerate(ichunks(tr.documents(), chunk_size)): - for doc_num, document in enumerate(documents): - if limit and chunk_num * chunk_size + doc_num > limit: - print(f'Segment {store_filepath} early terminated due to limits') - return - work(document) - print(f'Segment {store_filepath} successfully processed') - - -def iterate(data_filepath, schema_filepath, processes=8, chunk_size=100, limit=1): - data_filepath = resolve_path(data_filepath) - schema_filepath = resolve_path(schema_filepath) - - with open(schema_filepath) as schema_file: - coder = TantivyCoder(yaml.safe_load(schema_file.read())) - - store_filepaths = glob.glob(os.path.join(data_filepath, '*.store')) - - print(f'Total segments: {len(store_filepaths)}') - pool = multiprocessing.Pool(processes) - pool.map(partial(_do_work, coder, chunk_size, limit), store_filepaths) diff --git a/nexus/cognitron/web/BUILD.bazel b/nexus/cognitron/web/BUILD.bazel index 98ef7a5..74f8a1c 100644 --- a/nexus/cognitron/web/BUILD.bazel +++ b/nexus/cognitron/web/BUILD.bazel @@ -1,51 +1,43 @@ load("@io_bazel_rules_docker//container:container.bzl", "container_push") load("@io_bazel_rules_docker//nodejs:image.bzl", "nodejs_image") -load("@npm//nuxt:index.bzl", "nuxt") +load("@npm//nuxt3:index.bzl", "nuxi") -files = ["nuxt.config.js"] + glob([ - "assets/**", +files = [ + "app.vue", + "nuxt.config.ts", +] + glob([ "components/**/*.vue", - "layouts/*.vue", - "middleware/*.js", - "pages/**/*.vue", - "plugins/*.js", - "static/*", - "store/*.js", + "layouts/**/*.vue", + "plugins/**/*.js", ]) deps = [ - "@npm//@nuxtjs/axios", - "@npm//bootstrap", - "@npm//bootstrap-vue", - "@npm//core-js", - "@npm//dateformat", - "@npm//electron", + "@npm//axios", + "@npm//bootstrap-vue-3", "@npm//pug", "@npm//pug-plain-loader", "@npm//sass", "@npm//sass-loader", "@npm//vue", + "@npm//@types/node", "//nexus/meta_api/js/client", "//nexus/views/js", ] -nuxt( +nuxi( name = "web-dev", args = [ - "-c", - "nexus/cognitron/web/nuxt.config.js", - "--watch-poll", + "dev", + "nexus/cognitron/web", ], data = files + deps, ) -nuxt( - name = ".nuxt", +nuxi( + name = ".output", args = [ "build", - "--standalone", - "-c", - "nexus/cognitron/web/nuxt.config.js", + "nexus/cognitron/web", "--buildDir=$(@D)", ], data = files + deps, @@ -55,19 +47,8 @@ nuxt( nodejs_image( name = "image", base = "//images/production:base-nodejs-image", - data = glob(["static/*"]) + [ - "nuxt.config.js", - ":.nuxt", - "@npm//@nuxtjs/axios", - "@npm//bootstrap-vue", - "@npm//nuxt", - ], - entry_point = "@npm//:node_modules/nuxt/bin/nuxt.js", - templated_args = [ - "start", - "-c", - "nexus/cognitron/web/nuxt.config.js", - ], + data = [":.output"], + entry_point = ".output/server/index.mjs", ) diff --git a/nexus/cognitron/web/README.md b/nexus/cognitron/web/README.md index 05ec8f1..32d27ba 100644 --- a/nexus/cognitron/web/README.md +++ b/nexus/cognitron/web/README.md @@ -1,6 +1,29 @@ -# Nexus Web +# Nuxt 3 Minimal Starter -#### Development -```shell script -bazel run web-dev -``` \ No newline at end of file +We recommend to look at the [documentation](https://v3.nuxtjs.org). + +## Setup + +Make sure to install the dependencies + +```bash +yarn install +``` + +## Development + +Start the development server on http://localhost:3000 + +```bash +yarn dev +``` + +## Production + +Build the application for production: + +```bash +yarn build +``` + +Checkout the [deployment documentation](https://v3.nuxtjs.org/docs/deployment). \ No newline at end of file diff --git a/nexus/cognitron/web/app.vue b/nexus/cognitron/web/app.vue new file mode 100644 index 0000000..ad76faf --- /dev/null +++ b/nexus/cognitron/web/app.vue @@ -0,0 +1,4 @@ + diff --git a/nexus/cognitron/web/assets/css/app.scss b/nexus/cognitron/web/assets/css/app.scss deleted file mode 100644 index c0a7906..0000000 --- a/nexus/cognitron/web/assets/css/app.scss +++ /dev/null @@ -1,41 +0,0 @@ -.btn { - border-radius: 0 !important; // sass-lint:disable-line no-important - padding: 0 2em !important; // sass-lint:disable-line no-important -} - -.pagination { - li { - padding-left: 0 !important; // sass-lint:disable-line no-important - - &::after { - content: none; - } - } -} - -$primary: #1a95e0; - -@import 'bootstrap/scss/bootstrap'; - -body { - font-size: 13px !important; // sass-lint:disable-line no-important - line-height: 1.3em !important; // sass-lint:disable-line no-important -} - -html { - overflow-y: scroll; -} - -a { - &:hover { - text-decoration: none; - } -} - -.radio-group { - label { - span { - line-height: 2em; - } - } -} diff --git a/nexus/cognitron/web/assets/css/terminal.css b/nexus/cognitron/web/assets/css/terminal.css deleted file mode 100644 index d92ba60..0000000 --- a/nexus/cognitron/web/assets/css/terminal.css +++ /dev/null @@ -1 +0,0 @@ -:root{--global-font-size:15px;--global-line-height:1.4em;--global-space:10px;--font-stack:Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;--mono-font-stack:Menlo,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New,monospace,serif;--background-color:#fff;--page-width:60em;--font-color:#151515;--invert-font-color:#fff;--primary-color:#1a95e0;--secondary-color:#727578;--error-color:#d20962;--progress-bar-background:#727578;--progress-bar-fill:#151515;--code-bg-color:#e8eff2;--input-style:solid;--display-h1-decoration:none}*{box-sizing:border-box;text-rendering:geometricPrecision}::-moz-selection{background:var(--primary-color);color:var(--invert-font-color)}::selection{background:var(--primary-color);color:var(--invert-font-color)}body{font-size:var(--global-font-size);color:var(--font-color);line-height:var(--global-line-height);margin:0;font-family:var(--font-stack);word-wrap:break-word;background-color:var(--background-color)}.logo,h1,h2,h3,h4,h5,h6{line-height:var(--global-line-height)}a{cursor:pointer;color:var(--primary-color);text-decoration:none}a:hover{background-color:var(--primary-color);color:var(--invert-font-color)}em{font-size:var(--global-font-size);font-style:italic;font-family:var(--font-stack);color:var(--font-color)}blockquote,code,em,strong{line-height:var(--global-line-height)}.logo,blockquote,code,footer,h1,h2,h3,h4,h5,h6,header,li,ol,p,section,ul{float:none;margin:0;padding:0}.logo,blockquote,h1,ol,p,ul{margin-top:calc(var(--global-space) * 2);margin-bottom:calc(var(--global-space) * 2)}.logo,h1{position:relative;display:inline-block;display:table-cell;padding:calc(var(--global-space) * 2) 0 calc(var(--global-space) * 2);margin:0;overflow:hidden;font-weight:600}h1::after{content:"====================================================================================================";position:absolute;bottom:5px;left:0;display:var(--display-h1-decoration)}.logo+*,h1+*{margin-top:0}h2,h3,h4,h5,h6{position:relative;margin-bottom:var(--global-line-height);font-weight:600}blockquote{position:relative;padding-left:calc(var(--global-space) * 2);padding-left:2ch;overflow:hidden}blockquote::after{content:">\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>\A>";white-space:pre;position:absolute;top:0;left:0;line-height:var(--global-line-height);color:#9ca2ab}code{font-weight:inherit;background-color:var(--code-bg-color);font-family:var(--mono-font-stack)}code::after,code::before{content:"`";display:inline}pre code::after,pre code::before{content:""}pre{display:block;word-break:break-all;word-wrap:break-word;color:var(--secondary-color);background-color:var(--background-color);border:1px solid var(--secondary-color);padding:var(--global-space);white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap}pre code{overflow-x:scroll;padding:0;margin:0;display:inline-block;min-width:100%;font-family:var(--mono-font-stack)}.terminal .logo,.terminal blockquote,.terminal code,.terminal h1,.terminal h2,.terminal h3,.terminal h4,.terminal h5,.terminal h6,.terminal strong{font-size:var(--global-font-size);font-style:normal;font-family:var(--font-stack);color:var(--font-color)}.terminal-prompt{position:relative;white-space:nowrap}.terminal-prompt::before{content:"> "}.terminal-prompt::after{content:"";-webkit-animation:cursor .8s infinite;animation:cursor .8s infinite;background:var(--primary-color);border-radius:0;display:inline-block;height:1em;margin-left:.2em;width:3px;bottom:-2px;position:relative}@-webkit-keyframes cursor{0%{opacity:0}50%{opacity:1}to{opacity:0}}@keyframes cursor{0%{opacity:0}50%{opacity:1}to{opacity:0}}li,li>ul>li{position:relative;display:block;padding-left:calc(var(--global-space) * 2)}nav>ul>li{padding-left:0}li::after{position:absolute;top:0;left:0}ul>li::after{content:"-"}nav ul>li::after{content:""}ol li::before{content:counters(item, ".") ". ";counter-increment:item}ol ol li::before{content:counters(item, ".") " ";counter-increment:item}.terminal-menu li::after,.terminal-menu li::before{display:none}ol{counter-reset:item}ol li:nth-child(n+10)::after{left:-7px}ol ol{margin-top:0;margin-bottom:0}.terminal-menu{width:100%}.terminal-nav{display:flex;flex-direction:column;align-items:flex-start}ul ul{margin-top:0;margin-bottom:0}.terminal-menu ul{list-style-type:none;padding:0!important;display:flex;flex-direction:column;width:100%;flex-grow:1;font-size:var(--global-font-size);margin-top:0}.terminal-menu li{display:flex;margin:0 0 .5em 0;padding:0}ol.terminal-toc li{border-bottom:1px dotted var(--secondary-color);padding:0;margin-bottom:15px}.terminal-menu li:last-child{margin-bottom:0}ol.terminal-toc li a{margin:4px 4px 4px 0;background:var(--background-color);position:relative;top:6px;text-align:left;padding-right:4px}.terminal-menu li a:not(.btn){text-decoration:none;display:block;width:100%;border:none;color:var(--secondary-color)}.terminal-menu li a.active{color:var(--font-color)}.terminal-menu li a:hover{background:0 0;color:inherit}ol.terminal-toc li::before{content:counters(item, ".") ". ";counter-increment:item;position:absolute;right:0;background:var(--background-color);padding:4px 0 4px 4px;bottom:-8px}ol.terminal-toc li a:hover{background:var(--primary-color);color:var(--invert-font-color)}hr{position:relative;overflow:hidden;margin:calc(var(--global-space) * 4) 0;border:0;border-bottom:1px dashed var(--secondary-color)}p{margin:0 0 var(--global-line-height);color:var(--global-font-color)}.container{max-width:var(--page-width)}.container,.container-fluid{margin:0 auto;padding:0 calc(var(--global-space) * 2)}img{width:100%}.progress-bar{height:8px;background-color:var(--progress-bar-background);margin:12px 0}.progress-bar.progress-bar-show-percent{margin-top:38px}.progress-bar-filled{background-color:var(--progress-bar-fill);height:100%;transition:width .3s ease;position:relative;width:0}.progress-bar-filled::before{content:"";border:6px solid transparent;border-top-color:var(--progress-bar-fill);position:absolute;top:-12px;right:-6px}.progress-bar-filled::after{color:var(--progress-bar-fill);content:attr(data-filled);display:block;font-size:12px;white-space:nowrap;position:absolute;border:6px solid transparent;top:-38px;right:0;transform:translateX(50%)}.progress-bar-no-arrow>.progress-bar-filled::after,.progress-bar-no-arrow>.progress-bar-filled::before{content:"";display:none;visibility:hidden;opacity:0}table{width:100%;border-collapse:collapse;margin:var(--global-line-height) 0;color:var(--font-color);font-size:var(--global-font-size)}table td,table th{vertical-align:top;border:1px solid var(--font-color);line-height:var(--global-line-height);padding:calc(var(--global-space)/ 2);font-size:1em}table thead th{font-size:1em}table tfoot tr th{font-weight:500}table caption{font-size:1em;margin:0 0 1em 0}table tbody td:first-child{font-weight:700;color:var(--secondary-color)}.form{width:100%}fieldset{border:1px solid var(--font-color);padding:1em}label{font-size:1em;color:var(--font-color)}input[type=email],input[type=number],input[type=password],input[type=search],input[type=text]{border:1px var(--input-style) var(--font-color);width:100%;padding:.7em .5em;font-size:1em;font-family:var(--font-stack);-webkit-appearance:none;border-radius:0}input[type=email]:active,input[type=email]:focus,input[type=number]:active,input[type=number]:focus,input[type=password]:active,input[type=password]:focus,input[type=search]:active,input[type=search]:focus,input[type=text]:active,input[type=text]:focus{outline:0;-webkit-appearance:none;border:1px solid var(--font-color)}input[type=email]:not(:placeholder-shown):invalid,input[type=number]:not(:placeholder-shown):invalid,input[type=password]:not(:placeholder-shown):invalid,input[type=search]:not(:placeholder-shown):invalid,input[type=text]:not(:placeholder-shown):invalid{border-color:var(--error-color)}input,textarea{color:var(--font-color);background-color:var(--background-color)}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:var(--secondary-color)!important;opacity:1}input::-moz-placeholder,textarea::-moz-placeholder{color:var(--secondary-color)!important;opacity:1}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:var(--secondary-color)!important;opacity:1}input::-ms-input-placeholder,textarea::-ms-input-placeholder{color:var(--secondary-color)!important;opacity:1}input::placeholder,textarea::placeholder{color:var(--secondary-color)!important;opacity:1}textarea{height:auto;width:100%;resize:none;border:1px var(--input-style) var(--font-color);padding:.5em;font-size:1em;font-family:var(--font-stack);-webkit-appearance:none;border-radius:0}textarea:focus{outline:0;-webkit-appearance:none;border:1px solid var(--font-color)}textarea:not(:placeholder-shown):invalid{border-color:var(--error-color)}input:-webkit-autofill,input:-webkit-autofill:focus textarea:-webkit-autofill,input:-webkit-autofill:hover,select:-webkit-autofill,select:-webkit-autofill:focus,select:-webkit-autofill:hover,textarea:-webkit-autofill:hover textarea:-webkit-autofill:focus{border:1px solid var(--font-color);-webkit-text-fill-color:var(--font-color);box-shadow:0 0 0 1000px var(--invert-font-color) inset;-webkit-box-shadow:0 0 0 1000px var(--invert-font-color) inset;transition:background-color 5000s ease-in-out 0s}.form-group{margin-bottom:var(--global-line-height);overflow:auto}.btn{border-style:solid;border-width:1px;display:inline-flex;align-items:center;justify-content:center;cursor:pointer;outline:0;padding:.65em 2em;font-size:1em;font-family:inherit;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;position:relative;z-index:1}.btn:active{box-shadow:none}.btn.btn-ghost{border-color:var(--font-color);color:var(--font-color);background-color:transparent}.btn.btn-ghost:focus,.btn.btn-ghost:hover{border-color:var(--tertiary-color);color:var(--tertiary-color);z-index:2}.btn.btn-ghost:hover{background-color:transparent}.btn-block{width:100%;display:flex}.btn-default{background-color:var(--font-color);border-color:var(--invert-font-color);color:var(--invert-font-color)}.btn-default:focus:not(.btn-ghost),.btn-default:hover{background-color:var(--secondary-color);color:var(--invert-font-color)}.btn-default.btn-ghost:focus,.btn-default.btn-ghost:hover{border-color:var(--secondary-color);color:var(--secondary-color);z-index:2}.btn-error{color:var(--invert-font-color);background-color:var(--error-color);border:1px solid var(--error-color)}.btn-error:focus:not(.btn-ghost),.btn-error:hover{background-color:var(--error-color);border-color:var(--error-color)}.btn-error.btn-ghost{border-color:var(--error-color);color:var(--error-color)}.btn-error.btn-ghost:focus,.btn-error.btn-ghost:hover{border-color:var(--error-color);color:var(--error-color);z-index:2}.btn-primary{color:var(--invert-font-color);background-color:var(--primary-color);border:1px solid var(--primary-color)}.btn-primary:focus:not(.btn-ghost),.btn-primary:hover{background-color:var(--primary-color);border-color:var(--primary-color)}.btn-primary.btn-ghost{border-color:var(--primary-color);color:var(--primary-color)}.btn-primary.btn-ghost:focus,.btn-primary.btn-ghost:hover{border-color:var(--primary-color);color:var(--primary-color);z-index:2}.btn-small{padding:.5em 1.3em!important;font-size:.9em!important}.btn-group{overflow:auto}.btn-group .btn{float:left}.btn-group .btn-ghost:not(:first-child){margin-left:-1px}.terminal-card{border:1px solid var(--secondary-color)}.terminal-card>header{color:var(--invert-font-color);text-align:center;background-color:var(--secondary-color);padding:.5em 0}.terminal-card>div:first-of-type{padding:var(--global-space)}.terminal-timeline{position:relative;padding-left:70px}.terminal-timeline::before{content:' ';background:var(--secondary-color);display:inline-block;position:absolute;left:35px;width:2px;height:100%;z-index:400}.terminal-timeline .terminal-card{margin-bottom:25px}.terminal-timeline .terminal-card::before{content:' ';background:var(--invert-font-color);border:2px solid var(--secondary-color);display:inline-block;position:absolute;margin-top:25px;left:26px;width:15px;height:15px;z-index:400}.terminal-alert{color:var(--font-color);padding:1em;border:1px solid var(--font-color);margin-bottom:var(--global-space)}.terminal-alert-error{color:var(--error-color);border-color:var(--error-color)}.terminal-alert-primary{color:var(--primary-color);border-color:var(--primary-color)}@media screen and (max-width:960px){label{display:block;width:100%}pre::-webkit-scrollbar{height:3px}}@media screen and (max-width:480px){form{width:100%}}@media only screen and (min-width:30em){.terminal-nav{flex-direction:row;align-items:center}.terminal-menu ul{flex-direction:row;justify-items:flex-end;align-items:center;justify-content:flex-end;margin-top:calc(var(--global-space) * 2)}.terminal-menu li{margin:0;margin-right:2em}.terminal-menu li:last-child{margin-right:0}}.terminal-media:not(:last-child){margin-bottom:1.25rem}.terminal-media-left{padding-right:var(--global-space)}.terminal-media-left,.terminal-media-right{display:table-cell;vertical-align:top}.terminal-media-right{padding-left:var(--global-space)}.terminal-media-body{display:table-cell;vertical-align:top}.terminal-media-heading{font-size:1em;font-weight:700}.terminal-media-content{margin-top:.3rem}.terminal-placeholder{background-color:var(--secondary-color);text-align:center;color:var(--font-color);font-size:1rem;border:1px solid var(--secondary-color)}figure>img{padding:0}.terminal-avatarholder{width:calc(var(--global-space) * 5);height:calc(var(--global-space) * 5)}.terminal-avatarholder img{padding:0}figure{margin:0}figure>figcaption{color:var(--secondary-color);text-align:center}.hljs{display:block;overflow-x:auto;padding:.5em;background:var(--block-background-color);color:var(--font-color)}.hljs-comment,.hljs-quote{color:var(--secondary-color)}.hljs-variable{color:var(--font-color)}.hljs-built_in,.hljs-keyword,.hljs-name,.hljs-selector-tag,.hljs-tag{color:var(--primary-color)}.hljs-addition,.hljs-attribute,.hljs-literal,.hljs-section,.hljs-string,.hljs-template-tag,.hljs-template-variable,.hljs-title,.hljs-type{color:var(--secondary-color)}.hljs-string{color:var(--secondary-color)}.hljs-deletion,.hljs-meta,.hljs-selector-attr,.hljs-selector-pseudo{color:var(--primary-color)}.hljs-doctag{color:var(--secondary-color)}.hljs-attr{color:var(--primary-color)}.hljs-bullet,.hljs-link,.hljs-symbol{color:var(--primary-color)}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700} \ No newline at end of file diff --git a/nexus/cognitron/web/components/document.vue b/nexus/cognitron/web/components/document.vue index 523a461..87ffbee 100644 --- a/nexus/cognitron/web/components/document.vue +++ b/nexus/cognitron/web/components/document.vue @@ -1,7 +1,7 @@ - - diff --git a/nexus/cognitron/web/components/v-header.vue b/nexus/cognitron/web/components/v-header.vue index 9934e8a..52578da 100644 --- a/nexus/cognitron/web/components/v-header.vue +++ b/nexus/cognitron/web/components/v-header.vue @@ -1,10 +1,10 @@ diff --git a/nexus/cognitron/web/pages/index.vue b/nexus/cognitron/web/pages/index.vue deleted file mode 100644 index 1f42fba..0000000 --- a/nexus/cognitron/web/pages/index.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - diff --git a/nexus/cognitron/web/plugins/meta-api.js b/nexus/cognitron/web/plugins/meta-api.js old mode 100755 new mode 100644 index 51ee25d..b1ba9c9 --- a/nexus/cognitron/web/plugins/meta-api.js +++ b/nexus/cognitron/web/plugins/meta-api.js @@ -5,10 +5,10 @@ function getSchema (typedDocument) { return Object.keys(typedDocument).filter(k => typedDocument[k] !== undefined)[0] } -function schemaToView (schema, pb) { - if (schema === 'scimag') { +function indexNameToView (indexName, pb) { + if (indexName === 'scimag') { return new ScimagView(pb) - } else if (schema === 'scitech') { + } else if (indexName === 'scitech') { return new ScitechView(pb) } } @@ -18,16 +18,16 @@ class MetaApiWrapper { this.metaApi = new MetaApi(metaApiConfig.url || ('http://' + window.location.host), metaApiConfig.hostname) } - async get (schema, id) { - const response = await this.metaApi.get(schema, id) - return schemaToView(schema, response[schema]) + async get (indexName, id) { + const response = await this.metaApi.get(indexName, id) + return indexNameToView(indexName, response[indexName]) } - async search (schemas, query, page, pageSize) { - const response = await this.metaApi.search(schemas, query, page, pageSize) + async search (names, query, page, pageSize) { + const response = await this.metaApi.search(names, query, page, pageSize) const documents = response.scoredDocumentsList.map((scoredDocument) => { - const schema = getSchema(scoredDocument.typedDocument) - return schemaToView(schema, scoredDocument.typedDocument[schema]) + const indexName = getSchema(scoredDocument.typedDocument) + return indexNameToView(indexName, scoredDocument.typedDocument[indexName]) }) return { hasNext: response.hasNext, diff --git a/nexus/cognitron/web/static/android-chrome-192x192.png b/nexus/cognitron/web/static/android-chrome-192x192.png deleted file mode 100644 index 4495b61ebe8572b0e501bb6c536b655f568ee8be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58698 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 diff --git a/nexus/cognitron/web/static/android-chrome-512x512.png b/nexus/cognitron/web/static/android-chrome-512x512.png deleted file mode 100644 index 77591940905fc2a8ca0ded6e7c3fd37fe63ea39a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375558 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 z 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,qsIl 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 i#2my2%YaCrN-hBE7ZG&wLN%2D0000 - - - - - #603cba - - - diff --git a/nexus/cognitron/web/static/favicon-16x16.png b/nexus/cognitron/web/static/favicon-16x16.png deleted file mode 100644 index 9391560996c006c0e1a77a9f0f612c40508a5ff1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1385 zcmZ`%SyYo}5d9D>D(={7)z-AA#ZoL$&=##N3YDmULaMlnEQ)|2i7_k**&quLvam!6 zgai_@FC=6q3E4M5(Y97=H*0HAYmX0oXg#&RkA3LF%sqF`xpU{t4E<2vzQqgIECc{7 zM&x7_K)CEx%#Vd~Qp(ao2DT05og@fItD@FQ`O#1i+P4 z0A|kukii3BRW09ocozV3ZXG&^%odW4$~sDn0<3iiXBXq0GO}ZYU>?L8_$aG{I4+~w zM<|AVjH@<-aLqL#jhrQfaMScDX( zjP8(XjuE_7*q~xp^BPXD&`0=$GZMzdAzGD`S!Ws``JoA=M62+sQ_^S? zp!7YLl&s2r{7FV-E~aR=ic_oW#SqRRxR?{7)^Y<6<(5(0a$xmrR`wH%$Hin72W=j}ImCpC5qwb78ckTm(Vw4i|%G;(x(jkpp7xg!6jYhY$VG-kmDci2pT$rMz&i;8={pL?%Z5{FkQu}nzD4wObkX%?0~M_r=(1X>mz1P z#L^uyb%l&vpO#_bW5l%brqg>_bx3^=DxhtjG;^aSPEbepDM+p%?4-48(%KV-EVOis zu*uMe>2E$Qpdiq;Csos6GYJDMC-0Ia5|{c#IVpV+FKykFv$BAUh;@=Lo?g zZS<>%0Zpr4Lk&QkmE^FYEjrd7(zb?1=>aX(EhD&P&0ZzRuW1eI8Gdz(M^5xA$!ADACE#-^ZLgurKS6bn`PLL>AQM976#Rzv5NI%-qMnfQoTwL~eH6!o@fM zjVOaOYY|zQ$kn%Emc=~#2cmOg=gxaAZvKLW@rxEOSqhddUy-o#^*83OTK(plwd>w` z8?1-Dv+~`<4I4MTm$do)~R-S=pcO z%UOW{`wtw<&C5S@xS$aE#gU^$$H4IuCr_O|bGGMmsyBc!qseTs+U(;Fr)$FP@dBS;5(tLEk?7>q^z@CJGvL@l{xDT}^pKRT&IjUt0#Ns703mfaO1UzG(jCBS}f&{74k>umHp+#&0Q!Pe@ES zz+D-e0Lvnzc}imw^+;Ic&h4N#>RsoJix6@K_iq8StCpjm?@8~5EC3=qFH61WEa_i& Cj;V?O diff --git a/nexus/cognitron/web/static/favicon-32x32.png b/nexus/cognitron/web/static/favicon-32x32.png deleted file mode 100644 index e0155b239951717b7a2f7260ba10610028fcc97e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2319 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 diff --git a/nexus/cognitron/web/static/mstile-150x150.png b/nexus/cognitron/web/static/mstile-150x150.png deleted file mode 100644 index be00718df36561193293db95861d8f64ecb61046..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32108 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 XW4d39a-~8(0!l_gQM^{vIQaho=GEdN diff --git a/nexus/cognitron/web/static/safari-pinned-tab.svg b/nexus/cognitron/web/static/safari-pinned-tab.svg deleted file mode 100644 index 00c4c24..0000000 --- a/nexus/cognitron/web/static/safari-pinned-tab.svg +++ /dev/null @@ -1,932 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/nexus/cognitron/web/static/site.webmanifest b/nexus/cognitron/web/static/site.webmanifest deleted file mode 100644 index 156fce1..0000000 --- a/nexus/cognitron/web/static/site.webmanifest +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "Nexus Cognitron", - "short_name": "Nexus Cognitron", - "icons": [ - { - "src": "/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "/android-chrome-512x512.png", - "sizes": "512x512", - "type": "image/png" - } - ], - "theme_color": "#ffffff", - "background_color": "#ffffff", - "display": "standalone" -} diff --git a/nexus/cognitron/web/tsconfig.json b/nexus/cognitron/web/tsconfig.json new file mode 100644 index 0000000..a7bfa18 --- /dev/null +++ b/nexus/cognitron/web/tsconfig.json @@ -0,0 +1,4 @@ +{ + // https://v3.nuxtjs.org/concepts/typescript + "extends": "./.nuxt/tsconfig.json" +} diff --git a/nexus/hub/BUILD.bazel b/nexus/hub/BUILD.bazel index bb5545c..51bda71 100644 --- a/nexus/hub/BUILD.bazel +++ b/nexus/hub/BUILD.bazel @@ -26,25 +26,24 @@ py3_image( requirement("aiodns"), requirement("aiohttp"), requirement("aiohttp_socks"), - requirement("aioipfs"), requirement("cchardet"), requirement("orjson"), requirement("prometheus-client"), - requirement("psycopg2-binary"), requirement("python-socks"), requirement("tenacity"), requirement("uvloop"), - "//idm/api/proto:idm_proto_py", + "//idm/api/proto:proto_py", requirement("aiogrobid"), "//library/aiogrpctools", + "//library/aioipfs", requirement("aiokit"), "//library/aiopostgres", "//library/configurator", "//library/telegram", - "//nexus/hub/proto:hub_grpc_py", - "//nexus/hub/proto:hub_proto_py", + "//nexus/hub/proto:grpc_py", + "//nexus/hub/proto:proto_py", "//nexus/meta_api/aioclient", - "//nexus/models/proto:models_proto_py", + "//nexus/models/proto:proto_py", "//nexus/pylon", "//nexus/views/telegram", ], @@ -54,7 +53,7 @@ container_push( name = "push-latest", format = "Docker", image = ":image", - registry = "registry.example.com", + registry = "registry.infra.svc.cluster.local", repository = "nexus-hub", tag = "latest", ) @@ -63,7 +62,7 @@ container_push( name = "push-testing", format = "Docker", image = ":image", - registry = "registry.example.com", + registry = "registry.infra.svc.cluster.local", repository = "nexus-hub", tag = "testing", ) diff --git a/nexus/hub/aioclient/BUILD.bazel b/nexus/hub/aioclient/BUILD.bazel index db7c870..d383dd3 100644 --- a/nexus/hub/aioclient/BUILD.bazel +++ b/nexus/hub/aioclient/BUILD.bazel @@ -6,11 +6,11 @@ py_library( visibility = ["//visibility:public"], deps = [ requirement("grpcio"), - "//idm/api/proto:idm_proto_py", + "//idm/api/proto:proto_py", requirement("aiogrpcclient"), requirement("aiokit"), - "//nexus/hub/proto:hub_grpc_py", - "//nexus/hub/proto:hub_proto_py", - "//nexus/models/proto:models_proto_py", + "//nexus/hub/proto:grpc_py", + "//nexus/hub/proto:proto_py", + "//nexus/models/proto:proto_py", ], ) diff --git a/nexus/hub/aioclient/aioclient.py b/nexus/hub/aioclient/aioclient.py index 349c5da..c0b22b3 100644 --- a/nexus/hub/aioclient/aioclient.py +++ b/nexus/hub/aioclient/aioclient.py @@ -26,13 +26,15 @@ class HubGrpcClient(BaseGrpcClient): self, typed_document_pb: TypedDocumentPb, chat: ChatPb, - request_id: Optional[str], - session_id: Optional[str], + bot_name: str, + request_id: Optional[str] = None, + session_id: Optional[str] = None, ) -> StartDeliveryResponsePb: return await self.stubs['delivery'].start_delivery( StartDeliveryRequestPb( typed_document=typed_document_pb, chat=chat, + bot_name=bot_name, ), metadata=(('request-id', request_id), ('session-id', session_id)) ) @@ -42,6 +44,7 @@ class HubGrpcClient(BaseGrpcClient): telegram_document: bytes, telegram_file_id: str, chat: ChatPb, + bot_name: str, request_id: Optional[str] = None, session_id: Optional[str] = None, ) -> SubmitResponsePb: @@ -50,6 +53,7 @@ class HubGrpcClient(BaseGrpcClient): telegram_document=telegram_document, telegram_file_id=telegram_file_id, chat=chat, + bot_name=bot_name, ), metadata=(('request-id', request_id), ('session-id', session_id)) ) diff --git a/nexus/hub/configs/base.yaml b/nexus/hub/configs/base.yaml index a5dc527..a99cb8f 100644 --- a/nexus/hub/configs/base.yaml +++ b/nexus/hub/configs/base.yaml @@ -23,7 +23,7 @@ grpc: # Listen address address: 0.0.0.0 # Listen port - port: 9090 + port: 82 ipfs: address: localhost port: 4001 @@ -36,19 +36,20 @@ pylon: # Proxy used in `pylon` retriever to get metadata resolve_proxy: socks5://127.0.0.1:9050 telegram: - # Telegram App Hash from https://my.telegram.org/ - app_hash: - # Telegram App ID from https://my.telegram.org/ - app_id: 00000 - # External bot name shown in messages to users - bot_external_name: libgen_scihub_bot - # Internal bot name used in logging - bot_name: nexus-hub - bot_token: - # Telethon database for keeping cache - database: - session_id: /tmp/nexus-hub.db - # Frequency of updating downloading progress - progress_throttle_seconds: 5 - # Send files using stored telegram_file_id - should_use_telegram_file_id: true + bots: + _policy: merge + libgen_scihub_1_bot: + # Telegram App Hash from https://my.telegram.org/ + app_hash: + # Telegram App ID from https://my.telegram.org/ + app_id: 00000 + # Internal bot name used in logging + bot_name: nexus-hub + bot_token: + # Telethon database for keeping cache + database: + session_id: /tmp/nexus-hub.db + # Frequency of updating downloading progress + progress_throttle_seconds: 5 + # Send files using stored telegram_file_id + should_use_telegram_file_id: true diff --git a/nexus/hub/main.py b/nexus/hub/main.py index 604c0e4..260b804 100644 --- a/nexus/hub/main.py +++ b/nexus/hub/main.py @@ -19,37 +19,37 @@ class GrpcServer(AioGrpcServer): self.pool_holder = None if config['database']['enabled']: self.pool_holder = AioPostgresPoolHolder( - dsn=f'dbname={config["database"]["database"]} ' + conninfo=f'dbname={config["database"]["database"]} ' f'user={config["database"]["username"]} ' f'password={config["database"]["password"]} ' f'host={config["database"]["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, ) self.waits.append(self.pool_holder) - self.telegram_client = BaseTelegramClient( - app_id=config['telegram']['app_id'], - app_hash=config['telegram']['app_hash'], - bot_token=config['telegram']['bot_token'], - database=config['telegram'].get('database'), - mtproxy=config['telegram'].get('mtproxy'), - ) - self.starts.append(self.telegram_client) + self.telegram_clients = {} + for telegram_bot in config['telegram']['bots']: + telegram_bot_config = config['telegram']['bots'][telegram_bot] + telegram_client = BaseTelegramClient( + app_id=telegram_bot_config['app_id'], + app_hash=telegram_bot_config['app_hash'], + bot_token=telegram_bot_config['bot_token'], + database=telegram_bot_config.get('database'), + mtproxy=telegram_bot_config.get('mtproxy'), + ) + self.telegram_clients[telegram_bot] = telegram_client + self.starts.extend(self.telegram_clients.values()) self.delivery_service = DeliveryService( server=self.server, service_name=config['application']['service_name'], - bot_external_name=config['telegram']['bot_external_name'], ipfs_config=config['ipfs'], is_sharience_enabled=config['application']['is_sharience_enabled'], maintenance_picture_url=config['application'].get('maintenance_picture_url', ''), pool_holder=self.pool_holder, pylon_config=config['pylon'], should_store_hashes=config['application']['should_store_hashes'], - should_use_telegram_file_id=config['telegram']['should_use_telegram_file_id'], - telegram_client=self.telegram_client, + telegram_clients=self.telegram_clients, + telegram_bot_configs=config['telegram']['bots'], ) self.starts.append(self.delivery_service) @@ -57,11 +57,10 @@ class GrpcServer(AioGrpcServer): self.submitter_service = SubmitterService( server=self.server, service_name=config['application']['service_name'], - bot_external_name=config['telegram']['bot_external_name'], grobid_config=config['grobid'], ipfs_config=config['ipfs'], meta_api_config=config['meta_api'], - telegram_client=self.telegram_client, + telegram_clients=self.telegram_clients, ) self.starts.append(self.submitter_service) diff --git a/nexus/hub/proto/BUILD.bazel b/nexus/hub/proto/BUILD.bazel index fc3e83e..fd11ddf 100644 --- a/nexus/hub/proto/BUILD.bazel +++ b/nexus/hub/proto/BUILD.bazel @@ -4,24 +4,24 @@ load("@rules_proto//proto:defs.bzl", "proto_library") package(default_visibility = ["//visibility:public"]) proto_library( - name = "hub_proto", + name = "proto", srcs = glob([ "*.proto", ]), deps = [ - "//idm/api/proto:idm_proto", - "//nexus/models/proto:models_proto", + "//idm/api/proto", + "//nexus/models/proto", "@com_google_protobuf//:wrappers_proto", ], ) py_proto_library( - name = "hub_proto_py", - deps = [":hub_proto"], + name = "proto_py", + deps = [":proto"], ) py_grpc_library( - name = "hub_grpc_py", - srcs = [":hub_proto"], - deps = [":hub_proto_py"], + name = "grpc_py", + srcs = [":proto"], + deps = [":proto_py"], ) diff --git a/nexus/hub/proto/delivery_service.proto b/nexus/hub/proto/delivery_service.proto index 7f19af8..c628d76 100644 --- a/nexus/hub/proto/delivery_service.proto +++ b/nexus/hub/proto/delivery_service.proto @@ -7,6 +7,7 @@ import "idm/api/proto/chat_manager_service.proto"; message StartDeliveryRequest { nexus.models.proto.TypedDocument typed_document = 1; idm.api.proto.Chat chat = 2; + string bot_name = 3; } message StartDeliveryResponse { diff --git a/nexus/hub/proto/delivery_service_pb2.py b/nexus/hub/proto/delivery_service_pb2.py deleted file mode 100644 index 407dc80..0000000 --- a/nexus/hub/proto/delivery_service_pb2.py +++ /dev/null @@ -1,184 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: nexus/hub/proto/delivery_service.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database - -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from idm.api.proto import \ - chat_manager_service_pb2 as \ - idm_dot_api_dot_proto_dot_chat__manager__service__pb2 -from nexus.models.proto import \ - typed_document_pb2 as nexus_dot_models_dot_proto_dot_typed__document__pb2 - -DESCRIPTOR = _descriptor.FileDescriptor( - name='nexus/hub/proto/delivery_service.proto', - package='nexus.hub.proto', - syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n&nexus/hub/proto/delivery_service.proto\x12\x0fnexus.hub.proto\x1a\'nexus/models/proto/typed_document.proto\x1a(idm/api/proto/chat_manager_service.proto\"t\n\x14StartDeliveryRequest\x12\x39\n\x0etyped_document\x18\x01 \x01(\x0b\x32!.nexus.models.proto.TypedDocument\x12!\n\x04\x63hat\x18\x02 \x01(\x0b\x32\x13.idm.api.proto.Chat\"\x99\x01\n\x15StartDeliveryResponse\x12=\n\x06status\x18\x01 \x01(\x0e\x32-.nexus.hub.proto.StartDeliveryResponse.Status\"A\n\x06Status\x12\x06\n\x02OK\x10\x00\x12\x16\n\x12TOO_MANY_DOWNLOADS\x10\x01\x12\x17\n\x13\x41LREADY_DOWNLOADING\x10\x02\x32m\n\x08\x44\x65livery\x12\x61\n\x0estart_delivery\x12%.nexus.hub.proto.StartDeliveryRequest\x1a&.nexus.hub.proto.StartDeliveryResponse\"\x00\x62\x06proto3' - , - dependencies=[nexus_dot_models_dot_proto_dot_typed__document__pb2.DESCRIPTOR,idm_dot_api_dot_proto_dot_chat__manager__service__pb2.DESCRIPTOR,]) - - - -_STARTDELIVERYRESPONSE_STATUS = _descriptor.EnumDescriptor( - name='Status', - full_name='nexus.hub.proto.StartDeliveryResponse.Status', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='OK', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='TOO_MANY_DOWNLOADS', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='ALREADY_DOWNLOADING', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=349, - serialized_end=414, -) -_sym_db.RegisterEnumDescriptor(_STARTDELIVERYRESPONSE_STATUS) - - -_STARTDELIVERYREQUEST = _descriptor.Descriptor( - name='StartDeliveryRequest', - full_name='nexus.hub.proto.StartDeliveryRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='typed_document', full_name='nexus.hub.proto.StartDeliveryRequest.typed_document', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='chat', full_name='nexus.hub.proto.StartDeliveryRequest.chat', index=1, - number=2, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=142, - serialized_end=258, -) - - -_STARTDELIVERYRESPONSE = _descriptor.Descriptor( - name='StartDeliveryResponse', - full_name='nexus.hub.proto.StartDeliveryResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='status', full_name='nexus.hub.proto.StartDeliveryResponse.status', index=0, - number=1, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _STARTDELIVERYRESPONSE_STATUS, - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=261, - serialized_end=414, -) - -_STARTDELIVERYREQUEST.fields_by_name['typed_document'].message_type = nexus_dot_models_dot_proto_dot_typed__document__pb2._TYPEDDOCUMENT -_STARTDELIVERYREQUEST.fields_by_name['chat'].message_type = idm_dot_api_dot_proto_dot_chat__manager__service__pb2._CHAT -_STARTDELIVERYRESPONSE.fields_by_name['status'].enum_type = _STARTDELIVERYRESPONSE_STATUS -_STARTDELIVERYRESPONSE_STATUS.containing_type = _STARTDELIVERYRESPONSE -DESCRIPTOR.message_types_by_name['StartDeliveryRequest'] = _STARTDELIVERYREQUEST -DESCRIPTOR.message_types_by_name['StartDeliveryResponse'] = _STARTDELIVERYRESPONSE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -StartDeliveryRequest = _reflection.GeneratedProtocolMessageType('StartDeliveryRequest', (_message.Message,), { - 'DESCRIPTOR' : _STARTDELIVERYREQUEST, - '__module__' : 'nexus.hub.proto.delivery_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.hub.proto.StartDeliveryRequest) - }) -_sym_db.RegisterMessage(StartDeliveryRequest) - -StartDeliveryResponse = _reflection.GeneratedProtocolMessageType('StartDeliveryResponse', (_message.Message,), { - 'DESCRIPTOR' : _STARTDELIVERYRESPONSE, - '__module__' : 'nexus.hub.proto.delivery_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.hub.proto.StartDeliveryResponse) - }) -_sym_db.RegisterMessage(StartDeliveryResponse) - - - -_DELIVERY = _descriptor.ServiceDescriptor( - name='Delivery', - full_name='nexus.hub.proto.Delivery', - file=DESCRIPTOR, - index=0, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=416, - serialized_end=525, - methods=[ - _descriptor.MethodDescriptor( - name='start_delivery', - full_name='nexus.hub.proto.Delivery.start_delivery', - index=0, - containing_service=None, - input_type=_STARTDELIVERYREQUEST, - output_type=_STARTDELIVERYRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_DELIVERY) - -DESCRIPTOR.services_by_name['Delivery'] = _DELIVERY - -# @@protoc_insertion_point(module_scope) diff --git a/nexus/hub/proto/delivery_service_pb2_grpc.py b/nexus/hub/proto/delivery_service_pb2_grpc.py deleted file mode 100644 index aedf924..0000000 --- a/nexus/hub/proto/delivery_service_pb2_grpc.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -"""Client and server classes corresponding to protobuf-defined services.""" -import grpc -from nexus.hub.proto import \ - delivery_service_pb2 as nexus_dot_hub_dot_proto_dot_delivery__service__pb2 - - -class DeliveryStub(object): - """Missing associated documentation comment in .proto file.""" - - def __init__(self, channel): - """Constructor. - - Args: - channel: A grpc.Channel. - """ - self.start_delivery = channel.unary_unary( - '/nexus.hub.proto.Delivery/start_delivery', - request_serializer=nexus_dot_hub_dot_proto_dot_delivery__service__pb2.StartDeliveryRequest.SerializeToString, - response_deserializer=nexus_dot_hub_dot_proto_dot_delivery__service__pb2.StartDeliveryResponse.FromString, - ) - - -class DeliveryServicer(object): - """Missing associated documentation comment in .proto file.""" - - def start_delivery(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - -def add_DeliveryServicer_to_server(servicer, server): - rpc_method_handlers = { - 'start_delivery': grpc.unary_unary_rpc_method_handler( - servicer.start_delivery, - request_deserializer=nexus_dot_hub_dot_proto_dot_delivery__service__pb2.StartDeliveryRequest.FromString, - response_serializer=nexus_dot_hub_dot_proto_dot_delivery__service__pb2.StartDeliveryResponse.SerializeToString, - ), - } - generic_handler = grpc.method_handlers_generic_handler( - 'nexus.hub.proto.Delivery', rpc_method_handlers) - server.add_generic_rpc_handlers((generic_handler,)) - - - # This class is part of an EXPERIMENTAL API. -class Delivery(object): - """Missing associated documentation comment in .proto file.""" - - @staticmethod - def start_delivery(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/nexus.hub.proto.Delivery/start_delivery', - nexus_dot_hub_dot_proto_dot_delivery__service__pb2.StartDeliveryRequest.SerializeToString, - nexus_dot_hub_dot_proto_dot_delivery__service__pb2.StartDeliveryResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/nexus/hub/proto/submitter_service.proto b/nexus/hub/proto/submitter_service.proto index fc9f6ca..06d88a3 100644 --- a/nexus/hub/proto/submitter_service.proto +++ b/nexus/hub/proto/submitter_service.proto @@ -7,6 +7,7 @@ message SubmitRequest { bytes telegram_document = 1; string telegram_file_id = 2; idm.api.proto.Chat chat = 3; + string bot_name = 4; } message SubmitResponse { } diff --git a/nexus/hub/proto/submitter_service_pb2.py b/nexus/hub/proto/submitter_service_pb2.py deleted file mode 100644 index 5a48f2f..0000000 --- a/nexus/hub/proto/submitter_service_pb2.py +++ /dev/null @@ -1,148 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: nexus/hub/proto/submitter_service.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database - -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from idm.api.proto import \ - chat_manager_service_pb2 as \ - idm_dot_api_dot_proto_dot_chat__manager__service__pb2 - -DESCRIPTOR = _descriptor.FileDescriptor( - name='nexus/hub/proto/submitter_service.proto', - package='nexus.hub.proto', - syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\'nexus/hub/proto/submitter_service.proto\x12\x0fnexus.hub.proto\x1a(idm/api/proto/chat_manager_service.proto\"g\n\rSubmitRequest\x12\x19\n\x11telegram_document\x18\x01 \x01(\x0c\x12\x18\n\x10telegram_file_id\x18\x02 \x01(\t\x12!\n\x04\x63hat\x18\x03 \x01(\x0b\x32\x13.idm.api.proto.Chat\"\x10\n\x0eSubmitResponse2X\n\tSubmitter\x12K\n\x06submit\x12\x1e.nexus.hub.proto.SubmitRequest\x1a\x1f.nexus.hub.proto.SubmitResponse\"\x00\x62\x06proto3' - , - dependencies=[idm_dot_api_dot_proto_dot_chat__manager__service__pb2.DESCRIPTOR,]) - - - - -_SUBMITREQUEST = _descriptor.Descriptor( - name='SubmitRequest', - full_name='nexus.hub.proto.SubmitRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='telegram_document', full_name='nexus.hub.proto.SubmitRequest.telegram_document', index=0, - number=1, type=12, cpp_type=9, label=1, - has_default_value=False, default_value=b"", - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='telegram_file_id', full_name='nexus.hub.proto.SubmitRequest.telegram_file_id', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='chat', full_name='nexus.hub.proto.SubmitRequest.chat', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=102, - serialized_end=205, -) - - -_SUBMITRESPONSE = _descriptor.Descriptor( - name='SubmitResponse', - full_name='nexus.hub.proto.SubmitResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=207, - serialized_end=223, -) - -_SUBMITREQUEST.fields_by_name['chat'].message_type = idm_dot_api_dot_proto_dot_chat__manager__service__pb2._CHAT -DESCRIPTOR.message_types_by_name['SubmitRequest'] = _SUBMITREQUEST -DESCRIPTOR.message_types_by_name['SubmitResponse'] = _SUBMITRESPONSE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -SubmitRequest = _reflection.GeneratedProtocolMessageType('SubmitRequest', (_message.Message,), { - 'DESCRIPTOR' : _SUBMITREQUEST, - '__module__' : 'nexus.hub.proto.submitter_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.hub.proto.SubmitRequest) - }) -_sym_db.RegisterMessage(SubmitRequest) - -SubmitResponse = _reflection.GeneratedProtocolMessageType('SubmitResponse', (_message.Message,), { - 'DESCRIPTOR' : _SUBMITRESPONSE, - '__module__' : 'nexus.hub.proto.submitter_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.hub.proto.SubmitResponse) - }) -_sym_db.RegisterMessage(SubmitResponse) - - - -_SUBMITTER = _descriptor.ServiceDescriptor( - name='Submitter', - full_name='nexus.hub.proto.Submitter', - file=DESCRIPTOR, - index=0, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=225, - serialized_end=313, - methods=[ - _descriptor.MethodDescriptor( - name='submit', - full_name='nexus.hub.proto.Submitter.submit', - index=0, - containing_service=None, - input_type=_SUBMITREQUEST, - output_type=_SUBMITRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_SUBMITTER) - -DESCRIPTOR.services_by_name['Submitter'] = _SUBMITTER - -# @@protoc_insertion_point(module_scope) diff --git a/nexus/hub/proto/submitter_service_pb2_grpc.py b/nexus/hub/proto/submitter_service_pb2_grpc.py deleted file mode 100644 index 991007c..0000000 --- a/nexus/hub/proto/submitter_service_pb2_grpc.py +++ /dev/null @@ -1,67 +0,0 @@ -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -"""Client and server classes corresponding to protobuf-defined services.""" -import grpc -from nexus.hub.proto import \ - submitter_service_pb2 as \ - nexus_dot_hub_dot_proto_dot_submitter__service__pb2 - - -class SubmitterStub(object): - """Missing associated documentation comment in .proto file.""" - - def __init__(self, channel): - """Constructor. - - Args: - channel: A grpc.Channel. - """ - self.submit = channel.unary_unary( - '/nexus.hub.proto.Submitter/submit', - request_serializer=nexus_dot_hub_dot_proto_dot_submitter__service__pb2.SubmitRequest.SerializeToString, - response_deserializer=nexus_dot_hub_dot_proto_dot_submitter__service__pb2.SubmitResponse.FromString, - ) - - -class SubmitterServicer(object): - """Missing associated documentation comment in .proto file.""" - - def submit(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - -def add_SubmitterServicer_to_server(servicer, server): - rpc_method_handlers = { - 'submit': grpc.unary_unary_rpc_method_handler( - servicer.submit, - request_deserializer=nexus_dot_hub_dot_proto_dot_submitter__service__pb2.SubmitRequest.FromString, - response_serializer=nexus_dot_hub_dot_proto_dot_submitter__service__pb2.SubmitResponse.SerializeToString, - ), - } - generic_handler = grpc.method_handlers_generic_handler( - 'nexus.hub.proto.Submitter', rpc_method_handlers) - server.add_generic_rpc_handlers((generic_handler,)) - - - # This class is part of an EXPERIMENTAL API. -class Submitter(object): - """Missing associated documentation comment in .proto file.""" - - @staticmethod - def submit(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/nexus.hub.proto.Submitter/submit', - nexus_dot_hub_dot_proto_dot_submitter__service__pb2.SubmitRequest.SerializeToString, - nexus_dot_hub_dot_proto_dot_submitter__service__pb2.SubmitResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/nexus/hub/services/base.py b/nexus/hub/services/base.py index 25423b5..ccfbfb5 100644 --- a/nexus/hub/services/base.py +++ b/nexus/hub/services/base.py @@ -1,6 +1,6 @@ import asyncio -from aioipfs import AsyncIPFS +from aioipfs import AsyncIPFS as AsyncIPFS from library.aiogrpctools.base import BaseService from nexus.views.telegram.common import vote_button from telethon.errors import rpcerrorlist @@ -17,11 +17,14 @@ def is_group_or_channel(chat_id: int): class BaseHubService(BaseService): - def __init__(self, service_name: str, bot_external_name: str, ipfs_config: dict, telegram_client): + def __init__(self, service_name: str, ipfs_config: dict, telegram_clients): super().__init__(service_name=service_name) - self.bot_external_name = bot_external_name - self.ipfs_client = AsyncIPFS(host=ipfs_config['address'], port=ipfs_config['port']) - self.telegram_client = telegram_client + self.ipfs_client = None + self.ipfs_config = ipfs_config + self.telegram_clients = telegram_clients + + async def start(self): + self.ipfs_client = AsyncIPFS(host=self.ipfs_config['address'], port=self.ipfs_config['port']) async def get_ipfs_hashes(self, file): return list(map( @@ -54,24 +57,28 @@ class BaseHubService(BaseService): buttons = [ vote_button( case='broken', - schema=document_view.schema, + index_alias=document_view.index_alias, document_id=document_id, language=request_context.chat.language, session_id=session_id, ), vote_button( case='ok', - schema=document_view.schema, + index_alias=document_view.index_alias, document_id=document_id, language=request_context.chat.language, session_id=session_id, ), ] - message = await self.telegram_client.send_file( + + caption = ( + f"{document_view.generate_body(language=request_context.chat.language, limit=512)}\n" + f"@{request_context.bot_name}" + ) + message = await self.telegram_clients[request_context.bot_name].send_file( attributes=[DocumentAttributeFilename(document_view.get_filename())], buttons=buttons, - caption=f"{document_view.generate_body(language=request_context.chat.language, limit=512)}\n" - f"@{self.bot_external_name}", + caption=caption, entity=request_context.chat.chat_id, file=file, progress_callback=progress_callback @@ -79,7 +86,7 @@ class BaseHubService(BaseService): request_context.statbox( action='sent', document_id=document_id, - schema=document_view.schema, + index_alias=document_view.index_alias, voting=voting, ) return message diff --git a/nexus/hub/services/delivery.py b/nexus/hub/services/delivery.py index b778f33..a8c8a25 100644 --- a/nexus/hub/services/delivery.py +++ b/nexus/hub/services/delivery.py @@ -10,10 +10,7 @@ from grpc import ( from izihawa_utils.common import filter_none from izihawa_utils.pb_to_json import MessageToDict from library.aiogrpctools.base import aiogrpc_request_wrapper -from library.telegram.base import ( - BaseTelegramClient, - RequestContext, -) +from library.telegram.base import RequestContext from library.telegram.utils import safe_execution from nexus.hub.fancy_names import get_fancy_name from nexus.hub.proto.delivery_service_pb2 import \ @@ -27,6 +24,8 @@ from nexus.hub.proto.delivery_service_pb2_grpc import ( from nexus.hub.user_manager import UserManager from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb +from nexus.models.proto.operation_pb2 import \ + StoreTelegramFileId as StoreTelegramFileIdPb from nexus.models.proto.operation_pb2 import UpdateDocument as UpdateDocumentPb from nexus.models.proto.typed_document_pb2 import \ TypedDocument as TypedDocumentPb @@ -51,7 +50,7 @@ downloads_gauge = Gauge('downloads_total', documentation='Currently downloading async def operation_log(document_operation_pb): - logging.getLogger('operation').info(msg=MessageToDict(document_operation_pb)) + logging.getLogger('operation').info(msg=MessageToDict(document_operation_pb, preserving_proto_field_name=True)) class DownloadTask: @@ -72,7 +71,7 @@ class DownloadTask: self.task = asyncio.create_task( self.download_task( request_context=self.request_context, - document_view=self.document_view + document_view=self.document_view, ) ) @@ -92,7 +91,7 @@ class DownloadTask: throttle_secs = 2.0 async def _on_fail(): - await self.delivery_service.telegram_client.send_message( + await self.delivery_service.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t('MAINTENANCE', language=request_context.chat.language).format( maintenance_picture_url=self.delivery_service.maintenance_picture_url @@ -104,7 +103,7 @@ class DownloadTask: on_fail=_on_fail, ): progress_bar_download = ProgressBar( - telegram_client=self.delivery_service.telegram_client, + telegram_client=self.delivery_service.telegram_clients[request_context.bot_name], request_context=request_context, banner=t("LOOKING_AT", language=request_context.chat.language), header=f'⬇️ {document_view.get_filename()}', @@ -123,7 +122,7 @@ class DownloadTask: action='missed', duration=time.time() - start_time, document_id=document_view.id, - schema=document_view.schema, + index_alias=document_view.index_alias, ) is_served_from_sharience = False if self.delivery_service.is_sharience_enabled: @@ -136,7 +135,7 @@ class DownloadTask: action='not_found', document_id=document_view.id, duration=time.time() - start_time, - schema=document_view.schema, + index_alias=document_view.index_alias, ) await self.respond_not_found( request_context=request_context, @@ -149,11 +148,11 @@ class DownloadTask: duration=time.time() - start_time, document_id=document_view.id, len=len(file), - schema=document_view.schema, + index_alias=document_view.index_alias, ) progress_bar_upload = ProgressBar( - telegram_client=self.delivery_service.telegram_client, + telegram_client=self.delivery_service.telegram_clients[request_context.bot_name], request_context=request_context, message=progress_bar_download.message, banner=t("LOOKING_AT", language=request_context.chat.language), @@ -161,7 +160,6 @@ class DownloadTask: tail_text=t('UPLOADED_TO_TELEGRAM', language=request_context.chat.language), throttle_secs=throttle_secs ) - uploaded_message = await self.delivery_service.send_file( document_view=self.document_view, file=file, @@ -174,10 +172,11 @@ class DownloadTask: action='uploaded', duration=time.time() - start_time, document_id=document_view.id, - schema=document_view.schema, + index_alias=document_view.index_alias, ) if self.delivery_service.should_store_hashes: asyncio.create_task(self.store_hashes( + bot_name=request_context.bot_name, document_view=document_view, telegram_file_id=uploaded_message.file.id, file=file, @@ -189,14 +188,18 @@ class DownloadTask: action='user_canceled', duration=time.time() - start_time, document_id=document_view.id, - schema=document_view.schema, + index_alias=document_view.index_alias, ) except asyncio.CancelledError: pass finally: downloads_gauge.dec() messages = filter_none([progress_bar_download.message]) - await self.delivery_service.telegram_client.delete_messages(request_context.chat.chat_id, messages) + await ( + self.delivery_service + .telegram_clients[request_context.bot_name] + .delete_messages(request_context.chat.chat_id, messages) + ) async def process_resp(self, resp, progress_bar, collected, filesize): progress_bar.set_source(get_fancy_name(resp.source)) @@ -210,7 +213,7 @@ class DownloadTask: await progress_bar.callback(len(collected), filesize) async def respond_not_found(self, request_context: RequestContext, document_view): - return await self.delivery_service.telegram_client.send_message( + return await self.delivery_service.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t("SOURCES_UNAVAILABLE", language=request_context.chat.language).format( document=document_view.get_robust_title() @@ -220,19 +223,22 @@ class DownloadTask: async def try_sharience(self, request_context, document_view): if document_view.doi: - request_context.statbox(action='try_sharience', doi=document_view.doi, schema=document_view.schema) - pg_data = await self.delivery_service.pool_holder.execute( + request_context.statbox(action='try_sharience', doi=document_view.doi, index_alias=document_view.index_alias) + pg_data = self.delivery_service.pool_holder.iterate( ''' - select sh.id, sh.telegram_file_id as vote_sum + select sh.id, t.telegram_file_id as vote_sum from sharience as sh left join votes as v on sh.id = v.document_id - group by sh.id + left join telegram_files as t + on sh.id = t.document_id + where t.bot_name = %s + group by sh.id, t.telegram_file_id having coalesce(sum(v.value), 0) > -1 and sh.parent_id = %s order by coalesce(sum(v.value), 0) desc; - ''', (document_view.id,), fetch=True) - for document_id, telegram_file_id in pg_data: + ''', (self.request_context.bot_name, document_view.id,)) + async for document_id, telegram_file_id in pg_data: return await self.delivery_service.send_file( document_id=document_id, document_view=self.document_view, @@ -258,8 +264,8 @@ class DownloadTask: filesize=document_view.filesize, ) return bytes(collected) - except DownloadError as e: - self.request_context.error_log(e) + except DownloadError: + pass if document_view.md5: try: async for resp in self.delivery_service.pylon_client.by_md5( @@ -273,17 +279,17 @@ class DownloadTask: filesize=document_view.filesize, ) return bytes(collected) - except DownloadError as e: - self.request_context.error_log(e) + except DownloadError: + pass async def external_cancel(self): self.task.cancel() self.request_context.statbox( action='externally_canceled', document_id=self.document_view.id, - schema=self.document_view.schema, + index=self.document_view.index, ) - await self.delivery_service.telegram_client.send_message( + await self.delivery_service.telegram_clients[self.request_context.bot_name].send_message( self.request_context.chat.chat_id, t("DOWNLOAD_CANCELED", language=self.request_context.chat.language).format( document=self.document_view.get_robust_title() @@ -291,22 +297,31 @@ class DownloadTask: buttons=[close_button()] ) - async def store_hashes(self, document_view, telegram_file_id, file): + async def store_hashes(self, bot_name, document_view, telegram_file_id, file): document_pb = document_view.document_pb - document_pb.telegram_file_id = telegram_file_id document_pb.filesize = len(file) if not document_pb.md5: document_pb.md5 = hashlib.md5(file).hexdigest() del document_pb.ipfs_multihashes[:] document_pb.ipfs_multihashes.extend(await self.delivery_service.get_ipfs_hashes(file=file)) - document_operation_pb = DocumentOperationPb( + update_document_operation_pb = DocumentOperationPb( update_document=UpdateDocumentPb( - fields=['filesize', 'ipfs_multihashes', 'md5', 'telegram_file_id'], - typed_document=TypedDocumentPb(**{document_view.schema: document_pb}), + fields=['filesize', 'ipfs_multihashes', 'md5'], + typed_document=TypedDocumentPb(**{document_view.index_alias: document_pb}), ), ) - await operation_log(document_operation_pb) + store_telegram_file_id_operation_pb = DocumentOperationPb( + store_telegram_file_id=StoreTelegramFileIdPb( + document_id=document_pb.id, + telegram_file_id=telegram_file_id, + bot_name=bot_name, + ), + ) + await asyncio.gather( + operation_log(update_document_operation_pb), + operation_log(store_telegram_file_id_operation_pb), + ) class DeliveryService(DeliveryServicer, BaseHubService): @@ -314,23 +329,19 @@ class DeliveryService(DeliveryServicer, BaseHubService): self, server: Server, service_name: str, - bot_external_name: str, ipfs_config: dict, is_sharience_enabled: bool, maintenance_picture_url: str, pool_holder, pylon_config: dict, should_store_hashes: bool, - should_use_telegram_file_id: bool, - telegram_client: BaseTelegramClient, + telegram_clients: dict, + telegram_bot_configs: dict, ): - if is_sharience_enabled and not pool_holder: - raise ValueError('Sharience can be used only with enabled database') super().__init__( service_name=service_name, - bot_external_name=bot_external_name, ipfs_config=ipfs_config, - telegram_client=telegram_client, + telegram_clients=telegram_clients, ) self.downloadings = set() self.is_sharience_enabled = is_sharience_enabled @@ -342,11 +353,12 @@ class DeliveryService(DeliveryServicer, BaseHubService): ) self.server = server self.should_store_hashes = should_store_hashes - self.should_use_telegram_file_id = should_use_telegram_file_id + self.telegram_bot_configs = telegram_bot_configs self.user_manager = UserManager() self.waits.extend([self.pylon_client]) async def start(self): + await super().start() add_DeliveryServicer_to_server(self, self.server) async def stop(self): @@ -355,6 +367,13 @@ class DeliveryService(DeliveryServicer, BaseHubService): await asyncio.gather(*map(lambda x: x.task, self.downloadings)) await self.ipfs_client.close() + async def get_telegram_file_id(self, bot_name, document_id): + pg_data = self.pool_holder.iterate(''' + select telegram_file_id from telegram_files where bot_name = %s and document_id = %s + ''', (bot_name, document_id)) + async for telegram_file_id in pg_data: + return telegram_file_id + @aiogrpc_request_wrapper(log=False) async def start_delivery( self, @@ -363,7 +382,7 @@ class DeliveryService(DeliveryServicer, BaseHubService): metadata: dict, ) -> StartDeliveryResponsePb: request_context = RequestContext( - bot_name=self.service_name, + bot_name=request.bot_name, chat=request.chat, request_id=metadata.get('request-id'), ) @@ -373,20 +392,22 @@ class DeliveryService(DeliveryServicer, BaseHubService): **self.get_default_service_fields(), ) document_view = parse_typed_document_to_view(request.typed_document) - cache_hit = self.should_use_telegram_file_id and document_view.telegram_file_id - if cache_hit: + telegram_file_id = None + if self.telegram_bot_configs[request_context.bot_name]['should_use_telegram_file_id']: + telegram_file_id = await self.get_telegram_file_id(request_context.bot_name, document_view.id) + if telegram_file_id: try: await self.send_file( document_view=document_view, - file=document_view.telegram_file_id, + file=telegram_file_id, session_id=metadata.get('session-id'), request_context=request_context, voting=not is_group_or_channel(request_context.chat.chat_id), ) - request_context.statbox(action='cache_hit', document_id=document_view.id, schema=document_view.schema) + request_context.statbox(action='cache_hit', document_id=document_view.id, index_alias=document_view.index_alias) except ValueError: - cache_hit = False - if not cache_hit: + telegram_file_id = None + if not telegram_file_id: if self.user_manager.has_task(request.chat.chat_id, document_view.id): return StartDeliveryResponsePb(status=StartDeliveryResponsePb.Status.ALREADY_DOWNLOADING) if self.user_manager.hit_limits(request.chat.chat_id): diff --git a/nexus/hub/services/submitter.py b/nexus/hub/services/submitter.py index bb34341..cec656a 100644 --- a/nexus/hub/services/submitter.py +++ b/nexus/hub/services/submitter.py @@ -1,3 +1,4 @@ +import asyncio import hashlib import logging import time @@ -10,10 +11,7 @@ from grpc import ( ) from izihawa_utils.pb_to_json import MessageToDict from library.aiogrpctools.base import aiogrpc_request_wrapper -from library.telegram.base import ( - BaseTelegramClient, - RequestContext, -) +from library.telegram.base import RequestContext from nexus.hub.exceptions import ( FileTooBigError, UnavailableMetadataError, @@ -31,6 +29,8 @@ from nexus.hub.user_manager import UserManager from nexus.meta_api.aioclient import MetaApiGrpcClient from nexus.models.proto.operation_pb2 import \ DocumentOperation as DocumentOperationPb +from nexus.models.proto.operation_pb2 import \ + StoreTelegramFileId as StoreTelegramFileIdPb from nexus.models.proto.operation_pb2 import UpdateDocument as UpdateDocumentPb from nexus.models.proto.sharience_pb2 import Sharience as ShariencePb from nexus.models.proto.typed_document_pb2 import \ @@ -44,7 +44,7 @@ from .base import BaseHubService async def operation_log(document_operation_pb): - logging.getLogger('operation').info(msg=MessageToDict(document_operation_pb)) + logging.getLogger('operation').info(msg=MessageToDict(document_operation_pb, preserving_proto_field_name=True)) class SubmitterService(SubmitterServicer, BaseHubService): @@ -52,27 +52,25 @@ class SubmitterService(SubmitterServicer, BaseHubService): self, server: Server, service_name: str, - bot_external_name: str, grobid_config: dict, ipfs_config: dict, meta_api_config: dict, - telegram_client: BaseTelegramClient, + telegram_clients, ): super().__init__( service_name=service_name, - bot_external_name=bot_external_name, ipfs_config=ipfs_config, - telegram_client=telegram_client, + telegram_clients=telegram_clients, ) self.server = server self.grobid_client = GrobidClient(base_url=grobid_config['url']) - self.meta_api_client = MetaApiGrpcClient(base_url=meta_api_config['url']) - self.telegram_client = telegram_client - self.bot_external_name = bot_external_name + self.meta_api_client = MetaApiGrpcClient(endpoint=meta_api_config['endpoint']) + self.telegram_clients = telegram_clients self.user_manager = UserManager() self.waits.extend([self.grobid_client, self.meta_api_client]) async def start(self): + await super().start() add_SubmitterServicer_to_server(self, self.server) async def stop(self): @@ -87,7 +85,7 @@ class SubmitterService(SubmitterServicer, BaseHubService): ) -> SubmitResponsePb: session_id = metadata.get('session-id') request_context = RequestContext( - bot_name=self.service_name, + bot_name=request.bot_name, chat=request.chat, request_id=metadata.get('request-id'), ) @@ -101,26 +99,26 @@ class SubmitterService(SubmitterServicer, BaseHubService): if document.size > 20 * 1024 * 1024: request_context.error_log(FileTooBigError(size=document.size)) request_context.statbox(action='file_too_big') - await self.telegram_client.send_message( + await self.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t('FILE_TOO_BIG_ERROR', language=request_context.chat.language), buttons=[close_button()], ) return SubmitResponsePb() - processing_message = await self.telegram_client.send_message( + processing_message = await self.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t("PROCESSING_PAPER", language=request_context.chat.language).format( filename=document.attributes[0].file_name, ), ) try: - file = await self.telegram_client.download_document(document=document, file=bytes) + file = await self.telegram_clients[request_context.bot_name].download_document(document=document, file=bytes) try: processed_document = await self.grobid_client.process_fulltext_document(pdf_file=file) except BadRequestError as e: request_context.statbox(action='unparsable_document') request_context.error_log(e) - await self.telegram_client.send_message( + await self.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t('UNPARSABLE_DOCUMENT_ERROR', language=request_context.chat.language).format( filename=document.attributes[0].file_name, @@ -132,7 +130,7 @@ class SubmitterService(SubmitterServicer, BaseHubService): if not processed_document.get('doi'): request_context.statbox(action='unparsable_doi') request_context.error_log(UnparsableDoiError()) - await self.telegram_client.send_message( + await self.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t('UNPARSABLE_DOI_ERROR', language=request_context.chat.language).format( filename=document.attributes[0].file_name, @@ -142,7 +140,7 @@ class SubmitterService(SubmitterServicer, BaseHubService): return SubmitResponsePb() search_response_pb = await self.meta_api_client.search( - schemas=('scimag',), + names=('scimag',), query=processed_document['doi'], page=0, page_size=1, @@ -155,7 +153,7 @@ class SubmitterService(SubmitterServicer, BaseHubService): if len(search_response_pb.scored_documents) == 0: request_context.statbox(action='unavailable_metadata') request_context.error_log(UnavailableMetadataError(doi=processed_document['doi'])) - await self.telegram_client.send_message( + await self.telegram_clients[request_context.bot_name].send_message( request_context.chat.chat_id, t( 'UNAVAILABLE_METADATA_ERROR', @@ -176,7 +174,7 @@ class SubmitterService(SubmitterServicer, BaseHubService): finally: await processing_message.delete() - document_operation_pb = DocumentOperationPb( + update_document_operation_pb = DocumentOperationPb( update_document=UpdateDocumentPb( typed_document=TypedDocumentPb(sharience=ShariencePb( parent_id=document_view.id, @@ -185,14 +183,23 @@ class SubmitterService(SubmitterServicer, BaseHubService): md5=hashlib.md5(file).hexdigest(), filesize=document.size, ipfs_multihashes=await self.get_ipfs_hashes(file=file), - telegram_file_id=uploaded_message.file.id, )), ), ) + store_telegram_file_id_operation_pb = DocumentOperationPb( + store_telegram_file_id=StoreTelegramFileIdPb( + document_id=document_view.id, + telegram_file_id=uploaded_message.file.id, + bot_name=request_context.bot_name, + ), + ) request_context.statbox( action='success', document_id=document_view.id, schema='scimag', ) - await operation_log(document_operation_pb) + await asyncio.gather( + operation_log(update_document_operation_pb), + operation_log(store_telegram_file_id_operation_pb), + ) return SubmitResponsePb() diff --git a/nexus/ingest/BUILD.bazel b/nexus/ingest/BUILD.bazel index 2e8793f..050b738 100644 --- a/nexus/ingest/BUILD.bazel +++ b/nexus/ingest/BUILD.bazel @@ -14,21 +14,22 @@ py3_image( data = [ "configs/base.yaml", "configs/logging.yaml", + "//nexus/cognitron/configs:scimag.yaml", + "//nexus/cognitron/configs:scitech.yaml", ], main = "main.py", srcs_version = "PY3ONLY", visibility = ["//visibility:public"], deps = [ requirement("aiokafka"), - requirement("aiopg"), - requirement("fire"), requirement("aiocrossref"), requirement("aiokit"), requirement("aiolibgen"), "//library/aiopostgres", "//library/configurator", - "//library/logging", + "//library/jobber", "//nexus/actions", + "//summa:aiosumma", ], ) diff --git a/nexus/ingest/jobs/__init__.py b/nexus/ingest/jobs/__init__.py index 72b0d85..116d768 100644 --- a/nexus/ingest/jobs/__init__.py +++ b/nexus/ingest/jobs/__init__.py @@ -1,5 +1,6 @@ from .crossref_api import CrossrefApiJob from .libgen_api import LibgenApiJob +from .postgres import PostgresJob from .self_feed import SelfFeedJob -__all__ = ['CrossrefApiJob', 'LibgenApiJob', 'SelfFeedJob'] +__all__ = ['CrossrefApiJob', 'LibgenApiJob', 'PostgresJob', 'SelfFeedJob'] diff --git a/nexus/ingest/jobs/base.py b/nexus/ingest/jobs/base.py index 2f83000..f478175 100644 --- a/nexus/ingest/jobs/base.py +++ b/nexus/ingest/jobs/base.py @@ -2,6 +2,7 @@ from typing import ( Any, AsyncIterable, Iterable, + Union, ) from aiokit import AioRootThing @@ -13,7 +14,7 @@ from ..sinks.base import BaseSink class BaseJob(AioRootThing): name = None - def __init__(self, actions: Iterable[dict], sinks: Iterable[dict]): + def __init__(self, actions: Iterable[dict], sinks: Iterable[Union[dict, BaseSink]]): super().__init__() real_sinks = [] for sink in sinks: diff --git a/nexus/ingest/jobs/crossref_api.py b/nexus/ingest/jobs/crossref_api.py index 97e4542..305b0af 100644 --- a/nexus/ingest/jobs/crossref_api.py +++ b/nexus/ingest/jobs/crossref_api.py @@ -28,7 +28,7 @@ class CrossrefApiJob(BaseJob): super().__init__(actions=actions, sinks=sinks) self.crossref_client = CrossrefClient(base_url=base_url, max_retries=max_retries, retry_delay=retry_delay) self.from_date = from_date or str(datetime.date(datetime.now()) - timedelta(days=1)) - self.starts.append(self.crossref_client) + self.waits.append(self.crossref_client) async def iterator(self) -> AsyncIterable[Any]: async for chunk in self.crossref_client.works_cursor( diff --git a/nexus/ingest/jobs/libgen_api.py b/nexus/ingest/jobs/libgen_api.py index c402b96..63707cd 100644 --- a/nexus/ingest/jobs/libgen_api.py +++ b/nexus/ingest/jobs/libgen_api.py @@ -28,7 +28,7 @@ class LibgenApiJob(BaseJob): super().__init__(sinks=sinks, actions=actions) self.libgen_client = LibgenClient(base_url=base_url, max_retries=max_retries, retry_delay=retry_delay) self.from_date = from_date or str(datetime.date(datetime.now()) - timedelta(days=1)) - self.starts.append(self.libgen_client) + self.waits.append(self.libgen_client) async def iterator(self) -> AsyncIterable[Any]: async for item in self.libgen_client.newer(timenewer=f'{self.from_date} 00:00:00'): diff --git a/nexus/ingest/jobs/postgres.py b/nexus/ingest/jobs/postgres.py new file mode 100644 index 0000000..f98d994 --- /dev/null +++ b/nexus/ingest/jobs/postgres.py @@ -0,0 +1,80 @@ +from typing import ( + Any, + AsyncIterable, + Iterable, +) + +import yaml +from grpc import StatusCode +from grpc.aio import AioRpcError +from izihawa_utils.random import generate_request_id +from library.aiopostgres.pool_holder import AioPostgresPoolHolder +from nexus.ingest.jobs.base import BaseJob +from nexus.ingest.sinks.kafka import KafkaSink +from psycopg.rows import dict_row +from summa.aiosumma.client import SummaClient + + +class PostgresJob(BaseJob): + name = 'postgres-job' + + def __init__( + self, + database: dict, + sql: str, + summa: dict, + actions: Iterable[dict], + ): + kafka_sink = KafkaSink(kafka_hosts=summa['kafka_hosts'], topic_name=summa['name']) + super().__init__(actions=actions, sinks=[kafka_sink]) + self.sql = sql + self.pool_holder = AioPostgresPoolHolder( + conninfo=f'dbname={database["database"]} ' + f'user={database["username"]} ' + f'password={database["password"]} ' + f'host={database["host"]}', + ) + self.summa_client = SummaClient(endpoint=summa['endpoint']) + self.summa_config = summa + self.waits.extend([self.pool_holder, self.summa_client]) + + async def init_tables(self, session_id): + try: + await self.summa_client.delete_index(self.summa_config['name'], session_id=session_id, cascade=True) + except AioRpcError as e: + if e.code() != StatusCode.NOT_FOUND: + raise + schema = yaml.dump(self.summa_config['index_config']['schema'], default_flow_style=False) + await self.summa_client.create_index( + self.summa_config['name'], + schema=schema, + primary_key=self.summa_config['index_config']['key_field'], + default_fields=self.summa_config['index_config']['default_fields'], + writer_heap_size_bytes=1073741824, + writer_threads=4, + autocommit_interval_ms=1800 * 1000, + session_id=session_id, + ) + await self.summa_client.create_consumer( + f"{self.summa_config['name']}_consumer", + index_name=self.summa_config['name'], + topics=[self.summa_config['name']], + bootstrap_servers=self.summa_config['kafka_hosts'], + group_id='summa', + session_id=session_id, + threads=4, + ) + + async def iterator(self) -> AsyncIterable[Any]: + session_id = generate_request_id() + await self.init_tables(session_id) + async for row in self.pool_holder.iterate( + self.sql, + row_factory=dict_row, + # Mandatory for server side cursor + cursor_name='nexus_ingest_cursor', + itersize=10_000, + ): + yield row + await self.summa_client.commit_index(self.summa_config['name'], session_id=session_id) + await self.summa_client.set_index_alias(self.summa_config['alias'], self.summa_config['name'], session_id=session_id) diff --git a/nexus/ingest/jobs/self_feed.py b/nexus/ingest/jobs/self_feed.py index a35a70d..9dc8e29 100644 --- a/nexus/ingest/jobs/self_feed.py +++ b/nexus/ingest/jobs/self_feed.py @@ -4,7 +4,6 @@ from typing import ( Iterable, ) -import aiopg from library.aiopostgres.pool_holder import AioPostgresPoolHolder from nexus.ingest.jobs.base import BaseJob @@ -22,18 +21,13 @@ class SelfFeedJob(BaseJob): super().__init__(actions=actions, sinks=sinks) self.sql = sql self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={database["database"]} ' + conninfo=f'dbname={database["database"]} ' f'user={database["username"]} ' f'password={database["password"]} ' f'host={database["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, ) self.waits.append(self.pool_holder) async def iterator(self) -> AsyncIterable[Any]: - rows = await self.pool_holder.execute(self.sql, fetch=True, timeout=3600) - for row in rows: + async for row in self.pool_holder.iterate(self.sql): yield row diff --git a/nexus/ingest/main.py b/nexus/ingest/main.py index 3fb81a1..5efd682 100644 --- a/nexus/ingest/main.py +++ b/nexus/ingest/main.py @@ -1,35 +1,6 @@ -import fire -from aiokit.utils import sync_fu -from izihawa_utils.importlib import import_object -from library.logging import ( - configure_logging, - error_log, -) +from library.jobber import job_cli from nexus.ingest.configs import get_config - -async def run_job(name, **kwargs): - config = get_config() - configure_logging(config) - - job_config = config['jobs'][name] - job_class = import_object(job_config['class']) - real_kwargs = job_config['kwargs'].copy() - real_kwargs.update(kwargs) - job = job_class(**real_kwargs) - - try: - await job.start_and_wait() - except Exception as e: - error_log(e) - raise - finally: - await job.stop() - - -def main(): - fire.Fire({'run-job': sync_fu(run_job)}) - - if __name__ == '__main__': - main() + config = get_config() + job_cli(config) diff --git a/nexus/meta_api/BUILD.bazel b/nexus/meta_api/BUILD.bazel index bb6ce9c..7b96cc6 100644 --- a/nexus/meta_api/BUILD.bazel +++ b/nexus/meta_api/BUILD.bazel @@ -1,3 +1,4 @@ +load("@io_bazel_rules_docker//python:image.bzl", "py_layer") load("@io_bazel_rules_docker//python3:image.bzl", "py3_image") load("@io_bazel_rules_docker//container:container.bzl", "container_push") @@ -9,6 +10,46 @@ alias( visibility = ["//visibility:public"], ) +DEPS = [ + requirement("aiochclient"), + requirement("aiohttp"), + requirement("cachetools"), + requirement("grpcio"), + requirement("lightgbm"), + requirement("numpy"), + requirement("protobuf"), + requirement("recordclass"), + requirement("uvloop"), + "//library/aiogrpctools", + "//library/aiopostgres", + "//library/configurator", + "//library/logging", + "//nexus/meta_api/proto:grpc_py", + "//nexus/meta_api/query_extensions", + "//nexus/models/proto:proto_py", + "//nexus/nlptools", + "//nexus/views/telegram", + "//summa:aiosumma", +] + +py_layer( + name = "common_deps", + filter = "//pkg/common", + deps = DEPS, +) + +py_layer( + name = "common_external_deps", + filter = "@", + deps = [":common_deps"], +) + +py_layer( + name = "external_deps", + filter = "@", + deps = DEPS, +) + py3_image( name = "image", srcs = glob( @@ -21,30 +62,15 @@ py3_image( "configs/logging.yaml", "models/classic.txt", ], + layers = [ + ":common_external_deps", + ":common_deps", + ":external_deps", + ], main = "main.py", srcs_version = "PY3ONLY", visibility = ["//visibility:public"], - deps = [ - requirement("aiochclient"), - requirement("aiopg"), - requirement("cachetools"), - requirement("grpcio"), - requirement("lightgbm"), - requirement("numpy"), - requirement("protobuf"), - requirement("recordclass"), - requirement("uvloop"), - "//library/aiogrpctools", - "//library/aiopostgres", - "//library/configurator", - "//library/logging", - "//nexus/meta_api/proto:meta-api-grpc-py", - "//nexus/meta_api/query_extensionner", - "//nexus/models/proto:models_proto_py", - "//nexus/nlptools", - "//nexus/views/telegram", - requirement("aiosumma"), - ], + deps = DEPS, ) py_binary( diff --git a/nexus/meta_api/aioclient/BUILD.bazel b/nexus/meta_api/aioclient/BUILD.bazel index 55d2296..d569fc7 100644 --- a/nexus/meta_api/aioclient/BUILD.bazel +++ b/nexus/meta_api/aioclient/BUILD.bazel @@ -11,8 +11,8 @@ py_library( requirement("tenacity"), requirement("aiogrpcclient"), requirement("aiokit"), - "//nexus/meta_api/proto:meta-api-grpc-py", - "//nexus/meta_api/proto:meta-api-proto-py", - "//nexus/models/proto:models_proto_py", + "//nexus/meta_api/proto:grpc_py", + "//nexus/meta_api/proto:proto_py", + "//nexus/models/proto:proto_py", ], ) diff --git a/nexus/meta_api/aioclient/aioclient.py b/nexus/meta_api/aioclient/aioclient.py index a5a421f..1e6b551 100644 --- a/nexus/meta_api/aioclient/aioclient.py +++ b/nexus/meta_api/aioclient/aioclient.py @@ -6,8 +6,6 @@ from typing import ( ) from aiogrpcclient import BaseGrpcClient -from grpc import StatusCode -from grpc.experimental.aio import AioRpcError from nexus.meta_api.proto.documents_service_pb2 import \ RollRequest as RollRequestPb from nexus.meta_api.proto.documents_service_pb2 import \ @@ -26,12 +24,6 @@ from nexus.meta_api.proto.search_service_pb2 import \ from nexus.meta_api.proto.search_service_pb2_grpc import SearchStub from nexus.models.proto.typed_document_pb2 import \ TypedDocument as TypedDocumentPb -from tenacity import ( - retry, - retry_if_exception, - stop_after_attempt, - wait_fixed, -) class MetaApiGrpcClient(BaseGrpcClient): @@ -42,7 +34,7 @@ class MetaApiGrpcClient(BaseGrpcClient): async def get( self, - schema: str, + index_alias: str, document_id: int, user_id: str, position: Optional[int] = None, @@ -51,7 +43,7 @@ class MetaApiGrpcClient(BaseGrpcClient): ) -> TypedDocumentPb: return await self.stubs['documents'].get( TypedDocumentRequestPb( - schema=schema, + index_alias=index_alias, document_id=document_id, position=position, ), @@ -80,20 +72,9 @@ class MetaApiGrpcClient(BaseGrpcClient): ), ) - @retry( - retry=retry_if_exception( - lambda e: isinstance(e, AioRpcError) and ( - e.code() == StatusCode.CANCELLED - or e.code() == StatusCode.UNAVAILABLE - ) - ), - reraise=True, - stop=stop_after_attempt(5), - wait=wait_fixed(2), - ) async def search( self, - schemas: Union[List[str], Tuple[str]], + index_aliases: Union[List[str], Tuple[str]], query: str, user_id: str, page: Optional[int] = None, @@ -104,7 +85,7 @@ class MetaApiGrpcClient(BaseGrpcClient): ) -> SearchResponsePb: return await self.stubs['search'].search( SearchRequestPb( - schemas=schemas, + index_aliases=index_aliases, query=query, page=page, page_size=page_size, diff --git a/nexus/meta_api/cli.py b/nexus/meta_api/cli.py index 51a7478..b627246 100644 --- a/nexus/meta_api/cli.py +++ b/nexus/meta_api/cli.py @@ -3,11 +3,11 @@ from aiokit.utils import sync_fu from nexus.meta_api.aioclient import MetaApiGrpcClient -async def search(url, schema, query): - client = MetaApiGrpcClient(url) +async def search(endpoint, index_alias, query): + client = MetaApiGrpcClient(endpoint) try: await client.start() - print(await client.search(schemas=(schema,), query=query, language='ru')) + print(await client.search(index_aliases=(index_alias,), query=query, language='ru')) finally: await client.stop() diff --git a/nexus/meta_api/configs/base.yaml b/nexus/meta_api/configs/base.yaml index f00656c..fb5f660 100644 --- a/nexus/meta_api/configs/base.yaml +++ b/nexus/meta_api/configs/base.yaml @@ -10,13 +10,14 @@ data_provider: enabled: false grpc: host: 0.0.0.0 - port: 9090 + port: 82 log_path: '/var/log/nexus-meta-api' metrics: enabled: false stat_provider: enabled: false summa: - timeout: 15 - ttl_dns_cache: 30 - url: http://summa + endpoint: summa:82 + connection_timeout: 5 + ttl_dns_cache: 10 + use_dns_cache: true diff --git a/nexus/meta_api/js/client/BUILD.bazel b/nexus/meta_api/js/client/BUILD.bazel index 11dcde6..1da4bfa 100644 --- a/nexus/meta_api/js/client/BUILD.bazel +++ b/nexus/meta_api/js/client/BUILD.bazel @@ -6,6 +6,6 @@ js_library( srcs = glob(["*.js"]), visibility = ["//visibility:public"], deps = [ - "//nexus/meta_api/proto:meta-api-grpc-web-js", + "//nexus/meta_api/proto:grpc_web_js", ], ) diff --git a/nexus/meta_api/js/client/index.js b/nexus/meta_api/js/client/index.js index 039e8db..2c1c3f7 100644 --- a/nexus/meta_api/js/client/index.js +++ b/nexus/meta_api/js/client/index.js @@ -28,19 +28,19 @@ export default class MetaApi { }, this.metadata) } - async get (schema, documentId) { + async get (indexName, documentId) { const request = new documentsProto.TypedDocumentRequest() - request.setSchema(schema) + request.setIndexName(indexName) request.setDocumentId(documentId) const response = await this.documentsClient.get(request, this.prepareMetadata()) return response.toObject() } - async search (schemas, query, page, pageSize = 5) { + async search (names, query, page, pageSize = 5) { const request = new searchProto.SearchRequest() request.setPage(page) request.setPageSize(pageSize) - schemas.forEach((schema) => request.addSchemas(schema)) + names.forEach((name) => request.addNames(name)) request.setQuery(query) const response = await this.searchClient.search(request, this.prepareMetadata()) return response.toObject() diff --git a/nexus/meta_api/main.py b/nexus/meta_api/main.py index e3c4d1e..a9ad30d 100644 --- a/nexus/meta_api/main.py +++ b/nexus/meta_api/main.py @@ -2,7 +2,6 @@ import asyncio import logging import uvloop -from aiosumma import SummaHttpClient from library.aiogrpctools import AioGrpcServer from library.configurator import Configurator from library.logging import configure_logging @@ -11,6 +10,7 @@ from nexus.meta_api.providers.data import DataProvider from nexus.meta_api.providers.stat import StatProvider from nexus.meta_api.services.documents import DocumentsService from nexus.meta_api.services.search import SearchService +from summa.aiosumma import SummaClient class GrpcServer(AioGrpcServer): @@ -19,10 +19,9 @@ class GrpcServer(AioGrpcServer): super().__init__(address=config['grpc']['host'], port=config['grpc']['port']) self.config = config - self.summa_client = SummaHttpClient( - base_url=config['summa']['url'], - timeout=config['summa']['timeout'], - ttl_dns_cache=config['summa']['ttl_dns_cache'], + self.summa_client = SummaClient( + endpoint=config['summa']['endpoint'], + connection_timeout=config['summa']['connection_timeout'], ) self.data_provider = DataProvider(data_provider_config=self.config['data_provider']) self.stat_provider = StatProvider(stat_provider_config=self.config['stat_provider']) diff --git a/nexus/meta_api/proto/BUILD.bazel b/nexus/meta_api/proto/BUILD.bazel index d450c8a..2e357f8 100644 --- a/nexus/meta_api/proto/BUILD.bazel +++ b/nexus/meta_api/proto/BUILD.bazel @@ -5,33 +5,33 @@ load("@rules_proto_grpc//js:defs.bzl", "js_grpc_web_library") package(default_visibility = ["//visibility:public"]) proto_library( - name = "meta-api-proto", + name = "proto", srcs = glob([ "*.proto", ]), deps = [ - "//nexus/models/proto:models_proto", + "//nexus/models/proto", "@com_google_protobuf//:wrappers_proto", ], ) py_proto_library( - name = "meta-api-proto-py", - deps = [":meta-api-proto"], + name = "proto_py", + deps = [":proto"], ) py_grpc_library( - name = "meta-api-grpc-py", - srcs = [":meta-api-proto"], - deps = [":meta-api-proto-py"], + name = "grpc_py", + srcs = [":proto"], + deps = [":proto_py"], ) js_grpc_web_library( - name = "meta-api-grpc-web-js", + name = "grpc_web_js", protos = [ - ":meta-api-proto", - "//nexus/models/proto:models_proto", + ":proto", + "//nexus/models/proto", ], visibility = ["//visibility:public"], - deps = ["//nexus/models/proto:models_proto_js"], + deps = ["//nexus/models/proto:proto_js"], ) diff --git a/nexus/meta_api/proto/documents_service.proto b/nexus/meta_api/proto/documents_service.proto index 8c98b93..828e539 100644 --- a/nexus/meta_api/proto/documents_service.proto +++ b/nexus/meta_api/proto/documents_service.proto @@ -22,7 +22,7 @@ message TopMissedResponse { } message TypedDocumentRequest { - string schema = 1; + string index_alias = 1; uint64 document_id = 2; uint32 position = 3; } diff --git a/nexus/meta_api/proto/documents_service_pb2.py b/nexus/meta_api/proto/documents_service_pb2.py deleted file mode 100644 index 4783cb9..0000000 --- a/nexus/meta_api/proto/documents_service_pb2.py +++ /dev/null @@ -1,308 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: nexus/meta_api/proto/documents_service.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database - -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from nexus.models.proto import \ - typed_document_pb2 as nexus_dot_models_dot_proto_dot_typed__document__pb2 - -DESCRIPTOR = _descriptor.FileDescriptor( - name='nexus/meta_api/proto/documents_service.proto', - package='nexus.meta_api.proto', - syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n,nexus/meta_api/proto/documents_service.proto\x12\x14nexus.meta_api.proto\x1a\'nexus/models/proto/typed_document.proto\"\x1f\n\x0bRollRequest\x12\x10\n\x08language\x18\x01 \x01(\t\"#\n\x0cRollResponse\x12\x13\n\x0b\x64ocument_id\x18\x01 \x01(\x04\"3\n\x10TopMissedRequest\x12\x0c\n\x04page\x18\x01 \x01(\r\x12\x11\n\tpage_size\x18\x02 \x01(\r\"a\n\x11TopMissedResponse\x12:\n\x0ftyped_documents\x18\x01 \x03(\x0b\x32!.nexus.models.proto.TypedDocument\x12\x10\n\x08has_next\x18\x02 \x01(\x08\"M\n\x14TypedDocumentRequest\x12\x0e\n\x06schema\x18\x01 \x01(\t\x12\x13\n\x0b\x64ocument_id\x18\x02 \x01(\x04\x12\x10\n\x08position\x18\x03 \x01(\r2\x95\x02\n\tDocuments\x12V\n\x03get\x12*.nexus.meta_api.proto.TypedDocumentRequest\x1a!.nexus.models.proto.TypedDocument\"\x00\x12O\n\x04roll\x12!.nexus.meta_api.proto.RollRequest\x1a\".nexus.meta_api.proto.RollResponse\"\x00\x12_\n\ntop_missed\x12&.nexus.meta_api.proto.TopMissedRequest\x1a\'.nexus.meta_api.proto.TopMissedResponse\"\x00\x62\x06proto3' - , - dependencies=[nexus_dot_models_dot_proto_dot_typed__document__pb2.DESCRIPTOR,]) - - - - -_ROLLREQUEST = _descriptor.Descriptor( - name='RollRequest', - full_name='nexus.meta_api.proto.RollRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='language', full_name='nexus.meta_api.proto.RollRequest.language', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=111, - serialized_end=142, -) - - -_ROLLRESPONSE = _descriptor.Descriptor( - name='RollResponse', - full_name='nexus.meta_api.proto.RollResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='document_id', full_name='nexus.meta_api.proto.RollResponse.document_id', index=0, - number=1, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=144, - serialized_end=179, -) - - -_TOPMISSEDREQUEST = _descriptor.Descriptor( - name='TopMissedRequest', - full_name='nexus.meta_api.proto.TopMissedRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='page', full_name='nexus.meta_api.proto.TopMissedRequest.page', index=0, - number=1, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='page_size', full_name='nexus.meta_api.proto.TopMissedRequest.page_size', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=181, - serialized_end=232, -) - - -_TOPMISSEDRESPONSE = _descriptor.Descriptor( - name='TopMissedResponse', - full_name='nexus.meta_api.proto.TopMissedResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='typed_documents', full_name='nexus.meta_api.proto.TopMissedResponse.typed_documents', index=0, - number=1, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='has_next', full_name='nexus.meta_api.proto.TopMissedResponse.has_next', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=234, - serialized_end=331, -) - - -_TYPEDDOCUMENTREQUEST = _descriptor.Descriptor( - name='TypedDocumentRequest', - full_name='nexus.meta_api.proto.TypedDocumentRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='schema', full_name='nexus.meta_api.proto.TypedDocumentRequest.schema', index=0, - number=1, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='document_id', full_name='nexus.meta_api.proto.TypedDocumentRequest.document_id', index=1, - number=2, type=4, cpp_type=4, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='position', full_name='nexus.meta_api.proto.TypedDocumentRequest.position', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=333, - serialized_end=410, -) - -_TOPMISSEDRESPONSE.fields_by_name['typed_documents'].message_type = nexus_dot_models_dot_proto_dot_typed__document__pb2._TYPEDDOCUMENT -DESCRIPTOR.message_types_by_name['RollRequest'] = _ROLLREQUEST -DESCRIPTOR.message_types_by_name['RollResponse'] = _ROLLRESPONSE -DESCRIPTOR.message_types_by_name['TopMissedRequest'] = _TOPMISSEDREQUEST -DESCRIPTOR.message_types_by_name['TopMissedResponse'] = _TOPMISSEDRESPONSE -DESCRIPTOR.message_types_by_name['TypedDocumentRequest'] = _TYPEDDOCUMENTREQUEST -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -RollRequest = _reflection.GeneratedProtocolMessageType('RollRequest', (_message.Message,), { - 'DESCRIPTOR' : _ROLLREQUEST, - '__module__' : 'nexus.meta_api.proto.documents_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.RollRequest) - }) -_sym_db.RegisterMessage(RollRequest) - -RollResponse = _reflection.GeneratedProtocolMessageType('RollResponse', (_message.Message,), { - 'DESCRIPTOR' : _ROLLRESPONSE, - '__module__' : 'nexus.meta_api.proto.documents_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.RollResponse) - }) -_sym_db.RegisterMessage(RollResponse) - -TopMissedRequest = _reflection.GeneratedProtocolMessageType('TopMissedRequest', (_message.Message,), { - 'DESCRIPTOR' : _TOPMISSEDREQUEST, - '__module__' : 'nexus.meta_api.proto.documents_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.TopMissedRequest) - }) -_sym_db.RegisterMessage(TopMissedRequest) - -TopMissedResponse = _reflection.GeneratedProtocolMessageType('TopMissedResponse', (_message.Message,), { - 'DESCRIPTOR' : _TOPMISSEDRESPONSE, - '__module__' : 'nexus.meta_api.proto.documents_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.TopMissedResponse) - }) -_sym_db.RegisterMessage(TopMissedResponse) - -TypedDocumentRequest = _reflection.GeneratedProtocolMessageType('TypedDocumentRequest', (_message.Message,), { - 'DESCRIPTOR' : _TYPEDDOCUMENTREQUEST, - '__module__' : 'nexus.meta_api.proto.documents_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.TypedDocumentRequest) - }) -_sym_db.RegisterMessage(TypedDocumentRequest) - - - -_DOCUMENTS = _descriptor.ServiceDescriptor( - name='Documents', - full_name='nexus.meta_api.proto.Documents', - file=DESCRIPTOR, - index=0, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=413, - serialized_end=690, - methods=[ - _descriptor.MethodDescriptor( - name='get', - full_name='nexus.meta_api.proto.Documents.get', - index=0, - containing_service=None, - input_type=_TYPEDDOCUMENTREQUEST, - output_type=nexus_dot_models_dot_proto_dot_typed__document__pb2._TYPEDDOCUMENT, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='roll', - full_name='nexus.meta_api.proto.Documents.roll', - index=1, - containing_service=None, - input_type=_ROLLREQUEST, - output_type=_ROLLRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), - _descriptor.MethodDescriptor( - name='top_missed', - full_name='nexus.meta_api.proto.Documents.top_missed', - index=2, - containing_service=None, - input_type=_TOPMISSEDREQUEST, - output_type=_TOPMISSEDRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_DOCUMENTS) - -DESCRIPTOR.services_by_name['Documents'] = _DOCUMENTS - -# @@protoc_insertion_point(module_scope) diff --git a/nexus/meta_api/proto/documents_service_pb2_grpc.py b/nexus/meta_api/proto/documents_service_pb2_grpc.py deleted file mode 100644 index 8935f94..0000000 --- a/nexus/meta_api/proto/documents_service_pb2_grpc.py +++ /dev/null @@ -1,135 +0,0 @@ -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -"""Client and server classes corresponding to protobuf-defined services.""" -import grpc -from nexus.meta_api.proto import \ - documents_service_pb2 as \ - nexus_dot_meta__api_dot_proto_dot_documents__service__pb2 -from nexus.models.proto import \ - typed_document_pb2 as nexus_dot_models_dot_proto_dot_typed__document__pb2 - - -class DocumentsStub(object): - """Missing associated documentation comment in .proto file.""" - - def __init__(self, channel): - """Constructor. - - Args: - channel: A grpc.Channel. - """ - self.get = channel.unary_unary( - '/nexus.meta_api.proto.Documents/get', - request_serializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TypedDocumentRequest.SerializeToString, - response_deserializer=nexus_dot_models_dot_proto_dot_typed__document__pb2.TypedDocument.FromString, - ) - self.roll = channel.unary_unary( - '/nexus.meta_api.proto.Documents/roll', - request_serializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.RollRequest.SerializeToString, - response_deserializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.RollResponse.FromString, - ) - self.top_missed = channel.unary_unary( - '/nexus.meta_api.proto.Documents/top_missed', - request_serializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TopMissedRequest.SerializeToString, - response_deserializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TopMissedResponse.FromString, - ) - - -class DocumentsServicer(object): - """Missing associated documentation comment in .proto file.""" - - def get(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - def roll(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - def top_missed(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - -def add_DocumentsServicer_to_server(servicer, server): - rpc_method_handlers = { - 'get': grpc.unary_unary_rpc_method_handler( - servicer.get, - request_deserializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TypedDocumentRequest.FromString, - response_serializer=nexus_dot_models_dot_proto_dot_typed__document__pb2.TypedDocument.SerializeToString, - ), - 'roll': grpc.unary_unary_rpc_method_handler( - servicer.roll, - request_deserializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.RollRequest.FromString, - response_serializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.RollResponse.SerializeToString, - ), - 'top_missed': grpc.unary_unary_rpc_method_handler( - servicer.top_missed, - request_deserializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TopMissedRequest.FromString, - response_serializer=nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TopMissedResponse.SerializeToString, - ), - } - generic_handler = grpc.method_handlers_generic_handler( - 'nexus.meta_api.proto.Documents', rpc_method_handlers) - server.add_generic_rpc_handlers((generic_handler,)) - - - # This class is part of an EXPERIMENTAL API. -class Documents(object): - """Missing associated documentation comment in .proto file.""" - - @staticmethod - def get(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/nexus.meta_api.proto.Documents/get', - nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TypedDocumentRequest.SerializeToString, - nexus_dot_models_dot_proto_dot_typed__document__pb2.TypedDocument.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - - @staticmethod - def roll(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/nexus.meta_api.proto.Documents/roll', - nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.RollRequest.SerializeToString, - nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.RollResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) - - @staticmethod - def top_missed(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/nexus.meta_api.proto.Documents/top_missed', - nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TopMissedRequest.SerializeToString, - nexus_dot_meta__api_dot_proto_dot_documents__service__pb2.TopMissedResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/nexus/meta_api/proto/search_service.proto b/nexus/meta_api/proto/search_service.proto index f2f33eb..6c13d53 100644 --- a/nexus/meta_api/proto/search_service.proto +++ b/nexus/meta_api/proto/search_service.proto @@ -10,7 +10,7 @@ message ScoredDocument { } message SearchRequest { - repeated string schemas = 1; + repeated string index_aliases = 1; string query = 2; uint32 page = 3; uint32 page_size = 4; diff --git a/nexus/meta_api/proto/search_service_pb2.py b/nexus/meta_api/proto/search_service_pb2.py deleted file mode 100644 index 162fed2..0000000 --- a/nexus/meta_api/proto/search_service_pb2.py +++ /dev/null @@ -1,230 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: nexus/meta_api/proto/search_service.proto -"""Generated protocol buffer code.""" -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database - -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - -from nexus.models.proto import \ - typed_document_pb2 as nexus_dot_models_dot_proto_dot_typed__document__pb2 - -DESCRIPTOR = _descriptor.FileDescriptor( - name='nexus/meta_api/proto/search_service.proto', - package='nexus.meta_api.proto', - syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n)nexus/meta_api/proto/search_service.proto\x12\x14nexus.meta_api.proto\x1a\'nexus/models/proto/typed_document.proto\"l\n\x0eScoredDocument\x12\x39\n\x0etyped_document\x18\x01 \x01(\x0b\x32!.nexus.models.proto.TypedDocument\x12\r\n\x05score\x18\x02 \x01(\x02\x12\x10\n\x08position\x18\x03 \x01(\r\"b\n\x0eSearchResponse\x12>\n\x10scored_documents\x18\x01 \x03(\x0b\x32$.nexus.meta_api.proto.ScoredDocument\x12\x10\n\x08has_next\x18\x02 \x01(\x08\"b\n\rSearchRequest\x12\x0f\n\x07schemas\x18\x01 \x03(\t\x12\r\n\x05query\x18\x02 \x01(\t\x12\x0c\n\x04page\x18\x03 \x01(\r\x12\x11\n\tpage_size\x18\x04 \x01(\r\x12\x10\n\x08language\x18\x05 \x01(\t2_\n\x06Search\x12U\n\x06search\x12#.nexus.meta_api.proto.SearchRequest\x1a$.nexus.meta_api.proto.SearchResponse\"\x00\x62\x06proto3' - , - dependencies=[nexus_dot_models_dot_proto_dot_typed__document__pb2.DESCRIPTOR,]) - - - - -_SCOREDDOCUMENT = _descriptor.Descriptor( - name='ScoredDocument', - full_name='nexus.meta_api.proto.ScoredDocument', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='typed_document', full_name='nexus.meta_api.proto.ScoredDocument.typed_document', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='score', full_name='nexus.meta_api.proto.ScoredDocument.score', index=1, - number=2, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='position', full_name='nexus.meta_api.proto.ScoredDocument.position', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=108, - serialized_end=216, -) - - -_SEARCHRESPONSE = _descriptor.Descriptor( - name='SearchResponse', - full_name='nexus.meta_api.proto.SearchResponse', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='scored_documents', full_name='nexus.meta_api.proto.SearchResponse.scored_documents', index=0, - number=1, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='has_next', full_name='nexus.meta_api.proto.SearchResponse.has_next', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=218, - serialized_end=316, -) - - -_SEARCHREQUEST = _descriptor.Descriptor( - name='SearchRequest', - full_name='nexus.meta_api.proto.SearchRequest', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='schemas', full_name='nexus.meta_api.proto.SearchRequest.schemas', index=0, - number=1, type=9, cpp_type=9, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='query', full_name='nexus.meta_api.proto.SearchRequest.query', index=1, - number=2, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='page', full_name='nexus.meta_api.proto.SearchRequest.page', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='page_size', full_name='nexus.meta_api.proto.SearchRequest.page_size', index=3, - number=4, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='language', full_name='nexus.meta_api.proto.SearchRequest.language', index=4, - number=5, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=318, - serialized_end=416, -) - -_SCOREDDOCUMENT.fields_by_name['typed_document'].message_type = nexus_dot_models_dot_proto_dot_typed__document__pb2._TYPEDDOCUMENT -_SEARCHRESPONSE.fields_by_name['scored_documents'].message_type = _SCOREDDOCUMENT -DESCRIPTOR.message_types_by_name['ScoredDocument'] = _SCOREDDOCUMENT -DESCRIPTOR.message_types_by_name['SearchResponse'] = _SEARCHRESPONSE -DESCRIPTOR.message_types_by_name['SearchRequest'] = _SEARCHREQUEST -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -ScoredDocument = _reflection.GeneratedProtocolMessageType('ScoredDocument', (_message.Message,), { - 'DESCRIPTOR' : _SCOREDDOCUMENT, - '__module__' : 'nexus.meta_api.proto.search_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.ScoredDocument) - }) -_sym_db.RegisterMessage(ScoredDocument) - -SearchResponse = _reflection.GeneratedProtocolMessageType('SearchResponse', (_message.Message,), { - 'DESCRIPTOR' : _SEARCHRESPONSE, - '__module__' : 'nexus.meta_api.proto.search_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.SearchResponse) - }) -_sym_db.RegisterMessage(SearchResponse) - -SearchRequest = _reflection.GeneratedProtocolMessageType('SearchRequest', (_message.Message,), { - 'DESCRIPTOR' : _SEARCHREQUEST, - '__module__' : 'nexus.meta_api.proto.search_service_pb2' - # @@protoc_insertion_point(class_scope:nexus.meta_api.proto.SearchRequest) - }) -_sym_db.RegisterMessage(SearchRequest) - - - -_SEARCH = _descriptor.ServiceDescriptor( - name='Search', - full_name='nexus.meta_api.proto.Search', - file=DESCRIPTOR, - index=0, - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_start=418, - serialized_end=513, - methods=[ - _descriptor.MethodDescriptor( - name='search', - full_name='nexus.meta_api.proto.Search.search', - index=0, - containing_service=None, - input_type=_SEARCHREQUEST, - output_type=_SEARCHRESPONSE, - serialized_options=None, - create_key=_descriptor._internal_create_key, - ), -]) -_sym_db.RegisterServiceDescriptor(_SEARCH) - -DESCRIPTOR.services_by_name['Search'] = _SEARCH - -# @@protoc_insertion_point(module_scope) diff --git a/nexus/meta_api/proto/search_service_pb2_grpc.py b/nexus/meta_api/proto/search_service_pb2_grpc.py deleted file mode 100644 index aaf82fb..0000000 --- a/nexus/meta_api/proto/search_service_pb2_grpc.py +++ /dev/null @@ -1,66 +0,0 @@ -# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT! -"""Client and server classes corresponding to protobuf-defined services.""" -import grpc - -from nexus.meta_api.proto import search_service_pb2 as nexus_dot_meta__api_dot_proto_dot_search__service__pb2 - - -class SearchStub(object): - """Missing associated documentation comment in .proto file.""" - - def __init__(self, channel): - """Constructor. - - Args: - channel: A grpc.Channel. - """ - self.search = channel.unary_unary( - '/nexus.meta_api.proto.Search/search', - request_serializer=nexus_dot_meta__api_dot_proto_dot_search__service__pb2.SearchRequest.SerializeToString, - response_deserializer=nexus_dot_meta__api_dot_proto_dot_search__service__pb2.SearchResponse.FromString, - ) - - -class SearchServicer(object): - """Missing associated documentation comment in .proto file.""" - - def search(self, request, context): - """Missing associated documentation comment in .proto file.""" - context.set_code(grpc.StatusCode.UNIMPLEMENTED) - context.set_details('Method not implemented!') - raise NotImplementedError('Method not implemented!') - - -def add_SearchServicer_to_server(servicer, server): - rpc_method_handlers = { - 'search': grpc.unary_unary_rpc_method_handler( - servicer.search, - request_deserializer=nexus_dot_meta__api_dot_proto_dot_search__service__pb2.SearchRequest.FromString, - response_serializer=nexus_dot_meta__api_dot_proto_dot_search__service__pb2.SearchResponse.SerializeToString, - ), - } - generic_handler = grpc.method_handlers_generic_handler( - 'nexus.meta_api.proto.Search', rpc_method_handlers) - server.add_generic_rpc_handlers((generic_handler,)) - - - # This class is part of an EXPERIMENTAL API. -class Search(object): - """Missing associated documentation comment in .proto file.""" - - @staticmethod - def search(request, - target, - options=(), - channel_credentials=None, - call_credentials=None, - insecure=False, - compression=None, - wait_for_ready=None, - timeout=None, - metadata=None): - return grpc.experimental.unary_unary(request, target, '/nexus.meta_api.proto.Search/search', - nexus_dot_meta__api_dot_proto_dot_search__service__pb2.SearchRequest.SerializeToString, - nexus_dot_meta__api_dot_proto_dot_search__service__pb2.SearchResponse.FromString, - options, channel_credentials, - insecure, call_credentials, compression, wait_for_ready, timeout, metadata) diff --git a/nexus/meta_api/providers/data.py b/nexus/meta_api/providers/data.py index 82fdc14..4781938 100644 --- a/nexus/meta_api/providers/data.py +++ b/nexus/meta_api/providers/data.py @@ -1,6 +1,5 @@ from typing import List -import aiopg from aiokit import AioThing from library.aiopostgres.pool_holder import AioPostgresPoolHolder from recordclass import dataobject @@ -8,7 +7,6 @@ from recordclass import dataobject class DocumentData(dataobject): ipfs_multihashes: List[str] - telegram_file_id: int class DataProvider(AioThing): @@ -17,39 +15,32 @@ class DataProvider(AioThing): self.pool_holder = None if data_provider_config['enabled']: self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={data_provider_config["database"]} ' + conninfo=f'dbname={data_provider_config["database"]} ' f'user={data_provider_config["username"]} ' f'password={data_provider_config["password"]} ' f'host={data_provider_config["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, ) self.waits.append(self.pool_holder) async def get(self, document_id): if not self.pool_holder: return - pg_data = await self.pool_holder.execute(''' - select id, telegram_file_id, ipfs_multihashes + pg_data = self.pool_holder.iterate(''' + select id, ipfs_multihashes from scimag where id = %s union all - select id, telegram_file_id, ipfs_multihashes + select id, ipfs_multihashes from scitech where id = %s - ''', (document_id, document_id), fetch=True) - for _, telegram_file_id, ipfs_multihashes in pg_data: - return DocumentData( - ipfs_multihashes=ipfs_multihashes or [], - telegram_file_id=telegram_file_id or '', - ) + ''', (document_id, document_id)) + async for _, ipfs_multihashes in pg_data: + return DocumentData(ipfs_multihashes=ipfs_multihashes or []) async def random_id(self, language): if not self.pool_holder: return - pg_data = await self.pool_holder.execute(''' + pg_data = self.pool_holder.iterate(''' select id from scitech where (language = %s or language = 'en') @@ -64,6 +55,6 @@ class DataProvider(AioThing): ) ) limit 1; - ''', (language, language), fetch=True) - for (id_,) in pg_data: + ''', (language, language)) + async for (id_,) in pg_data: return id_ diff --git a/nexus/meta_api/providers/stat.py b/nexus/meta_api/providers/stat.py index 3db057a..8ac8983 100644 --- a/nexus/meta_api/providers/stat.py +++ b/nexus/meta_api/providers/stat.py @@ -75,7 +75,7 @@ class StatProvider(AioThing): count(distinct chat_id) as c from telegram_statbox_log where action = 'missed' and (mode = 'start_delivery' or mode = 'delivery') and - schema = 'scimag' + index_alias = 'scimag' group by document_id order by count(distinct chat_id) desc, document_id desc limit 1000 '''): diff --git a/nexus/meta_api/query_extensionner/tests/__init__.py b/nexus/meta_api/query_extensionner/tests/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/nexus/meta_api/query_extensionner/BUILD.bazel b/nexus/meta_api/query_extensions/BUILD.bazel similarity index 92% rename from nexus/meta_api/query_extensionner/BUILD.bazel rename to nexus/meta_api/query_extensions/BUILD.bazel index 0474934..4878c2e 100644 --- a/nexus/meta_api/query_extensionner/BUILD.bazel +++ b/nexus/meta_api/query_extensions/BUILD.bazel @@ -2,7 +2,7 @@ load("@pip_modules//:requirements.bzl", "requirement") load("@rules_python//python:defs.bzl", "py_library") py_library( - name = "query_extensionner", + name = "query_extensions", srcs = glob(["**/*.py"]), srcs_version = "PY3", visibility = ["//visibility:public"], diff --git a/nexus/meta_api/query_extensionner/__init__.py b/nexus/meta_api/query_extensions/__init__.py similarity index 93% rename from nexus/meta_api/query_extensionner/__init__.py rename to nexus/meta_api/query_extensions/__init__.py index 5a16529..1070ba1 100644 --- a/nexus/meta_api/query_extensionner/__init__.py +++ b/nexus/meta_api/query_extensions/__init__.py @@ -1,4 +1,4 @@ -from nexus.meta_api.query_extensionner.grammar import ( +from nexus.meta_api.query_extensions.grammar import ( FieldResolver, MorphyResolver, OrOperation, diff --git a/nexus/meta_api/query_extensionner/checks.py b/nexus/meta_api/query_extensions/checks.py similarity index 100% rename from nexus/meta_api/query_extensionner/checks.py rename to nexus/meta_api/query_extensions/checks.py diff --git a/nexus/meta_api/query_extensionner/grammar/__init__.py b/nexus/meta_api/query_extensions/grammar/__init__.py similarity index 100% rename from nexus/meta_api/query_extensionner/grammar/__init__.py rename to nexus/meta_api/query_extensions/grammar/__init__.py diff --git a/nexus/meta_api/query_extensionner/grammar/parser.py b/nexus/meta_api/query_extensions/grammar/parser.py similarity index 100% rename from nexus/meta_api/query_extensionner/grammar/parser.py rename to nexus/meta_api/query_extensions/grammar/parser.py diff --git a/nexus/meta_api/query_extensionner/grammar/tree.py b/nexus/meta_api/query_extensions/grammar/tree.py similarity index 100% rename from nexus/meta_api/query_extensionner/grammar/tree.py rename to nexus/meta_api/query_extensions/grammar/tree.py diff --git a/nexus/meta_api/query_extensionner/grammar/tree_transformer.py b/nexus/meta_api/query_extensions/grammar/tree_transformer.py similarity index 98% rename from nexus/meta_api/query_extensionner/grammar/tree_transformer.py rename to nexus/meta_api/query_extensions/grammar/tree_transformer.py index 1267bc7..97e6069 100644 --- a/nexus/meta_api/query_extensionner/grammar/tree_transformer.py +++ b/nexus/meta_api/query_extensions/grammar/tree_transformer.py @@ -1,8 +1,5 @@ from izihawa_utils.text import camel_to_snake -from nexus.nlptools.morph import ( - EnglishMorphology, - RussianMorphology, -) +from nexus.nlptools.morph import EnglishMorphology from .tree import ( AndOperation, @@ -174,7 +171,6 @@ class FieldResolver(TreeTransformer): class MorphyResolver(TreeTransformer): morphology = { - 'ru': RussianMorphology(), 'en': EnglishMorphology('en_core_web_sm'), } diff --git a/nexus/meta_api/query_extensionner/tests/BUILD.bazel b/nexus/meta_api/query_extensions/tests/BUILD.bazel similarity index 83% rename from nexus/meta_api/query_extensionner/tests/BUILD.bazel rename to nexus/meta_api/query_extensions/tests/BUILD.bazel index afaf5f5..606b282 100644 --- a/nexus/meta_api/query_extensionner/tests/BUILD.bazel +++ b/nexus/meta_api/query_extensions/tests/BUILD.bazel @@ -6,7 +6,7 @@ py_test( srcs = glob(["**/*.py"]), main = "test.py", deps = [ - "//nexus/meta_api/query_extensionner", + "//nexus/meta_api/query_extensions", requirement("pytest"), ], ) diff --git a/nexus/cognitron/installer/__init__.py b/nexus/meta_api/query_extensions/tests/__init__.py similarity index 100% rename from nexus/cognitron/installer/__init__.py rename to nexus/meta_api/query_extensions/tests/__init__.py diff --git a/nexus/meta_api/query_extensionner/tests/test.py b/nexus/meta_api/query_extensions/tests/test.py similarity index 100% rename from nexus/meta_api/query_extensionner/tests/test.py rename to nexus/meta_api/query_extensions/tests/test.py diff --git a/nexus/meta_api/query_extensionner/tests/test_grammar.py b/nexus/meta_api/query_extensions/tests/test_grammar.py similarity index 96% rename from nexus/meta_api/query_extensionner/tests/test_grammar.py rename to nexus/meta_api/query_extensions/tests/test_grammar.py index 642f5d3..d1e135d 100644 --- a/nexus/meta_api/query_extensionner/tests/test_grammar.py +++ b/nexus/meta_api/query_extensions/tests/test_grammar.py @@ -1,4 +1,4 @@ -from nexus.meta_api.query_extensionner.grammar import ( +from nexus.meta_api.query_extensions.grammar import ( FieldResolver, UnknownOperationResolver, parser, diff --git a/nexus/meta_api/query_extensionner/tests/test_query_extensionner.py b/nexus/meta_api/query_extensions/tests/test_query_extensionner.py similarity index 95% rename from nexus/meta_api/query_extensionner/tests/test_query_extensionner.py rename to nexus/meta_api/query_extensions/tests/test_query_extensionner.py index b0fea23..6687510 100644 --- a/nexus/meta_api/query_extensionner/tests/test_query_extensionner.py +++ b/nexus/meta_api/query_extensions/tests/test_query_extensionner.py @@ -1,5 +1,5 @@ -from nexus.meta_api.query_extensionner import ClassicQueryProcessor -from nexus.meta_api.query_extensionner.checks import QueryClass +from nexus.meta_api.query_extensions import ClassicQueryProcessor +from nexus.meta_api.query_extensions.checks import QueryClass def classic_query_processor(query): diff --git a/nexus/meta_api/rescorers/classic_rescorer.py b/nexus/meta_api/rescorers/classic_rescorer.py index 0395f1a..d107156 100644 --- a/nexus/meta_api/rescorers/classic_rescorer.py +++ b/nexus/meta_api/rescorers/classic_rescorer.py @@ -15,7 +15,7 @@ from .base import Rescorer def convert_scoring_to_vec_current_version( original_score, - schema_id, + index_id, document_age, downloads_count, ref_by_count, @@ -26,7 +26,7 @@ def convert_scoring_to_vec_current_version( ): return np.array([ original_score, - schema_id, + index_id, document_age, downloads_count, ref_by_count, @@ -37,9 +37,9 @@ def convert_scoring_to_vec_current_version( def convert_scoring_to_vec_future_version( - doc_id, + document_id, original_score, - schema_id, + index_id, document_age, downloads_count, ref_by_count, @@ -49,9 +49,9 @@ def convert_scoring_to_vec_future_version( query_documents_similarity_vector, ): return np.array([ - doc_id, + document_id, original_score, - schema_id, + index_id, document_age, downloads_count, ref_by_count, @@ -61,8 +61,8 @@ def convert_scoring_to_vec_future_version( ] + query_documents_similarity_vector) -def schema_to_id(schema): - return 1 if schema == 'scimag' else 2 +def index_alias_to_id(name): + return 1 if name == 'scimag' else 2 def query_document_similarity_measures(query_tokens, query_tokens_set, query_tokens_count, document_tokens): @@ -95,9 +95,9 @@ def query_document_similarity_measures(query_tokens, query_tokens_set, query_tok def cast_issued_at(document): - if 'issued_at' in document: + if document.HasField('issued_at'): try: - return datetime.date.fromtimestamp(document['issued_at']) + return datetime.date.fromtimestamp(document.issued_at) except ValueError: return datetime.date(2000, 1, 1) else: @@ -106,9 +106,9 @@ def cast_issued_at(document): def calculate_title_tokens(document): # ToDo: should we add tags? - title_tokens = list(document.get('authors', [])) - if document.get('title'): - title_tokens.append(document['title']) + title_tokens = list(document.authors) + if document.title: + title_tokens.append(document.title) return (' '.join(title_tokens)).lower().split() @@ -126,8 +126,8 @@ class ClassicRescorer(Rescorer): query_tokens_set = set(query_tokens) for scored_document in scored_documents: - document = scored_document['document'] - original_id = document.get('original_id') or document['id'] + document = getattr(scored_document.typed_document, scored_document.typed_document.WhichOneof('document')) + original_id = document.original_id or document.id title_tokens = calculate_title_tokens(document) @@ -138,14 +138,14 @@ class ClassicRescorer(Rescorer): title_tokens, ) future_scoring_vecs.append(convert_scoring_to_vec_future_version( - doc_id=original_id, - original_score=scored_document['score'], - schema_id=schema_to_id(scored_document['schema']), + document_id=original_id, + original_score=scored_document.score, + index_id=index_alias_to_id(scored_document.typed_document.WhichOneof('document')), document_age=(now - cast_issued_at(document)).total_seconds(), - downloads_count=scored_document['document'].get('downloads_count', 0), - ref_by_count=document.get('ref_by_count', 0), - same_language=int(language == document.get('language')), - same_query_language=int(query_language == document.get('language')), + downloads_count=scored_document.document.downloads_count, + ref_by_count=getattr(document, 'ref_by_count', 0), + same_language=int(language == document.language), + same_query_language=int(query_language == document.language), query_tokens_count=query_tokens_count, query_documents_similarity_vector=query_documents_similarity_vector )) @@ -175,7 +175,7 @@ class ClassicRescorer(Rescorer): for scored_document in scored_documents: # ToDo: Use shared wrappers - document = scored_document['document'] + document = getattr(scored_document.typed_document, scored_document.typed_document.WhichOneof('document')) title_tokens = calculate_title_tokens(document) query_documents_similarity_vector = query_document_similarity_measures( @@ -185,24 +185,24 @@ class ClassicRescorer(Rescorer): title_tokens, ) current_scoring_vecs.append(convert_scoring_to_vec_current_version( - original_score=scored_document['score'], - schema_id=schema_to_id(scored_document['schema']), + original_score=scored_document.score, + index_id=index_alias_to_id(scored_document.typed_document.WhichOneof('document')), document_age=(now - cast_issued_at(document)).total_seconds(), - downloads_count=scored_document['document'].get('downloads_count', 0), - ref_by_count=document.get('ref_by_count', 0), - same_language=int(language == document.get('language')), - same_query_language=int(query_language == document.get('language')), + downloads_count=document.downloads_count, + ref_by_count=getattr(document, 'ref_by_count', 0), + same_language=int(language == document.language), + same_query_language=int(query_language == document.language), query_tokens_count=query_tokens_count, query_documents_similarity_vector=query_documents_similarity_vector, )) scores = self.lgbm_ranker.predict(current_scoring_vecs) for score, scored_document in zip(scores, scored_documents): - scored_document['score'] = score + scored_document.score = score - scored_documents = sorted(scored_documents, key=lambda x: x['score'], reverse=True) + scored_documents = sorted(scored_documents, key=lambda x: x.score, reverse=True) for position, scored_document in enumerate(scored_documents): - scored_document['position'] = position + scored_document.position = position return scored_documents async def rescore(self, scored_documents, query, session_id, language): diff --git a/nexus/meta_api/services/base.py b/nexus/meta_api/services/base.py deleted file mode 100644 index 95842f6..0000000 --- a/nexus/meta_api/services/base.py +++ /dev/null @@ -1,15 +0,0 @@ -from aiosumma.exceptions import ( - InvalidSyntaxError, - QueryTimeoutError, -) -from grpc import StatusCode -from library.aiogrpctools.base import BaseService as LibraryBaseService -from nexus.meta_api.query_extensionner.grammar.parser import ParseError - - -class BaseService(LibraryBaseService): - error_mapping = { - InvalidSyntaxError: (StatusCode.INVALID_ARGUMENT, 'invalid_query_error'), - ParseError: (StatusCode.INVALID_ARGUMENT, 'invalid_query_error'), - QueryTimeoutError: (StatusCode.CANCELLED, 'cancelled_error'), - } diff --git a/nexus/meta_api/services/documents.py b/nexus/meta_api/services/documents.py index ff0885c..a5aacf6 100644 --- a/nexus/meta_api/services/documents.py +++ b/nexus/meta_api/services/documents.py @@ -1,8 +1,12 @@ +import json import logging import time from grpc import StatusCode -from library.aiogrpctools.base import aiogrpc_request_wrapper +from library.aiogrpctools.base import ( + BaseService, + aiogrpc_request_wrapper, +) from nexus.meta_api.proto.documents_service_pb2 import \ RollResponse as RollResponsePb from nexus.meta_api.proto.documents_service_pb2 import \ @@ -16,8 +20,6 @@ from nexus.models.proto.typed_document_pb2 import \ TypedDocument as TypedDocumentPb from nexus.views.telegram.registry import pb_registry -from .base import BaseService - class DocumentsService(DocumentsServicer, BaseService): def __init__(self, server, summa_client, data_provider, stat_provider, learn_logger=None): @@ -28,19 +30,24 @@ class DocumentsService(DocumentsServicer, BaseService): self.data_provider = data_provider self.learn_logger = learn_logger - async def get_document(self, schema, document_id, request_id, context): + async def get_document(self, index_alias, document_id, request_id, context): search_response = await self.summa_client.search( - schema=schema, + index_alias=index_alias, query=f'id:{document_id}', - page=0, - page_size=1, + offset=0, + limit=1, request_id=request_id, ) - if len(search_response['scored_documents']) == 0: + if len(search_response.scored_documents) == 0: await context.abort(StatusCode.NOT_FOUND, 'not_found') - return search_response['scored_documents'][0]['document'] + loaded = json.loads(search_response.scored_documents[0].document) + for field in loaded: + if field in {'authors', 'ipfs_multihashes', 'isbns', 'issns', 'references', 'tags'}: + continue + loaded[field] = loaded[field][0] + return loaded def copy_document(self, source, target): for key in source: @@ -51,15 +58,15 @@ class DocumentsService(DocumentsServicer, BaseService): @aiogrpc_request_wrapper() async def get(self, request, context, metadata) -> TypedDocumentPb: - document = await self.get_document(request.schema, request.document_id, metadata['request-id'], context) + document = await self.get_document(request.index_alias, request.document_id, metadata['request-id'], context) if document.get('original_id'): original_document = await self.get_document( - request.schema, - document['original_id'], - metadata['request-id'], - context, + index_alias=request.index_alias, + document_id=document['original_id'], + request_id=metadata['request-id'], + context=context, ) - for to_remove in ('doi', 'fiction_id', 'filesize', 'libgen_id', 'telegram_file_id',): + for to_remove in ('doi', 'fiction_id', 'filesize', 'libgen_id',): original_document.pop(to_remove, None) document = {**original_document, **document} @@ -69,34 +76,33 @@ class DocumentsService(DocumentsServicer, BaseService): if self.learn_logger: self.learn_logger.info({ 'action': 'get', + 'document_id': document['id'], + 'index_alias': request.index_alias, 'session_id': metadata['session-id'], 'unixtime': time.time(), - 'schema': request.schema, - 'document_id': document['id'], }) logging.getLogger('query').info({ 'action': 'get', 'cache_hit': False, 'id': document['id'], + 'index_alias': request.index_alias, 'mode': 'get', 'position': request.position, 'request_id': metadata['request-id'], - 'schema': request.schema, 'session_id': metadata['session-id'], 'user_id': metadata['user-id'], }) - document_pb = pb_registry[request.schema](**document) + document_pb = pb_registry[request.index_alias](**document) if document_data: - document_pb.telegram_file_id = document_data.telegram_file_id del document_pb.ipfs_multihashes[:] document_pb.ipfs_multihashes.extend(document_data.ipfs_multihashes) if download_stats and download_stats.downloads_count: document_pb.downloads_count = download_stats.downloads_count return TypedDocumentPb( - **{request.schema: document_pb}, + **{request.index_alias: document_pb}, ) @aiogrpc_request_wrapper() @@ -125,19 +131,18 @@ class DocumentsService(DocumentsServicer, BaseService): document_ids = ' OR '.join(document_ids) search_response = await self.summa_client.search( - schema='scimag', + index_alias='scimag', query=document_ids, - page=0, - page_size=limit, + limit=limit, request_id=metadata['request-id'], ) - if len(search_response['scored_documents']) == 0: + if len(search_response.scored_documents) == 0: await context.abort(StatusCode.NOT_FOUND, 'not_found') documents = list(map( - lambda document: TypedDocumentPb(scimag=ScimagPb(**document['document'])), - search_response['scored_documents'], + lambda document: TypedDocumentPb(scimag=ScimagPb(**json.loads(document.typed_document.scimag))), + search_response.scored_documents, )) return TopMissedResponsePb(typed_documents=documents) diff --git a/nexus/meta_api/services/search.py b/nexus/meta_api/services/search.py index 6f9c25c..e7a636a 100644 --- a/nexus/meta_api/services/search.py +++ b/nexus/meta_api/services/search.py @@ -1,15 +1,19 @@ import asyncio +import json import logging from contextlib import suppress from timeit import default_timer from aiokit import AioThing from cachetools import TTLCache -from google.protobuf.json_format import MessageToDict from grpc import StatusCode from izihawa_utils.exceptions import NeedRetryError +from izihawa_utils.pb_to_json import MessageToDict from izihawa_utils.text import camel_to_snake -from library.aiogrpctools.base import aiogrpc_request_wrapper +from library.aiogrpctools.base import ( + BaseService, + aiogrpc_request_wrapper, +) from nexus.meta_api.proto.search_service_pb2 import \ ScoredDocument as ScoredDocumentPb from nexus.meta_api.proto.search_service_pb2 import \ @@ -18,7 +22,7 @@ from nexus.meta_api.proto.search_service_pb2_grpc import ( SearchServicer, add_SearchServicer_to_server, ) -from nexus.meta_api.query_extensionner import ( +from nexus.meta_api.query_extensions import ( ClassicQueryProcessor, QueryClass, ) @@ -39,10 +43,8 @@ from tenacity import ( wait_fixed, ) -from .base import BaseService - -class Searcher(BaseService): +class ClassicSearcher(BaseService): page_sizes = { 'scimag': 100, 'scitech': 100, @@ -60,36 +62,47 @@ class Searcher(BaseService): self.rescorer = rescorer self.stat_provider = stat_provider - async def processed_response_hook(self, processor_response, context): - return processor_response - - async def post_search_hook(self, search_response, processor_response, request, context, - metadata, retry_state): - return search_response + async def processed_query_hook(self, processed_query, context): + if processed_query['class'] == QueryClass.URL: + await context.abort(StatusCode.INVALID_ARGUMENT, 'url_query_error') + return processed_query def merge_search_responses(self, search_responses): if not search_responses: return elif len(search_responses) == 1: return search_responses[0] - return dict( + return SearchResponsePb( scored_documents=[ scored_document for search_response in search_responses - for scored_document in search_response['scored_documents'] + for scored_document in search_response.scored_documents ], - has_next=any([search_response['has_next'] for search_response in search_responses]), + has_next=any([search_response.has_next for search_response in search_responses]), ) - def cast_search_response(self, search_response): + def cast_search_response(self, name, search_response): scored_documents_pb = [] for scored_document in search_response['scored_documents']: - document_pb = pb_registry[scored_document['schema']](**scored_document['document']) + document = json.loads(scored_document['document']) + for field in document: + if field in {'authors', 'ipfs_multihashes', 'isbns', 'issns', 'references', 'tags'}: + continue + document[field] = document[field][0] + + original_id = ( + document.get('original_id') + or document['id'] + ) + download_stats = self.stat_provider.get_download_stats(original_id) + if download_stats and download_stats.downloads_count: + document['downloads_count'] = download_stats.downloads_count + scored_documents_pb.append(ScoredDocumentPb( position=scored_document['position'], score=scored_document['score'], typed_document=TypedDocumentPb( - **{scored_document['schema']: document_pb}, + **{name: pb_registry[name](**document)}, ) )) return SearchResponsePb( @@ -100,76 +113,86 @@ class Searcher(BaseService): @aiogrpc_request_wrapper() async def search(self, request, context, metadata): start = default_timer() - processor_response = None + processed_query = None cache_hit = True page_size = request.page_size or 5 - schemas = tuple(sorted([schema for schema in request.schemas])) + index_aliases = tuple(sorted([index_alias for index_alias in request.index_aliases])) user_id = metadata['user-id'] if ( - (user_id, request.language, schemas, request.query) not in self.query_cache - or len(self.query_cache[(user_id, request.language, schemas, request.query)].scored_documents) == 0 + (user_id, request.language, index_aliases, request.query) not in self.query_cache + or len(self.query_cache[(user_id, request.language, index_aliases, request.query)].scored_documents) == 0 ): cache_hit = False query = despace_full(request.query) - processor_response = self.query_processor.process(query, request.language) - processor_response = await self.processed_response_hook(processor_response, context) + processed_query = self.query_processor.process(query, request.language) + processed_query = await self.processed_query_hook(processed_query, context) with suppress(RetryError): async for attempt in AsyncRetrying( retry=retry_if_exception_type(NeedRetryError), - wait=wait_fixed(10), - stop=stop_after_attempt(3) + wait=wait_fixed(15), + stop=stop_after_attempt(2) ): with attempt: requests = [] - for schema in schemas: + for index_alias in index_aliases: requests.append( self.summa_client.search( - schema=schema, - query=processor_response['query'], - page=0, - page_size=self.page_sizes[schema], + index_alias=index_alias, + query=processed_query['query'], + offset=0, + limit=self.page_sizes[index_alias], request_id=metadata['request-id'], ) ) - search_response = self.merge_search_responses(await asyncio.gather(*requests)) - search_response = await self.post_search_hook( - search_response, - processor_response=processor_response, - request=request, - context=context, - metadata=metadata, - retry_state=attempt.retry_state - ) + search_responses = [ + MessageToDict( + search_response, + preserving_proto_field_name=True, + including_default_value_fields=True, + ) for search_response in await asyncio.gather(*requests) + ] + search_responses_pb = [ + self.cast_search_response(name, search_response) + for (name, search_response) in zip(index_aliases, search_responses) + ] + search_response_pb = self.merge_search_responses(search_responses_pb) + + if len(search_response_pb.scored_documents) == 0 and processed_query['class'] == QueryClass.DOI: + if attempt.retry_state.attempt_number == 1: + await self.request_doi_delivery(doi=processed_query['doi']) + raise NeedRetryError() rescored_documents = await self.rescorer.rescore( - scored_documents=search_response['scored_documents'], + scored_documents=search_response_pb.scored_documents, query=query, session_id=metadata['session-id'], language=request.language, ) - search_response['scored_documents'] = rescored_documents - search_response_pb = self.cast_search_response(search_response) - self.query_cache[(user_id, request.language, schemas, request.query)] = search_response_pb + search_response_pb = SearchResponsePb( + scored_documents=rescored_documents, + has_next=search_response_pb.has_next, + ) + self.query_cache[(user_id, request.language, index_aliases, request.query)] = search_response_pb logging.getLogger('query').info({ 'action': 'request', 'cache_hit': cache_hit, 'duration': default_timer() - start, + 'index_aliases': index_aliases, 'mode': 'search', 'page': request.page, 'page_size': page_size, - 'processed_query': processor_response['query'] if processor_response else None, + 'processed_query': processed_query['query'] if processed_query else None, 'query': request.query, - 'query_class': processor_response['class'].value if processor_response else None, + 'query_class': processed_query['class'].value if processed_query else None, 'request_id': metadata['request-id'], - 'schemas': schemas, 'session_id': metadata['session-id'], 'user_id': user_id, }) - scored_documents = self.query_cache[(user_id, request.language, schemas, request.query)].scored_documents + scored_documents = self.query_cache[(user_id, request.language, index_aliases, request.query)].scored_documents left_offset = request.page * page_size right_offset = left_offset + page_size has_next = len(scored_documents) > right_offset @@ -181,29 +204,6 @@ class Searcher(BaseService): return search_response_pb - -class ClassicSearcher(Searcher): - async def processed_response_hook(self, processor_response, context): - if processor_response['class'] == QueryClass.URL: - await context.abort(StatusCode.INVALID_ARGUMENT, 'url_query_error') - return processor_response - - async def post_search_hook(self, search_response, processor_response, request, context, metadata, - retry_state): - if len(search_response['scored_documents']) == 0 and processor_response['class'] == QueryClass.DOI: - if retry_state.attempt_number == 1: - await self.request_doi_delivery(doi=processor_response['doi']) - raise NeedRetryError() - for scored_document in search_response['scored_documents']: - original_id = ( - scored_document['document'].get('original_id') - or scored_document['document']['id'] - ) - download_stats = self.stat_provider.get_download_stats(original_id) - if download_stats and download_stats.downloads_count: - scored_document['document']['downloads_count'] = download_stats.downloads_count - return search_response - async def request_doi_delivery(self, doi): document_operation = DocumentOperationPb( update_document=UpdateDocumentPb( @@ -213,7 +213,7 @@ class ClassicSearcher(Searcher): typed_document=TypedDocumentPb(scimag=ScimagPb(doi=doi)), ), ) - self.operation_logger.info(MessageToDict(document_operation)) + self.operation_logger.info(MessageToDict(document_operation, preserving_proto_field_name=True)) class SearchService(SearchServicer, AioThing): diff --git a/nexus/models/proto/BUILD.bazel b/nexus/models/proto/BUILD.bazel index 2bdc235..1932a9f 100644 --- a/nexus/models/proto/BUILD.bazel +++ b/nexus/models/proto/BUILD.bazel @@ -3,7 +3,7 @@ load("@rules_proto//proto:defs.bzl", "proto_library") load("@rules_proto_grpc//js:defs.bzl", "js_proto_library") proto_library( - name = "models_proto", + name = "proto", srcs = glob([ "*.proto", ]), @@ -11,13 +11,13 @@ proto_library( ) py_proto_library( - name = "models_proto_py", + name = "proto_py", visibility = ["//visibility:public"], - deps = [":models_proto"], + deps = [":proto"], ) js_proto_library( - name = "models_proto_js", - protos = [":models_proto"], + name = "proto_js", + protos = [":proto"], visibility = ["//visibility:public"], ) diff --git a/nexus/models/proto/operation.proto b/nexus/models/proto/operation.proto index 33e6a0c..a2d1594 100644 --- a/nexus/models/proto/operation.proto +++ b/nexus/models/proto/operation.proto @@ -14,6 +14,7 @@ message CrossReferenceOperation { message DocumentOperation { oneof operation { Vote vote = 1; + StoreTelegramFileId store_telegram_file_id = 2; UpdateDocument update_document = 3; }; } @@ -30,4 +31,10 @@ message UpdateDocument { bool commit = 3; bool reindex = 4; TypedDocument typed_document = 5; +} + +message StoreTelegramFileId { + string bot_name = 1; + string telegram_file_id = 2; + int64 document_id = 3; } \ No newline at end of file diff --git a/nexus/models/proto/operation_pb2.py b/nexus/models/proto/operation_pb2.py index 1c2233f..45e7526 100644 --- a/nexus/models/proto/operation_pb2.py +++ b/nexus/models/proto/operation_pb2.py @@ -21,7 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\"nexus/models/proto/operation.proto\x12\x12nexus.models.proto\x1a\'nexus/models/proto/typed_document.proto\"k\n\x17\x43rossReferenceOperation\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1b\n\x13last_retry_unixtime\x18\x03 \x01(\r\x12\x13\n\x0bretry_count\x18\x04 \x01(\r\"\x89\x01\n\x11\x44ocumentOperation\x12(\n\x04vote\x18\x01 \x01(\x0b\x32\x18.nexus.models.proto.VoteH\x00\x12=\n\x0fupdate_document\x18\x03 \x01(\x0b\x32\".nexus.models.proto.UpdateDocumentH\x00\x42\x0b\n\toperation\"b\n\x04Vote\x12\x10\n\x08voter_id\x18\x01 \x01(\x03\x12\r\n\x05value\x18\x02 \x01(\x05\x12\x39\n\x0etyped_document\x18\x03 \x01(\x0b\x32!.nexus.models.proto.TypedDocument\"\xa6\x01\n\x0eUpdateDocument\x12\x0e\n\x06\x66ields\x18\x01 \x03(\t\x12(\n should_fill_from_external_source\x18\x02 \x01(\x08\x12\x0e\n\x06\x63ommit\x18\x03 \x01(\x08\x12\x0f\n\x07reindex\x18\x04 \x01(\x08\x12\x39\n\x0etyped_document\x18\x05 \x01(\x0b\x32!.nexus.models.proto.TypedDocumentb\x06proto3' + serialized_pb=b'\n\"nexus/models/proto/operation.proto\x12\x12nexus.models.proto\x1a\'nexus/models/proto/typed_document.proto\"k\n\x17\x43rossReferenceOperation\x12\x0e\n\x06source\x18\x01 \x01(\t\x12\x0e\n\x06target\x18\x02 \x01(\t\x12\x1b\n\x13last_retry_unixtime\x18\x03 \x01(\r\x12\x13\n\x0bretry_count\x18\x04 \x01(\r\"\xd4\x01\n\x11\x44ocumentOperation\x12(\n\x04vote\x18\x01 \x01(\x0b\x32\x18.nexus.models.proto.VoteH\x00\x12I\n\x16store_telegram_file_id\x18\x02 \x01(\x0b\x32\'.nexus.models.proto.StoreTelegramFileIdH\x00\x12=\n\x0fupdate_document\x18\x03 \x01(\x0b\x32\".nexus.models.proto.UpdateDocumentH\x00\x42\x0b\n\toperation\"<\n\x04Vote\x12\x13\n\x0b\x64ocument_id\x18\x01 \x01(\x03\x12\r\n\x05value\x18\x02 \x01(\x05\x12\x10\n\x08voter_id\x18\x03 \x01(\x03\"\xa6\x01\n\x0eUpdateDocument\x12\x0e\n\x06\x66ields\x18\x01 \x03(\t\x12(\n should_fill_from_external_source\x18\x02 \x01(\x08\x12\x0e\n\x06\x63ommit\x18\x03 \x01(\x08\x12\x0f\n\x07reindex\x18\x04 \x01(\x08\x12\x39\n\x0etyped_document\x18\x05 \x01(\x0b\x32!.nexus.models.proto.TypedDocument\"Q\n\x13StoreTelegramFileId\x12\x10\n\x08\x62ot_name\x18\x01 \x01(\t\x12\x18\n\x10telegram_file_id\x18\x02 \x01(\t\x12\x0e\n\x06\x64oc_id\x18\x03 \x01(\x03\x62\x06proto3' , dependencies=[nexus_dot_models_dot_proto_dot_typed__document__pb2.DESCRIPTOR,]) @@ -97,7 +97,14 @@ _DOCUMENTOPERATION = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='update_document', full_name='nexus.models.proto.DocumentOperation.update_document', index=1, + name='store_telegram_file_id', full_name='nexus.models.proto.DocumentOperation.store_telegram_file_id', index=1, + number=2, type=11, cpp_type=10, label=1, + has_default_value=False, default_value=None, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor( + name='update_document', full_name='nexus.models.proto.DocumentOperation.update_document', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, @@ -121,7 +128,7 @@ _DOCUMENTOPERATION = _descriptor.Descriptor( fields=[]), ], serialized_start=209, - serialized_end=346, + serialized_end=421, ) @@ -134,7 +141,7 @@ _VOTE = _descriptor.Descriptor( create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name='voter_id', full_name='nexus.models.proto.Vote.voter_id', index=0, + name='document_id', full_name='nexus.models.proto.Vote.document_id', index=0, number=1, type=3, cpp_type=2, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, @@ -148,9 +155,9 @@ _VOTE = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='typed_document', full_name='nexus.models.proto.Vote.typed_document', index=2, - number=3, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, + name='voter_id', full_name='nexus.models.proto.Vote.voter_id', index=2, + number=3, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), @@ -166,8 +173,8 @@ _VOTE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=348, - serialized_end=446, + serialized_start=423, + serialized_end=483, ) @@ -226,24 +233,74 @@ _UPDATEDOCUMENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=449, - serialized_end=615, + serialized_start=486, + serialized_end=652, +) + + +_STORETELEGRAMFILEID = _descriptor.Descriptor( + name='StoreTelegramFileId', + full_name='nexus.models.proto.StoreTelegramFileId', + filename=None, + file=DESCRIPTOR, + containing_type=None, + create_key=_descriptor._internal_create_key, + fields=[ + _descriptor.FieldDescriptor( + name='bot_name', full_name='nexus.models.proto.StoreTelegramFileId.bot_name', index=0, + number=1, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor( + name='telegram_file_id', full_name='nexus.models.proto.StoreTelegramFileId.telegram_file_id', index=1, + number=2, type=9, cpp_type=9, label=1, + has_default_value=False, default_value=b"".decode('utf-8'), + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + _descriptor.FieldDescriptor( + name='document_id', full_name='nexus.models.proto.StoreTelegramFileId.document_id', index=2, + number=3, type=3, cpp_type=2, label=1, + has_default_value=False, default_value=0, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), + ], + extensions=[ + ], + nested_types=[], + enum_types=[ + ], + serialized_options=None, + is_extendable=False, + syntax='proto3', + extension_ranges=[], + oneofs=[ + ], + serialized_start=654, + serialized_end=735, ) _DOCUMENTOPERATION.fields_by_name['vote'].message_type = _VOTE +_DOCUMENTOPERATION.fields_by_name['store_telegram_file_id'].message_type = _STORETELEGRAMFILEID _DOCUMENTOPERATION.fields_by_name['update_document'].message_type = _UPDATEDOCUMENT _DOCUMENTOPERATION.oneofs_by_name['operation'].fields.append( _DOCUMENTOPERATION.fields_by_name['vote']) _DOCUMENTOPERATION.fields_by_name['vote'].containing_oneof = _DOCUMENTOPERATION.oneofs_by_name['operation'] +_DOCUMENTOPERATION.oneofs_by_name['operation'].fields.append( + _DOCUMENTOPERATION.fields_by_name['store_telegram_file_id']) +_DOCUMENTOPERATION.fields_by_name['store_telegram_file_id'].containing_oneof = _DOCUMENTOPERATION.oneofs_by_name['operation'] _DOCUMENTOPERATION.oneofs_by_name['operation'].fields.append( _DOCUMENTOPERATION.fields_by_name['update_document']) _DOCUMENTOPERATION.fields_by_name['update_document'].containing_oneof = _DOCUMENTOPERATION.oneofs_by_name['operation'] -_VOTE.fields_by_name['typed_document'].message_type = nexus_dot_models_dot_proto_dot_typed__document__pb2._TYPEDDOCUMENT _UPDATEDOCUMENT.fields_by_name['typed_document'].message_type = nexus_dot_models_dot_proto_dot_typed__document__pb2._TYPEDDOCUMENT DESCRIPTOR.message_types_by_name['CrossReferenceOperation'] = _CROSSREFERENCEOPERATION DESCRIPTOR.message_types_by_name['DocumentOperation'] = _DOCUMENTOPERATION DESCRIPTOR.message_types_by_name['Vote'] = _VOTE DESCRIPTOR.message_types_by_name['UpdateDocument'] = _UPDATEDOCUMENT +DESCRIPTOR.message_types_by_name['StoreTelegramFileId'] = _STORETELEGRAMFILEID _sym_db.RegisterFileDescriptor(DESCRIPTOR) CrossReferenceOperation = _reflection.GeneratedProtocolMessageType('CrossReferenceOperation', (_message.Message,), { @@ -274,5 +331,12 @@ UpdateDocument = _reflection.GeneratedProtocolMessageType('UpdateDocument', (_me }) _sym_db.RegisterMessage(UpdateDocument) +StoreTelegramFileId = _reflection.GeneratedProtocolMessageType('StoreTelegramFileId', (_message.Message,), { + 'DESCRIPTOR' : _STORETELEGRAMFILEID, + '__module__' : 'nexus.models.proto.operation_pb2' + # @@protoc_insertion_point(class_scope:nexus.models.proto.StoreTelegramFileId) + }) +_sym_db.RegisterMessage(StoreTelegramFileId) + # @@protoc_insertion_point(module_scope) diff --git a/nexus/models/proto/scimag.proto b/nexus/models/proto/scimag.proto index b5dbf56..e89d621 100644 --- a/nexus/models/proto/scimag.proto +++ b/nexus/models/proto/scimag.proto @@ -15,9 +15,7 @@ message Scimag { bool is_deleted = 7; repeated string issns = 25; string issue = 10; - oneof optional_issued_at { - int64 issued_at = 26; - } + optional int64 issued_at = 26; uint32 journal_id = 12; string language = 13; uint32 last_page = 14; @@ -29,10 +27,9 @@ message Scimag { int32 scimag_bulk_id = 24; } repeated string tags = 17; - string telegram_file_id = 18; string title = 19; string type = 29; int32 updated_at = 20; string volume = 21; - string year = 30; + int32 year = 30; } diff --git a/nexus/models/proto/scimag_pb2.py b/nexus/models/proto/scimag_pb2.py index 5c6af34..bbb3aff 100644 --- a/nexus/models/proto/scimag_pb2.py +++ b/nexus/models/proto/scimag_pb2.py @@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x1fnexus/models/proto/scimag.proto\x12\x12nexus.models.proto\"\xd9\x04\n\x06Scimag\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x10\n\x08\x61\x62stract\x18\x02 \x01(\t\x12\x0f\n\x07\x61uthors\x18\x03 \x03(\t\x12\x17\n\x0f\x63ontainer_title\x18\x0b \x01(\t\x12\x0b\n\x03\x64oi\x18\x04 \x01(\t\x12\x17\n\x0f\x64ownloads_count\x18\x1b \x01(\r\x12\x11\n\tembedding\x18\x16 \x01(\x0c\x12\x10\n\x08\x66ilesize\x18\x05 \x01(\r\x12\x12\n\nfirst_page\x18\x06 \x01(\r\x12\x18\n\x10ipfs_multihashes\x18\x1f \x03(\t\x12\x12\n\nis_deleted\x18\x07 \x01(\x08\x12\r\n\x05issns\x18\x19 \x03(\t\x12\r\n\x05issue\x18\n \x01(\t\x12\x13\n\tissued_at\x18\x1a \x01(\x03H\x00\x12\x12\n\njournal_id\x18\x0c \x01(\r\x12\x10\n\x08language\x18\r \x01(\t\x12\x11\n\tlast_page\x18\x0e \x01(\r\x12\x15\n\rmeta_language\x18\x0f \x01(\t\x12\x0b\n\x03md5\x18\x10 \x01(\t\x12\x14\n\x0cref_by_count\x18\x17 \x01(\x05\x12\x12\n\nreferences\x18\x1c \x03(\t\x12\x18\n\x0escimag_bulk_id\x18\x18 \x01(\x05H\x01\x12\x0c\n\x04tags\x18\x11 \x03(\t\x12\x18\n\x10telegram_file_id\x18\x12 \x01(\t\x12\r\n\x05title\x18\x13 \x01(\t\x12\x0c\n\x04type\x18\x1d \x01(\t\x12\x12\n\nupdated_at\x18\x14 \x01(\x05\x12\x0e\n\x06volume\x18\x15 \x01(\t\x12\x0c\n\x04year\x18\x1e \x01(\tB\x14\n\x12optional_issued_atB\x19\n\x17optional_scimag_bulk_idb\x06proto3' + serialized_pb=b'\n\x1fnexus/models/proto/scimag.proto\x12\x12nexus.models.proto\"\xbf\x04\n\x06Scimag\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x10\n\x08\x61\x62stract\x18\x02 \x01(\t\x12\x0f\n\x07\x61uthors\x18\x03 \x03(\t\x12\x17\n\x0f\x63ontainer_title\x18\x0b \x01(\t\x12\x0b\n\x03\x64oi\x18\x04 \x01(\t\x12\x17\n\x0f\x64ownloads_count\x18\x1b \x01(\r\x12\x11\n\tembedding\x18\x16 \x01(\x0c\x12\x10\n\x08\x66ilesize\x18\x05 \x01(\r\x12\x12\n\nfirst_page\x18\x06 \x01(\r\x12\x18\n\x10ipfs_multihashes\x18\x1f \x03(\t\x12\x12\n\nis_deleted\x18\x07 \x01(\x08\x12\r\n\x05issns\x18\x19 \x03(\t\x12\r\n\x05issue\x18\n \x01(\t\x12\x13\n\tissued_at\x18\x1a \x01(\x03H\x00\x12\x12\n\njournal_id\x18\x0c \x01(\r\x12\x10\n\x08language\x18\r \x01(\t\x12\x11\n\tlast_page\x18\x0e \x01(\r\x12\x15\n\rmeta_language\x18\x0f \x01(\t\x12\x0b\n\x03md5\x18\x10 \x01(\t\x12\x14\n\x0cref_by_count\x18\x17 \x01(\x05\x12\x12\n\nreferences\x18\x1c \x03(\t\x12\x18\n\x0escimag_bulk_id\x18\x18 \x01(\x05H\x01\x12\x0c\n\x04tags\x18\x11 \x03(\t\x12\r\n\x05title\x18\x13 \x01(\t\x12\x0c\n\x04type\x18\x1d \x01(\t\x12\x12\n\nupdated_at\x18\x14 \x01(\x05\x12\x0e\n\x06volume\x18\x15 \x01(\t\x12\x0c\n\x04year\x18\x1e \x01(\tB\x14\n\x12optional_issued_atB\x19\n\x17optional_scimag_bulk_idb\x06proto3' ) @@ -196,42 +196,35 @@ _SCIMAG = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='telegram_file_id', full_name='nexus.models.proto.Scimag.telegram_file_id', index=23, - number=18, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='title', full_name='nexus.models.proto.Scimag.title', index=24, + name='title', full_name='nexus.models.proto.Scimag.title', index=23, number=19, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='type', full_name='nexus.models.proto.Scimag.type', index=25, + name='type', full_name='nexus.models.proto.Scimag.type', index=24, number=29, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='updated_at', full_name='nexus.models.proto.Scimag.updated_at', index=26, + name='updated_at', full_name='nexus.models.proto.Scimag.updated_at', index=25, number=20, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='volume', full_name='nexus.models.proto.Scimag.volume', index=27, + name='volume', full_name='nexus.models.proto.Scimag.volume', index=26, number=21, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='year', full_name='nexus.models.proto.Scimag.year', index=28, + name='year', full_name='nexus.models.proto.Scimag.year', index=27, number=30, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -260,7 +253,7 @@ _SCIMAG = _descriptor.Descriptor( fields=[]), ], serialized_start=56, - serialized_end=657, + serialized_end=631, ) _SCIMAG.oneofs_by_name['optional_issued_at'].fields.append( diff --git a/nexus/models/proto/scitech.proto b/nexus/models/proto/scitech.proto index 2a4277e..e4d82a3 100644 --- a/nexus/models/proto/scitech.proto +++ b/nexus/models/proto/scitech.proto @@ -17,9 +17,7 @@ message Scitech { bool is_deleted = 11; repeated string isbns = 12; bool has_duplicates = 31; - oneof optional_issued_at { - int64 issued_at = 25; - } + optional int64 issued_at = 25; string language = 13; int64 libgen_id = 14; string meta_language = 15; @@ -28,9 +26,8 @@ message Scitech { uint32 pages = 17; string series = 18; repeated string tags = 19; - string telegram_file_id = 20; string title = 21; int32 updated_at = 22; string volume = 24; - string year = 29; + int32 year = 29; } diff --git a/nexus/models/proto/scitech_pb2.py b/nexus/models/proto/scitech_pb2.py index da499cb..952e2df 100644 --- a/nexus/models/proto/scitech_pb2.py +++ b/nexus/models/proto/scitech_pb2.py @@ -20,7 +20,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( syntax='proto3', serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b'\n nexus/models/proto/scitech.proto\x12\x12nexus.models.proto\"\xad\x04\n\x07Scitech\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0f\n\x07\x61uthors\x18\x02 \x03(\t\x12\n\n\x02\x63u\x18\x03 \x01(\t\x12\x0e\n\x06\x63u_suf\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x05 \x01(\t\x12\x0b\n\x03\x64oi\x18\x06 \x01(\t\x12\x17\n\x0f\x64ownloads_count\x18\x1c \x01(\r\x12\x0f\n\x07\x65\x64ition\x18\x07 \x01(\t\x12\x11\n\textension\x18\x08 \x01(\t\x12\x12\n\nfiction_id\x18\t \x01(\x03\x12\x10\n\x08\x66ilesize\x18\n \x01(\x04\x12\x18\n\x10ipfs_multihashes\x18\x1e \x03(\t\x12\x12\n\nis_deleted\x18\x0b \x01(\x08\x12\r\n\x05isbns\x18\x0c \x03(\t\x12\x16\n\x0ehas_duplicates\x18\x1f \x01(\x08\x12\x13\n\tissued_at\x18\x19 \x01(\x03H\x00\x12\x10\n\x08language\x18\r \x01(\t\x12\x11\n\tlibgen_id\x18\x0e \x01(\x03\x12\x15\n\rmeta_language\x18\x0f \x01(\t\x12\x0b\n\x03md5\x18\x10 \x01(\t\x12\x13\n\x0boriginal_id\x18\x17 \x01(\x03\x12\r\n\x05pages\x18\x11 \x01(\r\x12\x0e\n\x06series\x18\x12 \x01(\t\x12\x0c\n\x04tags\x18\x13 \x03(\t\x12\x18\n\x10telegram_file_id\x18\x14 \x01(\t\x12\r\n\x05title\x18\x15 \x01(\t\x12\x12\n\nupdated_at\x18\x16 \x01(\x05\x12\x0e\n\x06volume\x18\x18 \x01(\t\x12\x0c\n\x04year\x18\x1d \x01(\tB\x14\n\x12optional_issued_atb\x06proto3' + serialized_pb=b'\n nexus/models/proto/scitech.proto\x12\x12nexus.models.proto\"\x93\x04\n\x07Scitech\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x0f\n\x07\x61uthors\x18\x02 \x03(\t\x12\n\n\x02\x63u\x18\x03 \x01(\t\x12\x0e\n\x06\x63u_suf\x18\x04 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x05 \x01(\t\x12\x0b\n\x03\x64oi\x18\x06 \x01(\t\x12\x17\n\x0f\x64ownloads_count\x18\x1c \x01(\r\x12\x0f\n\x07\x65\x64ition\x18\x07 \x01(\t\x12\x11\n\textension\x18\x08 \x01(\t\x12\x12\n\nfiction_id\x18\t \x01(\x03\x12\x10\n\x08\x66ilesize\x18\n \x01(\x04\x12\x18\n\x10ipfs_multihashes\x18\x1e \x03(\t\x12\x12\n\nis_deleted\x18\x0b \x01(\x08\x12\r\n\x05isbns\x18\x0c \x03(\t\x12\x16\n\x0ehas_duplicates\x18\x1f \x01(\x08\x12\x13\n\tissued_at\x18\x19 \x01(\x03H\x00\x12\x10\n\x08language\x18\r \x01(\t\x12\x11\n\tlibgen_id\x18\x0e \x01(\x03\x12\x15\n\rmeta_language\x18\x0f \x01(\t\x12\x0b\n\x03md5\x18\x10 \x01(\t\x12\x13\n\x0boriginal_id\x18\x17 \x01(\x03\x12\r\n\x05pages\x18\x11 \x01(\r\x12\x0e\n\x06series\x18\x12 \x01(\t\x12\x0c\n\x04tags\x18\x13 \x03(\t\x12\r\n\x05title\x18\x15 \x01(\t\x12\x12\n\nupdated_at\x18\x16 \x01(\x05\x12\x0e\n\x06volume\x18\x18 \x01(\t\x12\x0c\n\x04year\x18\x1d \x01(\tB\x14\n\x12optional_issued_atb\x06proto3' ) @@ -203,35 +203,28 @@ _SCITECH = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='telegram_file_id', full_name='nexus.models.proto.Scitech.telegram_file_id', index=24, - number=20, type=9, cpp_type=9, label=1, - has_default_value=False, default_value=b"".decode('utf-8'), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='title', full_name='nexus.models.proto.Scitech.title', index=25, + name='title', full_name='nexus.models.proto.Scitech.title', index=24, number=21, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='updated_at', full_name='nexus.models.proto.Scitech.updated_at', index=26, + name='updated_at', full_name='nexus.models.proto.Scitech.updated_at', index=25, number=22, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='volume', full_name='nexus.models.proto.Scitech.volume', index=27, + name='volume', full_name='nexus.models.proto.Scitech.volume', index=26, number=24, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), _descriptor.FieldDescriptor( - name='year', full_name='nexus.models.proto.Scitech.year', index=28, + name='year', full_name='nexus.models.proto.Scitech.year', index=27, number=29, type=9, cpp_type=9, label=1, has_default_value=False, default_value=b"".decode('utf-8'), message_type=None, enum_type=None, containing_type=None, @@ -255,7 +248,7 @@ _SCITECH = _descriptor.Descriptor( fields=[]), ], serialized_start=57, - serialized_end=614, + serialized_end=588, ) _SCITECH.oneofs_by_name['optional_issued_at'].fields.append( diff --git a/nexus/models/proto/sharience.proto b/nexus/models/proto/sharience.proto index 83a93ab..207a6e4 100644 --- a/nexus/models/proto/sharience.proto +++ b/nexus/models/proto/sharience.proto @@ -9,5 +9,4 @@ message Sharience { string md5 = 5; uint32 filesize = 6; repeated string ipfs_multihashes = 7; - string telegram_file_id = 8; } diff --git a/nexus/nlptools/BUILD.bazel b/nexus/nlptools/BUILD.bazel index 30c22b9..245969b 100644 --- a/nexus/nlptools/BUILD.bazel +++ b/nexus/nlptools/BUILD.bazel @@ -10,11 +10,9 @@ py_library( srcs_version = "PY3", visibility = ["//visibility:public"], deps = [ - requirement("DAWG"), requirement("emoji"), requirement("lemminflect"), requirement("pycld3"), - requirement("pymorphy2"), requirement("spacy"), ], ) diff --git a/nexus/nlptools/morph.py b/nexus/nlptools/morph.py index c3d82f3..81cbf13 100644 --- a/nexus/nlptools/morph.py +++ b/nexus/nlptools/morph.py @@ -1,7 +1,4 @@ -import math - import lemminflect # noqa -import pymorphy2 import spacy @@ -30,21 +27,3 @@ class EnglishMorphology: if not inflected and word: forms.add(str(word)) return list(sorted(forms)) - - -class RussianMorphology: - def __init__(self): - self.morph_analyzer = pymorphy2.MorphAnalyzer() - - def derive_forms(self, word): - words = set() - phrase_word_form = self.morph_analyzer.parse(word)[0] - for lexeme in phrase_word_form.lexeme: - if lexeme.word == word: - coef = 1.0 - else: - coef = 1.0 / math.log1p(len(phrase_word_form.lexeme)) - if 'Abbr' in lexeme.tag: - continue - words.add(f'{lexeme.word}^{coef:.2f}') - return list(sorted(words)) diff --git a/nexus/pipe/BUILD.bazel b/nexus/pipe/BUILD.bazel index ef90d8b..0253461 100644 --- a/nexus/pipe/BUILD.bazel +++ b/nexus/pipe/BUILD.bazel @@ -28,8 +28,8 @@ py3_image( "//library/configurator", "//library/logging", "//nexus/actions", - "//nexus/models/proto:models_proto_py", - requirement("aiosumma"), + "//nexus/models/proto:proto_py", + "//summa:aiosumma", requirement("izihawa_utils"), ], ) diff --git a/nexus/pipe/configs/base.yaml b/nexus/pipe/configs/base.yaml index fbc6eb9..3c4057c 100644 --- a/nexus/pipe/configs/base.yaml +++ b/nexus/pipe/configs/base.yaml @@ -37,30 +37,25 @@ pipe: - class: nexus.pipe.processors.ActionProcessor kwargs: actions: - - class: nexus.actions.FillDocumentOperationUpdateDocumentScimagPbFromExternalSourceAction + - class: nexus.actions.document_operations_pb.update_document_scimag_pb.FillFromExternalSourceAction kwargs: crossref: rps: 50 user_agent: 'ScienceLegion/1.0 (Linux x86_64; ) ScienceLegion/1.0.0' - - class: nexus.actions.CleanDocumentOperationUpdateDocumentScimagPbAction - - class: nexus.actions.SendDocumentOperationUpdateDocumentScimagPbToGoldenPostgresAction + ttl_dns_cache: 120 + - class: nexus.actions.document_operations_pb.update_document_scimag_pb.CleanAction + - class: nexus.actions.document_operations_pb.update_document_scimag_pb.ToPostgresAction kwargs: database: database: nexus host: postgres.example.net password: '{{ DATABASE_PASSWORD }}' username: '{{ DATABASE_USERNAME }}' - - class: nexus.actions.SendDocumentOperationUpdateDocumentScimagPbReferencesToKafkaAction + - class: nexus.actions.document_operations_pb.update_document_scimag_pb.ReferencesToKafkaAction kwargs: brokers: | kafka-0.example.net topic: cross_references - - class: nexus.actions.SendDocumentOperationUpdateDocumentPbToSummaAction - kwargs: - summa: - base_url: http://summa.example.net - timeout: 15 - ttl_dns_cache: 30 filter: class: nexus.pipe.filters.DocumentOperationFilter kwargs: @@ -69,22 +64,30 @@ pipe: - class: nexus.pipe.processors.ActionProcessor kwargs: actions: - - class: nexus.actions.CleanDocumentOperationUpdateDocumentScitechPbAction - - class: nexus.actions.SendDocumentOperationUpdateDocumentScitechPbToGoldenPostgresAction + - class: nexus.actions.document_operations_pb.update_document_scitech_pb.CleanAction + - class: nexus.actions.document_operations_pb.update_document_scitech_pb.ToPostgresAction kwargs: database: database: nexus host: postgres.example.net password: '{{ DATABASE_PASSWORD }}' username: '{{ DATABASE_USERNAME }}' - - class: nexus.actions.SendDocumentOperationUpdateDocumentPbToSummaAction - kwargs: - summa: - base_url: http://summa.example.net - timeout: 15 - ttl_dns_cache: 30 filter: class: nexus.pipe.filters.DocumentOperationFilter kwargs: document: scitech operation: update_document + - class: nexus.pipe.processors.ActionProcessor + kwargs: + actions: + - class: nexus.actions.document_operations_pb.store_telegram_file_id_pb.ToPostgresAction + kwargs: + database: + database: nexus + host: postgres.example.net + password: '{{ DATABASE_PASSWORD }}' + username: '{{ DATABASE_USERNAME }}' + filter: + class: nexus.pipe.filters.DocumentOperationFilter + kwargs: + operation: store_telegram_file_id diff --git a/nexus/pipe/consumers/base.py b/nexus/pipe/consumers/base.py index 6bbe2d4..f1b879e 100644 --- a/nexus/pipe/consumers/base.py +++ b/nexus/pipe/consumers/base.py @@ -72,9 +72,6 @@ class BaseConsumer(AioRootThing): await processor.process(preprocessed_msg) except (ConflictError, InterruptProcessing) as e: logging.getLogger('statbox').info(e) - except Exception as e: - logging.getLogger('error').error(e) - raise try: await self.consumer.commit() except CommitFailedError as e: @@ -142,9 +139,6 @@ class BaseBulkConsumer(BaseConsumer): await processor.process_bulk(filtered) except InterruptProcessing as e: logging.getLogger('statbox').info(e) - except Exception as e: - logging.getLogger('error').error(e) - raise try: await self.consumer.commit() except CommitFailedError as e: diff --git a/nexus/pipe/processors/cross_references_processor.py b/nexus/pipe/processors/cross_references_processor.py index 6eba5f9..63ebc47 100644 --- a/nexus/pipe/processors/cross_references_processor.py +++ b/nexus/pipe/processors/cross_references_processor.py @@ -3,7 +3,6 @@ import logging import time from typing import Iterable -import aiopg from aiokafka import AIOKafkaProducer from izihawa_utils.exceptions import NeedRetryError from library.aiopostgres.pool_holder import AioPostgresPoolHolder @@ -17,6 +16,7 @@ from nexus.models.proto.scimag_pb2 import Scimag as ScimagPb from nexus.models.proto.typed_document_pb2 import \ TypedDocument as TypedDocumentPb from pypika import ( + Parameter, PostgreSQLQuery, Table, ) @@ -37,14 +37,11 @@ class CrossReferencesProcessor(Processor): def __init__(self, brokers, database): super().__init__() self.pool_holder = AioPostgresPoolHolder( - fn=aiopg.create_pool, - dsn=f'dbname={database["database"]} ' + conninfo=f'dbname={database["database"]} ' f'user={database["username"]} ' f'password={database["password"]} ' f'host={database["host"]}', - timeout=30, - pool_recycle=60, - maxsize=4, + max_size=2, ) self.brokers = brokers self.producer = None @@ -85,17 +82,16 @@ class CrossReferencesProcessor(Processor): message.SerializeToString(), ) continue - - source = canonize_doi(message.source.strip()) - target = canonize_doi(message.target.strip()) - target_row = await self.pool_holder.execute( + source = canonize_doi(message.source) + target = canonize_doi(message.target) + target_row = [row async for row in self.pool_holder.iterate( PostgreSQLQuery .from_('scimag') .select('id') - .where(self.scimag_table.doi == target) + .where(self.scimag_table.doi == Parameter('%s')) .get_sql(), - fetch=True, - ) + values=(target,) + )] if not target_row: if message.retry_count == 0: diff --git a/nexus/pylon/client.py b/nexus/pylon/client.py index d7bb363..2d3a1ea 100644 --- a/nexus/pylon/client.py +++ b/nexus/pylon/client.py @@ -17,7 +17,7 @@ from nexus.pylon.sources import ( LibgenDoiSource, LibgenMd5Source, LibraryLolSource, - SciHubDoSource, + SciHubMksaTopSource, SciHubSeSource, ) from nexus.pylon.sources.specific import get_specific_sources_for_doi @@ -38,7 +38,7 @@ class PylonClient(AioThing): sources = [] sources.extend(get_specific_sources_for_doi(doi, proxy=self.proxy, resolve_proxy=self.resolve_proxy)) sources.extend([ - SciHubDoSource(doi=doi, md5=md5, proxy=self.proxy, resolve_proxy=self.resolve_proxy), + SciHubMksaTopSource(doi=doi, md5=md5, proxy=self.proxy, resolve_proxy=self.resolve_proxy), SciHubSeSource(doi=doi, md5=md5, proxy=self.proxy, resolve_proxy=self.resolve_proxy), LibgenDoiSource(doi=doi, md5=md5, proxy=self.proxy, resolve_proxy=self.resolve_proxy), ]) @@ -68,12 +68,12 @@ class PylonClient(AioThing): except DownloadError as e: error_log_func(e) continue - raise DownloadError(error='not_found', source=str(source)) + raise DownloadError(error='not_found', source=source.__class__.__name__) async def download(self, sources: Iterable[BaseSource], error_log_func: Callable = error_log) -> AsyncIterable[FileResponsePb]: for source in sources: + await source.start() try: - await source.start() async for resp in self.download_source(source, error_log_func=error_log_func): yield resp return diff --git a/nexus/pylon/sources/__init__.py b/nexus/pylon/sources/__init__.py index 7a7adfa..af4dd16 100644 --- a/nexus/pylon/sources/__init__.py +++ b/nexus/pylon/sources/__init__.py @@ -3,7 +3,7 @@ from .libgen_doi import LibgenDoiSource from .libgen_md5 import LibgenMd5Source from .libgen_new import LibraryLolSource from .scihub import ( - SciHubDoSource, + SciHubMksaTopSource, SciHubSeSource, ) @@ -12,6 +12,6 @@ __all__ = [ 'LibgenDoiSource', 'LibgenMd5Source', 'LibraryLolSource', - 'SciHubDoSource', + 'SciHubMksaTopSource', 'SciHubSeSource', ] diff --git a/nexus/pylon/sources/base.py b/nexus/pylon/sources/base.py index 3bd7d99..d43d915 100644 --- a/nexus/pylon/sources/base.py +++ b/nexus/pylon/sources/base.py @@ -100,12 +100,19 @@ class PreparedRequest: aiohttp.client_exceptions.ClientPayloadError, aiohttp.client_exceptions.ClientResponseError, aiohttp.client_exceptions.TooManyRedirects, + asyncio.exceptions.IncompleteReadError, asyncio.TimeoutError, + ConnectionAbortedError, + ConnectionResetError, ProxyConnectionError, ProxyTimeoutError, ProxyError, ) as e: - raise DownloadError(nested_error=repr(e), nested_error_cls=class_fullname(e)) + raise DownloadError( + nested_error=repr(e), + nested_error_cls=class_fullname(e), + url=self.url, + ) class BaseValidator: @@ -164,13 +171,13 @@ class BaseSource(AioThing): def get_proxy(self): if self.proxy and self.use_proxy is not False: - return ProxyConnector.from_url(self.proxy, verify_ssl=self.ssl) - return aiohttp.TCPConnector(verify_ssl=self.ssl) + return ProxyConnector.from_url(self.proxy, ssl=self.ssl) + return aiohttp.TCPConnector(ssl=self.ssl) def get_resolve_proxy(self): if self.resolve_proxy and self.use_proxy is not False: - return ProxyConnector.from_url(self.resolve_proxy, verify_ssl=self.ssl) - return aiohttp.TCPConnector(verify_ssl=self.ssl) + return ProxyConnector.from_url(self.resolve_proxy, ssl=self.ssl) + return aiohttp.TCPConnector(ssl=self.ssl) def get_session(self): return aiohttp.ClientSession(request_class=KeepAliveClientRequest, connector=self.get_proxy()) diff --git a/nexus/pylon/sources/libgen_doi.py b/nexus/pylon/sources/libgen_doi.py index 1d401e0..0e05ffc 100644 --- a/nexus/pylon/sources/libgen_doi.py +++ b/nexus/pylon/sources/libgen_doi.py @@ -14,12 +14,12 @@ from .base import ( class LibgenDoiSource(DoiSource): - base_url = 'http://libgen.gs' + base_url = 'http://libgen.rocks' resolve_timeout = 10 async def resolve(self, error_log_func: Callable = error_log) -> AsyncIterable[PreparedRequest]: async with self.get_resolve_session() as session: - url = f'{self.base_url}/scimag/ads.php?doi={self.doi}' + url = f'{self.base_url}/ads.php?doi={self.doi}' async with PreparedRequest( method='get', url=url, @@ -28,7 +28,7 @@ class LibgenDoiSource(DoiSource): downloaded_page_bytes = await resp.read() downloaded_page = downloaded_page_bytes.decode('utf-8', 'backslashreplace') match = re.search( - 'https?://.*/scimag/get\\.php\\?doi=.*&key=[A-Za-z0-9]+', + 'https?://.*/get\\.php\\?md5=[a-fA-F\\d]+&key=[A-Za-z\\d]+&doi=.*', downloaded_page, re.IGNORECASE, ) diff --git a/nexus/pylon/sources/libgen_md5.py b/nexus/pylon/sources/libgen_md5.py index a5cc254..4a249cd 100644 --- a/nexus/pylon/sources/libgen_md5.py +++ b/nexus/pylon/sources/libgen_md5.py @@ -13,7 +13,7 @@ from .base import ( class LibgenMd5Source(Md5Source): - base_url = 'http://libgen.gs' + base_url = 'http://libgen.rocks' resolve_timeout = 10 async def resolve_lg(self, session, url): @@ -22,14 +22,14 @@ class LibgenMd5Source(Md5Source): url=url, timeout=self.resolve_timeout ).execute_with(session=session) as resp: - downloaded_page_fiction = await resp.text() + downloaded_page = await resp.text() match = re.search( - 'https?://.*/get\\.php\\?md5=.*&key=[A-Za-z0-9]+', - downloaded_page_fiction, + 'get\\.php\\?md5=.*&key=[A-Za-z0-9]+', + downloaded_page, re.IGNORECASE, ) if match: - return PreparedRequest(method='get', url=match.group(), timeout=self.timeout) + return PreparedRequest(method='get', url=f'{self.base_url}/{match.group()}', timeout=self.timeout) async def resolve(self, error_log_func: Callable = error_log) -> AsyncIterable[PreparedRequest]: async with self.get_resolve_session() as session: diff --git a/nexus/pylon/sources/libgen_new.py b/nexus/pylon/sources/libgen_new.py index 8b268b9..4650a03 100644 --- a/nexus/pylon/sources/libgen_new.py +++ b/nexus/pylon/sources/libgen_new.py @@ -24,21 +24,21 @@ class LibgenNewSource(Md5Source): ).execute_with(session) as resp: downloaded_page = await resp.text() match_ipfs = re.search( - 'https://ipfs.io/ipfs/[A-Za-z0-9]+', + 'https://ipfs.io/ipfs/[A-Za-z\\d]+', downloaded_page, re.IGNORECASE, ) if match_ipfs: yield PreparedRequest(method='get', url=match_ipfs.group(), ssl=self.ssl, timeout=self.timeout) match_cf = re.search( - 'https://cloudflare-ipfs.com/ipfs/[A-Za-z0-9]+', + 'https://cloudflare-ipfs.com/ipfs/[A-Za-z\\d]+', downloaded_page, re.IGNORECASE, ) if match_cf: yield PreparedRequest(method='get', url=match_cf.group(), ssl=self.ssl, timeout=self.timeout) match_infura = re.search( - 'https://ipfs.infura.io/ipfs/[A-Za-z0-9]+', + 'https://ipfs.infura.io/ipfs/[A-Za-z\\d]+', downloaded_page, re.IGNORECASE, ) diff --git a/nexus/pylon/sources/scihub.py b/nexus/pylon/sources/scihub.py index 8e93466..4e132d9 100644 --- a/nexus/pylon/sources/scihub.py +++ b/nexus/pylon/sources/scihub.py @@ -35,18 +35,19 @@ class SciHubSource(DoiSource): yield PreparedRequest(method='get', url=url, timeout=self.timeout) downloaded_page_bytes = await resp.read() downloaded_page = downloaded_page_bytes.decode('utf-8', 'backslashreplace') - match = re.search('(?:https?:)?//.*\\?download=true', downloaded_page, re.IGNORECASE) + match = re.search(r'(?:https?:)?\\?/\\?/?.*\.pdf\?download=true', downloaded_page, re.IGNORECASE) if match: url = match.group() - if url.startswith('//'): - url = 'http:' + url + url = url.replace(r'\/', '/') + if not url.startswith('http'): + url = self.base_url.rstrip('/') + url yield PreparedRequest(method='get', url=url, timeout=self.timeout) else: error_log_func(RegexNotFoundError(url=url)) -class SciHubDoSource(SciHubSource): - base_url = 'https://sci-hub.do' +class SciHubMksaTopSource(SciHubSource): + base_url = 'https://sci-hub.mksa.top' class SciHubSeSource(SciHubSource): diff --git a/nexus/pylon/sources/specific/__init__.py b/nexus/pylon/sources/specific/__init__.py index 9fd1600..c807405 100644 --- a/nexus/pylon/sources/specific/__init__.py +++ b/nexus/pylon/sources/specific/__init__.py @@ -3,12 +3,16 @@ from typing import Iterable from ..base import DoiSource from .biorxiv import BiorxivSource from .lancet import LancetSource +from .nature import NatureSource from .nejm import NejmSource +from .pnas import PnasSource from .research_square import ResearchSquareSource paper_sources = { '10.1016': [LancetSource], + '10.1038': [NatureSource], '10.1056': [NejmSource], + '10.1073': [PnasSource], '10.1101': [BiorxivSource], '10.21203': [ResearchSquareSource], } diff --git a/nexus/pylon/sources/specific/nature.py b/nexus/pylon/sources/specific/nature.py new file mode 100644 index 0000000..ded5c39 --- /dev/null +++ b/nexus/pylon/sources/specific/nature.py @@ -0,0 +1,27 @@ +from typing import ( + AsyncIterable, + Callable, +) + +from library.logging import error_log +from nexus.pylon.sources.base import ( + DoiSource, + PreparedRequest, +) + + +class NatureSource(DoiSource): + base_url = 'https://www.nature.com' + resolve_timeout = 10 + use_proxy = False + + async def resolve(self, error_log_func: Callable = error_log) -> AsyncIterable[PreparedRequest]: + splitted_doi = self.doi.split("/", maxsplit=1) + if len(splitted_doi) < 2: + return + url = f'{self.base_url}/articles/{splitted_doi[1].upper()}.pdf' + yield PreparedRequest( + method='get', + url=url, + timeout=self.timeout, + ) diff --git a/nexus/pylon/sources/specific/pnas.py b/nexus/pylon/sources/specific/pnas.py new file mode 100644 index 0000000..9538459 --- /dev/null +++ b/nexus/pylon/sources/specific/pnas.py @@ -0,0 +1,42 @@ +import re +from typing import ( + AsyncIterable, + Callable, +) + +from library.logging import error_log +from nexus.pylon.exceptions import RegexNotFoundError +from nexus.pylon.sources.base import ( + DoiSource, + PreparedRequest, +) + + +class PnasSource(DoiSource): + base_url = 'https://www.pnas.org' + resolve_timeout = 10 + use_proxy = False + + async def resolve(self, error_log_func: Callable = error_log) -> AsyncIterable[PreparedRequest]: + async with self.get_resolve_session() as session: + url = f'{self.base_url}/lookup/doi/{self.doi}' + async with PreparedRequest( + method='get', + url=url, + timeout=self.resolve_timeout, + ).execute_with(session=session) as resp_1: + async with PreparedRequest( + method='get', + cookies=resp_1.cookies, + url=str(resp_1.url), + timeout=self.resolve_timeout, + ).execute_with(session=session) as resp_2: + download_page = await resp_2.text() + match = re.search( + r'\"(https://www\.pnas\.org/content/pnas/[^\"]+\.pdf)\"', + download_page, + re.IGNORECASE, + ) + if not match: + raise RegexNotFoundError(url=url) + yield PreparedRequest(method='get', url=match.group(1), timeout=self.timeout) diff --git a/nexus/translations/translations.yaml b/nexus/translations/translations.yaml index 3223128..a7318a5 100644 --- a/nexus/translations/translations.yaml +++ b/nexus/translations/translations.yaml @@ -21,7 +21,7 @@ en: **Donation details**: /donate **LiberaPay**: {libera_pay_url} - **BTC Address:** {btc_donate_address} + **BTC Address:** `{btc_donate_address}` You can directly feedback us by /contact COPYRIGHT_DESCRIPTION: | @@ -57,7 +57,7 @@ en: **Donation details** **LiberaPay**: {libera_pay_url} - **BTC Address**: {btc_donate_address} + **BTC Address**: `{btc_donate_address}` **Amazon Gift Card**: [Buy]({amazon_gift_card_url}) any card using `{amazon_gift_card_recipient}` as recipient email DOWNLOAD: Download DOWNLOADED: downloaded @@ -134,7 +134,7 @@ en: REFERENCED_BY: Referenced by REPLY_MESSAGE_HAS_BEEN_DELETED: Search message has been (re-)moved. Do search again. REPORT_BROKEN_FILE: ❌ Broken File - REPORT_OK_FILE: ✅ What Is Needed + REPORT_OK_FILE: ✅ File is OK SEARCHING: '`searching...`' SEND_YOUR_LOCATION: Send your location (through the left attach button) SETTINGS_TEMPLATE: | @@ -184,7 +184,7 @@ es: **Detalles sobre donaciones**: /donate **LiberaPay**: {libera_pay_url} - **Dirección BTC:** {btc_donate_address} + **Dirección BTC:** `{btc_donate_address}` Puedes enviarnos sus comentarios directamente por /contact COPYRIGHT_DESCRIPTION: | @@ -220,7 +220,7 @@ es: **Detalles sobre donaciones** **LiberaPay**: {libera_pay_url} - **Dirección BTC**: {btc_donate_address} + **Dirección BTC**: `{btc_donate_address}` **Tarjeta de regalo de Amazon**: [Compre]({amazon_gift_card_url}) cualquier tarjeta que use `{amazon_gift_card_recipient}` como correo electrónico del destinatario DOWNLOAD: Descargar DOWNLOADED: descargado @@ -339,7 +339,7 @@ it: **Info per donazioni**: /donate **LiberaPay**: {libera_pay_url} - **Indirizzo BTC:** {btc_donate_address} + **Indirizzo BTC:** `{btc_donate_address}` Puoi inviarci un feedback direttamente con /contact COPYRIGHT_DESCRIPTION: | @@ -375,7 +375,7 @@ it: **Dettagli per le donazioni** **LiberaPay**: {libera_pay_url} - **Indirizzo BTC**: {btc_donate_address} + **Indirizzo BTC**: `{btc_donate_address}` **Buono regalo Amazon**: [Acquista]({amazon_gift_card_url}) qualsiasi carta utilizzando `{amazon_gift_card_recipient}` come indirizzo email del destinatario DOWNLOAD: Scarica DOWNLOADED: scaricato @@ -475,7 +475,7 @@ pb: **Detalhes para doação**: /donate **LiberaPay**: {libera_pay_url} - **Endereço BTC:** {btc_donate_address} + **Endereço BTC:** `{btc_donate_address}` Você pode nos enviar feedback diretamente por /contact COPYRIGHT_DESCRIPTION: | @@ -511,7 +511,7 @@ pb: **Detalhes de doação** **LiberaPay**: {libera_pay_url} - **Endereço BTC**: {btc_donate_address} + **Endereço BTC**: `{btc_donate_address}` **Amazon Gift Card**: [Compre]({amazon_gift_card_url}) qualquer cartão usando `{amazon_gift_card_recipient}` como e-mail do destinatário DOWNLOAD: Baixar DOWNLOADED: Baixado @@ -629,7 +629,7 @@ ru: **Реквизиты для пожертвования**: /donate **LiberaPay**: {libera_pay_url} - **BTC Address:** {btc_donate_address} + **BTC Address:** `{btc_donate_address}` Можете также оставить нам сообщение: /contact <ваше сообщение> COULD_NOT_FIND_ANYTHING: Ничего не найдено:( @@ -654,7 +654,7 @@ ru: **Реквизиты для пожертвования** **LiberaPay**: {libera_pay_url} - **BTC Address**: {btc_donate_address} + **BTC Address**: `{btc_donate_address}` **Amazon Gift Card**: [Купите]({amazon_gift_card_url}) любую карту с `{amazon_gift_card_recipient}` в качестве получателя DOWNLOAD: Загрузить DOWNLOADED: загружено diff --git a/nexus/views/js/base.js b/nexus/views/js/base.js index 10e4042..b5681d0 100644 --- a/nexus/views/js/base.js +++ b/nexus/views/js/base.js @@ -114,7 +114,7 @@ export class BaseView { } getTelegramLink () { - return `https://t.me/libgen_scihub_bot?start=${Buffer.from('NID: ' + this.id.toString()).toString('base64')}` + return `https://t.me/libgen_scihub_1_bot?start=${Buffer.from('NID: ' + this.id.toString()).toString('base64')}` } getRobustTitle () { diff --git a/nexus/views/js/scimag.js b/nexus/views/js/scimag.js index 840dc8b..bc25f0c 100644 --- a/nexus/views/js/scimag.js +++ b/nexus/views/js/scimag.js @@ -1,7 +1,7 @@ import { BaseView } from './base' export class ScimagView extends BaseView { - schema = 'scimag' + index = 'scimag' icon = '🔬' getFormattedLocator () { diff --git a/nexus/views/js/scitech.js b/nexus/views/js/scitech.js index 0071d38..9b12c40 100644 --- a/nexus/views/js/scitech.js +++ b/nexus/views/js/scitech.js @@ -1,7 +1,7 @@ import { BaseView } from './base' export class ScitechView extends BaseView { - schema = 'scitech' + index = 'scitech' icon = '📚' getFormattedLocator () { diff --git a/nexus/views/telegram/BUILD.bazel b/nexus/views/telegram/BUILD.bazel index ea30f52..5df01b4 100644 --- a/nexus/views/telegram/BUILD.bazel +++ b/nexus/views/telegram/BUILD.bazel @@ -11,7 +11,7 @@ py_library( visibility = ["//visibility:public"], deps = [ requirement("telethon"), - "//nexus/models/proto:models_proto_py", + "//nexus/models/proto:proto_py", "//nexus/nlptools", "//nexus/translations", requirement("izihawa_utils"), diff --git a/nexus/views/telegram/base.py b/nexus/views/telegram/base.py index 5c614b9..845303d 100644 --- a/nexus/views/telegram/base.py +++ b/nexus/views/telegram/base.py @@ -3,28 +3,12 @@ from typing import Optional from urllib.parse import quote import numpy as np +from izihawa_types.datetime import CustomDatetime from nexus.nlptools.utils import escape_format from .common import encode_query_to_deep_link -class CustomDatetime: - def __init__(self, dt: np.datetime64): - self.dt = dt - - @property - def year(self) -> int: - return self.dt.astype('datetime64[Y]').astype(int) + 1970 - - @property - def month(self) -> int: - return self.dt.astype('datetime64[M]').astype(int) % 12 + 1 - - @property - def day(self) -> int: - return self.dt - self.dt.astype('datetime64[M]') + 1 - - class DoiMixin: def get_doi_link(self) -> str: if not self.doi: @@ -93,7 +77,7 @@ class FileMixin: class BaseView: - schema = None + index_alias = None multihash_ix = 0 def __getattr__(self, name): @@ -113,15 +97,15 @@ class BaseView: ) return f'[IPFS]({ipfs_link})' - def get_deep_link(self, bot_external_name, text=None): + def get_deep_link(self, bot_name, text=None): if not text: text = str(self.id) - encoded_query = encode_query_to_deep_link(f'NID: {self.id}', bot_external_name) + encoded_query = encode_query_to_deep_link(f'NID: {self.id}', bot_name) return f'[{text}]({encoded_query})' - def generate_links(self, bot_external_name): + def generate_links(self, bot_name): links = [ - self.get_deep_link(bot_external_name=bot_external_name, text='Nexus Bot') + self.get_deep_link(bot_name=bot_name, text='Nexus Bot') ] if self.ipfs_multihashes: links.append(self.get_ipfs_gateway_link()) diff --git a/nexus/views/telegram/common.py b/nexus/views/telegram/common.py index dce660c..dd9c0a0 100644 --- a/nexus/views/telegram/common.py +++ b/nexus/views/telegram/common.py @@ -30,13 +30,13 @@ def close_button(session_id: str = None): ) -def vote_button(language: str, session_id: str, schema: str, document_id: int, case: str): +def vote_button(language: str, session_id: str, index_alias: str, document_id: int, case: str): label = f"REPORT_{case.upper()}_FILE" case = {'broken': 'b', 'ok': 'o'}[case] - schema = {'scimag': 'a', 'scitech': 'b'}[schema] + short_index_alias = {'scimag': 'a', 'scitech': 'b'}[index_alias] return Button.inline( text=t(label, language=language), - data=f'/vote{schema}_{session_id}_{document_id}_{case}', + data=f'/vote{short_index_alias}_{session_id}_{document_id}_{case}', ) diff --git a/nexus/views/telegram/scimag.py b/nexus/views/telegram/scimag.py index ccef6fb..d490a4a 100644 --- a/nexus/views/telegram/scimag.py +++ b/nexus/views/telegram/scimag.py @@ -30,7 +30,7 @@ preprints = {'10.1101', '10.21203'} class ScimagView(BaseView, AuthorMixin, DoiMixin, FileMixin, IssuedAtMixin): icon = '🔬' - schema = 'scimag' + index_alias = 'scimag' multihash_ix = 1 def __init__(self, document_pb: ScimagPb): @@ -154,7 +154,7 @@ class ScimagView(BaseView, AuthorMixin, DoiMixin, FileMixin, IssuedAtMixin): self, language: str, session_id: str, - bot_external_name: str, + bot_name: str, position: int = 0, back_command: Optional[str] = None, with_buttons: bool = True, @@ -175,7 +175,7 @@ class ScimagView(BaseView, AuthorMixin, DoiMixin, FileMixin, IssuedAtMixin): if self.downloads_count: parts.append(f'**NRank**: {math.log1p(self.downloads_count):.1f}') - parts.append(f'**Links**: {" - ".join(self.generate_links(bot_external_name))}') + parts.append(f'**Links**: {" - ".join(self.generate_links(bot_name))}') if self.abstract: parts.append( diff --git a/nexus/views/telegram/scitech.py b/nexus/views/telegram/scitech.py index 1cae2ae..00a9917 100644 --- a/nexus/views/telegram/scitech.py +++ b/nexus/views/telegram/scitech.py @@ -31,7 +31,7 @@ from .base import ( class ScitechView(BaseView, AuthorMixin, DoiMixin, FileMixin, IssuedAtMixin): icon = '📚' - schema = 'scitech' + index_alias = 'scitech' def __init__(self, document_pb: ScitechPb, duplicates: Optional[Iterable[ScitechPb]] = tuple()): self.document_pb = document_pb @@ -160,7 +160,7 @@ class ScitechView(BaseView, AuthorMixin, DoiMixin, FileMixin, IssuedAtMixin): self, language: str, session_id: str, - bot_external_name: str, + bot_name: str, position: int = 0, back_command: Optional[str] = None, with_buttons: bool = True, @@ -181,7 +181,7 @@ class ScitechView(BaseView, AuthorMixin, DoiMixin, FileMixin, IssuedAtMixin): parts.append(f'**{t("EDITION", language=language)}**: ' f'{escape_format(self.edition)}') - parts.append(f'**Links**: {" - ".join(self.generate_links(bot_external_name))}') + parts.append(f'**Links**: {" - ".join(self.generate_links(bot_name))}') if self.description: parts.append( diff --git a/postgres/sql/scimag.sql b/postgres/sql/scimag.sql index 5492404..ccd4d8f 100644 --- a/postgres/sql/scimag.sql +++ b/postgres/sql/scimag.sql @@ -39,7 +39,6 @@ CREATE TABLE public.scimag ( meta_language text, md5 uuid, tags text[], - telegram_file_id text, title text, updated_at integer DEFAULT date_part('epoch'::text, now()) NOT NULL, volume text, @@ -76,13 +75,6 @@ CREATE UNIQUE INDEX scimag_doi_idx ON public.scimag USING btree (doi); CREATE INDEX scimag_md5_idx ON public.scimag USING btree (md5); --- --- Name: scimag_telegram_file_id_not_null_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX scimag_telegram_file_id_not_null_idx ON public.scimag USING btree (telegram_file_id) WHERE (telegram_file_id IS NOT NULL); - - -- -- Name: scimag set_timestamp_on_scimag; Type: TRIGGER; Schema: public; Owner: - -- diff --git a/postgres/sql/scitech.sql b/postgres/sql/scitech.sql index 79b90c6..6280ab3 100644 --- a/postgres/sql/scitech.sql +++ b/postgres/sql/scitech.sql @@ -43,7 +43,6 @@ CREATE TABLE public.scitech ( pages integer, series text, tags text[], - telegram_file_id text, title text, updated_at integer DEFAULT date_part('epoch'::text, now()) NOT NULL, original_id bigint, @@ -111,13 +110,6 @@ CREATE INDEX scitech_md5_idx ON public.scitech USING btree (md5); CREATE INDEX scitech_original_id_idx ON public.scitech USING btree (original_id); --- --- Name: scitech_telegram_file_id_not_null_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX scitech_telegram_file_id_not_null_idx ON public.scitech USING btree (telegram_file_id) WHERE (telegram_file_id IS NOT NULL); - - -- -- Name: scitech set_timestamp_on_scitech; Type: TRIGGER; Schema: public; Owner: - -- diff --git a/postgres/sql/sharience.sql b/postgres/sql/sharience.sql index 7d78258..0874161 100644 --- a/postgres/sql/sharience.sql +++ b/postgres/sql/sharience.sql @@ -31,8 +31,7 @@ CREATE TABLE public.sharience ( updated_at integer DEFAULT date_part('epoch'::text, now()) NOT NULL, md5 uuid, filesize integer, - ipfs_multihashes text[], - telegram_file_id text + ipfs_multihashes text[] ); diff --git a/repository/install-packages.sh b/repository/install-packages.sh index 2b42b32..72eb9d9 100755 --- a/repository/install-packages.sh +++ b/repository/install-packages.sh @@ -4,13 +4,12 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="$(dirname "$(dirname $SCRIPT_DIR)")" if [[ "$OSTYPE" == "linux-gnu" ]]; then - apt install curl gnupg - curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg - mv bazel.gpg /etc/apt/trusted.gpg.d/ - echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list + apt install wget + wget https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-linux-amd64 -O /usr/bin/bazel + chmod +x /usr/bin/bazel apt-get update - apt-get -y install bazel llvm make openjdk-8-jdk python3.9 python3.9-venv python3.9-dev python-dev \ - libsqlite3-dev nodejs libev-dev libev-perl python3-distutils yarn + apt-get -y install llvm make openjdk-17-jdk python3.9 python3.9-venv python3.9-dev python-dev \ + libsqlite3-dev nodejs libev-dev libev-perl python3-distutils wireguard yarn elif [[ "$OSTYPE" == "darwin"* ]]; then required_packages='bazel coreutils ibazel libev libomp llvm protobuf python3.9 sqlite3' brew tap bazelbuild/tap diff --git a/nexus/cognitron/installer/scripts/__init__.py b/rules/go/BUILD.bazel similarity index 100% rename from nexus/cognitron/installer/scripts/__init__.py rename to rules/go/BUILD.bazel diff --git a/rules/go/install.bzl b/rules/go/install.bzl new file mode 100644 index 0000000..d1ce126 --- /dev/null +++ b/rules/go/install.bzl @@ -0,0 +1,11 @@ +""" +Go dependencies +""" + +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") +load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies") + +def go_install(): + go_rules_dependencies() + go_register_toolchains(version = "1.17.2") + gazelle_dependencies() diff --git a/rules/go/setup.bzl b/rules/go/setup.bzl new file mode 100644 index 0000000..af4a854 --- /dev/null +++ b/rules/go/setup.bzl @@ -0,0 +1,24 @@ +""" +Go setup +""" + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +def go_setup(): + http_archive( + name = "io_bazel_rules_go", + sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.29.0/rules_go-v0.29.0.zip", + ], + ) + + http_archive( + name = "bazel_gazelle", + sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + ], + ) diff --git a/rules/misc/setup.bzl b/rules/misc/setup.bzl index 6c813e0..bcd9b80 100644 --- a/rules/misc/setup.bzl +++ b/rules/misc/setup.bzl @@ -8,14 +8,6 @@ def rules_misc_setup_internal(): """ Setup various packages """ - http_archive( - name = "bazel_gazelle", - sha256 = "d8c45ee70ec39a57e7a05e5027c32b1576cc7f16d9dd37135b0eddde45cf1b10", - urls = [ - "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz", - ], - ) http_archive( name = "com_github_bazelbuild_buildtools", @@ -24,26 +16,18 @@ def rules_misc_setup_internal(): url = "https://github.com/bazelbuild/buildtools/archive/e002736a9eca26c3356590213bff9292ca4af580.zip", ) - http_archive( - name = "com_github_google_flatbuffers", - strip_prefix = "flatbuffers-04d80f255d1c2fa7a466e8465a119c0eaef26d59", - urls = ["https://github.com/google/flatbuffers/archive/04d80f255d1c2fa7a466e8465a119c0eaef26d59.zip"], - ) - http_archive( name = "com_github_grpc_grpc", - sha256 = "f046d4cb4d60d4f2a2087e9d46c7ec0c523cd54ebf68eda6272de4ce65e20ac7", - strip_prefix = "grpc-ae7f520358d7145a7484db693376fdebbd72662d", + strip_prefix = "grpc-1.39.0", urls = [ - "https://github.com/grpc/grpc/archive/ae7f520358d7145a7484db693376fdebbd72662d.tar.gz", + "https://github.com/grpc/grpc/archive/v1.39.0.tar.gz", ], ) http_archive( name = "com_google_protobuf", - sha256 = "65e020a42bdab44a66664d34421995829e9e79c60e5adaa08282fd14ca552f57", - strip_prefix = "protobuf-3.15.6", - url = "https://github.com/protocolbuffers/protobuf/archive/v3.15.6.tar.gz", + strip_prefix = "protobuf-3.17.3", + url = "https://github.com/protocolbuffers/protobuf/archive/v3.17.3.tar.gz", ) http_archive( @@ -54,15 +38,6 @@ def rules_misc_setup_internal(): urls = ["https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/ghostscript-9.52-linux-x86_64.tgz"], ) - http_archive( - name = "io_bazel_rules_go", - sha256 = "db2b2d35293f405430f553bc7a865a8749a8ef60c30287e90d2b278c32771afe", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.22.3/rules_go-v0.22.3.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.22.3/rules_go-v0.22.3.tar.gz", - ], - ) - http_archive( name = "lz4", sha256 = "0b8bf249fd54a0b974de1a50f0a13ba809a78fd48f90c465c240ee28a9e4784d", @@ -85,13 +60,6 @@ def rules_misc_setup_internal(): urls = ["https://mirror.linux-ia64.org/apache/pdfbox/2.0.23/pdfbox-app-2.0.23.jar"], ) - http_archive( - name = "cities", - sha256 = "3e720fc7249919ea340ff9c49c4423953278107e1f53a0e48f203f04851a3f7f", - build_file_content = 'exports_files(["cities1000.txt"])', - type = "zip", - urls = ["https://drive.google.com/u/0/uc?id=14YTWJk477bXWMmXT1EgpXP0aIX_au-AA&export=download"], - ) http_archive( name = "openssl", sha256 = "9066c68c1aa8e8719af61cb82b88156ab07b3ad2a9ab1f874a8afb324583b1b6", @@ -107,11 +75,3 @@ def rules_misc_setup_internal(): strip_prefix = "zlib-1.2.11", url = "https://github.com/madler/zlib/archive/v1.2.11.tar.gz", ) - - http_archive( - name = "unrar", - sha256 = "a9521667094664084387baf17bcfe1d83a332f2b3b89736e8cb0de5e72fd7bdd", - build_file_content = 'exports_files(["unrar"])', - strip_prefix = "rar", - urls = ["https://www.rarlab.com/rar/rarlinux-x64-5.9.0.tar.gz"], - ) diff --git a/rules/nodejs/package.json b/rules/nodejs/package.json index 8a3c8cd..4e95401 100644 --- a/rules/nodejs/package.json +++ b/rules/nodejs/package.json @@ -6,70 +6,31 @@ "nuxt": "nuxt" }, "dependencies": { - "@grpc/grpc-js": "^1.2.12", - "@mdi/font": "^5.8.55", - "@nuxtjs/axios": "^5.12.5", - "@pointotech/pug-plain-loader": "^1.0.1", - "ansi-html": "^0.0.7", - "axios": "^0.21.1", - "babel-eslint": "^10.1.0", - "bootstrap": "^4.5.3", - "bootstrap-scss": "^4.5.3", - "bootstrap-vue": "^2.17.3", - "copy-webpack-plugin": "^8.1.1", - "core-js": "^3.6.5", - "css-loader": "^5.0.1", - "dateformat": "^4.4.1", - "deepmerge": "^4.2.2", - "electron": "^12.0.5", - "eslint": "^7.17.0", - "eslint-config-standard": "^16.0.2", - "eslint-plugin-import": "^2.22.1", + "@babel/eslint-parser": "^7.16.3", + "@grpc/grpc-js": "^1.4.4", + "@types/node": "^16.11.7", + "axios": "^0.24.0", + "bootstrap-vue-3": "^0.0.5", + "dateformat": "^5.0.2", + "eslint": "^8.2.0", + "eslint-config-standard": "^16.0.3", + "eslint-plugin-import": "^2.25.3", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-promise": "^5.1.0", - "eslint-plugin-vue": "^7.4.1", - "express": "^4.17.1", - "file-loader": "^6.2.0", - "font-awesome": "^4.7.0", - "google-protobuf": "^3.15.8", - "grpc": "^1.24.6", - "grpc-tools": "^1.11.1", - "grpc-web": "^1.2.1", - "html-entities": "^2.3.2", - "html-webpack-plugin": "^5.3.1", - "ipfs-http-client": "^49.0.4", - "js-cookie": "^2.2.1", - "lodash": "^4.17.20", - "loglevel": "^1.7.1", - "mini-css-extract-plugin": "^1.3.4", - "nuxt": "^2.14.12", - "nuxt-start": "^2.14.12", - "optionator": "^0.9.1", - "pug": "^3.0.0", + "eslint-plugin-promise": "^5.1.1", + "eslint-plugin-vue": "^8.0.3", + "google-protobuf": "^3.19.1", + "grpc-web": "^1.3.0", + "lodash": "^4.17.21", + "nuxt3": "^3.0.0-27277498.850ef69", + "pug": "^3.0.2", "pug-plain-loader": "^1.1.0", - "sass": "^1.32.4", + "sass": "^1.43.4", "sass-lint": "^1.13.1", - "sass-loader": "^10.1.1", - "sockjs-client": "^1.5.0", - "tempusdominus-bootstrap-4": "^5.39.0", - "ts-protoc-gen": "^0.14.0", - "url": "^0.11.0", - "url-loader": "^4.1.1", - "v8-compile-cache": "^2.2.0", - "vue": "^2.6.12", - "vue-cookies": "^1.7.4", - "vue-loader": "^15.9.6", - "vue-moment": "^4.1.0", - "vue-router": "^3.4.9", - "vue-scrollto": "^2.20.0", - "vue-select": "^3.11.2", - "vue-template-compiler": "^2.6.12", - "vuejs-dialog": "^1.4.2", - "vuex-persistedstate": "^4.0.0-beta.3", - "webpack": "^4.46.0", - "webpack-cli": "^4.3.1", - "webpack-dev-server": "^3.11.1", - "wordwrap": "^1.0.0" + "sass-loader": "^12.3.0", + "ts-protoc-gen": "^0.15.0", + "v8-compile-cache": "^2.3.0", + "vue": "^3.2.21", + "webpack": "^5.64.0" }, "devDependencies": { "@bazel/bazelisk": "latest", @@ -77,7 +38,7 @@ "@bazel/ibazel": "latest" }, "engines": { - "node": "^15" + "node": "^14" }, "browserslist": [ "> 1%", diff --git a/rules/nodejs/yarn.lock b/rules/nodejs/yarn.lock index 1861fa0..cdda9e0 100644 --- a/rules/nodejs/yarn.lock +++ b/rules/nodejs/yarn.lock @@ -2,39 +2,32 @@ # yarn lockfile v1 -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== dependencies: - "@babel/highlight" "^7.10.4" + "@babel/highlight" "^7.16.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== +"@babel/compat-data@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.0.tgz#ea269d7f78deb3a7826c39a4048eecda541ebdaa" + integrity sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew== + +"@babel/core@^7.15.5", "@babel/core@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" + integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ== dependencies: - "@babel/highlight" "^7.12.13" - -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.12", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4" - integrity sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA== - -"@babel/core@^7.13.14": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.16.tgz#7756ab24396cc9675f1c3fcd5b79fcce192ea96a" - integrity sha512-sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.16" - "@babel/helper-compilation-targets" "^7.13.16" - "@babel/helper-module-transforms" "^7.13.14" - "@babel/helpers" "^7.13.16" - "@babel/parser" "^7.13.16" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.15" - "@babel/types" "^7.13.16" + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.0" + "@babel/helper-compilation-targets" "^7.16.0" + "@babel/helper-module-transforms" "^7.16.0" + "@babel/helpers" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -42,1292 +35,530 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.13.16": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.16.tgz#0befc287031a201d84cdfc173b46b320ae472d14" - integrity sha512-grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg== +"@babel/eslint-parser@^7.16.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.16.3.tgz#2a6b1702f3f5aea48e00cea5a5bcc241c437e459" + integrity sha512-iB4ElZT0jAt7PKVaeVulOECdGe6UnmA/O0P9jlF5g5GBOwDVbna8AXhHRu4s27xQf6OkveyA8iTDv1jHdDejgQ== dependencies: - "@babel/types" "^7.13.16" + eslint-scope "^5.1.1" + eslint-visitor-keys "^2.1.0" + semver "^6.3.0" + +"@babel/generator@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" + integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== + dependencies: + "@babel/types" "^7.16.0" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" - integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== +"@babel/helper-annotate-as-pure@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" + integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.16.0" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" - integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== +"@babel/helper-compilation-targets@^7.16.0": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: - "@babel/helper-explode-assignable-expression" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.13", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c" - integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA== - dependencies: - "@babel/compat-data" "^7.13.15" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" + "@babel/compat-data" "^7.16.0" + "@babel/helper-validator-option" "^7.14.5" + browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.13.11": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz#30d30a005bca2c953f5653fc25091a492177f4f6" - integrity sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw== +"@babel/helper-create-class-features-plugin@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" + integrity sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA== dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-function-name" "^7.16.0" + "@babel/helper-member-expression-to-functions" "^7.16.0" + "@babel/helper-optimise-call-expression" "^7.16.0" + "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" -"@babel/helper-create-regexp-features-plugin@^7.12.13": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7" - integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg== +"@babel/helper-function-name@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" + integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - regexpu-core "^4.7.1" + "@babel/helper-get-function-arity" "^7.16.0" + "@babel/template" "^7.16.0" + "@babel/types" "^7.16.0" -"@babel/helper-define-polyfill-provider@^0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1" - integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw== +"@babel/helper-get-function-arity@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" + integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== dependencies: - "@babel/helper-compilation-targets" "^7.13.0" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/traverse" "^7.13.0" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" + "@babel/types" "^7.16.0" -"@babel/helper-explode-assignable-expression@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f" - integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA== +"@babel/helper-hoist-variables@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.16.0" -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== +"@babel/helper-member-expression-to-functions@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" + integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ== dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/types" "^7.16.0" -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.16.0" -"@babel/helper-hoist-variables@^7.13.0": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30" - integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg== +"@babel/helper-module-transforms@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5" + integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA== dependencies: - "@babel/traverse" "^7.13.15" - "@babel/types" "^7.13.16" + "@babel/helper-module-imports" "^7.16.0" + "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-simple-access" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-validator-identifier" "^7.15.7" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" -"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" - integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== +"@babel/helper-optimise-call-expression@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" + integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw== dependencies: - "@babel/types" "^7.13.12" + "@babel/types" "^7.16.0" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" - integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== +"@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-replace-supers@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" + integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA== dependencies: - "@babel/types" "^7.13.12" + "@babel/helper-member-expression-to-functions" "^7.16.0" + "@babel/helper-optimise-call-expression" "^7.16.0" + "@babel/traverse" "^7.16.0" + "@babel/types" "^7.16.0" -"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14": - version "7.13.14" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef" - integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g== +"@babel/helper-simple-access@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== dependencies: - "@babel/helper-module-imports" "^7.13.12" - "@babel/helper-replace-supers" "^7.13.12" - "@babel/helper-simple-access" "^7.13.12" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.13" - "@babel/types" "^7.13.14" + "@babel/types" "^7.16.0" -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== +"@babel/helper-split-export-declaration@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.16.0" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== +"@babel/helper-validator-identifier@^7.15.7": + version "7.15.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== -"@babel/helper-remap-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" - integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== +"@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helpers@^7.16.0": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" + integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-wrap-function" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/template" "^7.16.0" + "@babel/traverse" "^7.16.3" + "@babel/types" "^7.16.0" -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" - integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== +"@babel/highlight@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.12" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.12" - -"@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" - integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== - dependencies: - "@babel/types" "^7.13.12" - -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" - integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - -"@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - -"@babel/helper-wrap-function@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" - integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helpers@^7.13.16": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.17.tgz#b497c7a00e9719d5b613b8982bda6ed3ee94caf6" - integrity sha512-Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.17" - "@babel/types" "^7.13.17" - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.13.10" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1" - integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.15.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.13", "@babel/parser@^7.13.16", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37" - integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw== +"@babel/parser@^7.15.0", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.3.tgz#271bafcb811080905a119222edbc17909c82261d" + integrity sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw== -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a" - integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-proposal-optional-chaining" "^7.13.12" - -"@babel/plugin-proposal-async-generator-functions@^7.13.15": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b" - integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" - integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-proposal-decorators@^7.13.5": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz#e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8" - integrity sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.11" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-decorators" "^7.12.13" - -"@babel/plugin-proposal-dynamic-import@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" - integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" - integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b" - integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a" - integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3" - integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" - integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a" - integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.13.0" - -"@babel/plugin-proposal-optional-catch-binding@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107" - integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.13.12": - version "7.13.12" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866" - integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787" - integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" - integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-decorators@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648" - integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-jsx@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" - integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": +"@babel/plugin-syntax-import-meta@^7.10.4": version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== +"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.16.0.tgz#f9624394317365a9a88c82358d3f8471154698f1" + integrity sha512-8zv2+xiPHwly31RK4RmnEYY5zziuF3O7W2kIDW+07ewWDh6Oi0dRq8kwvulRkFgt6DB97RlKs5c1y068iPlCUg== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== +"@babel/plugin-syntax-typescript@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" + integrity sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ== dependencies: - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== +"@babel/plugin-transform-typescript@^7.15.4": + version "7.16.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz#cc0670b2822b0338355bc1b3d2246a42b8166409" + integrity sha512-NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/helper-create-class-features-plugin" "^7.16.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-typescript" "^7.16.0" -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== +"@babel/template@^7.0.0", "@babel/template@^7.16.0": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" + "@babel/code-frame" "^7.16.0" + "@babel/parser" "^7.16.0" + "@babel/types" "^7.16.0" -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== +"@babel/traverse@^7.0.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3": + version "7.16.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" + integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-top-level-await@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" - integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-arrow-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae" - integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f" - integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" - -"@babel/plugin-transform-block-scoped-functions@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-block-scoping@^7.12.13": - version "7.13.16" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz#a9c0f10794855c63b1d629914c7dcfeddd185892" - integrity sha512-ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-classes@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b" - integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g== - dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed" - integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-destructuring@^7.13.0": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27" - integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" - integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-duplicate-keys@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" - integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-exponentiation-operator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" - integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-for-of@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062" - integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" - integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" - integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-member-expression-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-modules-amd@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3" - integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ== - dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-commonjs@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b" - integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw== - dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-systemjs@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3" - integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A== - dependencies: - "@babel/helper-hoist-variables" "^7.13.0" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-identifier" "^7.12.11" - babel-plugin-dynamic-import-node "^2.3.3" - -"@babel/plugin-transform-modules-umd@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b" - integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw== - dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" - integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - -"@babel/plugin-transform-new-target@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" - integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-object-super@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" - -"@babel/plugin-transform-parameters@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007" - integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-property-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-regenerator@^7.13.15": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39" - integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ== - dependencies: - regenerator-transform "^0.14.2" - -"@babel/plugin-transform-reserved-words@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" - integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-runtime@^7.13.10": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7" - integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA== - dependencies: - "@babel/helper-module-imports" "^7.13.12" - "@babel/helper-plugin-utils" "^7.13.0" - babel-plugin-polyfill-corejs2 "^0.2.0" - babel-plugin-polyfill-corejs3 "^0.2.0" - babel-plugin-polyfill-regenerator "^0.2.0" - semver "^6.3.0" - -"@babel/plugin-transform-shorthand-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" - integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-spread@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd" - integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" - -"@babel/plugin-transform-sticky-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" - integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-template-literals@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d" - integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw== - dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - -"@babel/plugin-transform-typeof-symbol@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" - integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-unicode-escapes@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" - integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-transform-unicode-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" - integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/preset-env@^7.13.12": - version "7.13.15" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.15.tgz#c8a6eb584f96ecba183d3d414a83553a599f478f" - integrity sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA== - dependencies: - "@babel/compat-data" "^7.13.15" - "@babel/helper-compilation-targets" "^7.13.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-option" "^7.12.17" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12" - "@babel/plugin-proposal-async-generator-functions" "^7.13.15" - "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-dynamic-import" "^7.13.8" - "@babel/plugin-proposal-export-namespace-from" "^7.12.13" - "@babel/plugin-proposal-json-strings" "^7.13.8" - "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" - "@babel/plugin-proposal-numeric-separator" "^7.12.13" - "@babel/plugin-proposal-object-rest-spread" "^7.13.8" - "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.12" - "@babel/plugin-proposal-private-methods" "^7.13.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-class-properties" "^7.12.13" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.12.13" - "@babel/plugin-transform-arrow-functions" "^7.13.0" - "@babel/plugin-transform-async-to-generator" "^7.13.0" - "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.12.13" - "@babel/plugin-transform-classes" "^7.13.0" - "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.0" - "@babel/plugin-transform-dotall-regex" "^7.12.13" - "@babel/plugin-transform-duplicate-keys" "^7.12.13" - "@babel/plugin-transform-exponentiation-operator" "^7.12.13" - "@babel/plugin-transform-for-of" "^7.13.0" - "@babel/plugin-transform-function-name" "^7.12.13" - "@babel/plugin-transform-literals" "^7.12.13" - "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.13.0" - "@babel/plugin-transform-modules-commonjs" "^7.13.8" - "@babel/plugin-transform-modules-systemjs" "^7.13.8" - "@babel/plugin-transform-modules-umd" "^7.13.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" - "@babel/plugin-transform-new-target" "^7.12.13" - "@babel/plugin-transform-object-super" "^7.12.13" - "@babel/plugin-transform-parameters" "^7.13.0" - "@babel/plugin-transform-property-literals" "^7.12.13" - "@babel/plugin-transform-regenerator" "^7.13.15" - "@babel/plugin-transform-reserved-words" "^7.12.13" - "@babel/plugin-transform-shorthand-properties" "^7.12.13" - "@babel/plugin-transform-spread" "^7.13.0" - "@babel/plugin-transform-sticky-regex" "^7.12.13" - "@babel/plugin-transform-template-literals" "^7.13.0" - "@babel/plugin-transform-typeof-symbol" "^7.12.13" - "@babel/plugin-transform-unicode-escapes" "^7.12.13" - "@babel/plugin-transform-unicode-regex" "^7.12.13" - "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.14" - babel-plugin-polyfill-corejs2 "^0.2.0" - babel-plugin-polyfill-corejs3 "^0.2.0" - babel-plugin-polyfill-regenerator "^0.2.0" - core-js-compat "^3.9.0" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.4": - version "0.1.4" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e" - integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.4.4" - "@babel/plugin-transform-dotall-regex" "^7.4.4" - "@babel/types" "^7.4.4" - esutils "^2.0.2" - -"@babel/runtime@^7.13.10", "@babel/runtime@^7.8.4": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec" - integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/template@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17", "@babel/traverse@^7.7.0": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3" - integrity sha512-BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.16" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.16" - "@babel/types" "^7.13.17" + "@babel/code-frame" "^7.16.0" + "@babel/generator" "^7.16.0" + "@babel/helper-function-name" "^7.16.0" + "@babel/helper-hoist-variables" "^7.16.0" + "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/parser" "^7.16.3" + "@babel/types" "^7.16.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.7.0", "@babel/types@^7.9.6": - version "7.13.17" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4" - integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA== +"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.6.1", "@babel/types@^7.9.6": + version "7.16.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-validator-identifier" "^7.15.7" to-fast-properties "^2.0.0" "@bazel/bazelisk@latest": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.8.0.tgz#7bdb7c7068d4779ba8ddbf8cd72afb9b2099bb6e" - integrity sha512-RcovBpVPlLptW/+j1+Xbnr4+Ooy1HO8bG2ECAC0pegLvKFWhO6X3twLKKAJ2KQ4jkoeE0xzUUWIL9zyaIsNxLA== + version "1.10.1" + resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.10.1.tgz#46236a43ad58e310c55247f866da0dc6083c3d8b" + integrity sha512-IHszNzBO2UrUy6YtsSAsZtnU6I6qpzXGkWdEvGoMxLgJnDsEnsIYniDCUjvjU1KAP+A03eepmCHlyFcRHMSxRA== "@bazel/buildifier@latest": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-4.0.1.tgz#52cfbad5cbb86e9183a29dde2370cd465730ea0d" - integrity sha512-BTmtvJbeeEVrqRApI1gr5hvPgYcHLpdGJ5EXNXEWO692ztMPSj5fB/dH0xUlaW45jn6LimYx8ymqTMhj3538og== + version "4.2.3" + resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-4.2.3.tgz#2c6e54faa12e31b75051834cf1cfa68c71678262" + integrity sha512-19GqPhxlyh376mJT6kvvNAJbRCjDj4WFjqy+sT2LAMt5THMGSES8+lwde5J1jwpud/mqrNUIRjEzVZR5A/6+BA== "@bazel/ibazel@latest": version "0.15.10" resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.15.10.tgz#cf0cff1aec6d8e7bb23e1fc618d09fbd39b7a13f" integrity sha512-0v+OwCQ6fsGFa50r6MXWbUkSGuWOoZ22K4pMSdtWiL5LKFIE4kfmMmtQS+M7/ICNwk2EIYob+NRreyi/DGUz5A== -"@csstools/convert-colors@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" - integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" - integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== - -"@electron/get@^1.0.1": - version "1.12.4" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" - integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== +"@cloudflare/kv-asset-handler@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.1.3.tgz#3eaaf962b16c48a7189db5d5ac1c4dca4e2ed1a0" + integrity sha512-FNcunDuTmEfQTLRLtA6zz+buIXUHj1soPvSWzzQFBC+n2lsy+CGf/NIrR3SEPCmsVNQj70/Jx2lViCpq+09YpQ== dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^9.6.0" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^2.0.2" - global-tunnel-ng "^2.7.1" + mime "^2.5.2" -"@eslint/eslintrc@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" - integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== +"@eslint/eslintrc@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.4.tgz#dfe0ff7ba270848d10c5add0715e04964c034b31" + integrity sha512-h8Vx6MdxwWI2WM8/zREHMoqdgLNXEL4QX3MWSVMdyNJGvXVOs+6lp+m2hc3FnuMHDc4poxFNI20vCk0OmI4G0Q== dependencies: ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^12.1.0" + debug "^4.3.2" + espree "^9.0.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" - js-yaml "^3.13.1" + js-yaml "^4.1.0" minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@grpc/grpc-js@^1.2.12": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.3.0.tgz#c6febaaf00ce7f53b5ec52c7cf3e2a4725b82bcb" - integrity sha512-fiL7ZaGg2HBiFtmv6m34d5jEgEtNXfctjzB3f7b3iuT7olBX4mHLMOqOBmGTTSOTfNRQJH5+vsyk6mEz3I0Q7Q== +"@grpc/grpc-js@^1.4.4": + version "1.4.4" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.4.4.tgz#59336f13d77bc446bbdf2161564a32639288dc5b" + integrity sha512-a6222b7Dl6fIlMgzVl7e+NiRoLiZFbpcwvBH2Oli56Bn7W4/3Ld+86hK4ffPn5rx2DlDidmIcvIJiOQXyhv9gA== dependencies: + "@grpc/proto-loader" "^0.6.4" "@types/node" ">=12.12.47" -"@mdi/font@^5.8.55": - version "5.9.55" - resolved "https://registry.yarnpkg.com/@mdi/font/-/font-5.9.55.tgz#41acd50b88073ded7095fc3029d8712b6e12f38e" - integrity sha512-jswRF6q3eq8NWpWiqct6q+6Fg/I7nUhrxYJfiEM8JJpap0wVJLQdbKtyS65GdlK7S7Ytnx3TTi/bmw+tBhkGmg== - -"@multiformats/base-x@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@multiformats/base-x/-/base-x-4.0.1.tgz#95ff0fa58711789d53aefb2590a8b7a4e715d121" - integrity sha512-eMk0b9ReBbV23xXU693TAIrLyeO5iTgBZGSJfpqriG8UkYvr/hC9u9pyMlAakDNHWmbhMZCDs6KQO0jzKD8OTw== - -"@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== +"@grpc/proto-loader@^0.6.4": + version "0.6.6" + resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.6.6.tgz#d8e51ea808ec5fa54d9defbecbf859336fb2da71" + integrity sha512-cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ== dependencies: - "@nodelib/fs.stat" "2.0.4" + "@types/long" "^4.0.1" + lodash.camelcase "^4.3.0" + long "^4.0.0" + protobufjs "^6.10.0" + yargs "^16.1.1" + +"@humanwhocodes/config-array@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.6.0.tgz#b5621fdb3b32309d2d16575456cbc277fa8f021a" + integrity sha512-JQlEKbcgEUjBFhLIF4iqM7u/9lwgHRBcpHrmUNCALK0Q3amXN6lxdoXLnF0sm11E9VqTmBALR87IlUg1bZ8A9A== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + +"@mapbox/node-pre-gyp@^1.0.5": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.6.tgz#f859d601a210537e27530f363028cde56e0cf962" + integrity sha512-qK1ECws8UxuPqOA8F5LFD90vyVU33W7N3hGfgsOVfrJaRVc8McC3JClTDHpeSbL9CBrOHly/4GsNPAvIgNZE+g== + dependencies: + detect-libc "^1.0.3" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.5" + nopt "^5.0.0" + npmlog "^5.0.1" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.11" + +"@netlify/functions@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@netlify/functions/-/functions-0.8.0.tgz#0c0a3d5a8efdc6aa469f75acb9df556a317cff1f" + integrity sha512-Ew4Q2ofSBa5aeVOvrHNNEkfCJNmjTkEIr+WkyveOZrcnKQGH/sTtPqVb6HP51NJHNhczBkd3S3KdXfrCB0q0Ig== + dependencies: + is-promise "^4.0.0" + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.4" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" +"@nuxt/design@0.1.5", "@nuxt/design@^0.1.5": + version "0.1.5" + resolved "https://registry.yarnpkg.com/@nuxt/design/-/design-0.1.5.tgz#8d63a5a8e94c070ca7ef504327577888f43fb0ce" + integrity sha512-s1meTL1zTrgl1Go/Bhy3GdaYGmZqsUY99xo+e4t5AuLY+9pviTfOUzziB7097NomKHUdieb+J8gH1wcsY65B6A== -"@nuxt/babel-preset-app@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.15.4.tgz#e5ca0714806db1ede41ae6f0a42d34022ab68150" - integrity sha512-49boY5aSfs7ImExW2EHutkfyxoipZeCF2MxF8kYKyhJz/9esoJdo6eY8JNhzDZYISDaWSeN2w5HjiMVo9zTrjg== - dependencies: - "@babel/compat-data" "^7.13.12" - "@babel/core" "^7.13.14" - "@babel/helper-compilation-targets" "^7.13.13" - "@babel/helper-module-imports" "^7.13.12" - "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-decorators" "^7.13.5" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.12" - "@babel/plugin-transform-runtime" "^7.13.10" - "@babel/preset-env" "^7.13.12" - "@babel/runtime" "^7.13.10" - "@vue/babel-preset-jsx" "^1.2.4" - core-js "^2.6.5" - core-js-compat "^3.10.0" - regenerator-runtime "^0.13.7" +"@nuxt/devalue@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-2.0.0.tgz#c7bd7e9a516514e612d5d2e511ffc399e0eac322" + integrity sha512-YBI/6o2EBz02tdEJRBK8xkt3zvOFOWlLBf7WKYGBsSYSRtjjgrqPe2skp6VLLmKx5WbHHDNcW+6oACaurxGzeA== -"@nuxt/builder@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.15.4.tgz#0b54e0acb48aacc339af71b3b5d4df2d52a3d9da" - integrity sha512-C2pmWH1ueUnwo/W0YIwlzQRqLy9BkoQTUHvy849hDTE4EFeTnW9g8cE9sGI0MTfmKY2dDDx2dc/W63MPP8r3wQ== - dependencies: - "@nuxt/devalue" "^1.2.5" - "@nuxt/utils" "2.15.4" - "@nuxt/vue-app" "2.15.4" - "@nuxt/webpack" "2.15.4" - chalk "^4.1.0" - chokidar "^3.5.1" - consola "^2.15.3" - fs-extra "^9.1.0" - glob "^7.1.6" - hash-sum "^2.0.0" - ignore "^5.1.8" - lodash "^4.17.21" - pify "^5.0.0" - serialize-javascript "^5.0.1" - upath "^2.0.1" - -"@nuxt/cli@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.15.4.tgz#d5f33ee3e1e0cc4a3edaaf21e9b0c294cd0e4097" - integrity sha512-KlBXwvvgP0H3lcub5PGez2OhaNo3p8ln6Dhejmv8WoOfsn/z6Qa7+3sGUE3a03uBbh59JXYLSBFzhVDVx7NdDg== - dependencies: - "@nuxt/config" "2.15.4" - "@nuxt/utils" "2.15.4" - boxen "^5.0.0" - chalk "^4.1.0" - compression "^1.7.4" - connect "^3.7.0" - consola "^2.15.3" - crc "^3.8.0" - defu "^3.2.2" - destr "^1.1.0" - execa "^5.0.0" - exit "^0.1.2" - fs-extra "^9.1.0" - globby "^11.0.3" - hable "^3.0.0" - lodash "^4.17.21" - minimist "^1.2.5" - opener "1.5.2" - pretty-bytes "^5.6.0" - semver "^7.3.5" - serve-static "^1.14.1" - std-env "^2.3.0" - upath "^2.0.1" - wrap-ansi "^7.0.0" - -"@nuxt/components@^2.1.4": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@nuxt/components/-/components-2.1.7.tgz#8acf0ffeca52593a529b5228fa578a31c946ae1f" - integrity sha512-elN055qIqUgSp2QtsoDjwcVuY7wiAaVEFcSjuLIPlAmgA/xP9TW1yF67i+0FDHz3P/EfS5gLbHo7G/Qq1K4XqA== - dependencies: - chalk "^4.1.1" - chokidar "^3.5.1" - glob "^7.1.6" - globby "^11.0.3" - scule "^0.2.1" - semver "^7.3.5" - upath "^2.0.1" - vue-template-compiler "^2.6.12" - -"@nuxt/config@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.15.4.tgz#b99d1623a7b9ed3f0fe0dbf768c7424f1455d896" - integrity sha512-IwbsSrCMXN0QLY4e0tFImMsFxGtAFaf42TuYkwwJiG4YgqaY6CBHI6GYmmcDma+kPtoZ85n0RRyyuQp6lUwBLw== - dependencies: - "@nuxt/utils" "2.15.4" - consola "^2.15.3" - defu "^3.2.2" - destr "^1.1.0" - dotenv "^8.2.0" - lodash "^4.17.21" - rc9 "^1.2.0" - std-env "^2.3.0" - ufo "^0.6.10" - -"@nuxt/core@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.15.4.tgz#73dee1a03ba82bad745b23e5c72e66f9c73b29d9" - integrity sha512-SM+mEE7X3RgO+cyD0VP62pJ9Pd9KUAGDka32uaQAGEwGdRyoz1g1jUayzfnut75Pk0s96zuOmsD+uwdIGTU0vQ== - dependencies: - "@nuxt/config" "2.15.4" - "@nuxt/server" "2.15.4" - "@nuxt/utils" "2.15.4" - consola "^2.15.3" - fs-extra "^9.1.0" - hable "^3.0.0" - hash-sum "^2.0.0" - lodash "^4.17.21" - -"@nuxt/devalue@^1.2.5": - version "1.2.5" - resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-1.2.5.tgz#8d95e3e74b3332d3eb713342c5c4d18096047d66" - integrity sha512-Tg86C7tqzvZtZli2BQVqgzZN136mZDTgauvJXagglKkP2xt5Kw3NUIiJyjX0Ww/IZy2xVmD0LN+CEPpij4dB2g== - dependencies: - consola "^2.9.0" - -"@nuxt/friendly-errors-webpack-plugin@^2.5.0": - version "2.5.1" - resolved "https://registry.yarnpkg.com/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.5.1.tgz#3ab815c31eb43859a239848a85481157aaf7b07e" - integrity sha512-mKN0Mbb1PjJYBzrswsyWvSEZw5Jxi0fQZPMA0ssrTmkz9lvtxtXq4luhX31OpULUvbc0jLaBu/SL0ExlxIbTlw== +"@nuxt/friendly-errors-webpack-plugin@^2.5.2": + version "2.5.2" + resolved "https://registry.yarnpkg.com/@nuxt/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-2.5.2.tgz#982a43ee2da61611f7396439e57038392d3944d5" + integrity sha512-LLc+90lnxVbpKkMqk5z1EWpXoODhc6gRkqqXJCInJwF5xabHAE7biFvbULfvTRmtaTzAaP8IV4HQDLUgeAUTTw== dependencies: chalk "^2.3.2" consola "^2.6.0" error-stack-parser "^2.0.0" - string-width "^2.0.0" + string-width "^4.2.3" -"@nuxt/generator@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.15.4.tgz#6060ac9c37f78fa9c99ad73735a41da103d3f76e" - integrity sha512-Yq5tlLszZjBaw2PPt5d+WCDmfqcYrPxHngaDo/VmQR0tGyGEUETGNCYvJziOmErk0pZjk54npSr7ftnrFtJXxA== +"@nuxt/kit@npm:@nuxt/kit-edge@3.0.0-27277498.850ef69": + version "3.0.0-27277498.850ef69" + resolved "https://registry.yarnpkg.com/@nuxt/kit-edge/-/kit-edge-3.0.0-27277498.850ef69.tgz#3c90bb72a18127820c23f3d428ccdee5a60ef549" + integrity sha512-nlRbNf0wZwIuDzUs20AE9O4bE1rcIv3yaA/oYFhqUlXumiEDqHPmiuDAL5Trbe+E3Ut7EmZxgrcwUgQ0zQ8fuQ== dependencies: - "@nuxt/utils" "2.15.4" - chalk "^4.1.0" consola "^2.15.3" - defu "^3.2.2" - devalue "^2.0.1" - fs-extra "^9.1.0" - html-minifier "^4.0.0" - node-html-parser "^3.1.2" - ufo "^0.6.10" - -"@nuxt/loading-screen@^2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@nuxt/loading-screen/-/loading-screen-2.0.3.tgz#1d6b1f976bb143c6592231af0bf7fa6245f6ebd2" - integrity sha512-ThvxxUpfTZezzz0gAgyG4vHCM7KDeA692EL7lKrZ/fU8JvXlG6LYngVLWAobexBsydtGkuZyKCwCVDnEGNL4jw== - dependencies: - connect "^3.7.0" - defu "^2.0.4" - get-port-please "^1.0.0" - node-res "^5.0.1" - serve-static "^1.14.1" - -"@nuxt/opencollective@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.2.tgz#83cb70cdb2bac5fad6f8c93529e7b11187d49c02" - integrity sha512-XG7rUdXG9fcafu9KTDIYjJSkRO38EwjlKYIb5TQ/0WDbiTUTtUtgncMscKOYzfsY86kGs05pAuMOR+3Fi0aN3A== - dependencies: - chalk "^4.1.0" - consola "^2.15.0" - node-fetch "^2.6.1" - -"@nuxt/server@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.15.4.tgz#6b9beae7aa945387d277a2f442368f8beb82670d" - integrity sha512-RxHBif+12v9Tqg0hBADGRJA+HnVJDd5RDDlo4plHhIU8KhgfewGGSdF3PAltHoCavXAHrTVdTEAZKN11gtAAlA== - dependencies: - "@nuxt/utils" "2.15.4" - "@nuxt/vue-renderer" "2.15.4" - "@nuxtjs/youch" "^4.2.3" - compression "^1.7.4" - connect "^3.7.0" - consola "^2.15.3" - etag "^1.8.1" - fresh "^0.5.2" - fs-extra "^9.1.0" - ip "^1.1.5" - launch-editor-middleware "^2.2.1" - on-headers "^1.0.2" - pify "^5.0.0" - serve-placeholder "^1.2.3" - serve-static "^1.14.1" - server-destroy "^1.0.1" - ufo "^0.6.10" - -"@nuxt/telemetry@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@nuxt/telemetry/-/telemetry-1.3.3.tgz#beefa94c6032a1312c7dc9c8784c6b8cc3aa42ae" - integrity sha512-ElnoAJo1n/Ui0j9i3xqhXajoGJdEwmkEtsWftlZUpQNJxdfoz+623qnt9XHMYa0X5Nf1PXYdcUKa2u4AASXOjA== - dependencies: - arg "^5.0.0" - chalk "^4.1.0" - ci-info "^2.0.0" - consola "^2.15.0" create-require "^1.1.1" - defu "^3.2.2" - destr "^1.1.0" - dotenv "^8.2.0" - fs-extra "^8.1.0" - git-url-parse "^11.4.3" - inquirer "^7.3.3" - is-docker "^2.1.1" - jiti "^1.3.0" - nanoid "^3.1.20" - node-fetch "^2.6.1" - parse-git-config "^3.0.0" + defu "^5.0.0" + dotenv "^10.0.0" + globby "^11.0.4" + hash-sum "^2.0.0" + hookable "^5.0.0" + jiti "^1.12.9" + lodash.template "^4.5.0" + mlly "^0.3.13" + pathe "^0.2.0" + pkg-types "^0.3.1" rc9 "^1.2.0" - std-env "^2.2.1" - -"@nuxt/utils@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.15.4.tgz#1c84dfa964357224a79d402797c9feab2040991c" - integrity sha512-ngvE7TDVXDIQgB+vvENEPfwetWu5zxGX0vqszeEB6248MZAoU1nBqT+nVH9tIm1/aiZZz1Wg0plc4d+QLizpmA== - dependencies: - consola "^2.15.3" - create-require "^1.1.1" - fs-extra "^9.1.0" - hash-sum "^2.0.0" - jiti "^1.6.4" - lodash "^4.17.21" - proper-lockfile "^4.1.2" + scule "^0.2.1" semver "^7.3.5" - serialize-javascript "^5.0.1" - signal-exit "^3.0.3" - ua-parser-js "^0.7.26" - ufo "^0.6.10" + std-env "^3.0.1" + ufo "^0.7.9" + unctx "^1.0.2" + untyped "^0.2.12" -"@nuxt/vue-app@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.15.4.tgz#85f478ddbde4fe3f64fbe9d8878ceb41a1a704fb" - integrity sha512-AtvMkY0OdsqlLQLEHbc61fSX3Y6HGsZPbvdFPuBX8fjFVhOCggC9HtYKcJf/S7qXhnDm241biDCy7U51myxuPw== +"@nuxt/nitro@npm:@nuxt/nitro-edge@3.0.0-27277498.850ef69": + version "3.0.0-27277498.850ef69" + resolved "https://registry.yarnpkg.com/@nuxt/nitro-edge/-/nitro-edge-3.0.0-27277498.850ef69.tgz#6301c5737cd60e6849a6076276a85df14634d765" + integrity sha512-1ojLhD8Y0rQuWL43cUC3Nmu8u/Z+oRVoPibFN1nuXqderyJVk0aUdiIy2mZuh4PXTi7lZgOic5luUkwtCIYTEw== dependencies: - node-fetch "^2.6.1" - ufo "^0.6.10" - unfetch "^4.2.0" - vue "^2.6.12" - vue-client-only "^2.0.0" - vue-meta "^2.4.0" - vue-no-ssr "^1.1.1" - vue-router "^3.5.1" - vue-template-compiler "^2.6.12" - vuex "^3.6.2" - -"@nuxt/vue-renderer@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.15.4.tgz#39831811fff62f4ba65200163d523d0fd7311fee" - integrity sha512-UQzU4XzYFBOiwrZvh4ORcVEQbNzXPfub3/MWWZiYR7uuKjCfRNmU/ZIvAcSsWCrkyc1bvaw8Iehq4h0z88ZyQw== - dependencies: - "@nuxt/devalue" "^1.2.5" - "@nuxt/utils" "2.15.4" + "@cloudflare/kv-asset-handler" "^0.1.3" + "@netlify/functions" "^0.8.0" + "@nuxt/design" "0.1.5" + "@nuxt/devalue" "^2.0.0" + "@nuxt/kit" "npm:@nuxt/kit-edge@3.0.0-27277498.850ef69" + "@rollup/plugin-alias" "^3.1.8" + "@rollup/plugin-commonjs" "^21.0.1" + "@rollup/plugin-inject" "^4.0.3" + "@rollup/plugin-json" "^4.1.0" + "@rollup/plugin-node-resolve" "^13.0.6" + "@rollup/plugin-replace" "^3.0.0" + "@rollup/plugin-virtual" "^2.0.3" + "@rollup/plugin-wasm" "^5.1.2" + "@rollup/pluginutils" "^4.1.1" + "@types/jsdom" "^16.2.13" + "@vercel/nft" "^0.17.0" + archiver "^5.3.0" + chalk "^4.1.2" + chokidar "^3.5.2" + connect "^3.7.0" consola "^2.15.3" - defu "^3.2.2" - fs-extra "^9.1.0" - lodash "^4.17.21" - lru-cache "^5.1.1" - ufo "^0.6.10" - vue "^2.6.12" - vue-meta "^2.4.0" - vue-server-renderer "^2.6.12" + defu "^5.0.0" + destr "^1.1.0" + dot-prop "^6.0.1" + esbuild "^0.13.13" + etag "^1.8.1" + fs-extra "^10.0.0" + globby "^11.0.4" + gzip-size "^6.0.0" + h3 "^0.3.3" + hasha "^5.2.2" + hookable "^5.0.0" + http-proxy "^1.18.1" + is-primitive "^3.0.1" + jiti "^1.12.9" + listhen "^0.2.5" + mime "^3.0.0" + mlly "^0.3.13" + node-fetch "^3.1.0" + ohmyfetch "^0.4.6" + ora "^6.0.1" + p-debounce "^4.0.0" + pathe "^0.2.0" + pkg-types "^0.3.1" + pretty-bytes "^5.6.0" + rollup "^2.59.0" + rollup-plugin-terser "^7.0.2" + rollup-plugin-visualizer "^5.5.2" + serve-placeholder "^1.2.4" + serve-static "^1.14.1" + std-env "^3.0.1" + table "^6.7.3" + ufo "^0.7.9" + unenv "^0.4.1" + unstorage "^0.3.2" + vue-bundle-renderer "^0.3.2" + vue-server-renderer "^2.6.14" -"@nuxt/webpack@2.15.4": - version "2.15.4" - resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.15.4.tgz#f65df7234248c6622f172f84646cde20ef26f347" - integrity sha512-VyrTuTpl+aXjuymHHunBg0c+F7BFuPNWU62A3fwdNoCq4zxHt4+JzXTcQkst2FlL9btJ/y2+OEM7QJRVE0+1FA== +"@nuxt/vite-builder@npm:@nuxt/vite-builder-edge@3.0.0-27277498.850ef69": + version "3.0.0-27277498.850ef69" + resolved "https://registry.yarnpkg.com/@nuxt/vite-builder-edge/-/vite-builder-edge-3.0.0-27277498.850ef69.tgz#0b288e4167c0fbfb7bc2365f59153ce43219f2a5" + integrity sha512-UN+2T595ibP4DJElprnBw/5rRZ/pb40wB68flDXeEiq//TKUbgybPTkOjU6zoO8GvPxGBFuEd7h3BQMLpNmMZQ== dependencies: - "@babel/core" "^7.13.14" - "@nuxt/babel-preset-app" "2.15.4" - "@nuxt/friendly-errors-webpack-plugin" "^2.5.0" - "@nuxt/utils" "2.15.4" - babel-loader "^8.2.2" - cache-loader "^4.1.0" - caniuse-lite "^1.0.30001205" + "@nuxt/kit" "npm:@nuxt/kit-edge@3.0.0-27277498.850ef69" + "@vitejs/plugin-vue" "^1.9.4" + "@vitejs/plugin-vue-jsx" "^1.2.0" + autoprefixer "^10.4.0" + chokidar "^3.5.2" consola "^2.15.3" - css-loader "^4.3.0" - cssnano "^4.1.10" - eventsource-polyfill "^0.9.6" - extract-css-chunks-webpack-plugin "^4.9.0" - file-loader "^6.2.0" - glob "^7.1.6" - hard-source-webpack-plugin "^0.13.1" - hash-sum "^2.0.0" - html-webpack-plugin "^4.5.1" - lodash "^4.17.21" - memory-fs "^0.5.0" - optimize-css-assets-webpack-plugin "^5.0.4" - pify "^5.0.0" - pnp-webpack-plugin "^1.6.4" - postcss "^7.0.32" - postcss-import "^12.0.1" + defu "^5.0.0" + esbuild "^0.13.13" + externality "^0.1.5" + fs-extra "^10.0.0" + magic-string "^0.25.7" + mlly "^0.3.13" + p-debounce "^4.0.0" + pathe "^0.2.0" + postcss-import "^14.0.2" postcss-import-resolver "^2.0.0" - postcss-loader "^3.0.0" - postcss-preset-env "^6.7.0" - postcss-url "^8.0.0" - semver "^7.3.5" - std-env "^2.3.0" - style-resources-loader "^1.4.1" - terser-webpack-plugin "^4.2.3" - thread-loader "^3.0.1" - time-fix-plugin "^2.0.7" - ufo "^0.6.10" - url-loader "^4.1.1" - vue-loader "^15.9.6" - vue-style-loader "^4.1.3" - vue-template-compiler "^2.6.12" - webpack "^4.46.0" - webpack-bundle-analyzer "^4.4.0" - webpack-dev-middleware "^4.1.0" - webpack-hot-middleware "^2.25.0" - webpack-node-externals "^2.5.2" - webpackbar "^4.0.0" + postcss-url "^10.1.3" + rollup-plugin-visualizer "^5.5.2" + ufo "^0.7.9" + vite "^2.6.14" -"@nuxtjs/axios@^5.12.5": - version "5.13.1" - resolved "https://registry.yarnpkg.com/@nuxtjs/axios/-/axios-5.13.1.tgz#70c7444e6be8989372c249637f9287c844340f42" - integrity sha512-vZpXV2AAkQ5Duejubt1k3ZgUnYowYnPvmcUt0hskd+OebmQ+jF6Wk6rOG0/9EeknOxm7mtTGgKSwdlE1jDo+xA== +"@nuxt/webpack-builder@npm:@nuxt/webpack-builder-edge@3.0.0-27277498.850ef69": + version "3.0.0-27277498.850ef69" + resolved "https://registry.yarnpkg.com/@nuxt/webpack-builder-edge/-/webpack-builder-edge-3.0.0-27277498.850ef69.tgz#c4880b83dc8b71fa1ece06394ab17b122e2b4978" + integrity sha512-mxQSfqApDojUea11MZWvi1viRGZbKCKFGA2R1ijaWYsrZ2cqrF40r7+KQEakdyo1YWfzenlbrLhO0yqzzLptKA== dependencies: - "@nuxtjs/proxy" "^2.1.0" - axios "^0.21.1" - axios-retry "^3.1.9" + "@babel/core" "^7.16.0" + "@nuxt/friendly-errors-webpack-plugin" "^2.5.2" + "@nuxt/kit" "npm:@nuxt/kit-edge@3.0.0-27277498.850ef69" + "@vue/babel-preset-jsx" "^1.2.4" + autoprefixer "^10.4.0" + babel-loader "^8.2.3" consola "^2.15.3" - defu "^3.2.2" + css-loader "^6.5.1" + css-minimizer-webpack-plugin "^3.1.3" + cssnano "^5.0.10" + esbuild-loader "^2.16.0" + file-loader "^6.2.0" + fs-extra "^10.0.0" + glob "^7.2.0" + hash-sum "^2.0.0" + lodash-es "^4.17.21" + memfs "^3.3.0" + mini-css-extract-plugin "^2.4.4" + mlly "^0.3.13" + pathe "^0.2.0" + pify "^5.0.0" + postcss "^8.3.11" + postcss-import "^14.0.2" + postcss-import-resolver "^2.0.0" + postcss-loader "^6.2.0" + postcss-url "^10.1.3" + style-resources-loader "^1.4.1" + time-fix-plugin "^2.0.7" + ufo "^0.7.9" + url-loader "^4.1.1" + vue-loader "^16.8.3" + vue-style-loader "^4.1.3" + webpack "^5.63.0" + webpack-bundle-analyzer "^4.5.0" + webpack-dev-middleware "^5.2.1" + webpack-hot-middleware "^2.25.1" + webpack-virtual-modules "^0.4.3" + webpackbar "^5.0.2" -"@nuxtjs/proxy@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@nuxtjs/proxy/-/proxy-2.1.0.tgz#fa7715a11d237fa1273503c4e9e137dd1bf5575b" - integrity sha512-/qtoeqXgZ4Mg6LRg/gDUZQrFpOlOdHrol/vQYMnKu3aN3bP90UfOUB3QSDghUUK7OISAJ0xp8Ld78aHyCTcKCQ== - dependencies: - http-proxy-middleware "^1.0.6" - -"@nuxtjs/youch@^4.2.3": - version "4.2.3" - resolved "https://registry.yarnpkg.com/@nuxtjs/youch/-/youch-4.2.3.tgz#36f8b22df5a0efaa81373109851e1d857aca6bed" - integrity sha512-XiTWdadTwtmL/IGkNqbVe+dOlT+IMvcBu7TvKI7plWhVQeBCQ9iKhk3jgvVWFyiwL2yHJDlEwOM5v9oVES5Xmw== - dependencies: - cookie "^0.3.1" - mustache "^2.3.0" - stack-trace "0.0.10" - -"@pointotech/pug-plain-loader@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@pointotech/pug-plain-loader/-/pug-plain-loader-1.0.1.tgz#352b62db936568d15872165fd361606e58799495" - integrity sha512-3uWkNllfLn2nW1bpjoDgo9fHaso4uRNcYOmTp7+nSyZSdoXRm9rL1+4r92xCu6arcCuDB5/K5AW4Xzyze5KFpg== - dependencies: - loader-utils "^2.0.0" - -"@polka/url@^1.0.0-next.9": - version "1.0.0-next.12" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.12.tgz#431ec342a7195622f86688bbda82e3166ce8cb28" - integrity sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ== +"@polka/url@^1.0.0-next.20": + version "1.0.0-next.21" + resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -1382,134 +613,234 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== - -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== +"@rollup/plugin-alias@^3.1.8": + version "3.1.8" + resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-3.1.8.tgz#645fd84659e08d3d1b059408fcdf69c1dd435a6b" + integrity sha512-tf7HeSs/06wO2LPqKNY3Ckbvy0JRe7Jyn98bXnt/gfrxbe+AJucoNJlsEVi9sdgbQtXemjbakCpO/76JVgnHpA== dependencies: - defer-to-connect "^1.0.1" + slash "^3.0.0" -"@types/anymatch@*": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" - integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== - -"@types/bytebuffer@^5.0.40": - version "5.0.42" - resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.42.tgz#1c602a77942d34c5c0879ad75c58d5d8c07dfb3b" - integrity sha512-lEgKojWUAc/MG2t649oZS5AfYFP2xRNPoDuwDBlBMjHXd8MaGPgFgtCXUK7inZdBOygmVf10qxc1Us8GXC96aw== +"@rollup/plugin-commonjs@^21.0.1": + version "21.0.1" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.1.tgz#1e57c81ae1518e4df0954d681c642e7d94588fee" + integrity sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg== dependencies: - "@types/long" "*" - "@types/node" "*" + "@rollup/pluginutils" "^3.1.0" + commondir "^1.0.1" + estree-walker "^2.0.1" + glob "^7.1.6" + is-reference "^1.2.1" + magic-string "^0.25.7" + resolve "^1.17.0" -"@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== +"@rollup/plugin-inject@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-4.0.3.tgz#6f04ebc14790a8bf892286fe9b8c0eb1ddf4d5ce" + integrity sha512-lzMXmj0LZjd67MI+M8H9dk/oCxR0TYqYAdZ6ZOejWQLSUtud+FUPu4NCMAO8KyWWAalFo8ean7yFHCMvCNsCZw== dependencies: - "@types/minimatch" "*" - "@types/node" "*" + "@rollup/pluginutils" "^3.1.0" + estree-walker "^2.0.1" + magic-string "^0.25.7" -"@types/html-minifier-terser@^5.0.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" - integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== +"@rollup/plugin-json@^4.1.0": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3" + integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw== + dependencies: + "@rollup/pluginutils" "^3.0.8" -"@types/http-proxy@^1.17.5": - version "1.17.5" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.5.tgz#c203c5e6e9dc6820d27a40eb1e511c70a220423d" - integrity sha512-GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q== +"@rollup/plugin-node-resolve@^13.0.6": + version "13.0.6" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.6.tgz#29629070bb767567be8157f575cfa8f2b8e9ef77" + integrity sha512-sFsPDMPd4gMqnh2gS0uIxELnoRUp5kBl5knxD2EO0778G1oOJv4G1vyT2cpWz75OU2jDVcXhjVUuTAczGyFNKA== + dependencies: + "@rollup/pluginutils" "^3.1.0" + "@types/resolve" "1.17.1" + builtin-modules "^3.1.0" + deepmerge "^4.2.2" + is-module "^1.0.0" + resolve "^1.19.0" + +"@rollup/plugin-replace@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-3.0.0.tgz#3a4c9665d4e7a4ce2c360cf021232784892f3fac" + integrity sha512-3c7JCbMuYXM4PbPWT4+m/4Y6U60SgsnDT/cCyAyUKwFHg7pTSfsSQzIpETha3a3ig6OdOKzZz87D9ZXIK3qsDg== + dependencies: + "@rollup/pluginutils" "^3.1.0" + magic-string "^0.25.7" + +"@rollup/plugin-virtual@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@rollup/plugin-virtual/-/plugin-virtual-2.0.3.tgz#0afc88d75c1e1378ab290b8e9898d4edb5be0d74" + integrity sha512-pw6ziJcyjZtntQ//bkad9qXaBx665SgEL8C8KI5wO8G5iU5MPxvdWrQyVaAvjojGm9tJoS8M9Z/EEepbqieYmw== + +"@rollup/plugin-wasm@^5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-wasm/-/plugin-wasm-5.1.2.tgz#5ebd767a14eb7cc98f45aee817e3efbe15c944d8" + integrity sha512-eiOuMHBNY0EGTq3LCebg4IQ6/SOvKjmGetzqKajJWcbDQkrQZvHihZKKnBJYY7NuuvjNqCLdEViYr5aAZms63g== + +"@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" + integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== + dependencies: + "@types/estree" "0.0.39" + estree-walker "^1.0.1" + picomatch "^2.2.2" + +"@rollup/pluginutils@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec" + integrity sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ== + dependencies: + estree-walker "^2.0.1" + picomatch "^2.2.2" + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== + +"@types/eslint-scope@^3.7.0": + version "3.7.1" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" + integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "7.28.2" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.2.tgz#0ff2947cdd305897c52d5372294e8c76f351db68" + integrity sha512-KubbADPkfoU75KgKeKLsFHXnU4ipH7wYg0TRT33NK3N3yiu7jlFAAoygIWBV+KbuHx/G+AvuGX6DllnK35gfJA== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^0.0.50": + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== + +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== + +"@types/jsdom@^16.2.13": + version "16.2.13" + resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.13.tgz#126c8b7441b159d6234610a48de77b6066f1823f" + integrity sha512-8JQCjdeAidptSsOcRWk2iTm9wCcwn9l+kRG6k5bzUacrnm1ezV4forq0kWjUih/tumAeoG+OspOvQEbbRucBTw== dependencies: "@types/node" "*" + "@types/parse5" "*" + "@types/tough-cookie" "*" -"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== +"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/long@*", "@types/long@^4.0.1": +"@types/long@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== -"@types/minimatch@*": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21" - integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== +"@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0", "@types/node@^16.11.7": + version "16.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" + integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== -"@types/node@*", "@types/node@>=12.12.47": - version "15.0.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a" - integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA== +"@types/parse-json@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" + integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/node@^13.7.0": - version "13.13.51" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.51.tgz#a424c5282f99fc1ca41f11b727b6aea80668bcba" - integrity sha512-66/xg5I5Te4oGi5Jws11PtNmKkZbOPZWyBZZ/l5AOrWj1Dyw+6Ge/JhYTq/2/Yvdqyhrue8RL+DGI298OJ0xcg== +"@types/parse5@*": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.2.tgz#99f6b72d82e34cea03a4d8f2ed72114d909c1c61" + integrity sha512-+hQX+WyJAOne7Fh3zF5CxPemILIbuhNcqHHodzK9caYOLnC8pD5efmPleRnw0z++LfKUC/sVNMwk0Gap+B0baA== -"@types/node@^14.6.2": - version "14.14.43" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8" - integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ== - -"@types/q@^1.5.1": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" - integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== - -"@types/source-list-map@*": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" - integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== - -"@types/tapable@^1", "@types/tapable@^1.0.5": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4" - integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ== - -"@types/uglify-js@*": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124" - integrity sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q== - dependencies: - source-map "^0.6.1" - -"@types/webpack-sources@*": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" - integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg== +"@types/resolve@1.17.1": + version "1.17.1" + resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" + integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== dependencies: "@types/node" "*" - "@types/source-list-map" "*" - source-map "^0.7.3" -"@types/webpack@^4.41.8": - version "4.41.27" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.27.tgz#f47da488c8037e7f1b2dbf2714fbbacb61ec0ffc" - integrity sha512-wK/oi5gcHi72VMTbOaQ70VcDxSQ1uX8S2tukBK9ARuGXrYM/+u4ou73roc7trXDNmCxCoerE8zruQqX/wuHszA== +"@types/tough-cookie@*": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.1.tgz#8f80dd965ad81f3e1bc26d6f5c727e132721ff40" + integrity sha512-Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg== + +"@vercel/nft@^0.17.0": + version "0.17.0" + resolved "https://registry.yarnpkg.com/@vercel/nft/-/nft-0.17.0.tgz#28851fefe42fae7a116dc5e23a0a9da29929a18b" + integrity sha512-dXz4RAODHpEPl1Yfzk1UfVpZfqhY9O80FdI9sF/Hw2bXWj5022U9Z46VpdNYe8pDluSuQv/JUo/ZP4/OcsfDRw== dependencies: - "@types/anymatch" "*" - "@types/node" "*" - "@types/tapable" "^1" - "@types/uglify-js" "*" - "@types/webpack-sources" "*" - source-map "^0.6.0" + "@mapbox/node-pre-gyp" "^1.0.5" + acorn "^8.3.0" + acorn-class-fields "^1.0.0" + acorn-private-class-elements "^1.0.0" + acorn-static-class-features "^1.0.0" + bindings "^1.4.0" + estree-walker "2.0.2" + glob "^7.1.3" + graceful-fs "^4.1.15" + micromatch "^4.0.2" + mkdirp "^0.5.1" + node-gyp-build "^4.2.2" + node-pre-gyp "^0.13.0" + resolve-from "^5.0.0" + rollup-pluginutils "^2.8.2" + +"@vitejs/plugin-vue-jsx@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-1.2.0.tgz#a4216bdbb8b12800537d39e3b5711fcf2eb470ef" + integrity sha512-Y4Er2bn8bHNiUziJizcVT1yQKTq6oOJeBrKkxvjo2yKT/RTSK1ZlkP/qnzchxxuBkx0tYG4Aaxbb9xuVnNNDEA== + dependencies: + "@babel/core" "^7.15.5" + "@babel/plugin-syntax-import-meta" "^7.10.4" + "@babel/plugin-transform-typescript" "^7.15.4" + "@rollup/pluginutils" "^4.1.1" + "@vue/babel-plugin-jsx" "^1.0.7" + hash-sum "^2.0.0" + +"@vitejs/plugin-vue@^1.9.4": + version "1.9.4" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-1.9.4.tgz#4f48485432cbb986a9fb9d254dc33ce30ddccbfa" + integrity sha512-0CZqaCoChriPTTtGkERy1LGPcYjGFpi2uYRhBPIkqJqUGV5JnJFhQAgh6oH9j5XZHfrRaisX8W0xSpO4T7S78A== "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" integrity sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA== +"@vue/babel-helper-vue-transform-on@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz#9b9c691cd06fc855221a2475c3cc831d774bc7dc" + integrity sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA== + +"@vue/babel-plugin-jsx@^1.0.7": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz#0c5bac27880d23f89894cd036a37b55ef61ddfc1" + integrity sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w== + dependencies: + "@babel/helper-module-imports" "^7.0.0" + "@babel/plugin-syntax-jsx" "^7.0.0" + "@babel/template" "^7.0.0" + "@babel/traverse" "^7.0.0" + "@babel/types" "^7.0.0" + "@vue/babel-helper-vue-transform-on" "^1.0.2" + camelcase "^6.0.0" + html-tags "^3.1.0" + svg-tags "^1.0.0" + "@vue/babel-plugin-transform-vue-jsx@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz#646046c652c2f0242727f34519d917b064041ed7" @@ -1585,184 +916,227 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" camelcase "^5.0.0" -"@vue/component-compiler-utils@^3.1.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz#8f85182ceed28e9b3c75313de669f83166d11e5d" - integrity sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw== +"@vue/compiler-core@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.21.tgz#26566c32b2ad838199d471ef5df620a83846f24e" + integrity sha512-NhhiQZNG71KNq1h5pMW/fAXdTF7lJRaSI7LDm2edhHXVz1ROMICo8SreUmQnSf4Fet0UPBVqJ988eF4+936iDQ== dependencies: - consolidate "^0.15.1" - hash-sum "^1.0.2" - lru-cache "^4.1.2" - merge-source-map "^1.1.0" - postcss "^7.0.14" - postcss-selector-parser "^6.0.2" - source-map "~0.6.1" - vue-template-es2015-compiler "^1.9.0" - optionalDependencies: - prettier "^1.18.2" + "@babel/parser" "^7.15.0" + "@vue/shared" "3.2.21" + estree-walker "^2.0.2" + source-map "^0.6.1" -"@webassemblyjs/ast@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" - integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== +"@vue/compiler-dom@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.21.tgz#d6f6c85364ef8888f9c4e9122bfba11e78fb398c" + integrity sha512-gsJD3DpYZSYquiA7UIPsMDSlAooYWDvHPq9VRsqzJEk2PZtFvLvHPb4aaMD8Ufd62xzYn32cnnkzsEOJhyGilA== dependencies: - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" + "@vue/compiler-core" "3.2.21" + "@vue/shared" "3.2.21" -"@webassemblyjs/floating-point-hex-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" - integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== - -"@webassemblyjs/helper-api-error@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" - integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== - -"@webassemblyjs/helper-buffer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" - integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== - -"@webassemblyjs/helper-code-frame@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" - integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== +"@vue/compiler-sfc@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.21.tgz#42639ee49e725afb7d8f1d1940e75dc17a56002c" + integrity sha512-+yDlUSebKpz/ovxM2vLRRx7w/gVfY767pOfYTgbIhAs+ogvIV2BsIt4fpxlThnlCNChJ+yE0ERUNoROv2kEGEQ== dependencies: - "@webassemblyjs/wast-printer" "1.9.0" + "@babel/parser" "^7.15.0" + "@vue/compiler-core" "3.2.21" + "@vue/compiler-dom" "3.2.21" + "@vue/compiler-ssr" "3.2.21" + "@vue/ref-transform" "3.2.21" + "@vue/shared" "3.2.21" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" -"@webassemblyjs/helper-fsm@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" - integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== - -"@webassemblyjs/helper-module-context@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" - integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== +"@vue/compiler-ssr@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.21.tgz#37d124f89e8adef9fd56b85775de4b5310a0436e" + integrity sha512-eU+A0iWYy+1zAo2CRIJ0zSVlv1iuGAIbNRCnllSJ31pV1lX3jypJYzGbJlSRAbB7VP6E+tYveVT1Oq8JKewa3g== dependencies: - "@webassemblyjs/ast" "1.9.0" + "@vue/compiler-dom" "3.2.21" + "@vue/shared" "3.2.21" -"@webassemblyjs/helper-wasm-bytecode@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" - integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== +"@vue/devtools-api@^6.0.0-beta.18": + version "6.0.0-beta.20.1" + resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.0.0-beta.20.1.tgz#5b499647e929c35baf2a66a399578f9aa4601142" + integrity sha512-R2rfiRY+kZugzWh9ZyITaovx+jpU4vgivAEAiz80kvh3yviiTU3CBuGuyWpSwGz9/C7TkSWVM/FtQRGlZ16n8Q== -"@webassemblyjs/helper-wasm-section@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" - integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== +"@vue/reactivity@3.2.21", "@vue/reactivity@^3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.21.tgz#073ad144192ed78a07e151e95a3baa515e4099a2" + integrity sha512-7C57zFm/5E3SSTUhVuYj1InDwuJ+GIVQ/z+H43C9sST85gIThGXVhksl1yWTAadf8Yz4T5lSbqi5Ds8U/ueWcw== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" + "@vue/shared" "3.2.21" -"@webassemblyjs/ieee754@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" - integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== +"@vue/ref-transform@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.21.tgz#b0c554c9f640c3f005f77e676066aa0faba90984" + integrity sha512-uiEWWBsrGeun9O7dQExYWzXO3rHm/YdtFNXDVqCSoPypzOVxWxdiL+8hHeWzxMB58fVuV2sT80aUtIVyaBVZgQ== + dependencies: + "@babel/parser" "^7.15.0" + "@vue/compiler-core" "3.2.21" + "@vue/shared" "3.2.21" + estree-walker "^2.0.2" + magic-string "^0.25.7" + +"@vue/runtime-core@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.21.tgz#e12dac8c3893b7aebfc37e32066718d8aa686ac5" + integrity sha512-7oOxKaU0D2IunOAMOOHZgJVrHg63xwng8BZx3fbgmakqEIMwHhQcp+5GV1sOg/sWW7R4UhaRDIUCukO2GRVK2Q== + dependencies: + "@vue/reactivity" "3.2.21" + "@vue/shared" "3.2.21" + +"@vue/runtime-dom@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.21.tgz#33dd15bc85281e773177a30dc6931c294bd77aa1" + integrity sha512-apBdriD6QsI4ywbllY8kjr9/0scGuStDuvLbJULPQkFPtHzntd51bP5PQTQVAEIc9kwnTozmj6x6ZdX/cwo7xA== + dependencies: + "@vue/runtime-core" "3.2.21" + "@vue/shared" "3.2.21" + csstype "^2.6.8" + +"@vue/server-renderer@3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.21.tgz#887d0a44de76f72313cff2686a24c0315231d634" + integrity sha512-QBgYqVgI7XCSBCqGa4LduV9vpfQFdZBOodFmq5Txk5W/v1KrJ1LoOh2Q0RHiRgtoK/UR9uyvRVcYqOmwHkZNEg== + dependencies: + "@vue/compiler-ssr" "3.2.21" + "@vue/shared" "3.2.21" + +"@vue/shared@3.2.21", "@vue/shared@^3.2.21": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.21.tgz#4cd80c0e62cf65a7adab2449e86b6f0cb33a130b" + integrity sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA== + +"@vueuse/head@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@vueuse/head/-/head-0.6.0.tgz#5584b1f724327cfce941c42efec9e590f5799329" + integrity sha512-fi7ZjkMpEAUtTT6iR5wgL2HkX1+3zbrmbpcwU//RgJIWEr5b42jk8E9yOheaC2dYAAHzelAllVpX0pDmhcTXuw== + +"@webassemblyjs/ast@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== + dependencies: + "@webassemblyjs/helper-numbers" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + +"@webassemblyjs/floating-point-hex-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== + +"@webassemblyjs/helper-api-error@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== + +"@webassemblyjs/helper-buffer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== + +"@webassemblyjs/helper-numbers@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== + dependencies: + "@webassemblyjs/floating-point-hex-parser" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@xtuc/long" "4.2.2" + +"@webassemblyjs/helper-wasm-bytecode@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== + +"@webassemblyjs/helper-wasm-section@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== + dependencies: + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + +"@webassemblyjs/ieee754@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" - integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== +"@webassemblyjs/leb128@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" - integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== +"@webassemblyjs/utf8@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== -"@webassemblyjs/wasm-edit@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" - integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== +"@webassemblyjs/wasm-edit@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/helper-wasm-section" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-opt" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - "@webassemblyjs/wast-printer" "1.9.0" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-wasm-section" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-opt" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + "@webassemblyjs/wast-printer" "1.11.1" -"@webassemblyjs/wasm-gen@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" - integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== +"@webassemblyjs/wasm-gen@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" -"@webassemblyjs/wasm-opt@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" - integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== +"@webassemblyjs/wasm-opt@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-buffer" "1.11.1" + "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" -"@webassemblyjs/wasm-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" - integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== +"@webassemblyjs/wasm-parser@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/ieee754" "1.11.1" + "@webassemblyjs/leb128" "1.11.1" + "@webassemblyjs/utf8" "1.11.1" -"@webassemblyjs/wast-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" - integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== +"@webassemblyjs/wast-printer@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/floating-point-hex-parser" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-code-frame" "1.9.0" - "@webassemblyjs/helper-fsm" "1.9.0" + "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" -"@webassemblyjs/wast-printer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" - integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.2.tgz#2a20812bfb3a2ebb0b27ee26a52eeb3e3f000836" - integrity sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA== - -"@webpack-cli/info@^1.2.3": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.3.tgz#ef819d10ace2976b6d134c7c823a3e79ee31a92c" - integrity sha512-lLek3/T7u40lTqzCGpC6CAbY6+vXhdhmwFRxZLMnRm6/sIF/7qMpT8MocXCRQfz0JAh63wpbXLMnsQ5162WS7Q== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.3.1.tgz#911d1b3ff4a843304b9c3bacf67bb34672418441" - integrity sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw== - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -1773,30 +1147,22 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== -"@zxing/text-encoding@0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" - integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA== - abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== +acorn-class-fields@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/acorn-class-fields/-/acorn-class-fields-1.0.0.tgz#b413793e6b3ddfcd17a02f9c7a850f4bbfdc1c7a" + integrity sha512-l+1FokF34AeCXGBHkrXFmml9nOIRI+2yBnBpO5MaVAaTIJ96irWLtcCxX+7hAp6USHFCe+iyyBB4ZhxV807wmA== dependencies: - event-target-shim "^5.0.0" + acorn-private-class-elements "^1.0.0" -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" +acorn-import-assertions@^1.7.6: + version "1.8.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== acorn-jsx@^3.0.0: version "3.0.1" @@ -1805,15 +1171,27 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn-jsx@^5.2.0, acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== +acorn-jsx@^5.3.1: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn-private-class-elements@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/acorn-private-class-elements/-/acorn-private-class-elements-1.0.0.tgz#c5805bf8a46cd065dc9b3513bfebb504c88cd706" + integrity sha512-zYNcZtxKgVCg1brS39BEou86mIao1EV7eeREG+6WMwKbuYTeivRRs6S2XdWnboRde6G9wKh2w+WBydEyJsJ6mg== + +acorn-static-class-features@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/acorn-static-class-features/-/acorn-static-class-features-1.0.0.tgz#ab9d862d5b184007ed509f5a8d031b837694ace2" + integrity sha512-XZJECjbmMOKvMHiNzbiPXuXpLAJfN3dAKtfIYbk1eHiWdsutlek+gS7ND4B8yJ3oqvHo1NxfafnezVmq7NXK0A== + dependencies: + acorn-private-class-elements "^1.0.0" acorn-walk@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.1.0.tgz#d3c6a9faf00987a5e2b9bdb506c2aa76cd707f83" - integrity sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg== + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== acorn@^3.0.4: version "3.3.0" @@ -1825,40 +1203,29 @@ acorn@^5.5.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e" integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg== -acorn@^6.4.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== - -acorn@^7.1.1, acorn@^7.4.0: +acorn@^7.1.1: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.0.4: - version "8.2.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.1.tgz#0d36af126fb6755095879c1dc6fd7edf7d60a5fb" - integrity sha512-z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg== +acorn@^8.0.4, acorn@^8.3.0, acorn@^8.4.1, acorn@^8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" + integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== + debug "4" ajv-keywords@^1.0.0: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" integrity sha1-MU3QpLM2j609/NxU7eYXG4htrzw= -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: +ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== @@ -1871,7 +1238,7 @@ ajv@^4.7.0: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -1882,32 +1249,25 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.2.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602" - integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA== + version "8.7.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.7.1.tgz#52be6f1736b076074798124293618f132ad07a7e" + integrity sha512-gPpOObTO1QjbnN1sVMjJcp1TF9nggMfO4MBR5uQl6ZVTOaEPq5i4oq/6R9q2alMMPB3eg53wFv1RuJBLuxf3Hw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" uri-js "^4.2.2" -alphanum-sort@^1.0.0: +allowlist@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/allowlist/-/allowlist-0.1.1.tgz#7f337b1e9a292e5aaf59c879933be1172915eaeb" + integrity sha512-l298+rQLx33JiaFBJ/4GJoSc1bou+COScif8asoAZqkX0Wz25jmJc4vqJV7NqCsj3ZuGkeODkNFJg/I4/vo4xg== + +alphanum-sort@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= -ansi-align@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" - integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== - dependencies: - string-width "^3.0.0" - -ansi-colors@^3.0.0: - version "3.2.4" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" - integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== - ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -1918,17 +1278,10 @@ ansi-escapes@^1.1.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-html@0.0.7, ansi-html@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= +ansi-html-community@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== ansi-regex@^2.0.0: version "2.1.1" @@ -1940,22 +1293,22 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -1969,23 +1322,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -any-signal@^2.1.0, any-signal@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/any-signal/-/any-signal-2.1.2.tgz#8d48270de0605f8b218cf9abe8e9c6a0e7418102" - integrity sha512-B+rDnWasMi/eWcajPcCWSlYc7muXOrcYrqgyzcdKisl2H/WTlQ0gip1KyQfr0ZlxJdsuWCj/LWwQm7fhyhRfIQ== - dependencies: - abort-controller "^3.0.0" - native-abort-controller "^1.0.3" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@~3.1.1: +anymatch@^3.1.1, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== @@ -1993,24 +1330,66 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.0.3, aproba@^1.1.1: +aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + +arch@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" + integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== + +archiver-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" + integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== + dependencies: + glob "^7.1.4" + graceful-fs "^4.2.0" + lazystream "^1.0.0" + lodash.defaults "^4.2.0" + lodash.difference "^4.5.0" + lodash.flatten "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.union "^4.6.0" + normalize-path "^3.0.0" + readable-stream "^2.0.0" + +archiver@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" + integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== + dependencies: + archiver-utils "^2.1.0" + async "^3.2.0" + buffer-crc32 "^0.2.1" + readable-stream "^3.6.0" + readdir-glob "^1.0.0" + tar-stream "^2.2.0" + zip-stream "^4.1.0" + +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw== + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" -arg@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.0.tgz#a20e2bb5710e82950a516b3f933fee5ed478be90" - integrity sha512-4P8Zm2H+BRS+c/xX1LrHw0qKpEhdlZjLCgWy+d78T9vqa2Z2SiD2wMrYuWIAFy5IZUD7nnNXroRttz+0RzlrzQ== - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2018,243 +1397,90 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-flatten@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -array-includes@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" - integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== +array-includes@^3.1.4: + version "3.1.4" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" + integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" + es-abstract "^1.19.1" get-intrinsic "^1.1.1" - is-string "^1.0.5" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= - dependencies: - array-uniq "^1.0.1" + is-string "^1.0.7" array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -array.prototype.flat@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" - integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== +array.prototype.flat@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13" + integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" + es-abstract "^1.19.0" asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= -ascli@~1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc" - integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw= - dependencies: - colour "~0.7.1" - optjs "~3.2.2" - -asn1.js@^5.0.1, asn1.js@^5.2.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" - integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - safer-buffer "^2.1.0" - assert-never@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe" integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw== -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - astral-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-each@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== +async@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" + integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - -async@^2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" - integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== +autoprefixer@^10.4.0: + version "10.4.0" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" + integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA== dependencies: - lodash "^4.17.14" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -autoprefixer@^9.6.1: - version "9.8.6" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" - integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== - dependencies: - browserslist "^4.12.0" - caniuse-lite "^1.0.30001109" - colorette "^1.2.1" + browserslist "^4.17.5" + caniuse-lite "^1.0.30001272" + fraction.js "^4.1.1" normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^7.0.32" + picocolors "^1.0.0" postcss-value-parser "^4.1.0" -available-typed-arrays@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" - integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== - dependencies: - array-filter "^1.0.0" +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios-retry@^3.1.9: - version "3.1.9" - resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.1.9.tgz#6c30fc9aeb4519aebaec758b90ef56fa03fe72e8" - integrity sha512-NFCoNIHq8lYkJa6ku4m+V1837TP6lCa7n79Iuf8/AqATAHYB0ISaAS1eyIenDOfHOLtym34W65Sjke2xjg2fsA== +axios@^0.24.0: + version "0.24.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" + integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA== dependencies: - is-retry-allowed "^1.1.0" + follow-redirects "^1.14.4" -axios@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== - dependencies: - follow-redirects "^1.10.0" - -babel-eslint@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" - integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.7.0" - "@babel/traverse" "^7.7.0" - "@babel/types" "^7.7.0" - eslint-visitor-keys "^1.0.0" - resolve "^1.12.0" - -babel-loader@^8.2.2: - version "8.2.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" - integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g== +babel-loader@^8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw== dependencies: find-cache-dir "^3.3.1" loader-utils "^1.4.0" make-dir "^3.1.0" schema-utils "^2.6.5" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - -babel-plugin-polyfill-corejs2@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4" - integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg== - dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.2.0" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2" - integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.0" - core-js-compat "^3.9.1" - -babel-plugin-polyfill-regenerator@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8" - integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.2.0" - babel-walk@3.0.0-canary-5: version "3.0.0-canary-5" resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11" @@ -2267,62 +1493,29 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.0.2, base64-js@^1.3.1: +base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= - -bezier-easing@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/bezier-easing/-/bezier-easing-2.1.0.tgz#c04dfe8b926d6ecaca1813d69ff179b7c2025d86" - integrity sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY= - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== -bignumber.js@^9.0.0, bignumber.js@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.1.tgz#8d7ba124c882bfd8e43260c67475518d0689e4e5" - integrity sha512-IdZR9mh6ahOBv/hYGiXyVuyCetmGJhtYkqLBpTStdhEGjegpPlUawydyaF3pbIOFynJTpllEs+NP+CS9jKFLjA== - -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -bindings@^1.5.0: +bindings@^1.4.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== dependencies: file-uri-to-path "1.0.0" -bl@^4.0.0: +bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== @@ -2331,118 +1524,32 @@ bl@^4.0.0: inherits "^2.0.4" readable-stream "^3.4.0" -blakejs@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/blakejs/-/blakejs-1.1.0.tgz#69df92ef953aa88ca51a32df6ab1c54a155fc7a5" - integrity sha1-ad+S75U6qIylGjLfarHFShVfx6U= - -blob-to-it@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/blob-to-it/-/blob-to-it-1.0.2.tgz#bc76550638ca13280dbd3f202422a6a132ffcc8d" - integrity sha512-yD8tikfTlUGEOSHExz4vDCIQFLaBPXIL0KcxGQt9RbwMVXBEh+jokdJyStvTXPgWrdKfwgk7RX8GPsgrYzsyng== +bl@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/bl/-/bl-5.0.0.tgz#6928804a41e9da9034868e1c50ca88f21f57aea2" + integrity sha512-8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ== dependencies: - browser-readablestream-to-it "^1.0.2" + buffer "^6.0.3" + inherits "^2.0.4" + readable-stream "^3.4.0" -bluebird@^3.1.1, bluebird@^3.5.5: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== - -bn.js@^5.0.0, bn.js@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" - integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== - -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= - dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" - -boolbase@^1.0.0, boolbase@~1.0.0: +boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= -boolean@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz#0fee0c9813b66bef25a8a6a904bb46736d05f024" - integrity sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA== - -bootstrap-scss@^4.5.3: - version "4.6.0" - resolved "https://registry.yarnpkg.com/bootstrap-scss/-/bootstrap-scss-4.6.0.tgz#1cc8227029fbd5680c2b0bdf42ceccfdc2f99bfa" - integrity sha512-VfcGsMAjWpDpJi0d8DknZtJUaJJJkvmpku0Wg7FeJPbXQnqYp6+pkj2/zcZ7QWfRns/1Lt4WMP/QP1do58eDRg== - -bootstrap-vue@^2.17.3: - version "2.21.2" - resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.21.2.tgz#ec38f66c3a2205becccddb6158a991d96509ed0b" - integrity sha512-0Exe+4MZysqhZNXIKf4TzkvXaupxh9EHsoCRez0o5Dc0J7rlafayOEwql63qXv74CgZO8E4U8ugRNJko1vMvNw== +bootstrap-vue-3@^0.0.5: + version "0.0.5" + resolved "https://registry.yarnpkg.com/bootstrap-vue-3/-/bootstrap-vue-3-0.0.5.tgz#de7f885e4187c0b42dd5b1ef44791402f0420121" + integrity sha512-3Bvv8HAt2thZdgjOPxg+a8hhI992joCztKQdf9Hg4XE9OkgbJtUBmZnHhNEUp8B+W0feqc3g9aFL9hq26IVPNA== dependencies: - "@nuxt/opencollective" "^0.3.2" - bootstrap ">=4.5.3 <5.0.0" - popper.js "^1.16.1" - portal-vue "^2.1.7" - vue-functional-data-merge "^3.1.0" + bootstrap "^5.1.3" + core-js "^3.6.5" -"bootstrap@>=4.5.3 <5.0.0", bootstrap@^4.5.2, bootstrap@^4.5.3: - version "4.6.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" - integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== - -borc@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/borc/-/borc-2.1.2.tgz#6ce75e7da5ce711b963755117dd1b187f6f8cf19" - integrity sha512-Sy9eoUi4OiKzq7VovMn246iTo17kzuyHJKomCfpWMlI6RpfN1gk95w7d7gH264nApVLg0HZfcpz62/g4VH1Y4w== - dependencies: - bignumber.js "^9.0.0" - buffer "^5.5.0" - commander "^2.15.0" - ieee754 "^1.1.13" - iso-url "~0.4.7" - json-text-sequence "~0.1.0" - readable-stream "^3.6.0" - -boxen@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.0.1.tgz#657528bdd3f59a772b8279b831f27ec2c744664b" - integrity sha512-49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.0" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" +bootstrap@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== brace-expansion@^1.1.7: version "1.1.11" @@ -2452,22 +1559,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^2.3.1, braces@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -2475,123 +1566,28 @@ braces@^3.0.1, braces@~3.0.2: dependencies: fill-range "^7.0.1" -brorand@^1.0.1, brorand@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= - -browser-readablestream-to-it@^1.0.1, browser-readablestream-to-it@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.2.tgz#f6b8d18e7a35b0321359261a32aa2c70f46921c4" - integrity sha512-lv4M2Z6RKJpyJijJzBQL5MNssS7i8yedl+QkhnLCyPtgNGNSXv1KthzUnye9NlRAtBAI80X6S9i+vK09Rzjcvg== - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" - integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.17.5: + version "4.17.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.6.tgz#c76be33e7786b497f66cad25a73756c8b938985d" + integrity sha512-uPgz3vyRTlEiCv4ee9KlsKgo2V6qPk7Jsn0KAn2OBqbqKo3iNcPEC1Ti6J4dwnz+aIRfEEEuOzC9IBk8tXUomw== dependencies: - buffer-xor "^1.0.3" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.3" - inherits "^2.0.1" - safe-buffer "^5.0.1" - -browserify-cipher@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" - integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" - integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" - integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== - dependencies: - bn.js "^5.0.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== - dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" - create-hash "^1.2.0" - create-hmac "^1.1.7" - elliptic "^6.5.3" - inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== - dependencies: - pako "~1.0.5" - -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.4, browserslist@^4.6.4: - version "4.16.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae" - integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A== - dependencies: - caniuse-lite "^1.0.30001214" - colorette "^1.2.2" - electron-to-chromium "^1.3.719" + caniuse-lite "^1.0.30001274" + electron-to-chromium "^1.3.886" escalade "^3.1.1" - node-releases "^1.1.71" + node-releases "^2.0.1" + picocolors "^1.0.0" -buffer-crc32@~0.2.3: +buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== - -buffer-json@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23" - integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== - -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= - -buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -buffer@^5.1.0, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: +buffer@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== @@ -2599,7 +1595,7 @@ buffer@^5.1.0, buffer@^5.4.3, buffer@^5.5.0, buffer@^5.6.0: base64-js "^1.3.1" ieee754 "^1.1.13" -buffer@^6.0.1, buffer@^6.0.3: +buffer@^6.0.2, buffer@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== @@ -2607,111 +1603,17 @@ buffer@^6.0.1, buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= +builtin-modules@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" + integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA== -bytebuffer@~5: - version "5.0.1" - resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" - integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= +bundle-runner@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/bundle-runner/-/bundle-runner-0.0.1.tgz#d05ff2e3921e2ea3ec810d6b327eeb466ff4483b" + integrity sha512-xevhXw77nJ7wjCRTyo1JYumUNUiZmD0CJEummyLUJbdhub4bZWuplS+Y7nlMq5V9sKJQW+dV/LZR/SlxS5f4LQ== dependencies: - long "~3" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -cacache@^12.0.2: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -cacache@^15.0.5: - version "15.0.6" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099" - integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w== - dependencies: - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -cache-loader@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz#9948cae353aec0a1fcb1eafda2300816ec85387e" - integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw== - dependencies: - buffer-json "^2.0.0" - find-cache-dir "^3.0.0" - loader-utils "^1.2.3" - mkdirp "^0.5.1" - neo-async "^2.6.1" - schema-utils "^2.0.0" - -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" + source-map "^0.7.3" call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -2721,13 +1623,6 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - caller-path@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f" @@ -2735,55 +1630,22 @@ caller-path@^0.1.0: dependencies: callsites "^0.2.0" -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - callsites@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca" integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo= -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camel-case@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" - integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= - dependencies: - no-case "^2.2.0" - upper-case "^1.1.1" - -camel-case@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== - dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" - -camelcase@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= - camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0, camelcase@^6.2.0: +camelcase@^6.0.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -2798,10 +1660,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001205, caniuse-lite@^1.0.30001214: - version "1.0.30001219" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b" - integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001274: + version "1.0.30001280" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz#066a506046ba4be34cde5f74a08db7a396718fb7" + integrity sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA== chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" @@ -2814,7 +1676,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.3.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2823,10 +1685,10 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -2838,46 +1700,22 @@ character-parser@^2.2.0: dependencies: is-regex "^1.0.3" -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== +"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.3.2" -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chownr@^1.1.1: +chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -2892,71 +1730,11 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - -ci-info@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a" - integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ== - -cids@^1.0.0, cids@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/cids/-/cids-1.1.6.tgz#ac7aea7dbcabaa64ca242b5d970d596a5c34d006" - integrity sha512-5P+Jas2bVpjiHibp/SOwKY+v7JhAjTChaAZN+vCIrsWXn/JZV0frX22Vp5zZgEyJRPco79pX+yNQ2S3LkRukHQ== - dependencies: - multibase "^4.0.1" - multicodec "^3.0.1" - multihashes "^4.0.1" - uint8arrays "^2.1.3" - -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - circular-json@^0.3.1: version "0.3.3" resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A== -class-is@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/class-is/-/class-is-1.1.0.tgz#9d3c0fba0440d211d843cec3dedfa48055005825" - integrity sha512-rhjH9AG1fvabIDoGRVH587413LPjTZgmDF9fOFCbFJQV4yuocX1mHxxvXI4g3cGwbVY9wAYIoKlg1N79frJKQw== - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -clean-css@^4.2.1, clean-css@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" - integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== - dependencies: - source-map "~0.6.0" - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== - cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -2964,85 +1742,62 @@ cli-cursor@^1.0.1: dependencies: restore-cursor "^1.0.1" -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== dependencies: - restore-cursor "^3.1.0" + restore-cursor "^4.0.0" + +cli-spinners@^2.6.0: + version "2.6.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== cli-width@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= +clipboardy@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" + integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" + arch "^2.1.1" + execa "^1.0.0" + is-wsl "^2.1.1" -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" +clone@^1.0.2: + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" + integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= -clone-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= - dependencies: - mimic-response "^1.0.0" +cluster-key-slot@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz#30474b2a981fb12172695833052bc0d01336d10d" + integrity sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw== co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== - dependencies: - "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0, color-convert@^1.9.1: +color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -3061,60 +1816,37 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0, color-name@~1.1.4: +color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" - integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" +color-support@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -color@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" - integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.4" +colord@^2.9.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" + integrity sha512-4LBMSt09vR0uLnPVkOUBnmxgoaeN4ewRbx801wY/bXcltXfpR/G46OdWn96XpYmCWuYvO46aBZP4NgX8HpNAcw== -colorette@^1.2.1, colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +colorette@^1.2.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== -colour@~0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778" - integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g= +colorette@^2.0.10: + version "2.0.16" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^2.15.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1: +commander@^2.20.0, commander@^2.8.1: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - -commander@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" - integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== - -commander@^7.0.0: +commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -3124,37 +1856,22 @@ commondir@^1.0.1: resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== +compress-commons@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" + integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" + buffer-crc32 "^0.2.13" + crc32-stream "^4.0.2" + normalize-path "^3.0.0" + readable-stream "^3.6.0" concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.2: +concat-stream@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -3164,19 +1881,6 @@ concat-stream@^1.4.6, concat-stream@^1.5.0, concat-stream@^1.6.2: readable-stream "^2.2.2" typedarray "^0.0.6" -config-chain@^1.1.11: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - -connect-history-api-fallback@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" - integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== - connect@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" @@ -3187,28 +1891,16 @@ connect@^3.7.0: parseurl "~1.3.3" utils-merge "1.0.1" -consola@^2.10.0, consola@^2.15.0, consola@^2.15.3, consola@^2.6.0, consola@^2.9.0: +consola@^2.15.3, consola@^2.6.0: version "2.15.3" resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: +console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= -consolidate@^0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" - integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw== - dependencies: - bluebird "^3.1.1" - constantinople@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/constantinople/-/constantinople-4.0.1.tgz#0def113fa0e4dc8de83331a5cf79c8b325213151" @@ -3217,150 +1909,49 @@ constantinople@^4.0.1: "@babel/parser" "^7.6.0" "@babel/types" "^7.6.1" -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= - -contains-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -cookie@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s= - -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -copy-webpack-plugin@^8.1.1: - version "8.1.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-8.1.1.tgz#3f697e162764925c2f0d235f380676125508fd26" - integrity sha512-rYM2uzRxrLRpcyPqGceRBDpxxUV8vcDqIKxAUKfcnFpcrPxT5+XvhTxv7XLjo5AvEJFPdAE3zCogG2JVahqgSQ== - dependencies: - fast-glob "^3.2.5" - glob-parent "^5.1.1" - globby "^11.0.3" - normalize-path "^3.0.0" - p-limit "^3.1.0" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" - -core-js-compat@^3.10.0, core-js-compat@^3.9.0, core-js-compat@^3.9.1: - version "3.11.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.0.tgz#635683f43480a0b41e3f6be3b1c648dadb8b4390" - integrity sha512-3wsN9YZJohOSDCjVB0GequOyHax8zFiogSX3XWLE28M1Ew7dTU57tgHjIylSBKSIouwmLBp3g61sKMz/q3xEGA== - dependencies: - browserslist "^4.16.4" - semver "7.0.0" - -core-js@^2.6.5: - version "2.6.12" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== - core-js@^3.6.5: - version "3.11.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926" - integrity sha512-bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw== + version "3.19.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.19.1.tgz#f6f173cae23e73a7d88fa23b6e9da329276c6641" + integrity sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg== core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== -cosmiconfig@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== +cosmiconfig@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" + "@types/parse-json" "^4.0.0" + import-fresh "^3.2.1" + parse-json "^5.0.0" + path-type "^4.0.0" + yaml "^1.10.0" -crc@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" - integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== - dependencies: - buffer "^5.1.0" - -create-ecdh@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" - integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== - dependencies: - bn.js "^4.1.0" - elliptic "^6.5.3" - -create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: +crc-32@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" - integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - md5.js "^1.3.4" - ripemd160 "^2.0.1" - sha.js "^2.4.0" + exit-on-epipe "~1.0.1" + printj "~1.1.0" -create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" - integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== +crc32-stream@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" + integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" + crc-32 "^1.2.0" + readable-stream "^3.4.0" create-require@^1.1.1: version "1.1.1" @@ -3378,7 +1969,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -3387,128 +1978,56 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" +css-color-names@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" + integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== -css-blank-pseudo@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5" - integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w== +css-declaration-sorter@^6.0.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA== dependencies: - postcss "^7.0.5" - -css-color-names@0.0.4, css-color-names@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= - -css-declaration-sorter@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" - integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== - dependencies: - postcss "^7.0.1" timsort "^0.3.0" -css-has-pseudo@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee" - integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ== +css-loader@^6.5.1: + version "6.5.1" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1" + integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ== dependencies: - postcss "^7.0.6" - postcss-selector-parser "^5.0.0-rc.4" - -css-loader@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-4.3.0.tgz#c888af64b2a5b2e85462c72c0f4a85c7e2e0821e" - integrity sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg== - dependencies: - camelcase "^6.0.0" - cssesc "^3.0.0" - icss-utils "^4.1.1" - loader-utils "^2.0.0" - postcss "^7.0.32" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.3" - postcss-modules-scope "^2.2.0" - postcss-modules-values "^3.0.0" - postcss-value-parser "^4.1.0" - schema-utils "^2.7.1" - semver "^7.3.2" - -css-loader@^5.0.1: - version "5.2.4" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.4.tgz#e985dcbce339812cb6104ef3670f08f9893a1536" - integrity sha512-OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw== - dependencies: - camelcase "^6.2.0" icss-utils "^5.1.0" - loader-utils "^2.0.0" - postcss "^8.2.10" + postcss "^8.2.15" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" postcss-modules-values "^4.0.0" postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" semver "^7.3.5" -css-prefers-color-scheme@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4" - integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg== +css-minimizer-webpack-plugin@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.1.3.tgz#3cfa1c8603f98f0b5e70697b61cbc4857fe1987b" + integrity sha512-x+6kzXprepysouo513zKibWCbWTGIvH9OrEsMRRV8EcJ7vYY/zRg0lR8tCzMHMap+lhNPOrYCdDagjRmfnGGxw== dependencies: - postcss "^7.0.5" - -css-select-base-adapter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" - integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== - -css-select@^2.0.0, css-select@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" - integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== - dependencies: - boolbase "^1.0.0" - css-what "^3.2.1" - domutils "^1.7.0" - nth-check "^1.0.2" - -css-select@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-3.1.2.tgz#d52cbdc6fee379fba97fb0d3925abbd18af2d9d8" - integrity sha512-qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA== - dependencies: - boolbase "^1.0.0" - css-what "^4.0.0" - domhandler "^4.0.0" - domutils "^2.4.3" - nth-check "^2.0.0" - -css-tree@1.0.0-alpha.37: - version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" - integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== - dependencies: - mdn-data "2.0.4" + cssnano "^5.0.6" + jest-worker "^27.0.2" + postcss "^8.3.5" + schema-utils "^3.1.0" + serialize-javascript "^6.0.0" source-map "^0.6.1" -css-tree@^1.1.2: +css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + dependencies: + boolbase "^1.0.0" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" + +css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== @@ -3516,116 +2035,83 @@ css-tree@^1.1.2: mdn-data "2.0.14" source-map "^0.6.1" -css-what@^3.2.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" - integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== - -css-what@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233" - integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A== - -cssdb@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0" - integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ== - -cssesc@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703" - integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg== +css-what@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" - integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== +cssnano-preset-default@^5.1.6: + version "5.1.6" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.6.tgz#1bdb83be6a6b1fee6dc5e9ec2e61286bcadcc7a6" + integrity sha512-X2nDeNGBXc0486oHjT2vSj+TdeyVsxRvJUxaOH50hOM6vSDLkKd0+59YXpSZRInJ4sNtBOykS4KsPfhdrU/35w== dependencies: - css-declaration-sorter "^4.0.1" - cssnano-util-raw-cache "^4.0.1" - postcss "^7.0.0" - postcss-calc "^7.0.1" - postcss-colormin "^4.0.3" - postcss-convert-values "^4.0.1" - postcss-discard-comments "^4.0.2" - postcss-discard-duplicates "^4.0.2" - postcss-discard-empty "^4.0.1" - postcss-discard-overridden "^4.0.1" - postcss-merge-longhand "^4.0.11" - postcss-merge-rules "^4.0.3" - postcss-minify-font-values "^4.0.2" - postcss-minify-gradients "^4.0.2" - postcss-minify-params "^4.0.2" - postcss-minify-selectors "^4.0.2" - postcss-normalize-charset "^4.0.1" - postcss-normalize-display-values "^4.0.2" - postcss-normalize-positions "^4.0.2" - postcss-normalize-repeat-style "^4.0.2" - postcss-normalize-string "^4.0.2" - postcss-normalize-timing-functions "^4.0.2" - postcss-normalize-unicode "^4.0.1" - postcss-normalize-url "^4.0.1" - postcss-normalize-whitespace "^4.0.2" - postcss-ordered-values "^4.1.2" - postcss-reduce-initial "^4.0.3" - postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.3" - postcss-unique-selectors "^4.0.1" + css-declaration-sorter "^6.0.3" + cssnano-utils "^2.0.1" + postcss-calc "^8.0.0" + postcss-colormin "^5.2.1" + postcss-convert-values "^5.0.2" + postcss-discard-comments "^5.0.1" + postcss-discard-duplicates "^5.0.1" + postcss-discard-empty "^5.0.1" + postcss-discard-overridden "^5.0.1" + postcss-merge-longhand "^5.0.3" + postcss-merge-rules "^5.0.2" + postcss-minify-font-values "^5.0.1" + postcss-minify-gradients "^5.0.3" + postcss-minify-params "^5.0.1" + postcss-minify-selectors "^5.1.0" + postcss-normalize-charset "^5.0.1" + postcss-normalize-display-values "^5.0.1" + postcss-normalize-positions "^5.0.1" + postcss-normalize-repeat-style "^5.0.1" + postcss-normalize-string "^5.0.1" + postcss-normalize-timing-functions "^5.0.1" + postcss-normalize-unicode "^5.0.1" + postcss-normalize-url "^5.0.2" + postcss-normalize-whitespace "^5.0.1" + postcss-ordered-values "^5.0.2" + postcss-reduce-initial "^5.0.1" + postcss-reduce-transforms "^5.0.1" + postcss-svgo "^5.0.3" + postcss-unique-selectors "^5.0.1" -cssnano-util-get-arguments@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" - integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= +cssnano-utils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" + integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== -cssnano-util-get-match@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" - integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= - -cssnano-util-raw-cache@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" - integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== +cssnano@^5.0.10, cssnano@^5.0.6: + version "5.0.10" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.10.tgz#92207eb7c9c6dc08d318050726f9fad0adf7220b" + integrity sha512-YfNhVJJ04imffOpbPbXP2zjIoByf0m8E2c/s/HnvSvjXgzXMfgopVjAEGvxYOjkOpWuRQDg/OZFjO7WW94Ri8w== dependencies: - postcss "^7.0.0" + cssnano-preset-default "^5.1.6" + is-resolvable "^1.1.0" + lilconfig "^2.0.3" + yaml "^1.10.2" -cssnano-util-same-parent@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" - integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== - -cssnano@^4.1.10: - version "4.1.11" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" - integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== - dependencies: - cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.8" - is-resolvable "^1.0.0" - postcss "^7.0.0" - -csso@^4.0.2: +csso@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== dependencies: css-tree "^1.1.2" +csstype@^2.6.8: + version "2.6.18" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz#980a8b53085f34af313410af064f2bd241784218" + integrity sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ== + cuint@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs= -cyclist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" - integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= - d@1, d@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a" @@ -3634,213 +2120,111 @@ d@1, d@^1.0.1: es5-ext "^0.10.50" type "^1.0.1" -dateformat@^4.4.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.5.1.tgz#c20e7a9ca77d147906b6dc2261a8be0a5bd2173c" - integrity sha512-OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q== +data-uri-to-buffer@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b" + integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== -de-indent@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" - integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= +dateformat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-5.0.2.tgz#0f275609b02e3306ff76d6a2067a6ebb98e6114b" + integrity sha512-h9vywpuz+ReixnJTwFx5JLtZpS8eLCbRm8shwwKkCKOZA547N6yoMtD3W91Z6+NFZ8wOaZlcaCcK/w+kELhSVg== -debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: +debug@2.6.9, debug@^2.1.1, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@^3.1.1, debug@^3.2.6: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -decamelize@^1.1.1, decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= - dependencies: - mimic-response "^1.0.0" - -deep-equal@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" - integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== - dependencies: - is-arguments "^1.0.4" - is-date-object "^1.0.1" - is-regex "^1.0.4" - object-is "^1.0.1" - object-keys "^1.1.1" - regexp.prototype.flags "^1.2.0" - deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-gateway@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" - integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA== +defaults@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= dependencies: - execa "^1.0.0" - ip-regex "^2.1.0" + clone "^1.0.2" -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== +define-lazy-prop@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== -define-properties@^1.1.2, define-properties@^1.1.3: +define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== dependencies: object-keys "^1.0.12" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - defu@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/defu/-/defu-2.0.4.tgz#09659a6e87a8fd7178be13bd43e9357ebf6d1c46" integrity sha512-G9pEH1UUMxShy6syWk01VQSRVs3CDWtlxtZu7A+NyqjxaCA4gSlWAKDBx6QiUEKezqS8+DUlXLI14Fp05Hmpwg== -defu@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/defu/-/defu-3.2.2.tgz#be20f4cc49b9805d54ee6b610658d53894942e97" - integrity sha512-8UWj5lNv7HD+kB0e9w77Z7TdQlbUYDVWqITLHNqFIn6khrNHv5WQo38Dcm1f6HeNyZf0U7UbPf6WeZDSdCzGDQ== - -del@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4" - integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ== - dependencies: - "@types/glob" "^7.1.1" - globby "^6.1.0" - is-path-cwd "^2.0.0" - is-path-in-cwd "^2.0.0" - p-map "^2.0.0" - pify "^4.0.1" - rimraf "^2.6.3" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +defu@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/defu/-/defu-5.0.0.tgz#5768f0d402a555bfc4c267246b20f82ce8b5a10b" + integrity sha512-VHg73EDeRXlu7oYWRmmrNp/nl7QkdXUxkQQKig0Zk8daNmm84AbGoC8Be6/VVLJEKxn12hR0UBmz8O+xQiAPKQ== delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -delimit-stream@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/delimit-stream/-/delimit-stream-0.1.0.tgz#9b8319477c0e5f8aeb3ce357ae305fc25ea1cd2b" - integrity sha1-m4MZR3wOX4rrPONXrjBfwl6hzSs= +denque@^1.1.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" + integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -des.js@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" - integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - destr@^1.0.0, destr@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/destr/-/destr-1.1.0.tgz#2da6add6ba71e04fd0abfb1e642d4f6763235095" integrity sha512-Ev/sqS5AzzDwlpor/5wFCDu0dYMQu/0x2D6XfAsQ0E7uQmamIgYJ6Dppo2T2EOFVkeVYWjc+PCLKaqZZ57qmLg== -destroy@^1.0.4, destroy@~1.0.4: +destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-indent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" - integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= - -detect-libc@^1.0.2: +detect-libc@^1.0.2, detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= -detect-node@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79" - integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw== - -devalue@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/devalue/-/devalue-2.0.1.tgz#5d368f9adc0928e47b77eea53ca60d2f346f9762" - integrity sha512-I2TiqT5iWBEyB8GRfTDP0hiLZ0YeDJZ+upDxjBfOC2lebO5LezQMv7QvIUTzdb64jQyAKLf1AHADtGN+jw6v8Q== - -diffie-hellman@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" - integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -3848,36 +2232,7 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= - -dns-over-http-resolver@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/dns-over-http-resolver/-/dns-over-http-resolver-1.2.2.tgz#148740c1b14d81b78078a1af1d606f2d0c6cc255" - integrity sha512-4J7LoLl26mczU6LdWlhvNM51aWXHJmTz6iDUrGz1sqiAgNb6HzBc/huvkgqS6bYfbCzvlOKW/bGkugReliac0A== - dependencies: - debug "^4.2.0" - native-fetch "^3.0.0" - receptacle "^1.3.2" - -dns-packet@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" - integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg== - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= - dependencies: - buffer-indexof "^1.0.0" - -doctrine@1.5.0, doctrine@^1.2.2: +doctrine@^1.2.2: version "1.5.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= @@ -3885,6 +2240,13 @@ doctrine@1.5.0, doctrine@^1.2.2: esutils "^2.0.2" isarray "^1.0.0" +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== + dependencies: + esutils "^2.0.2" + doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -3897,159 +2259,62 @@ doctypes@^1.1.0: resolved "https://registry.yarnpkg.com/doctypes/-/doctypes-1.1.0.tgz#ea80b106a87538774e8a3a4a5afe293de489e0a9" integrity sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk= -dom-converter@^0.2: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== - dependencies: - utila "~0.4" - -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - dom-serializer@^1.0.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be" - integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q== + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== dependencies: domelementtype "^2.0.1" - domhandler "^4.0.0" + domhandler "^4.2.0" entities "^2.0.0" -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - -domelementtype@1, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== - dependencies: - domelementtype "1" - -domhandler@^4.0.0, domhandler@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" - integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== +domhandler@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" + integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== dependencies: domelementtype "^2.2.0" -domutils@^1.5.1, domutils@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^2.4.3: - version "2.6.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7" - integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA== +domutils@^2.6.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== dependencies: dom-serializer "^1.0.1" domelementtype "^2.2.0" domhandler "^4.2.0" -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== dependencies: is-obj "^2.0.0" -dotenv@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" - integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= +dotenv@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" + integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== duplexer@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -duplexify@^3.4.2, duplexify@^3.6.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" - integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-fetch@^1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/electron-fetch/-/electron-fetch-1.7.3.tgz#06cf363d7f64073ec00a37e9949ec9d29ce6b08a" - integrity sha512-1AVMaxrHXTTMqd7EK0MGWusdqNr07Rpj8Th6bG4at0oNgIi/1LBwa9CjT/0Zy+M0k/tSJPS04nFxHj0SXDVgVw== - dependencies: - encoding "^0.1.13" - -electron-to-chromium@^1.3.719: - version "1.3.723" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz#52769a75635342a4db29af5f1e40bd3dad02c877" - integrity sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg== - -electron@^12.0.5: - version "12.0.5" - resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.5.tgz#005cf4375d2ee4563f5e75dc4da4ef871846a8be" - integrity sha512-z0xYB3sPr0qZcDrHUUWqooPKe3yUzBDxQcgQe3f2TLstA84JIFXBoaIJCPh/fJW0+JdF/ZFVeK2SNgLhYtRV+Q== - dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^14.6.2" - extract-zip "^1.0.3" - -elliptic@^6.5.2, elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== - dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" - hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" - -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +electron-to-chromium@^1.3.886: + version "1.3.896" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz#4a94efe4870b1687eafd5c378198a49da06e8a1b" + integrity sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA== emoji-regex@^8.0.0: version "8.0.0" @@ -4061,26 +2326,19 @@ emojis-list@^3.0.0: resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -encodeurl@^1.0.2, encodeurl@~1.0.2: +encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -encoding@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - -end-of-stream@^1.0.0, end-of-stream@^1.1.0: +end-of-stream@^1.1.0, end-of-stream@^1.4.1: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== dependencies: once "^1.4.0" -enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0: +enhanced-resolve@^4.1.1: version "4.5.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== @@ -4089,51 +2347,34 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0: memory-fs "^0.5.0" tapable "^1.0.0" -enquirer@^2.3.5, enquirer@^2.3.6: +enhanced-resolve@^5.8.3: + version "5.8.3" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + +enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== dependencies: ansi-colors "^4.1.1" -entities@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -err-code@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - -err-code@^3.0.0, err-code@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" - integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== - -errno@^0.1.3, errno@~0.1.7: +errno@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== dependencies: prr "~1.0.1" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== @@ -4147,27 +2388,36 @@ error-stack-parser@^2.0.0: dependencies: stackframe "^1.1.1" -es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: - version "1.18.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4" - integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== +es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" has "^1.0.3" has-symbols "^1.0.2" - is-callable "^1.2.3" + internal-slot "^1.0.3" + is-callable "^1.2.4" is-negative-zero "^2.0.1" - is-regex "^1.1.2" - is-string "^1.0.5" - object-inspect "^1.9.0" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.1" + is-string "^1.0.7" + is-weakref "^1.0.1" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.0" + unbox-primitive "^1.0.1" + +es-module-lexer@^0.9.0: + version "0.9.3" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== es-to-primitive@^1.2.1: version "1.2.1" @@ -4187,11 +2437,6 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14: es6-symbol "~3.1.3" next-tick "~1.0.0" -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - es6-iterator@^2.0.3, es6-iterator@~2.0.1, es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" @@ -4250,6 +2495,127 @@ es6-weak-map@^2.0.1: es6-iterator "^2.0.3" es6-symbol "^3.1.1" +esbuild-android-arm64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.13.tgz#da07b5fb2daf7d83dcd725f7cf58a6758e6e702a" + integrity sha512-T02aneWWguJrF082jZworjU6vm8f4UQ+IH2K3HREtlqoY9voiJUwHLRL6khRlsNLzVglqgqb7a3HfGx7hAADCQ== + +esbuild-darwin-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.13.tgz#e94e9fd3b4b5455a2e675cd084a19a71b6904bbf" + integrity sha512-wkaiGAsN/09X9kDlkxFfbbIgR78SNjMOfUhoel3CqKBDsi9uZhw7HBNHNxTzYUK8X8LAKFpbODgcRB3b/I8gHA== + +esbuild-darwin-arm64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.13.tgz#8c320eafbb3ba2c70d8062128c5b71503e342471" + integrity sha512-b02/nNKGSV85Gw9pUCI5B48AYjk0vFggDeom0S6QMP/cEDtjSh1WVfoIFNAaLA0MHWfue8KBwoGVsN7rBshs4g== + +esbuild-freebsd-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.13.tgz#ce0ca5b8c4c274cfebc9326f9b316834bd9dd151" + integrity sha512-ALgXYNYDzk9YPVk80A+G4vz2D22Gv4j4y25exDBGgqTcwrVQP8rf/rjwUjHoh9apP76oLbUZTmUmvCMuTI1V9A== + +esbuild-freebsd-arm64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.13.tgz#463da17562fdcfdf03b3b94b28497d8d8dcc8f62" + integrity sha512-uFvkCpsZ1yqWQuonw5T1WZ4j59xP/PCvtu6I4pbLejhNo4nwjW6YalqnBvBSORq5/Ifo9S/wsIlVHzkzEwdtlw== + +esbuild-linux-32@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.13.tgz#2035793160da2c4be48a929e5bafb14a31789acc" + integrity sha512-yxR9BBwEPs9acVEwTrEE2JJNHYVuPQC9YGjRfbNqtyfK/vVBQYuw8JaeRFAvFs3pVJdQD0C2BNP4q9d62SCP4w== + +esbuild-linux-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.13.tgz#fbe4802a8168c6d339d0749f977b099449b56f22" + integrity sha512-kzhjlrlJ+6ESRB/n12WTGll94+y+HFeyoWsOrLo/Si0s0f+Vip4b8vlnG0GSiS6JTsWYAtGHReGczFOaETlKIw== + +esbuild-linux-arm64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.13.tgz#f08d98df28d436ed4aad1529615822bb74d4d978" + integrity sha512-KMrEfnVbmmJxT3vfTnPv/AiXpBFbbyExH13BsUGy1HZRPFMi5Gev5gk8kJIZCQSRfNR17aqq8sO5Crm2KpZkng== + +esbuild-linux-arm@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.13.tgz#6f968c3a98b64e30c80b212384192d0cfcb32e7f" + integrity sha512-hXub4pcEds+U1TfvLp1maJ+GHRw7oizvzbGRdUvVDwtITtjq8qpHV5Q5hWNNn6Q+b3b2UxF03JcgnpzCw96nUQ== + +esbuild-linux-mips64le@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.13.tgz#690c78dc4725efe7d06a1431287966fbf7774c7f" + integrity sha512-cJT9O1LYljqnnqlHaS0hdG73t7hHzF3zcN0BPsjvBq+5Ad47VJun+/IG4inPhk8ta0aEDK6LdP+F9299xa483w== + +esbuild-linux-ppc64le@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.13.tgz#7ec9048502de46754567e734aae7aebd2df6df02" + integrity sha512-+rghW8st6/7O6QJqAjVK3eXzKkZqYAw6LgHv7yTMiJ6ASnNvghSeOcIvXFep3W2oaJc35SgSPf21Ugh0o777qQ== + +esbuild-loader@^2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.16.0.tgz#a44a57a77ed2810d6b278579271f77d739aa7bc9" + integrity sha512-LCJEwkf+nMJbNmVYNgg/0PaIZDdr5OcHw1qbWAZLkrmBRX+KwHY/yAS6ia98UBtwzk/WhsftUBNB6tfPHgFIxw== + dependencies: + esbuild "^0.13.4" + joycon "^3.0.1" + json5 "^2.2.0" + loader-utils "^2.0.0" + tapable "^2.2.0" + type-fest "^1.4.0" + webpack-sources "^2.2.0" + +esbuild-netbsd-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.13.tgz#439bdaefffa03a8fa84324f5d83d636f548a2de3" + integrity sha512-A/B7rwmzPdzF8c3mht5TukbnNwY5qMJqes09ou0RSzA5/jm7Jwl/8z853ofujTFOLhkNHUf002EAgokzSgEMpQ== + +esbuild-openbsd-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.13.tgz#c9958e5291a00a3090c1ec482d6bcdf2d5b5d107" + integrity sha512-szwtuRA4rXKT3BbwoGpsff6G7nGxdKgUbW9LQo6nm0TVCCjDNDC/LXxT994duIW8Tyq04xZzzZSW7x7ttDiw1w== + +esbuild-sunos-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.13.tgz#ac9ead8287379cd2f6d00bd38c5997fda9c1179e" + integrity sha512-ihyds9O48tVOYF48iaHYUK/boU5zRaLOXFS+OOL3ceD39AyHo46HVmsJLc7A2ez0AxNZCxuhu+P9OxfPfycTYQ== + +esbuild-windows-32@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.13.tgz#a3820fc86631ca594cb7b348514b5cc3f058cfd6" + integrity sha512-h2RTYwpG4ldGVJlbmORObmilzL8EECy8BFiF8trWE1ZPHLpECE9//J3Bi+W3eDUuv/TqUbiNpGrq4t/odbayUw== + +esbuild-windows-64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.13.tgz#1da748441f228d75dff474ddb7d584b81887323c" + integrity sha512-oMrgjP4CjONvDHe7IZXHrMk3wX5Lof/IwFEIbwbhgbXGBaN2dke9PkViTiXC3zGJSGpMvATXVplEhlInJ0drHA== + +esbuild-windows-arm64@0.13.13: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.13.tgz#06dfa52a6b178a5932a9a6e2fdb240c09e6da30c" + integrity sha512-6fsDfTuTvltYB5k+QPah/x7LrI2+OLAJLE3bWLDiZI6E8wXMQU+wLqtEO/U/RvJgVY1loPs5eMpUBpVajczh1A== + +esbuild@^0.13.13, esbuild@^0.13.2, esbuild@^0.13.4: + version "0.13.13" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.13.tgz#0b5399c20f219f663c8c1048436fb0f59ab17a41" + integrity sha512-Z17A/R6D0b4s3MousytQ/5i7mTCbaF+Ua/yPfoe71vdTv4KBvVAvQ/6ytMngM2DwGJosl8WxaD75NOQl2QF26Q== + optionalDependencies: + esbuild-android-arm64 "0.13.13" + esbuild-darwin-64 "0.13.13" + esbuild-darwin-arm64 "0.13.13" + esbuild-freebsd-64 "0.13.13" + esbuild-freebsd-arm64 "0.13.13" + esbuild-linux-32 "0.13.13" + esbuild-linux-64 "0.13.13" + esbuild-linux-arm "0.13.13" + esbuild-linux-arm64 "0.13.13" + esbuild-linux-mips64le "0.13.13" + esbuild-linux-ppc64le "0.13.13" + esbuild-netbsd-64 "0.13.13" + esbuild-openbsd-64 "0.13.13" + esbuild-sunos-64 "0.13.13" + esbuild-windows-32 "0.13.13" + esbuild-windows-64 "0.13.13" + esbuild-windows-arm64 "0.13.13" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -4280,25 +2646,26 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-config-standard@^16.0.2: - version "16.0.2" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6" - integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw== +eslint-config-standard@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== -eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" -eslint-module-utils@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" - integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== +eslint-module-utils@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c" + integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ== dependencies: - debug "^2.6.9" + debug "^3.2.7" + find-up "^2.1.0" pkg-dir "^2.0.0" eslint-plugin-es@^3.0.0: @@ -4309,24 +2676,24 @@ eslint-plugin-es@^3.0.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@^2.22.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" - integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== +eslint-plugin-import@^2.25.3: + version "2.25.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766" + integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg== dependencies: - array-includes "^3.1.1" - array.prototype.flat "^1.2.3" - contains-path "^0.1.0" + array-includes "^3.1.4" + array.prototype.flat "^1.2.5" debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.0" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.7.1" has "^1.0.3" + is-core-module "^2.8.0" + is-glob "^4.0.3" minimatch "^3.0.4" - object.values "^1.1.1" - read-pkg-up "^2.0.0" - resolve "^1.17.0" - tsconfig-paths "^3.9.0" + object.values "^1.1.5" + resolve "^1.20.0" + tsconfig-paths "^3.11.0" eslint-plugin-node@^11.1.0: version "11.1.0" @@ -4340,30 +2707,22 @@ eslint-plugin-node@^11.1.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-promise@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" - integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== +eslint-plugin-promise@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.1.tgz#9674d11c056d1bafac38e4a3a9060be740988d90" + integrity sha512-XgdcdyNzHfmlQyweOPTxmc7pIsS6dE4MvwhXWMQ2Dxs1XAL2GJDilUsjWen6TWik0aSI+zD/PqocZBblcm9rdA== -eslint-plugin-vue@^7.4.1: - version "7.9.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.9.0.tgz#f8e83a2a908f4c43fc8304f5401d4ff671f3d560" - integrity sha512-2Q0qQp5+5h+pZvJKCbG1/jCRUYrdgAz5BYKGyTlp2NU8mx09u3Hp7PsH6d5qef6ojuPoCXMnrbbDxeoplihrSw== +eslint-plugin-vue@^8.0.3: + version "8.0.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-8.0.3.tgz#791cc4543940319e612ea61a1d779e8c87cf749a" + integrity sha512-Rlhhy5ltzde0sRwSkqHuNePTXLMMaJ5+qsQubM4RYloYsQ8cXlnJT5MDaCzSirkGADipOHtmQXIbbPFAzUrADg== dependencies: - eslint-utils "^2.1.0" + eslint-utils "^3.0.0" natural-compare "^1.4.0" - semver "^7.3.2" - vue-eslint-parser "^7.6.0" + semver "^7.3.5" + vue-eslint-parser "^8.0.1" -eslint-scope@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-scope@^5.0.0, eslint-scope@^5.1.1: +eslint-scope@5.1.1, eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -4371,22 +2730,42 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-utils@^2.0.0, eslint-utils@^2.1.0: +eslint-scope@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-6.0.0.tgz#9cf45b13c5ac8f3d4c50f46a5121f61b3e318978" + integrity sha512-uRDL9MWmQCkaFus8RF5K9/L/2fn+80yoW3jkD53l4shjCh26fCtvJGasxjUqP5OT87SYTxCVA3BwTUzuELx9kA== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + +eslint-utils@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2" + integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA== eslint@^2.7.0: version "2.13.1" @@ -4427,46 +2806,47 @@ eslint@^2.7.0: text-table "~0.2.0" user-home "^2.0.0" -eslint@^7.17.0: - version "7.25.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67" - integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw== +eslint@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.2.0.tgz#44d3fb506d0f866a506d97a0fc0e90ee6d06a815" + integrity sha512-erw7XmM+CLxTOickrimJ1SiF55jiNlVSp2qqm0NuBWPtHYQCegD5ZMaW0c3i5ytPqL+SSLaCxdvQXFPLJn+ABw== dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" + "@eslint/eslintrc" "^1.0.4" + "@humanwhocodes/config-array" "^0.6.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" - debug "^4.0.1" + debug "^4.3.2" doctrine "^3.0.0" enquirer "^2.3.5" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" + escape-string-regexp "^4.0.0" + eslint-scope "^6.0.0" + eslint-utils "^3.0.0" + eslint-visitor-keys "^3.0.0" + espree "^9.0.0" esquery "^1.4.0" esutils "^2.0.2" + fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" + glob-parent "^6.0.1" globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" is-glob "^4.0.0" - js-yaml "^3.13.1" + js-yaml "^4.1.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.21" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" progress "^2.0.0" - regexpp "^3.1.0" + regexpp "^3.2.0" semver "^7.2.1" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" strip-json-comments "^3.1.0" - table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -4478,23 +2858,14 @@ espree@^3.1.6: acorn "^5.5.0" acorn-jsx "^3.0.0" -espree@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" - integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== +espree@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.0.0.tgz#e90a2965698228502e771c7a58489b1a9d107090" + integrity sha512-r5EQJcYZ2oaGbeR0jR0fFVijGOcwai07/690YRXLINuhmVeRY4UKSAsQPe/0BNuDgwP7Ophoc1PRsr2E3tkbdQ== dependencies: - acorn "^7.1.1" - acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.1.0" - -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== - dependencies: - acorn "^7.4.0" + acorn "^8.5.0" acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" + eslint-visitor-keys "^3.0.0" esprima@^4.0.0: version "4.0.1" @@ -4521,9 +2892,24 @@ estraverse@^4.1.1, estraverse@^4.2.0: integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +estree-walker@2.0.2, estree-walker@^2.0.1, estree-walker@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" + integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== + +estree-walker@^0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" + integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== + +estree-walker@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" + integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== esutils@^2.0.2: version "2.0.3" @@ -4543,41 +2929,16 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - eventemitter3@^4.0.0: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -events@^3.0.0, events@^3.3.0: +events@^3.2.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -eventsource-polyfill@^0.9.6: - version "0.9.6" - resolved "https://registry.yarnpkg.com/eventsource-polyfill/-/eventsource-polyfill-0.9.6.tgz#10e0d187f111b167f28fdab918843ce7d818f13c" - integrity sha1-EODRh/ERsWfyj9q5GIQ859gY8Tw= - -eventsource@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" - integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== - dependencies: - original "^1.0.0" - -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -4591,166 +2952,49 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g= -exit@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" +exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== ext@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244" - integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A== + version "1.6.0" + resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52" + integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg== dependencies: - type "^2.0.0" + type "^2.5.0" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= +externality@^0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/externality/-/externality-0.1.5.tgz#07f784dfd782c3d2242166b2337a1e33b54ae3f5" + integrity sha512-Re29ft7X3Pfk7SVVOI5Xo/44XmkBMEqVmkUQd+21j8K/GjPuAyNuNJ5F/4yukubrbe4mEu2nE7OCzuDGewRH1Q== dependencies: - is-extendable "^0.1.0" + allowlist "^0.1.1" + enhanced-resolve "^5.8.3" + mlly "^0.3.10" + pathe "^0.2.0" + ufo "^0.7.9" -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extract-css-chunks-webpack-plugin@^4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/extract-css-chunks-webpack-plugin/-/extract-css-chunks-webpack-plugin-4.9.0.tgz#da5e6b1d8b39a398c817ffc98550f4ccb6d795e1" - integrity sha512-HNuNPCXRMqJDQ1OHAUehoY+0JVCnw9Y/H22FQzYVwo8Ulgew98AGDu0grnY5c7xwiXHjQa6yJ/1dxLCI/xqTyQ== - dependencies: - loader-utils "^2.0.0" - normalize-url "1.9.1" - schema-utils "^1.0.0" - webpack-sources "^1.1.0" - -extract-zip@^1.0.3: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-fifo@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.0.0.tgz#9bc72e6860347bb045a876d1c5c0af11e9b984e7" - integrity sha512-4VEXmjxLj7sbs8J//cn2qhRap50dGzF5n8fjay8mau+Jn4hxSeR3xPFwxMaQq/pDaq7+KQk0PAbC2+nWDkJrmQ== - -fast-glob@^3.1.1, fast-glob@^3.2.5: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== +fast-glob@^3.1.1: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -4762,36 +3006,19 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fastest-levenshtein@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" - integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== - fastq@^1.6.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" - integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: - version "0.11.3" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" - integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== +fetch-blob@^3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.3.tgz#a7dca4855e39d3e3c5a1da62d4ee335c37d26012" + integrity sha512-ax1Y5I9w+9+JiM+wdHkhBoxew+zG4AJ2SvAD1v1szpddUIiPERVGBxrMcB2ZqW0Y3PP8bOWYv2zqQq1Jp2kqUQ== dependencies: - websocket-driver ">=0.5.1" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= - dependencies: - pend "~1.2.0" - -figgy-pudding@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" - integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== + web-streams-polyfill "^3.0.3" figures@^1.3.5: version "1.7.0" @@ -4801,13 +3028,6 @@ figures@^1.3.5: escape-string-regexp "^1.0.5" object-assign "^4.1.0" -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^1.1.1: version "1.3.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz#44c61ea607ae4be9c1402f41f44270cbfe334ff8" @@ -4836,16 +3056,6 @@ file-uri-to-path@1.0.0: resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -4853,12 +3063,7 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -filter-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" - integrity sha1-mzERErxsYSehbgFsbF1/GeCAXFs= - -finalhandler@1.1.2, finalhandler@~1.1.2: +finalhandler@1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== @@ -4871,38 +3076,22 @@ finalhandler@1.1.2, finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - -find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== +find-cache-dir@^3.3.1: + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" make-dir "^3.0.2" pkg-dir "^4.1.0" -find-up@^2.0.0, find-up@^2.1.0: +find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= dependencies: locate-path "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" @@ -4935,77 +3124,37 @@ flat@^5.0.0: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.4" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.4.tgz#28d9969ea90661b5134259f312ab6aa7929ac5e2" + integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw== -flatten@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" - integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== - -flush-write-stream@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== - dependencies: - inherits "^2.0.3" - readable-stream "^2.3.6" - -follow-redirects@^1.0.0, follow-redirects@^1.10.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" - integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== - -font-awesome@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM= - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= +follow-redirects@^1.0.0, follow-redirects@^1.14.4: + version "1.14.5" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" + integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== foreach@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== +formdata-polyfill@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423" + integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" + fetch-blob "^3.1.2" -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +fraction.js@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8" + integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA== -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2, fresh@^0.5.2: +fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - front-matter@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/front-matter/-/front-matter-2.1.2.tgz#f75983b9f2f413be658c93dfd7bd8ce4078f5cdb" @@ -5013,6 +3162,20 @@ front-matter@2.1.2: dependencies: js-yaml "^3.4.6" +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" + integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" @@ -5022,31 +3185,12 @@ fs-extra@^3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.0.1, fs-extra@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-memo@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/fs-memo/-/fs-memo-1.2.0.tgz#a2ec3be606b902077adbb37ec529c5ec5fb2e037" integrity sha512-YEexkCpL4j03jn5SxaMHqcO6IuWuqm8JFUYhyCep7Ao89JIYmB8xoKhK7zXXJ9cCaNXpyNH5L3QtAmoxjoHW2w== -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -5065,30 +3209,12 @@ fs-monkey@1.0.3: resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== -fs-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^1.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - -fsevents@~2.3.1: +fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -5103,6 +3229,21 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= +gauge@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.1.tgz#4bea07bcde3782f06dced8950e51307aa0f4a346" + integrity sha512-6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ== + dependencies: + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + object-assign "^4.1.1" + signal-exit "^3.0.0" + string-width "^1.0.1 || ^2.0.0" + strip-ansi "^3.0.1 || ^4.0.0" + wide-align "^1.1.2" + gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -5136,12 +3277,12 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-caller-file@^2.0.1: +get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -5150,81 +3291,51 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.1" -get-iterator@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-iterator/-/get-iterator-1.0.2.tgz#cd747c02b4c084461fac14f48f6b45a80ed25c82" - integrity sha512-v+dm9bNVfOYsY1OrhaCrmyOcYoSeVvbt+hHZ0Au+T+p1y+0Uyj9aMaGIeUTT6xdpRbWzDeYKvfOslPhggQMcsg== - -get-port-please@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-1.1.0.tgz#7a60007578df6c4570c233803b48854c44db41f7" - integrity sha512-C9adQpQ9uyboxURlYAVcqvKdnrZ0uIad6lAZzIr51G5shhUFcZUwl8rxY0B0hB6OJytBNzPB1Uj/S1CpP9aFzQ== +get-port-please@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/get-port-please/-/get-port-please-2.2.0.tgz#3fabbbe2f9d8e6b7c47e1cddd71fc4c593f1deac" + integrity sha512-1c7Np/cpA7XCB6IrPAdaBaJjlGHTqg4P82h/ZqyBL6dCdwRzZBOFGZO7FL2KaZ2uNvD6v8QilA7LZwMpmIggDQ== dependencies: fs-memo "^1.2.0" -get-stream@^4.0.0, get-stream@^4.1.0: +get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== dependencies: pump "^3.0.0" -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== dependencies: - pump "^3.0.0" + call-bind "^1.0.2" + get-intrinsic "^1.1.1" -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -git-config-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-2.0.0.tgz#62633d61af63af4405a5024efd325762f58a181b" - integrity sha512-qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA== - -git-up@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.2.tgz#10c3d731051b366dc19d3df454bfca3f77913a7c" - integrity sha512-kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ== - dependencies: - is-ssh "^1.3.0" - parse-url "^5.0.0" - -git-url-parse@^11.4.3: - version "11.4.4" - resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77" - integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw== - dependencies: - git-up "^4.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: +glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +glob-parent@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + +glob-to-regexp@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== + +glob@^7.0.0, glob@^7.0.3, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -5233,45 +3344,27 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, gl once "^1.3.0" path-is-absolute "^1.0.0" -global-agent@^2.0.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz#566331b0646e6bf79429a16877685c4a1fbf76dc" - integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg== +glob@~7.1.1: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: - boolean "^3.0.1" - core-js "^3.6.5" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0: - version "13.8.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" - integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== +globals@^13.6.0, globals@^13.9.0: + version "13.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e" + integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg== dependencies: type-fest "^0.20.2" @@ -5280,17 +3373,10 @@ globals@^9.2.0: resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== -globalthis@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b" - integrity sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ== - dependencies: - define-properties "^1.1.3" - -globby@^11.0.3: - version "11.0.3" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" - integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== +globby@^11.0.4: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -5299,21 +3385,10 @@ globby@^11.0.3: merge2 "^1.3.0" slash "^3.0.0" -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - globule@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4" - integrity sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA== + version "1.3.3" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz#811919eeac1ab7344e905f2e3be80a13447973c2" + integrity sha512-mb1aYtDbIjTu4ShMB85m3UzjX9BVKe9WCzsnfMSZk+K5GpIbBOexgg4PPCt5eHDEG5/ZQAUX2Kct02zfiPLsKg== dependencies: glob "~7.1.1" lodash "~4.17.10" @@ -5326,56 +3401,20 @@ gonzales-pe-sl@^4.2.3: dependencies: minimist "1.1.x" -google-protobuf@^3.15.8, google-protobuf@^3.6.1: - version "3.15.8" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.15.8.tgz#5f3948905e4951c867d6bc143f385a80e2a39efe" - integrity sha512-2jtfdqTaSxk0cuBJBtTTWsot4WtR9RVr2rXg7x7OoqiuOKopPrwXpM1G4dXIkLcUNRh3RKzz76C8IOkksZSeOw== +google-protobuf@^3.15.5, google-protobuf@^3.19.1: + version "3.19.1" + resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.19.1.tgz#5af5390e8206c446d8f49febaffd4b7f4ac28f41" + integrity sha512-Isv1RlNC+IzZzilcxnlVSf+JvuhxmY7DaxYCBy+zPS9XVuJRtlTTIXR9hnZ1YL1MMusJn/7eSy2swCzZIomQSg== -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" +graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== - -grpc-tools@^1.11.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/grpc-tools/-/grpc-tools-1.11.1.tgz#25b3f9f47f4a691b2b1a44ee47e9603c189e2034" - integrity sha512-QNz6xuiyBuHXKu78bv5PAOzv/EBKkH54OgeTkHyFkic8TrY8oiifs6hozRJQxJb+L7k+udWYmPvfK76Pgt4JhA== - dependencies: - node-pre-gyp "^0.15.0" - -grpc-web@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/grpc-web/-/grpc-web-1.2.1.tgz#860051d705bf5baa7b81fcbd14030060bf16b7b9" - integrity sha512-ibBaJPzfMVuLPgaST9w0kZl60s+SnkPBQp6QKdpEr85tpc1gXW2QDqSne9xiyiym0logDfdUSm4aX5h9YBA2mw== - -grpc@^1.24.6: - version "1.24.7" - resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.7.tgz#58d8eb2a8a9c11ccd678f27403ba54ee4ea3d895" - integrity sha512-AFWychfq60LBUrelOWgT5PWk05n98z7/C8qCgeNAJ4YvK8khVNSlbEHMLaCu7COqbX1JwJxSbzw9B9YhnzKeYQ== - dependencies: - "@types/bytebuffer" "^5.0.40" - lodash.camelcase "^4.3.0" - lodash.clone "^4.5.0" - nan "^2.13.2" - node-pre-gyp "^0.16.0" - protobufjs "^5.0.3" +grpc-web@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/grpc-web/-/grpc-web-1.3.0.tgz#4c36d97e7a7b6102a7df463e7822cd86d4f65ed8" + integrity sha512-nePImtnrnkZLErFq00Sr1H6AqaRrRptOJEhjUnlTB6RiJgs8ULYvRI9cX2hDwMvyYgakmO3H/wThYvS+Ibdreg== gzip-size@^6.0.0: version "6.0.0" @@ -5384,34 +3423,10 @@ gzip-size@^6.0.0: dependencies: duplexer "^0.1.2" -hable@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/hable/-/hable-3.0.0.tgz#6de089b2df946635cf8134b9e4859f1b62de255f" - integrity sha512-7+G0/2/COR8pwteYFqHIVYfQpuEiO2HXwJrhCBJVgrNrl9O5eaUoJVDGXUJX+0RpGncNVTuestexjk1afj01wQ== - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -hard-source-webpack-plugin@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/hard-source-webpack-plugin/-/hard-source-webpack-plugin-0.13.1.tgz#a99071e25b232f1438a5bc3c99f10a3869e4428e" - integrity sha512-r9zf5Wq7IqJHdVAQsZ4OP+dcUSvoHqDMxJlIzaE2J0TZWn3UjMMrHqwDHR8Jr/pzPfG7XxSe36E7Y8QGNdtuAw== - dependencies: - chalk "^2.4.1" - find-cache-dir "^2.0.0" - graceful-fs "^4.1.11" - lodash "^4.15.0" - mkdirp "^0.5.1" - node-object-hash "^1.2.0" - parse-json "^4.0.0" - pkg-dir "^3.0.0" - rimraf "^2.6.2" - semver "^5.6.0" - tapable "^1.0.0-beta.5" - webpack-sources "^1.0.1" - write-json-file "^2.3.0" +h3@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/h3/-/h3-0.3.3.tgz#9c6feb2ddf842ea5448c53a8bc8bc3a686799c21" + integrity sha512-ammvVddtZArv6pnCkl0tEekY8owWPZNZCW4teePYzGwfN2w7kb0wnraLIFnB20mqUU2kCAV5bvI+2mjmGztS3w== has-ansi@^2.0.0: version "2.0.0" @@ -5440,58 +3455,25 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== -has-unicode@^2.0.0: +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + +has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.0, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" -hash-base@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" - integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== - dependencies: - inherits "^2.0.4" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - hash-sum@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" @@ -5502,167 +3484,38 @@ hash-sum@^2.0.0: resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" - integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== +hasha@^5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1" + integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ== dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.1" + is-stream "^2.0.0" + type-fest "^0.8.0" -he@1.2.0, he@^1.1.0, he@^1.2.0: +he@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -hex-color-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" - integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== +hookable@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/hookable/-/hookable-5.0.0.tgz#bac6f1d4b56e3f590f21cfe3f813731372c0c69f" + integrity sha512-IqoJ8oXCNTUtNfqwbUQvLd+6ebVXk5qqGpSMOe4BS514vd4bEEH+hd9lva48mbbbe9q4eFKmsOViTZkr7ludHg== -hmac-drbg@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -hsl-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" - integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= - -hsla-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" - integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= - -html-entities@^1.2.0, html-entities@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc" - integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA== - -html-entities@^2.3.2: +html-entities@^2.1.0: version "2.3.2" resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ== -html-minifier-terser@^5.0.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" - integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== - dependencies: - camel-case "^4.1.1" - clean-css "^4.2.3" - commander "^4.1.1" - he "^1.2.0" - param-case "^3.0.3" - relateurl "^0.2.7" - terser "^4.6.3" - -html-minifier@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56" - integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig== - dependencies: - camel-case "^3.0.0" - clean-css "^4.2.1" - commander "^2.19.0" - he "^1.2.0" - param-case "^2.1.1" - relateurl "^0.2.7" - uglify-js "^3.5.1" - html-tags@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-2.0.0.tgz#10b30a386085f43cede353cc8fa7cb0deeea668b" integrity sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos= -html-webpack-plugin@^4.5.1: - version "4.5.2" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12" - integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A== - dependencies: - "@types/html-minifier-terser" "^5.0.0" - "@types/tapable" "^1.0.5" - "@types/webpack" "^4.41.8" - html-minifier-terser "^5.0.1" - loader-utils "^1.2.3" - lodash "^4.17.20" - pretty-error "^2.1.1" - tapable "^1.1.3" - util.promisify "1.0.0" - -html-webpack-plugin@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.1.tgz#8797327548e3de438e3494e0c6d06f181a7f20d1" - integrity sha512-rZsVvPXUYFyME0cuGkyOHfx9hmkFa4pWfxY/mdY38PsBEaVNsRoA+Id+8z6DBDgyv3zaw6XQszdF8HLwfQvcdQ== - dependencies: - "@types/html-minifier-terser" "^5.0.0" - html-minifier-terser "^5.0.1" - lodash "^4.17.20" - pretty-error "^2.1.1" - tapable "^2.0.0" - -htmlparser2@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - -http-cache-semantics@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" +html-tags@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg== http-errors@~1.7.2: version "1.7.3" @@ -5675,33 +3528,7 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-parser-js@>=0.5.1: - version "0.5.3" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" - integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== - -http-proxy-middleware@0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" - integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q== - dependencies: - http-proxy "^1.17.0" - is-glob "^4.0.0" - lodash "^4.17.11" - micromatch "^3.1.10" - -http-proxy-middleware@^1.0.6: - version "1.3.0" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.0.tgz#eda5e0b7d1f27ac82bd11eb5099d8c309d30cf30" - integrity sha512-nHn8lcFNmxCalzHGXMn0ojKunXC9twBvJ+y7QNhvK/ep7ZDOXvO7Gph01rSwsMOrG4m6N72gAAWXMYhPZvK6OA== - dependencies: - "@types/http-proxy" "^1.17.5" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.17.0, http-proxy@^1.18.1: +http-proxy@^1.18.1: version "1.18.1" resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== @@ -5710,56 +3537,40 @@ http-proxy@^1.17.0, http-proxy@^1.18.1: follow-redirects "^1.0.0" requires-port "^1.0.0" -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +http-shutdown@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/http-shutdown/-/http-shutdown-1.2.2.tgz#41bc78fc767637c4c95179bc492f312c0ae64c5f" + integrity sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw== -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + debug "4" -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4: +iconv-lite@^0.4.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -icss-utils@^4.0.0, icss-utils@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467" - integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA== - dependencies: - postcss "^7.0.14" - icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: +ieee754@^1.1.13, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= - ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== + version "3.0.4" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== dependencies: minimatch "^3.0.4" @@ -5773,25 +3584,10 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -import-cwd@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" - integrity sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk= - dependencies: - import-from "^2.1.0" - -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" +ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.9: + version "5.1.9" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" @@ -5801,49 +3597,11 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: parent-module "^1.0.0" resolve-from "^4.0.0" -import-from@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" - integrity sha1-M1238qev/VOqpHHUuAId7ja387E= - dependencies: - resolve-from "^3.0.0" - -import-local@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" - integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ== - dependencies: - pkg-dir "^3.0.0" - resolve-cwd "^2.0.0" - -import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - -infer-owner@^1.0.3, infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -5852,22 +3610,17 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= - inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: +ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -5891,243 +3644,56 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -inquirer@^7.3.3: - version "7.3.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" - integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.19" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" -internal-ip@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" - integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg== +ioredis@^4.27.9: + version "4.28.0" + resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-4.28.0.tgz#5a2be3f37ff2075e2332f280eaeb02ab4d9ff0d3" + integrity sha512-I+zkeeWp3XFgPT2CtJKxvaF5FjGBGt4yGYljRjQecdQKteThuAsKqffeF1lgHVlYnuNeozRbPOCDNZ7tDWPeig== dependencies: - default-gateway "^4.2.0" - ipaddr.js "^1.9.0" - -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= - -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - -ip-regex@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5" - integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== - -ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= - -ipaddr.js@1.9.1, ipaddr.js@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -ipfs-core-types@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ipfs-core-types/-/ipfs-core-types-0.3.1.tgz#5dab234428d031d0657d1708f7bb040281d6ab5f" - integrity sha512-xPBsowS951RsuskMo86AWz9y4ReaBot1YsjOhZvKl8ORd8taxIBTT72LnEPwIZ2G24U854Zjxvd/qUMqO14ivg== - dependencies: - cids "^1.1.5" - multiaddr "^8.0.0" - peer-id "^0.14.1" - -ipfs-core-utils@^0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.7.2.tgz#ebc1281d14d26538881a8249c3eed8c27b98f519" - integrity sha512-d7T72GxvhNN+tEHsJjxI5Y4LQVdMMbSwNbWB6nVsIHUEdwm3w85L2u1E/ctNd9aaNGvoBwEcnIZhSmqhMf7stw== - dependencies: - any-signal "^2.1.2" - blob-to-it "^1.0.1" - browser-readablestream-to-it "^1.0.1" - cids "^1.1.5" - err-code "^2.0.3" - ipfs-core-types "^0.3.1" - ipfs-utils "^6.0.1" - it-all "^1.0.4" - it-map "^1.0.4" - it-peekable "^1.0.1" - multiaddr "^8.0.0" - multiaddr-to-uri "^6.0.0" - parse-duration "^0.4.4" - timeout-abort-controller "^1.1.1" - uint8arrays "^2.1.3" - -ipfs-http-client@^49.0.4: - version "49.0.4" - resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-49.0.4.tgz#a7b5a696ab755ce1e822240e1774caab6cffa117" - integrity sha512-qgWbkcB4glQrUkE2tZR+GVXyrO6aJyspWBjyct/6TzrhCHx7evjz+kUTK+wNm4S9zccUePEml5VNZUmUhoQtbA== - dependencies: - abort-controller "^3.0.0" - any-signal "^2.1.2" - bignumber.js "^9.0.1" - cids "^1.1.5" - debug "^4.1.1" - form-data "^3.0.0" - ipfs-core-types "^0.3.1" - ipfs-core-utils "^0.7.2" - ipfs-utils "^6.0.1" - ipld-block "^0.11.0" - ipld-dag-cbor "^0.17.0" - ipld-dag-pb "^0.20.0" - ipld-raw "^6.0.0" - it-last "^1.0.4" - it-map "^1.0.4" - it-tar "^1.2.2" - it-to-stream "^0.1.2" - merge-options "^3.0.4" - multiaddr "^8.0.0" - multibase "^4.0.2" - multicodec "^3.0.1" - multihashes "^4.0.2" - nanoid "^3.1.12" - native-abort-controller "^1.0.3" - parse-duration "^0.4.4" - stream-to-it "^0.2.2" - uint8arrays "^2.1.3" - -ipfs-utils@^6.0.1: - version "6.0.7" - resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-6.0.7.tgz#876acf88ca012e33a8be29f16e6826eafaa4b16b" - integrity sha512-VlFDyRuCSOKXPOXb68nXSUVEPA+eXbdS7LT22k4aZvFNIoB2OtysDEt8lal93UOB/QS0Gy+6DUoxj1wJ37SIxQ== - dependencies: - abort-controller "^3.0.0" - any-signal "^2.1.0" - buffer "^6.0.1" - electron-fetch "^1.7.2" - err-code "^3.0.1" - fs-extra "^9.0.1" - is-electron "^2.2.0" - iso-url "^1.0.0" - it-glob "~0.0.11" - it-to-stream "^1.0.0" - merge-options "^3.0.4" - nanoid "^3.1.20" - native-abort-controller "^1.0.3" - native-fetch "^3.0.0" - node-fetch "^2.6.1" - stream-to-it "^0.2.2" - -ipld-block@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/ipld-block/-/ipld-block-0.11.1.tgz#c3a7b41aee3244187bd87a73f980e3565d299b6e" - integrity sha512-sDqqLqD5qh4QzGq6ssxLHUCnH4emCf/8F8IwjQM2cjEEIEHMUj57XhNYgmGbemdYPznUhffxFGEHsruh5+HQRw== - dependencies: - cids "^1.0.0" - -ipld-dag-cbor@^0.17.0: - version "0.17.1" - resolved "https://registry.yarnpkg.com/ipld-dag-cbor/-/ipld-dag-cbor-0.17.1.tgz#842e6c250603e5791049168831a425ec03471fb1" - integrity sha512-Bakj/cnxQBdscORyf4LRHxQJQfoaY8KWc7PWROQgX+aw5FCzBt8ga0VM/59K+ABOznsqNvyLR/wz/oYImOpXJw== - dependencies: - borc "^2.1.2" - cids "^1.0.0" - is-circular "^1.0.2" - multicodec "^3.0.1" - multihashing-async "^2.0.0" - uint8arrays "^2.1.3" - -ipld-dag-pb@^0.20.0: - version "0.20.0" - resolved "https://registry.yarnpkg.com/ipld-dag-pb/-/ipld-dag-pb-0.20.0.tgz#025c0343aafe6cb9db395dd1dc93c8c60a669360" - integrity sha512-zfM0EdaolqNjAxIrtpuGKvXxWk5YtH9jKinBuQGTcngOsWFQhyybGCTJHGNGGtRjHNJi2hz5Udy/8pzv4kcKyg== - dependencies: - cids "^1.0.0" - class-is "^1.1.0" - multicodec "^2.0.0" - multihashing-async "^2.0.0" - protons "^2.0.0" - reset "^0.1.0" - run "^1.4.0" - stable "^0.1.8" - uint8arrays "^1.0.0" - -ipld-raw@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/ipld-raw/-/ipld-raw-6.0.0.tgz#74d947fcd2ce4e0e1d5bb650c1b5754ed8ea6da0" - integrity sha512-UK7fjncAzs59iu/o2kwYtb8jgTtW6B+cNWIiNpAJkfRwqoMk1xD/6i25ktzwe4qO8gQgoR9RxA5ibC23nq8BLg== - dependencies: - cids "^1.0.0" - multicodec "^2.0.0" - multihashing-async "^2.0.0" - -is-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= + cluster-key-slot "^1.1.0" + debug "^4.3.1" + denque "^1.1.0" + lodash.defaults "^4.2.0" + lodash.flatten "^4.4.0" + lodash.isarguments "^3.1.0" + p-map "^2.1.0" + redis-commands "1.7.0" + redis-errors "^1.2.0" + redis-parser "^3.0.0" + standard-as-callback "^2.1.0" is-absolute-url@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - is-arguments@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" - integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - is-bigint@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" - integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== dependencies: - binary-extensions "^1.0.0" + has-bigints "^1.0.1" is-binary-path@~2.1.0: version "2.1.0" @@ -6137,98 +3703,37 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" - integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== - -is-circular@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-circular/-/is-circular-1.0.2.tgz#2e0ab4e9835f4c6b0ea2b9855a84acd501b8366c" - integrity sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA== - -is-color-stop@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" - integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= - dependencies: - css-color-names "^0.0.4" - hex-color-regex "^1.1.0" - hsl-regex "^1.0.0" - hsla-regex "^1.0.0" - rgb-regex "^1.0.1" - rgba-regex "^1.0.0" - -is-core-module@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" - integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw== +is-core-module@^2.2.0, is-core-module@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== dependencies: has "^1.0.3" -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" + has-tostringtag "^1.0.0" -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= - -is-docker@^2.1.1: +is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-electron@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.0.tgz#8943084f09e8b731b3a7a0298a7b5d56f6b7eef0" - integrity sha512-SpMppC2XR3YdxSzczXReBjqs2zGscWQpBIKqwXYBFic0ERaxNVgwLCHwOLZeESfdJQjX0RDvrJ1lBXX2ij+G1Q== - is-expression@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/is-expression/-/is-expression-4.0.0.tgz#c33155962abf21d0afd2552514d67d2ec16fd2ab" @@ -6237,19 +3742,7 @@ is-expression@^4.0.0: acorn "^7.1.1" object-assign "^4.1.1" -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: +is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= @@ -6272,30 +3765,28 @@ is-fullwidth-code-point@^3.0.0: integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-generator-function@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b" - integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ== - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== dependencies: - is-extglob "^2.1.0" + has-tostringtag "^1.0.0" -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" -is-ip@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz#2ae5ddfafaf05cb8008a62093cf29734f657c5d8" - integrity sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q== - dependencies: - ip-regex "^4.0.0" +is-interactive@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-2.0.0.tgz#40c57614593826da1100ade6059778d597f16e90" + integrity sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ== + +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= is-my-ip-valid@^1.0.0: version "1.0.0" @@ -6303,14 +3794,14 @@ is-my-ip-valid@^1.0.0: integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ== is-my-json-valid@^2.10.0: - version "2.20.5" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.5.tgz#5eca6a8232a687f68869b7361be1612e7512e5df" - integrity sha512-VTPuvvGQtxvCeghwspQu1rBgjYUT6FGxPlvFKbYuFtgc4ADsX3U5ihZOYN0qyU6u+d4X9xXb0IT5O6QpXKt87A== + version "2.20.6" + resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz#a9d89e56a36493c77bda1440d69ae0dc46a08387" + integrity sha512-1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw== dependencies: generate-function "^2.0.0" generate-object-property "^1.1.0" is-my-ip-valid "^1.0.0" - jsonpointer "^4.0.0" + jsonpointer "^5.0.0" xtend "^4.0.0" is-negative-zero@^2.0.1: @@ -6319,16 +3810,11 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== dependencies: - kind-of "^3.0.2" + has-tostringtag "^1.0.0" is-number@^7.0.0: version "7.0.0" @@ -6340,81 +3826,50 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-path-cwd@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb" - integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ== - -is-path-in-cwd@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb" - integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ== - dependencies: - is-path-inside "^2.1.0" - -is-path-inside@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2" - integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg== - dependencies: - path-is-inside "^1.0.2" - -is-plain-obj@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" +is-primitive@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-3.0.1.tgz#98c4db1abff185485a657fc2905052b940524d05" + integrity sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w== is-promise@^2.0.0: version "2.2.2" resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== +is-promise@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3" + integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ== + is-property@^1.0.0, is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= -is-regex@^1.0.3, is-regex@^1.0.4, is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== +is-reference@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" + integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== + dependencies: + "@types/estree" "*" + +is-regex@^1.0.3, is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.1" + has-tostringtag "^1.0.0" -is-resolvable@^1.0.0: +is-resolvable@^1.0.0, is-resolvable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== -is-retry-allowed@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" - integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== - -is-ssh@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.2.tgz#a4b82ab63d73976fd8263cceee27f99a88bdae2b" - integrity sha512-elEw0/0c2UscLrNG+OAorbP539E3rhliKPg+hDMWN9VwrDXfYK+4PBEykDPfxlYYtQvl84TascnQyobfQLHEhQ== - dependencies: - protocols "^1.1.0" +is-shared-array-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" + integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== is-stream@^1.1.0: version "1.1.0" @@ -6422,49 +3877,55 @@ is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" -is-typed-array@^1.1.3: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e" - integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug== +is-typed-array@^1.1.3, is-typed-array@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79" + integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA== dependencies: - available-typed-arrays "^1.0.2" + available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.18.0-next.2" + es-abstract "^1.18.5" foreach "^2.0.5" - has-symbols "^1.0.1" + has-tostringtag "^1.0.0" -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^1.1.0: +is-unicode-supported@^1.0.0, is-unicode-supported@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-1.1.0.tgz#9127b71f9fa82f52ca5c20e982e7bec0ee31ee1e" + integrity sha512-lDcxivp8TJpLG75/DpatAqNzOpDPSpED8XNtrpBHTdQ2InQ1PbW78jhwSxyxhhu+xbVSast2X38bwj8atwoUQA== -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: +is-weakref@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" + integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ== + dependencies: + call-bind "^1.0.0" + +is-wsl@^2.1.1, is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -6474,120 +3935,7 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -iso-constants@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/iso-constants/-/iso-constants-0.1.2.tgz#3d2456ed5aeaa55d18564f285ba02a47a0d885b4" - integrity sha512-OTCM5ZCQsHBCI4Wdu4tSxvDIkmDHd5EwJDps5mKqnQnWJSKlnwMs3EDZ4n3Fh1tmkWkDlyd2vCDbEYuPbyrUNQ== - -iso-random-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/iso-random-stream/-/iso-random-stream-2.0.0.tgz#3f0118166d5443148bbc134345fb100002ad0f1d" - integrity sha512-lGuIu104KfBV9ubYTSaE3GeAr6I69iggXxBHbTBc5u/XKlwlWl0LCytnkIZissaKqvxablwRD9B3ktVnmIUnEg== - dependencies: - events "^3.3.0" - readable-stream "^3.4.0" - -iso-url@^1.0.0: - version "1.1.5" - resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-1.1.5.tgz#875a0f2bf33fa1fc200f8d89e3f49eee57a8f0d9" - integrity sha512-+3JqoKdBTGmyv9vOkS6b9iHhvK34UajfTibrH/1HOK8TI7K2VsM0qOCd+aJdWKtSOA8g3PqZfcwDmnR0p3klqQ== - -iso-url@~0.4.7: - version "0.4.7" - resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-0.4.7.tgz#de7e48120dae46921079fe78f325ac9e9217a385" - integrity sha512-27fFRDnPAMnHGLq36bWTpKET+eiXct3ENlCcdcMdk+mjXrb2kw3mhBUg1B7ewAC0kVzlOPhADzQgz1SE6Tglog== - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -it-all@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/it-all/-/it-all-1.0.5.tgz#e880510d7e73ebb79063a76296a2eb3cb77bbbdb" - integrity sha512-ygD4kA4vp8fi+Y+NBgEKt6W06xSbv6Ub/0V8d1r3uCyJ9Izwa1UspkIOlqY9fOee0Z1w3WRo1+VWyAU4DgtufA== - -it-concat@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/it-concat/-/it-concat-1.0.3.tgz#84db9376e4c77bf7bc1fd933bb90f184e7cef32b" - integrity sha512-sjeZQ1BWQ9U/W2oI09kZgUyvSWzQahTkOkLIsnEPgyqZFaF9ME5gV6An4nMjlyhXKWQMKEakQU8oRHs2SdmeyA== - dependencies: - bl "^4.0.0" - -it-glob@~0.0.11: - version "0.0.11" - resolved "https://registry.yarnpkg.com/it-glob/-/it-glob-0.0.11.tgz#c6d8daf783167e012a55cdcca52a33b7f4d6834f" - integrity sha512-p02iVYsvOPU7cW4sV9BC62Kz6Mz2aUTJz/cKWDeFqc05kzB3WgSq8OobZabVA/K4boSm6q+s0xOZ8xiArLSoXQ== - dependencies: - fs-extra "^9.0.1" - minimatch "^3.0.4" - -it-last@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/it-last/-/it-last-1.0.5.tgz#5c711c7d58948bcbc8e0cb129af3a039ba2a585b" - integrity sha512-PV/2S4zg5g6dkVuKfgrQfN2rUN4wdTI1FzyAvU+i8RV96syut40pa2s9Dut5X7SkjwA3P0tOhLABLdnOJ0Y/4Q== - -it-map@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/it-map/-/it-map-1.0.5.tgz#2f6a9b8f0ba1ed1aeadabf86e00b38c73a1dc299" - integrity sha512-EElupuWhHVStUgUY+OfTJIS2MZed96lDrAXzJUuqiiqLnIKoBRqtX1ZG2oR0bGDsSppmz83MtzCeKLZ9TVAUxQ== - -it-peekable@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/it-peekable/-/it-peekable-1.0.2.tgz#3b2c7948b765f35b3bb07abbb9b2108c644e73c1" - integrity sha512-LRPLu94RLm+lxLZbChuc9iCXrKCOu1obWqxfaKhF00yIp30VGkl741b5P60U+rdBxuZD/Gt1bnmakernv7bVFg== - -it-reader@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/it-reader/-/it-reader-2.1.0.tgz#b1164be343f8538d8775e10fb0339f61ccf71b0f" - integrity sha512-hSysqWTO9Tlwc5EGjVf8JYZzw0D2FsxD/g+eNNWrez9zODxWt6QlN6JAMmycK72Mv4jHEKEXoyzUN4FYGmJaZw== - dependencies: - bl "^4.0.0" - -it-tar@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/it-tar/-/it-tar-1.2.2.tgz#8d79863dad27726c781a4bcc491f53c20f2866cf" - integrity sha512-M8V4a9I+x/vwXTjqvixcEZbQZHjwDIb8iUQ+D4M2QbhAdNs3WKVSl+45u5/F2XFx6jYMFOGzMVlKNK/uONgNIA== - dependencies: - bl "^4.0.0" - buffer "^5.4.3" - iso-constants "^0.1.2" - it-concat "^1.0.0" - it-reader "^2.0.0" - p-defer "^3.0.0" - -it-to-stream@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/it-to-stream/-/it-to-stream-0.1.2.tgz#7163151f75b60445e86b8ab1a968666acaacfe7b" - integrity sha512-DTB5TJRZG3untmZehcaFN0kGWl2bNv7tnJRgQHAO9QEt8jfvVRrebZtnD5NZd4SCj4WVPjl0LSrugNWE/UaZRQ== - dependencies: - buffer "^5.6.0" - fast-fifo "^1.0.0" - get-iterator "^1.0.2" - p-defer "^3.0.0" - p-fifo "^1.0.0" - readable-stream "^3.6.0" - -it-to-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/it-to-stream/-/it-to-stream-1.0.0.tgz#6c47f91d5b5df28bda9334c52782ef8e97fe3a4a" - integrity sha512-pLULMZMAB/+vbdvbZtebC0nWBTbG581lk6w8P7DfIIIKUfa8FbY7Oi0FxZcFPbxvISs7A9E+cMpLDBc1XhpAOA== - dependencies: - buffer "^6.0.3" - fast-fifo "^1.0.0" - get-iterator "^1.0.2" - p-defer "^3.0.0" - p-fifo "^1.0.0" - readable-stream "^3.6.0" - -jest-worker@^26.5.0: +jest-worker@^26.2.1: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== @@ -6596,25 +3944,24 @@ jest-worker@^26.5.0: merge-stream "^2.0.0" supports-color "^7.0.0" -jiti@^1.3.0, jiti@^1.6.4: - version "1.9.1" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.9.1.tgz#d9e267fa050ddc52191f17d8af815d49a38ebafd" - integrity sha512-AhYrAxJ/IW2257nHkJasUjtxHhmYIUEHEjsofJtGYsPWk8pTjqjbPFlJfOwfY+WX8YBiKHM1l0ViDC/mye2SWg== +jest-worker@^27.0.2, jest-worker@^27.0.6: + version "27.3.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.3.1.tgz#0def7feae5b8042be38479799aeb7b5facac24b2" + integrity sha512-ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^8.0.0" -jquery@^3.5.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" - integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== +jiti@^1.12.9: + version "1.12.9" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.12.9.tgz#2ce45b265cfc8dc91ebd70a5204807cf915291bc" + integrity sha512-TdcJywkQtcwLxogc4rSMAi479G2eDPzfW0fLySks7TPhgZZ4s/tM6stnzayIh3gS/db3zExWJyUx4cNWrwAmoQ== -js-cookie@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== - -js-sha3@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" - integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== +joycon@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf" + integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA== js-stringify@^1.0.2: version "1.0.2" @@ -6626,7 +3973,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.1, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4: +js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -6634,26 +3981,28 @@ js-yaml@^3.13.1, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.4: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= - -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -6676,23 +4025,6 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: dependencies: jsonify "~0.0.0" -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json-text-sequence@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/json-text-sequence/-/json-text-sequence-0.1.1.tgz#a72f217dc4afc4629fff5feb304dc1bd51a2f3d2" - integrity sha1-py8hfcSvxGKf/1/rME3BvVGi89I= - dependencies: - delimit-stream "0.1.0" - -json3@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" - integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== - json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -6700,13 +4032,18 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== dependencies: minimist "^1.2.5" +jsonc-parser@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" + integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== + jsonfile@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" @@ -6714,13 +4051,6 @@ jsonfile@^3.0.0: optionalDependencies: graceful-fs "^4.1.6" -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" @@ -6735,10 +4065,10 @@ jsonify@~0.0.0: resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM= -jsonpointer@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.1.0.tgz#501fb89986a2389765ba09e6053299ceb4f2c2cc" - integrity sha512-CXcRvMyTlnR53xMcKnuMzfCA5i/nfblTnnr74CZb6C4vG39eu6w51t7nKmU5MfLfbTgGItliNyjO/ciNPDqClg== +jsonpointer@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072" + integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg== jstransformer@1.0.0: version "1.0.0" @@ -6748,86 +4078,22 @@ jstransformer@1.0.0: is-promise "^2.0.0" promise "^7.0.1" -keypair@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/keypair/-/keypair-1.0.3.tgz#4314109d94052a0acfd6b885695026ad29529c80" - integrity sha512-0wjZ2z/SfZZq01+3/8jYLd8aEShSa+aat1zyPGQY3IuKoEAp6DJGvu2zt6snELrQU9jbCkIlCyNOD7RdQbHhkQ== - -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== - dependencies: - json-buffer "3.0.0" - -killable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" - integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg== - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - klona@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" - integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== + version "2.0.5" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== known-css-properties@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4" integrity sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ== -last-call-webpack-plugin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555" - integrity sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w== +lazystream@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638" + integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw== dependencies: - lodash "^4.17.5" - webpack-sources "^1.1.0" - -launch-editor-middleware@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/launch-editor-middleware/-/launch-editor-middleware-2.2.1.tgz#e14b07e6c7154b0a4b86a0fd345784e45804c157" - integrity sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg== - dependencies: - launch-editor "^2.2.1" - -launch-editor@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.2.1.tgz#871b5a3ee39d6680fcc26d37930b6eeda89db0ca" - integrity sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw== - dependencies: - chalk "^2.3.0" - shell-quote "^1.6.1" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= - dependencies: - invert-kv "^1.0.0" + readable-stream "^2.0.5" levn@^0.3.0, levn@~0.3.0: version "0.3.0" @@ -6845,47 +4111,35 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -libp2p-crypto@^0.19.0: - version "0.19.4" - resolved "https://registry.yarnpkg.com/libp2p-crypto/-/libp2p-crypto-0.19.4.tgz#90603a1318e903fbf142db3124ff3b2a1ba07ec7" - integrity sha512-8iUwiNlU/sFEtXQpxaehmXUQ5Fw6r52H7NH0d8ZSb8nKBbO6r8y8ft6f1to8A81SrFOVd4/zsjEzokpedDvRgw== +lilconfig@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA== + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +listhen@^0.2.4, listhen@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/listhen/-/listhen-0.2.5.tgz#3d1db85c705ef4d4e0224dad34c3d67aefca2749" + integrity sha512-7stTOFjeQHVkDqpPl0AtGdzXNu1XN5sE2Pi4mudeZ597c100OKvUpmPuv3MKemDScIWqmIbeUOeP3PBo0w49XQ== dependencies: - err-code "^3.0.1" - is-typedarray "^1.0.0" - iso-random-stream "^2.0.0" - keypair "^1.0.1" - multibase "^4.0.3" - multicodec "^3.0.1" - multihashes "^4.0.2" - multihashing-async "^2.1.2" - node-forge "^0.10.0" - pem-jwk "^2.0.0" - protobufjs "^6.10.2" - secp256k1 "^4.0.0" - uint8arrays "^2.1.4" - ursa-optional "^0.10.1" + clipboardy "^2.3.0" + colorette "^1.2.2" + defu "^5.0.0" + get-port-please "^2.1.0" + http-shutdown "^1.2.2" + open "^8.0.5" + selfsigned "^1.10.8" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" - integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== - -loader-runner@^4.1.0: +loader-runner@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== -loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0: +loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -6895,9 +4149,9 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4 json5 "^1.0.1" loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + version "2.0.2" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -6911,14 +4165,6 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - locate-path@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" @@ -6926,6 +4172,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== + lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -6941,26 +4192,31 @@ lodash.capitalize@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz#f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9" integrity sha1-+CbJtOKoUR2E46yinbBeGk87cqk= -lodash.clone@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" - integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= -lodash.clonedeep@^4.5.0: +lodash.difference@^4.5.0: version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" + integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= lodash.flatten@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= +lodash.isarguments@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" + integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + lodash.kebabcase@^4.0.0, lodash.kebabcase@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" @@ -6971,6 +4227,11 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" @@ -6991,68 +4252,34 @@ lodash.truncate@^4.4.2: resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.3.0, lodash@~4.17.10: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -loglevel@^1.6.8, loglevel@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" - integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== +log-symbols@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-5.0.0.tgz#7720d3c6a56c365e1f658916069ba18d941092ca" + integrity sha512-zBsSKauX7sM0kcqrf8VpMRPqcWzU6a/Wi7iEl0QlVSCiIZ4CctaLdfVdiZUn6q2/nenyt392qJqpw9FhNAwqxQ== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^1.0.0" long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -long@~3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" - integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= - -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= - -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" - -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^4.1.2: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -7060,101 +4287,32 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" - integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== +magic-string@^0.25.7: + version "0.25.7" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== dependencies: - pify "^3.0.0" + sourcemap-codec "^1.4.4" -make-dir@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" - -make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@^3.0.2, make-dir@^3.1.0, make-dir@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== dependencies: semver "^6.0.0" -map-age-cleaner@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -md5.js@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" - integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - mdn-data@2.0.14: version "2.0.14" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== -mdn-data@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" - integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -mem@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122" - integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA== - dependencies: - map-age-cleaner "^0.1.3" - mimic-fn "^3.1.0" - -memfs@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e" - integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q== +memfs@^3.2.2, memfs@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.3.0.tgz#4da2d1fc40a04b170a56622c7164c6be2c4cbef2" + integrity sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg== dependencies: fs-monkey "1.0.3" -memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - memory-fs@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" @@ -7163,25 +4321,6 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-options@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" - integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== - dependencies: - is-plain-obj "^2.1.0" - -merge-source-map@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" - integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw== - dependencies: - source-map "^0.6.1" - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -7197,31 +4336,7 @@ merge@^1.2.0: resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -micromatch@^4.0.2: +micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== @@ -7229,32 +4344,34 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" - integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" +mime-db@1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== -mime-db@1.47.0, "mime-db@>= 1.43.0 < 2": - version "1.47.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" - integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== - -mime-types@^2.1.12, mime-types@^2.1.19, mime-types@^2.1.27, mime-types@^2.1.28, mime-types@~2.1.17, mime-types@~2.1.24: - version "2.1.30" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" - integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== +mime-types@^2.1.27, mime-types@^2.1.31: + version "2.1.34" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: - mime-db "1.47.0" + mime-db "1.51.0" mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.3.1, mime@^2.4.4: +mime@^2.3.1, mime@^2.4.6, mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mime@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7" + integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A== + +mime@~2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== @@ -7264,36 +4381,14 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mimic-fn@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" - integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== - -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mini-css-extract-plugin@^1.3.4: - version "1.5.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.5.0.tgz#69bee3b273d2d4ee8649a2eb409514b7df744a27" - integrity sha512-SIbuLMv6jsk1FnLIU5OUG/+VMGUprEjM1+o2trOAx8i5KOKMrhyezb1dJ4Ugsykb8Jgq8/w5NEopy6escV9G7g== +mini-css-extract-plugin@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.4.tgz#c7e5d2d931dcf100ae50ae949ba757c506b54b0f" + integrity sha512-UJ+aNuFQaQaECu7AamlWOBLj2cJ6XSGU4zNiqXeZ7lZLe5VD0DoSPWFbWArXueo+6FZVbgHzpX9lUIaBIDLuYg== dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - webpack-sources "^1.1.0" + schema-utils "^3.1.0" -minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= - -minimatch@*, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@^3.0.4, minimatch@~3.0.2, minimatch@~3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -7310,28 +4405,7 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -7339,14 +4413,14 @@ minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: safe-buffer "^5.1.2" yallist "^3.0.0" -minipass@^3.0.0, minipass@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" - integrity sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== +minipass@^3.0.0: + version "3.1.5" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" + integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== dependencies: yallist "^4.0.0" -minizlib@^1.2.1: +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -7361,65 +4435,27 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: minimist "^1.2.5" -mkdirp@^1.0.3, mkdirp@^1.0.4: +mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment-timezone@^0.5.31: - version "0.5.33" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" - integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== - dependencies: - moment ">= 2.9.0" +mlly@^0.3.10, mlly@^0.3.13, mlly@^0.3.6: + version "0.3.13" + resolved "https://registry.yarnpkg.com/mlly/-/mlly-0.3.13.tgz#5433261f38ccebba6f72fabda863a4dfc84b16d8" + integrity sha512-EXpbSPqSQLR9NEdB25uoyIYLSUvAqDEI7wUeM1HwXHsPF5Gx7cP7kuby5Mz2LfCPxBrgMnbcyPhcTCJRTQ+uvA== -"moment@>= 2.9.0", moment@^2.19.2, moment@^2.29.0: - version "2.29.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" - integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== - -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= - dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" +mri@^1.1.6: + version "1.2.0" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" + integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== ms@2.0.0: version "2.0.0" @@ -7441,169 +4477,36 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multiaddr-to-uri@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/multiaddr-to-uri/-/multiaddr-to-uri-6.0.0.tgz#8f08a75c6eeb2370d5d24b77b8413e3f0fa9bcc0" - integrity sha512-OjpkVHOXEmIKMO8WChzzQ7aZQcSQX8squxmvtDbRpy7/QNmJ3Z7jv6qyD74C28QtaeNie8O8ngW2AkeiMmKP7A== - dependencies: - multiaddr "^8.0.0" - -multiaddr@^8.0.0: - version "8.1.2" - resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-8.1.2.tgz#74060ff8636ba1c01b2cf0ffd53950b852fa9b1f" - integrity sha512-r13IzW8+Sv9zab9Gt8RPMIN2WkptIPq99EpAzg4IbJ/zTELhiEwXWr9bAmEatSCI4j/LSA6ESJzvz95JZ+ZYXQ== - dependencies: - cids "^1.0.0" - class-is "^1.1.0" - dns-over-http-resolver "^1.0.0" - err-code "^2.0.3" - is-ip "^3.1.0" - multibase "^3.0.0" - uint8arrays "^1.1.0" - varint "^5.0.0" - -multibase@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/multibase/-/multibase-3.1.2.tgz#59314e1e2c35d018db38e4c20bb79026827f0f2f" - integrity sha512-bpklWHs70LO3smJUHOjcnzGceJJvn9ui0Vau6Za0B/GBepaXswmW8Ufea0uD9pROf/qCQ4N4lZ3sf3U+SNf0tw== - dependencies: - "@multiformats/base-x" "^4.0.1" - web-encoding "^1.0.6" - -multibase@^4.0.1, multibase@^4.0.2, multibase@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/multibase/-/multibase-4.0.4.tgz#55ef53e6acce223c5a09341a8a3a3d973871a577" - integrity sha512-8/JmrdSGzlw6KTgAJCOqUBSGd1V6186i/X8dDCGy/lbCKrQ+1QB6f3HE+wPr7Tpdj4U3gutaj9jG2rNX6UpiJg== - dependencies: - "@multiformats/base-x" "^4.0.1" - -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE= - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g== - dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" - -multicodec@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-2.1.3.tgz#b9850635ad4e2a285a933151b55b4a2294152a5d" - integrity sha512-0tOH2Gtio39uO41o+2xl9UhRkCWxU5ZmZSbFCh/OjGzkWJI8e6lkN/s4Mj1YfyWoBod+2+S3W+6wO6nhkwN8pA== - dependencies: - uint8arrays "1.1.0" - varint "^6.0.0" - -multicodec@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/multicodec/-/multicodec-3.0.1.tgz#94e043847ee11fcce92487609ac9010429a95e31" - integrity sha512-Y6j3wiPojvkF/z6KFIGt84KdJdP2oILEdzc/3YbD3qQ3EerhqtYlfsZTPPNVoCCxNZZdzIpCKrdYFSav17sIrQ== - dependencies: - uint8arrays "^2.1.3" - varint "^5.0.2" - -multihashes@^4.0.1, multihashes@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/multihashes/-/multihashes-4.0.2.tgz#d76aeac3a302a1bed9fe1ec964fb7a22fa662283" - integrity sha512-xpx++1iZr4ZQHjN1mcrXS6904R36LWLxX/CBifczjtmrtCXEX623DMWOF1eiNSg+pFpiZDFVBgou/4v6ayCHSQ== - dependencies: - multibase "^4.0.1" - uint8arrays "^2.1.3" - varint "^5.0.2" - -multihashing-async@^2.0.0, multihashing-async@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/multihashing-async/-/multihashing-async-2.1.2.tgz#9ed68f183bde70e0416b166bbc59a0c0623a0ede" - integrity sha512-FTPNnWWxwIK5dXXmTFhySSF8Fkdqf7vzqpV09+RWsmfUhrsL/b3Arg3+bRrBnXTtjxm3JRGI3wSAtQHL0QCxhQ== - dependencies: - blakejs "^1.1.0" - err-code "^3.0.0" - js-sha3 "^0.8.0" - multihashes "^4.0.1" - murmurhash3js-revisited "^3.0.0" - uint8arrays "^2.1.3" - -murmurhash3js-revisited@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/murmurhash3js-revisited/-/murmurhash3js-revisited-3.0.0.tgz#6bd36e25de8f73394222adc6e41fa3fac08a5869" - integrity sha512-/sF3ee6zvScXMb1XFJ8gDsSnY+X8PbOyjIuBhtgis10W2Jx4ZjIhikUCIF9c4gpJxVnQIsPAFrSwTCuAjicP6g== - -mustache@^2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" - integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== +murmurhash-es@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/murmurhash-es/-/murmurhash-es-0.1.1.tgz#e4d7943eed19b0c1b66f5bb071fce52c7a052782" + integrity sha512-IfA8KVe9dxv28F9KSJ8EpJP2jgO1br6xInnFaPDjQKosEfpTMAx8v1eGCUzOvcZDstadm3mdP95JILrYs0mNsg== mute-stream@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA= -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - -nan@^2.12.1, nan@^2.13.2, nan@^2.14.2: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== - -nanoid@^3.1.12, nanoid@^3.1.20, nanoid@^3.1.22: - version "3.1.22" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" - integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -native-abort-controller@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/native-abort-controller/-/native-abort-controller-1.0.3.tgz#35974a2e189c0d91399c8767a989a5bf058c1435" - integrity sha512-fd5LY5q06mHKZPD5FmMrn7Lkd2H018oBGKNOAdLpctBDEPFKsfJ1nX9ke+XRa8PEJJpjqrpQkGjq2IZ27QNmYA== - -native-fetch@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/native-fetch/-/native-fetch-3.0.0.tgz#06ccdd70e79e171c365c75117959cf4fe14a09bb" - integrity sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw== +nanoid@^3.1.22, nanoid@^3.1.30: + version "3.1.30" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -needle@^2.5.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" - integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== +needle@^2.2.1: + version "2.9.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" + integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" sax "^1.2.4" -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2: +neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -7618,130 +4521,52 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -no-case@^2.2.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" - integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== +node-fetch@^2.6.5: + version "2.6.6" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" + integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== dependencies: - lower-case "^1.1.1" + whatwg-url "^5.0.0" -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== +node-fetch@^3.0.0, node-fetch@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.1.0.tgz#714f4922dc270239487654eaeeab86b8206cb52e" + integrity sha512-QU0WbIfMUjd5+MUzQOYhenAazakV7Irh1SGkWCsRzBwvm4fAhzEUaHMJ6QLP7gWT6WO9/oH2zhKMMGMuIrDyKw== dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - -node-addon-api@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32" - integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA== - -node-fetch@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + data-uri-to-buffer "^4.0.0" + fetch-blob "^3.1.2" + formdata-polyfill "^4.0.10" node-forge@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== -node-gyp-build@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" - integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== +node-gyp-build@^4.2.2: + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== -node-html-parser@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-3.2.0.tgz#2b1b81297bc6387a868b227761b35e553d5bf92c" - integrity sha512-fXhiFFnccwoUW92VvDACbtg1Kv7Ky0Qj9Rv7ETWpczSFLW07JWM6zQ+d523kiHNpodQHlvDhtjK2T86AclzXzQ== - dependencies: - css-select "^3.1.2" - he "1.2.0" - -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - -node-object-hash@^1.2.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94" - integrity sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ== - -node-pre-gyp@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087" - integrity sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA== +node-pre-gyp@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz#df9ab7b68dd6498137717838e4f92a33fc9daa42" + integrity sha512-Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ== dependencies: detect-libc "^1.0.2" - mkdirp "^0.5.3" - needle "^2.5.0" + mkdirp "^0.5.1" + needle "^2.2.1" nopt "^4.0.1" npm-packlist "^1.1.6" npmlog "^4.0.2" rc "^1.2.7" rimraf "^2.6.1" semver "^5.3.0" - tar "^4.4.2" + tar "^4" -node-pre-gyp@^0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz#238fa540364784e5015dfcdba78da3937e18dbdc" - integrity sha512-4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.3" - needle "^2.5.0" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - -node-releases@^1.1.71: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== - -node-res@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/node-res/-/node-res-5.0.1.tgz#ffaa462e206509d66d0ba28a4daf1f032daa6460" - integrity sha512-YOleO9c7MAqoHC+Ccu2vzvV1fL6Ku49gShq3PIMKWHRgrMSih3XcwL05NbLBi6oU2J471gTBfdpVVxwT6Pfhxg== - dependencies: - destroy "^1.0.4" - etag "^1.8.1" - mime-types "^2.1.19" - on-finished "^2.3.0" - vary "^1.1.2" +node-releases@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== nopt@^4.0.1: version "4.0.3" @@ -7751,22 +4576,12 @@ nopt@^4.0.1: abbrev "1" osenv "^0.1.4" -normalize-package-data@^2.3.2: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.1" + abbrev "1" normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" @@ -7778,25 +4593,10 @@ normalize-range@^0.1.2: resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= -normalize-url@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" - integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= - dependencies: - object-assign "^4.0.1" - prepend-http "^1.0.0" - query-string "^4.1.0" - sort-keys "^1.0.0" - -normalize-url@^3.0.0, normalize-url@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" - integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== - -normalize-url@^4.1.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" - integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== npm-bundled@^1.0.1: version "1.1.2" @@ -7805,14 +4605,6 @@ npm-bundled@^1.0.1: dependencies: npm-normalize-package-bin "^1.0.1" -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - npm-normalize-package-bin@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" @@ -7834,13 +4626,6 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -7851,111 +4636,82 @@ npmlog@^4.0.2: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== +npmlog@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0" + integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw== dependencies: - boolbase "~1.0.0" + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^3.0.0" + set-blocking "^2.0.0" nth-check@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" - integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== + version "2.0.1" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w== dependencies: boolbase "^1.0.0" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -nuxt-start@^2.14.12: - version "2.15.4" - resolved "https://registry.yarnpkg.com/nuxt-start/-/nuxt-start-2.15.4.tgz#703c357088dd56c182dee9ee830e90294207689a" - integrity sha512-+S/AmrcGjaaPto/LvoHOY0ui71b5zfs0y6xveoVFLP+VPcysYb+sIfvWDeNxhW5VfsYp4O3N68ss+iFQN9Y4yg== - dependencies: - "@nuxt/cli" "2.15.4" - "@nuxt/config" "2.15.4" - "@nuxt/core" "2.15.4" - "@nuxt/server" "2.15.4" - "@nuxt/telemetry" "^1.3.3" - "@nuxt/utils" "2.15.4" - "@nuxt/vue-renderer" "2.15.4" - node-fetch "^2.6.1" - vue "^2.6.12" - vue-client-only "^2.0.0" - vue-meta "^2.4.0" - vue-no-ssr "^1.1.1" - vue-router "^3.5.1" - vuex "^3.6.2" +"nuxi@npm:nuxi-edge@3.0.0-27277498.850ef69": + version "3.0.0-27277498.850ef69" + resolved "https://registry.yarnpkg.com/nuxi-edge/-/nuxi-edge-3.0.0-27277498.850ef69.tgz#9341502a654b83f5d1005ffc50804cc0a6c49ffb" + integrity sha512-8UxtGkJ7DsOIP/o+ci1oTBRxjVbSLSbeQP/9S/NK5Noe+TQWnLUkDdtxTFY4FpQy7UDWxHzvn/KRkK5tq3ot4g== + optionalDependencies: + fsevents "~2.3.2" -nuxt@^2.14.12: - version "2.15.4" - resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.15.4.tgz#5e2b441acec7344a1124bb550904b5576c850cef" - integrity sha512-o11VE61EwLj05PBPUN5RlDpaFb7vKbg3d5c+gfLi0gLVMpLUmjksRVTLzE9Ie8MB/TEnipy5BkhxMNppy0FKVg== +nuxt3@^3.0.0-27277498.850ef69: + version "3.0.0-27277498.850ef69" + resolved "https://registry.yarnpkg.com/nuxt3/-/nuxt3-3.0.0-27277498.850ef69.tgz#73b9e6fa141bc1fab74d179fe829cf883dbb7290" + integrity sha512-SjI89zVFyaonDs5IZed2KHpZJsmILOiSsBoGJ75QkXtXmOyylb7/HDczXgiHQoe15Rz9774anJ79UVuky13Buw== dependencies: - "@nuxt/babel-preset-app" "2.15.4" - "@nuxt/builder" "2.15.4" - "@nuxt/cli" "2.15.4" - "@nuxt/components" "^2.1.4" - "@nuxt/config" "2.15.4" - "@nuxt/core" "2.15.4" - "@nuxt/generator" "2.15.4" - "@nuxt/loading-screen" "^2.0.3" - "@nuxt/opencollective" "^0.3.2" - "@nuxt/server" "2.15.4" - "@nuxt/telemetry" "^1.3.3" - "@nuxt/utils" "2.15.4" - "@nuxt/vue-app" "2.15.4" - "@nuxt/vue-renderer" "2.15.4" - "@nuxt/webpack" "2.15.4" + "@nuxt/design" "^0.1.5" + "@nuxt/kit" "npm:@nuxt/kit-edge@3.0.0-27277498.850ef69" + "@nuxt/nitro" "npm:@nuxt/nitro-edge@3.0.0-27277498.850ef69" + "@nuxt/vite-builder" "npm:@nuxt/vite-builder-edge@3.0.0-27277498.850ef69" + "@nuxt/webpack-builder" "npm:@nuxt/webpack-builder-edge@3.0.0-27277498.850ef69" + "@vue/reactivity" "^3.2.21" + "@vue/shared" "^3.2.21" + "@vueuse/head" "^0.6.0" + chokidar "^3.5.2" + consola "^2.15.3" + defu "^5.0.0" + globby "^11.0.4" + hash-sum "^2.0.0" + hookable "^5.0.0" + ignore "^5.1.9" + mlly "^0.3.13" + murmurhash-es "^0.1.1" + nuxi "npm:nuxi-edge@3.0.0-27277498.850ef69" + ohmyfetch "^0.4.6" + pathe "^0.2.0" + scule "^0.2.1" + ufo "^0.7.9" + unplugin "^0.2.20" + vue "^3.2.21" + vue-router "^4.0.12" object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-inspect@^1.9.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30" - integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA== - -object-is@^1.0.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.0, object.assign@^4.1.2: +object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== @@ -7965,49 +4721,32 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" - integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ== +object.values@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" + es-abstract "^1.19.1" -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= +ohmyfetch@^0.4.5, ohmyfetch@^0.4.6: + version "0.4.6" + resolved "https://registry.yarnpkg.com/ohmyfetch/-/ohmyfetch-0.4.6.tgz#790f561d36eed285bbd1d14b46b99b3aeecb89c1" + integrity sha512-1tICxOs83mBBOFUikYGmtxScRBuqoXDEt/PGkvTc6ZAA/11petRNeK3El+eQFmM2mOBUK0cVMzyEvBKQ+l5Nhg== dependencies: - isobject "^3.0.1" + destr "^1.1.0" + node-fetch "^3.0.0" + ufo "^0.7.9" + undici "^4.9.5" -object.values@^1.1.0, object.values@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" - integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - has "^1.0.3" - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@^2.3.0, on-finished@~2.3.0: +on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" -on-headers@^1.0.2, on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -8020,33 +4759,35 @@ onetime@^1.0.0: resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= -onetime@^5.1.0, onetime@^5.1.2: +onetime@^5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" -opener@1.5.2, opener@^1.5.2: +open@^7.4.2: + version "7.4.2" + resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + +open@^8.0.5: + version "8.4.0" + resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== + dependencies: + define-lazy-prop "^2.0.0" + is-docker "^2.1.1" + is-wsl "^2.2.0" + +opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A== -opn@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" - integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA== - dependencies: - is-wsl "^1.1.0" - -optimize-css-assets-webpack-plugin@^5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90" - integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A== - dependencies: - cssnano "^4.1.10" - last-call-webpack-plugin "^3.0.0" - optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -8071,36 +4812,27 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -optjs@~3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee" - integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4= - -original@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" - integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg== +ora@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ora/-/ora-6.0.1.tgz#68caa9fd6c485a40d6f46c50a3940fa3df99c7f3" + integrity sha512-TDdKkKHdWE6jo/6pIa5U5AWcSVfpNRFJ8sdRJpioGNVPLAzZzHs/N+QhUfF7ZbyoC+rnDuNTKzeDJUbAza9g4g== dependencies: - url-parse "^1.4.3" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + bl "^5.0.0" + chalk "^4.1.2" + cli-cursor "^4.0.0" + cli-spinners "^2.6.0" + is-interactive "^2.0.0" + is-unicode-supported "^1.1.0" + log-symbols "^5.0.0" + strip-ansi "^7.0.1" + wcwidth "^1.0.1" os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= - dependencies: - lcid "^1.0.0" - -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= @@ -8113,28 +4845,10 @@ osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== - -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - -p-defer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83" - integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw== - -p-fifo@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-fifo/-/p-fifo-1.0.0.tgz#e29d5cf17c239ba87f51dde98c1d26a9cfe20a63" - integrity sha512-IjoCxXW48tqdtDFz6fqo5q1UfFVjjVZe8TC1QRflvNUJtNfCUhxOUw6MOVZhDPjqhSzc26xKdugsO17gmzd5+A== - dependencies: - fast-fifo "^1.0.0" - p-defer "^3.0.0" +p-debounce@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-debounce/-/p-debounce-4.0.0.tgz#348e3f44489baa9435cc7d807f17b3bb2fb16b24" + integrity sha512-4Ispi9I9qYGO4lueiLDhe4q4iK5ERK8reLsuzH6BPaXn53EGaua8H66PXIFGrW897hwjXp+pVLrm/DLxN0RF0A== p-finally@^1.0.0: version "1.0.0" @@ -8148,20 +4862,13 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0, p-limit@^2.2.0: +p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" -p-limit@^3.0.2, p-limit@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -8169,13 +4876,6 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - p-locate@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" @@ -8183,25 +4883,11 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" -p-map@^2.0.0: +p-map@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-retry@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328" - integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w== - dependencies: - retry "^0.12.0" - p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" @@ -8212,35 +4898,6 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -pako@~1.0.5: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -parallel-transform@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" - integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== - dependencies: - cyclist "^1.0.1" - inherits "^2.0.3" - readable-stream "^2.1.5" - -param-case@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" - integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= - dependencies: - no-case "^2.2.0" - -param-case@^3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -8248,93 +4905,21 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.6" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" - integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== - dependencies: - asn1.js "^5.2.0" - browserify-aes "^1.0.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - safe-buffer "^5.1.1" - -parse-duration@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-0.4.4.tgz#11c0f51a689e97d06c57bd772f7fda7dc013243c" - integrity sha512-KbAJuYGUhZkB9gotDiKLnZ7Z3VTacK3fgwmDdB6ZVDtJbMBT6MfLga0WJaYpPDu0mzqT0NgHtHDt5PY4l0nidg== - -parse-git-config@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-3.0.0.tgz#4a2de08c7b74a2555efa5ae94d40cd44302a6132" - integrity sha512-wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA== - dependencies: - git-config-path "^2.0.0" - ini "^1.3.5" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - dependencies: - error-ex "^1.2.0" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: + "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" -parse-path@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.3.tgz#82d81ec3e071dcc4ab49aa9f2c9c0b8966bb22bf" - integrity sha512-9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA== - dependencies: - is-ssh "^1.3.0" - protocols "^1.4.0" - qs "^6.9.4" - query-string "^6.13.8" - -parse-url@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.2.tgz#856a3be1fcdf78dc93fc8b3791f169072d898b59" - integrity sha512-Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA== - dependencies: - is-ssh "^1.3.0" - normalize-url "^3.3.0" - parse-path "^4.0.0" - protocols "^1.4.0" - -parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -8350,7 +4935,7 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-is-inside@^1.0.1, path-is-inside@^1.0.2: +path-is-inside@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= @@ -8360,106 +4945,46 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== -pbkdf2@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" - integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== - dependencies: - create-hash "^1.1.2" - create-hmac "^1.1.4" - ripemd160 "^2.0.1" - safe-buffer "^5.0.1" - sha.js "^2.4.8" +pathe@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.2.0.tgz#30fd7bbe0a0d91f0e60bae621f5d19e9e225c339" + integrity sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw== -peer-id@^0.14.1: - version "0.14.8" - resolved "https://registry.yarnpkg.com/peer-id/-/peer-id-0.14.8.tgz#667c6bedc8ab313c81376f6aca0baa2140266fab" - integrity sha512-GpuLpob/9FrEFvyZrKKsISEkaBYsON2u0WtiawLHj1ii6ewkoeRiSDFLyIefYhw0jGvQoeoZS05jaT52X7Bvig== - dependencies: - cids "^1.1.5" - class-is "^1.1.0" - libp2p-crypto "^0.19.0" - minimist "^1.2.5" - multihashes "^4.0.2" - protobufjs "^6.10.2" - uint8arrays "^2.0.5" +picocolors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -pem-jwk@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pem-jwk/-/pem-jwk-2.0.0.tgz#1c5bb264612fc391340907f5c1de60c06d22f085" - integrity sha512-rFxu7rVoHgQ5H9YsP50dDWf0rHjreVA2z0yPiWr5WdH/UHb29hKtF7h6l8vNd1cbYR1t0QL+JKhW55a2ZV4KtA== - dependencies: - asn1.js "^5.0.1" +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" - integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== - -pify@^2.0.0, pify@^2.3.0: +pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - pify@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -8467,244 +4992,71 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== - dependencies: - find-up "^3.0.0" - -pkg-dir@^4.1.0, pkg-dir@^4.2.0: +pkg-dir@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== dependencies: find-up "^4.0.0" +pkg-types@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-0.3.1.tgz#d7a8b69efb8777a05afc5aabfc259a29a5d6d159" + integrity sha512-BjECNgz/tsyqg0/T4Z/U7WbFQXUT24nfkxPbALcrk/uHVeZf9MrGG4tfvYtu+jsrHCFMseLQ6woQddDEBATw3A== + dependencies: + jsonc-parser "^3.0.0" + mlly "^0.3.6" + pathe "^0.2.0" + pluralize@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45" integrity sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU= -pnp-webpack-plugin@^1.6.4: - version "1.6.4" - resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" - integrity sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg== +postcss-calc@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== dependencies: - ts-pnp "^1.1.6" - -popper.js@^1.16.1: - version "1.16.1" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" - integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== - -portal-vue@^2.1.7: - version "2.1.7" - resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4" - integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g== - -portfinder@^1.0.26: - version "1.0.28" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778" - integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA== - dependencies: - async "^2.6.2" - debug "^3.1.1" - mkdirp "^0.5.5" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -postcss-attribute-case-insensitive@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880" - integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^6.0.2" - -postcss-calc@^7.0.1: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" - integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== - dependencies: - postcss "^7.0.27" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -postcss-color-functional-notation@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0" - integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g== +postcss-colormin@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" + integrity sha512-VVwMrEYLcHYePUYV99Ymuoi7WhKrMGy/V9/kTS0DkCoJYmmjdOMneyhzYUxcNgteKDVbrewOkSM7Wje/MFwxzA== dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" + browserslist "^4.16.6" + caniuse-api "^3.0.0" + colord "^2.9.1" + postcss-value-parser "^4.1.0" -postcss-color-gray@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547" - integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw== +postcss-convert-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + integrity sha512-KQ04E2yadmfa1LqXm7UIDwW1ftxU/QWZmz6NKnHnUvJ3LEYbbcX6i329f/ig+WnEByHegulocXrECaZGLpL8Zg== dependencies: - "@csstools/convert-colors" "^1.4.0" - postcss "^7.0.5" - postcss-values-parser "^2.0.0" + postcss-value-parser "^4.1.0" -postcss-color-hex-alpha@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388" - integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw== - dependencies: - postcss "^7.0.14" - postcss-values-parser "^2.0.1" +postcss-discard-comments@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== -postcss-color-mod-function@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d" - integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ== - dependencies: - "@csstools/convert-colors" "^1.4.0" - postcss "^7.0.2" - postcss-values-parser "^2.0.0" +postcss-discard-duplicates@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== -postcss-color-rebeccapurple@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77" - integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" +postcss-discard-empty@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== -postcss-colormin@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" - integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== - dependencies: - browserslist "^4.0.0" - color "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-convert-values@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" - integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== - dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-custom-media@^7.0.8: - version "7.0.8" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c" - integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg== - dependencies: - postcss "^7.0.14" - -postcss-custom-properties@^8.0.11: - version "8.0.11" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97" - integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA== - dependencies: - postcss "^7.0.17" - postcss-values-parser "^2.0.1" - -postcss-custom-selectors@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba" - integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^5.0.0-rc.3" - -postcss-dir-pseudo-class@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2" - integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^5.0.0-rc.3" - -postcss-discard-comments@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" - integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== - dependencies: - postcss "^7.0.0" - -postcss-discard-duplicates@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" - integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== - dependencies: - postcss "^7.0.0" - -postcss-discard-empty@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" - integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== - dependencies: - postcss "^7.0.0" - -postcss-discard-overridden@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" - integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== - dependencies: - postcss "^7.0.0" - -postcss-double-position-gradients@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e" - integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA== - dependencies: - postcss "^7.0.5" - postcss-values-parser "^2.0.0" - -postcss-env-function@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7" - integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-focus-visible@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e" - integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g== - dependencies: - postcss "^7.0.2" - -postcss-focus-within@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680" - integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w== - dependencies: - postcss "^7.0.2" - -postcss-font-variant@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641" - integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA== - dependencies: - postcss "^7.0.2" - -postcss-gap-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715" - integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg== - dependencies: - postcss "^7.0.2" - -postcss-image-set-function@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288" - integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" +postcss-discard-overridden@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== postcss-import-resolver@^2.0.0: version "2.0.0" @@ -8713,148 +5065,84 @@ postcss-import-resolver@^2.0.0: dependencies: enhanced-resolve "^4.1.1" -postcss-import@^12.0.1: - version "12.0.1" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153" - integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw== +postcss-import@^14.0.2: + version "14.0.2" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + integrity sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g== dependencies: - postcss "^7.0.1" - postcss-value-parser "^3.2.3" + postcss-value-parser "^4.0.0" read-cache "^1.0.0" resolve "^1.1.7" -postcss-initial@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53" - integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg== +postcss-loader@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.0.tgz#714370a3f567141cf4cadcdf9575f5234d186bc5" + integrity sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA== dependencies: - postcss "^7.0.2" + cosmiconfig "^7.0.0" + klona "^2.0.4" + semver "^7.3.5" -postcss-lab-function@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e" - integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg== +postcss-merge-longhand@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.3.tgz#42194a5ffbaa5513edbf606ef79c44958564658b" + integrity sha512-kmB+1TjMTj/bPw6MCDUiqSA5e/x4fvLffiAdthra3a0m2/IjTrWsTmD3FdSskzUjEwkj5ZHBDEbv5dOcqD7CMQ== dependencies: - "@csstools/convert-colors" "^1.4.0" - postcss "^7.0.2" - postcss-values-parser "^2.0.0" + css-color-names "^1.0.1" + postcss-value-parser "^4.1.0" + stylehacks "^5.0.1" -postcss-load-config@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz#c5ea504f2c4aef33c7359a34de3573772ad7502a" - integrity sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw== +postcss-merge-rules@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" + integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== dependencies: - cosmiconfig "^5.0.0" - import-cwd "^2.0.0" - -postcss-loader@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" - integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== - dependencies: - loader-utils "^1.1.0" - postcss "^7.0.0" - postcss-load-config "^2.0.0" - schema-utils "^1.0.0" - -postcss-logical@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5" - integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA== - dependencies: - postcss "^7.0.2" - -postcss-media-minmax@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5" - integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw== - dependencies: - postcss "^7.0.2" - -postcss-merge-longhand@^4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" - integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== - dependencies: - css-color-names "0.0.4" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - stylehacks "^4.0.0" - -postcss-merge-rules@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" - integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== - dependencies: - browserslist "^4.0.0" + browserslist "^4.16.6" caniuse-api "^3.0.0" - cssnano-util-same-parent "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - vendors "^1.0.0" + cssnano-utils "^2.0.1" + postcss-selector-parser "^6.0.5" + vendors "^1.0.3" -postcss-minify-font-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" - integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== +postcss-minify-font-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-minify-gradients@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" - integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== +postcss-minify-gradients@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e" + integrity sha512-Z91Ol22nB6XJW+5oe31+YxRsYooxOdFKcbOqY/V8Fxse1Y3vqlNRpi1cxCqoACZTQEhl+xvt4hsbWiV5R+XI9Q== dependencies: - cssnano-util-get-arguments "^4.0.0" - is-color-stop "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + colord "^2.9.1" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-minify-params@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" - integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== +postcss-minify-params@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" + integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== dependencies: - alphanum-sort "^1.0.0" - browserslist "^4.0.0" - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + alphanum-sort "^1.0.2" + browserslist "^4.16.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" uniqs "^2.0.0" -postcss-minify-selectors@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" - integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== +postcss-minify-selectors@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== dependencies: - alphanum-sort "^1.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - -postcss-modules-extract-imports@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e" - integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ== - dependencies: - postcss "^7.0.5" + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz#bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0" - integrity sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw== - dependencies: - icss-utils "^4.1.1" - postcss "^7.0.32" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - postcss-modules-local-by-default@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" @@ -8864,14 +5152,6 @@ postcss-modules-local-by-default@^4.0.0: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz#385cae013cc7743f5a7d7602d1073a89eaae62ee" - integrity sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ== - dependencies: - postcss "^7.0.6" - postcss-selector-parser "^6.0.0" - postcss-modules-scope@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" @@ -8879,14 +5159,6 @@ postcss-modules-scope@^3.0.0: dependencies: postcss-selector-parser "^6.0.4" -postcss-modules-values@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10" - integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg== - dependencies: - icss-utils "^4.0.0" - postcss "^7.0.6" - postcss-modules-values@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" @@ -8894,310 +5166,145 @@ postcss-modules-values@^4.0.0: dependencies: icss-utils "^5.0.0" -postcss-nesting@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052" - integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg== - dependencies: - postcss "^7.0.2" +postcss-normalize-charset@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== -postcss-normalize-charset@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" - integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== +postcss-normalize-display-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== dependencies: - postcss "^7.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-display-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" - integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== +postcss-normalize-positions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" + integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-normalize-positions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" - integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== +postcss-normalize-repeat-style@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== dependencies: - cssnano-util-get-arguments "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-repeat-style@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" - integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== +postcss-normalize-string@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== dependencies: - cssnano-util-get-arguments "^4.0.0" - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-normalize-string@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" - integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== +postcss-normalize-timing-functions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== dependencies: - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-timing-functions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" - integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== +postcss-normalize-unicode@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + browserslist "^4.16.0" + postcss-value-parser "^4.1.0" -postcss-normalize-unicode@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" - integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== +postcss-normalize-url@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" + integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + is-absolute-url "^3.0.3" + normalize-url "^6.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-url@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" - integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== +postcss-normalize-whitespace@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== dependencies: - is-absolute-url "^2.0.0" - normalize-url "^3.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-normalize-whitespace@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" - integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== +postcss-ordered-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-ordered-values@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" - integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== +postcss-reduce-initial@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" + integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== dependencies: - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - -postcss-overflow-shorthand@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30" - integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g== - dependencies: - postcss "^7.0.2" - -postcss-page-break@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf" - integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ== - dependencies: - postcss "^7.0.2" - -postcss-place@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62" - integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg== - dependencies: - postcss "^7.0.2" - postcss-values-parser "^2.0.0" - -postcss-preset-env@^6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5" - integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg== - dependencies: - autoprefixer "^9.6.1" - browserslist "^4.6.4" - caniuse-lite "^1.0.30000981" - css-blank-pseudo "^0.1.4" - css-has-pseudo "^0.10.0" - css-prefers-color-scheme "^3.1.1" - cssdb "^4.4.0" - postcss "^7.0.17" - postcss-attribute-case-insensitive "^4.0.1" - postcss-color-functional-notation "^2.0.1" - postcss-color-gray "^5.0.0" - postcss-color-hex-alpha "^5.0.3" - postcss-color-mod-function "^3.0.3" - postcss-color-rebeccapurple "^4.0.1" - postcss-custom-media "^7.0.8" - postcss-custom-properties "^8.0.11" - postcss-custom-selectors "^5.1.2" - postcss-dir-pseudo-class "^5.0.0" - postcss-double-position-gradients "^1.0.0" - postcss-env-function "^2.0.2" - postcss-focus-visible "^4.0.0" - postcss-focus-within "^3.0.0" - postcss-font-variant "^4.0.0" - postcss-gap-properties "^2.0.0" - postcss-image-set-function "^3.0.1" - postcss-initial "^3.0.0" - postcss-lab-function "^2.0.1" - postcss-logical "^3.0.0" - postcss-media-minmax "^4.0.0" - postcss-nesting "^7.0.0" - postcss-overflow-shorthand "^2.0.0" - postcss-page-break "^2.0.0" - postcss-place "^4.0.1" - postcss-pseudo-class-any-link "^6.0.0" - postcss-replace-overflow-wrap "^3.0.0" - postcss-selector-matches "^4.0.0" - postcss-selector-not "^4.0.0" - -postcss-pseudo-class-any-link@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1" - integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew== - dependencies: - postcss "^7.0.2" - postcss-selector-parser "^5.0.0-rc.3" - -postcss-reduce-initial@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" - integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== - dependencies: - browserslist "^4.0.0" + browserslist "^4.16.0" caniuse-api "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" -postcss-reduce-transforms@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" - integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== +postcss-reduce-transforms@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== dependencies: - cssnano-util-get-match "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-replace-overflow-wrap@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c" - integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw== - dependencies: - postcss "^7.0.2" - -postcss-selector-matches@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff" - integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww== - dependencies: - balanced-match "^1.0.0" - postcss "^7.0.2" - -postcss-selector-not@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf" - integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ== - dependencies: - balanced-match "^1.0.0" - postcss "^7.0.2" - -postcss-selector-parser@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" - integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA== - dependencies: - dot-prop "^5.2.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: - version "5.0.0" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c" - integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ== - dependencies: - cssesc "^2.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.5" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4" - integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg== +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" - integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== +postcss-svgo@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + integrity sha512-41XZUA1wNDAZrQ3XgWREL/M2zSw8LJPvb5ZWivljBsUQAGoEKMYm6okHsTjJxKYI4M75RQEH4KYlEM52VwdXVA== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - svgo "^1.0.0" + postcss-value-parser "^4.1.0" + svgo "^2.7.0" -postcss-unique-selectors@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" - integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== +postcss-unique-selectors@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" + integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== dependencies: - alphanum-sort "^1.0.0" - postcss "^7.0.0" + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" uniqs "^2.0.0" -postcss-url@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca" - integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw== +postcss-url@^10.1.3: + version "10.1.3" + resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e" + integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw== dependencies: - mime "^2.3.1" - minimatch "^3.0.4" - mkdirp "^0.5.0" - postcss "^7.0.2" - xxhashjs "^0.2.1" + make-dir "~3.1.0" + mime "~2.5.2" + minimatch "~3.0.4" + xxhashjs "~0.2.2" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3: - version "3.3.1" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" - integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== - -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f" - integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg== +postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.3.8: + version "8.3.11" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" + integrity sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA== dependencies: - flatten "^1.0.2" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.35" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" - integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^8.2.10: - version "8.2.13" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" - integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== - dependencies: - colorette "^1.2.2" - nanoid "^3.1.22" - source-map "^0.6.1" + nanoid "^3.1.30" + picocolors "^1.0.0" + source-map-js "^0.6.2" prelude-ls@^1.2.1: version "1.2.1" @@ -9209,39 +5316,21 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prepend-http@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= - -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= - -prettier@^1.18.2: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== - pretty-bytes@^5.6.0: version "5.6.0" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== -pretty-error@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6" - integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw== - dependencies: - lodash "^4.17.20" - renderkid "^2.0.4" - pretty-time@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA== +printj@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== + process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" @@ -9257,16 +5346,11 @@ progress@^1.1.8: resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= -progress@^2.0.0, progress@^2.0.3: +progress@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= - promise@^7.0.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -9274,34 +5358,10 @@ promise@^7.0.1: dependencies: asap "~2.0.3" -proper-lockfile@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" - integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== - dependencies: - graceful-fs "^4.2.4" - retry "^0.12.0" - signal-exit "^3.0.2" - -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= - -protobufjs@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" - integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== - dependencies: - ascli "~1" - bytebuffer "~5" - glob "^7.0.5" - yargs "^3.10.0" - -protobufjs@^6.10.2: - version "6.10.2" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b" - integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ== +protobufjs@^6.10.0: + version "6.11.2" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" + integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" @@ -9314,59 +5374,14 @@ protobufjs@^6.10.2: "@protobufjs/pool" "^1.1.0" "@protobufjs/utf8" "^1.1.0" "@types/long" "^4.0.1" - "@types/node" "^13.7.0" + "@types/node" ">=13.7.0" long "^4.0.0" -protocol-buffers-schema@^3.3.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz#8388e768d383ac8cbea23e1280dfadb79f4122ad" - integrity sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw== - -protocols@^1.1.0, protocols@^1.4.0: - version "1.4.8" - resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.8.tgz#48eea2d8f58d9644a4a32caae5d5db290a075ce8" - integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg== - -protons@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/protons/-/protons-2.0.1.tgz#bfee5123c100001dcf56ab8f71b1b36f2e8289f1" - integrity sha512-FlmPorLEeCEDPu+uIn0Qardgiy5XqVA4IyNTz9wb9c0e2U7BEXdRcIbx64r09o4Abtf+4B7mkTtMbsIXMxZzKw== - dependencies: - protocol-buffers-schema "^3.3.1" - signed-varint "^2.0.1" - uint8arrays "^2.1.3" - varint "^5.0.0" - -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.9.1" - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -public-encrypt@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" - integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - safe-buffer "^5.1.2" - pug-attrs@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-3.0.0.tgz#b10451e0348165e31fad1cc23ebddd9dc7347c41" @@ -9463,7 +5478,7 @@ pug-walk@^2.0.0: resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-2.0.0.tgz#417aabc29232bb4499b5b5069a2b2d2a24d5f5fe" integrity sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ== -pug@^3.0.0: +pug@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/pug/-/pug-3.0.2.tgz#f35c7107343454e43bc27ae0ff76c731b78ea535" integrity sha512-bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw== @@ -9477,14 +5492,6 @@ pug@^3.0.0: pug-runtime "^3.0.1" pug-strip-comments "^2.0.0" -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - pump@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" @@ -9493,120 +5500,33 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - -punycode@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -qs@^6.9.4: - version "6.10.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" - integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== - dependencies: - side-channel "^1.0.4" - -query-string@^4.1.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - -query-string@^6.13.8: - version "6.14.1" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a" - integrity sha512-XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw== - dependencies: - decode-uri-component "^0.2.0" - filter-obj "^1.1.0" - split-on-first "^1.0.0" - strict-uri-encode "^2.0.0" - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - querystring@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd" integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg== -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0: +randombytes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== dependencies: safe-buffer "^5.1.0" -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - rc9@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/rc9/-/rc9-1.2.0.tgz#ef098181fdde714efc4c426383d6e46c14b1254a" @@ -9633,24 +5553,7 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.2.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -9663,7 +5566,7 @@ read-pkg@^2.0.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -9672,19 +5575,17 @@ readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" -readdirp@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== +readdir-glob@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" + integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" + minimatch "^3.0.4" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -9697,119 +5598,27 @@ readline2@^1.0.1: is-fullwidth-code-point "^1.0.0" mute-stream "0.0.5" -receptacle@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/receptacle/-/receptacle-1.3.2.tgz#a7994c7efafc7a01d0e2041839dab6c4951360d2" - integrity sha512-HrsFvqZZheusncQRiEE7GatOAETrARKV/lnfYicIm8lbvp/JQOdADOfhjBd2DajvoszEyxSM6RlAAIZgEoeu/A== +redis-commands@1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89" + integrity sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ== + +redis-errors@^1.0.0, redis-errors@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/redis-errors/-/redis-errors-1.2.0.tgz#eb62d2adb15e4eaf4610c04afe1529384250abad" + integrity sha1-62LSrbFeTq9GEMBK/hUpOEJQq60= + +redis-parser@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-3.0.0.tgz#b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4" + integrity sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ= dependencies: - ms "^2.1.1" + redis-errors "^1.0.0" -rechoir@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" - integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q== - dependencies: - resolve "^1.9.0" - -regenerate-unicode-properties@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" - integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA== - dependencies: - regenerate "^1.4.0" - -regenerate@^1.4.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== - -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== - dependencies: - "@babel/runtime" "^7.8.4" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexp.prototype.flags@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -regexpp@^3.0.0, regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== - -regexpu-core@^4.7.1: - version "4.7.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6" - integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.2.0" - regjsgen "^0.5.1" - regjsparser "^0.6.4" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.2.0" - -regjsgen@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== - -regjsparser@^0.6.4: - version "0.6.9" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" - integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== - dependencies: - jsesc "~0.5.0" - -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -renderkid@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5" - integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ== - dependencies: - css-select "^2.0.2" - dom-converter "^0.2" - htmlparser2 "^3.10.1" - lodash "^4.17.20" - strip-ansi "^3.0.0" - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= +regexpp@^3.0.0, regexpp@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== require-directory@^2.1.1: version "2.1.1" @@ -9821,11 +5630,6 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - require-uncached@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" @@ -9839,35 +5643,11 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -reset@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/reset/-/reset-0.1.0.tgz#9fc7314171995ae6cb0b7e58b06ce7522af4bafb" - integrity sha1-n8cxQXGZWubLC35YsGznUir0uvs= - -resolve-cwd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" - integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo= - dependencies: - resolve-from "^3.0.0" - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY= -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -9878,12 +5658,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.2.0, resolve@^1.9.0: +resolve@^1.1.7, resolve@^1.10.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.2.0, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -9891,13 +5666,6 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13 is-core-module "^2.2.0" path-parse "^1.0.6" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= - dependencies: - lowercase-keys "^1.0.0" - restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -9906,45 +5674,20 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== dependencies: onetime "^5.1.0" signal-exit "^3.0.2" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - -retimer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz#e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca" - integrity sha512-KLXY85WkEq2V2bKex/LOO1ViXVn2KGYe4PYysAdYdjmraYIUsVkXu8O4am+8+5UbaaGl1qho4aqAAPHNQ4GSbg== - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rgb-regex@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" - integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= - -rgba-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" - integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= - -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.6.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -9965,25 +5708,39 @@ rimraf@~2.6.2: dependencies: glob "^7.1.3" -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" - integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== +rollup-plugin-terser@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" + integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" + "@babel/code-frame" "^7.10.4" + jest-worker "^26.2.1" + serialize-javascript "^4.0.0" + terser "^5.0.0" -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== +rollup-plugin-visualizer@^5.5.2: + version "5.5.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.5.2.tgz#ae2130ee5ae4a2d901e764e492b71357cb95eed7" + integrity sha512-sh+P9KhuWTzeStyRA5yNZpoEFGuj5Ph34JLMa9+muhU8CneFf9L0XE4fmAwAojJLWp//uLUEyytBPSCdZEg5AA== dependencies: - boolean "^3.0.1" - detect-node "^2.0.4" - globalthis "^1.0.1" - json-stringify-safe "^5.0.1" - semver-compare "^1.0.0" - sprintf-js "^1.1.2" + nanoid "^3.1.22" + open "^7.4.2" + source-map "^0.7.3" + yargs "^16.2.0" + +rollup-pluginutils@^2.8.2: + version "2.8.2" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" + integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== + dependencies: + estree-walker "^0.6.1" + +rollup@^2.57.0, rollup@^2.59.0: + version "2.60.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.60.0.tgz#4ee60ab7bdd0356763f87d7099f413e5460fc193" + integrity sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ== + optionalDependencies: + fsevents "~2.3.2" run-async@^0.1.0: version "0.1.0" @@ -9992,11 +5749,6 @@ run-async@^0.1.0: dependencies: once "^1.3.0" -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -10004,50 +5756,22 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -run-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= - dependencies: - aproba "^1.1.1" - -run@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/run/-/run-1.4.0.tgz#e17d9e9043ab2fe17776cb299e1237f38f0b4ffa" - integrity sha1-4X2ekEOrL+F3dsspnhI3848LT/o= - dependencies: - minimatch "*" - rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI= -rxjs@^6.6.0: - version "6.6.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" - integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== - dependencies: - tslib "^1.9.0" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0: +"safer-buffer@>= 2.1.2 < 3": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -10072,39 +5796,27 @@ sass-lint@^1.13.1: path-is-absolute "^1.0.0" util "^0.10.3" -sass-loader@^10.1.1: - version "10.1.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" - integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== +sass-loader@^12.3.0: + version "12.3.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.3.0.tgz#93278981c189c36a58cbfc37d4b9cef0cdc02871" + integrity sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA== dependencies: klona "^2.0.4" - loader-utils "^2.0.0" neo-async "^2.6.2" - schema-utils "^3.0.0" - semver "^7.3.2" -sass@^1.32.4: - version "1.32.11" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.11.tgz#b236b3ea55c76602c2ef2bd0445f0db581baa218" - integrity sha512-O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw== +sass@^1.43.4: + version "1.43.4" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.43.4.tgz#68c7d6a1b004bef49af0d9caf750e9b252105d1f" + integrity sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg== dependencies: chokidar ">=3.0.0 <4.0.0" -sax@^1.2.4, sax@~1.2.4: +sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - -schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.1: +schema-utils@^2.6.5: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -10113,12 +5825,12 @@ schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.1: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== +schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -10127,48 +5839,24 @@ scule@^0.2.1: resolved "https://registry.yarnpkg.com/scule/-/scule-0.2.1.tgz#0c1dc847b18e07219ae9a3832f2f83224e2079dc" integrity sha512-M9gnWtn3J0W+UhJOHmBxBTwv8mZCan5i1Himp60t6vvZcor0wr+IM0URKmIglsWJ7bRujNAVVN77fp+uZaWoKg== -secp256k1@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.2.tgz#15dd57d0f0b9fdb54ac1fa1694f40e5e9a54f4a1" - integrity sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg== - dependencies: - elliptic "^6.5.2" - node-addon-api "^2.0.0" - node-gyp-build "^4.2.0" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= - selfsigned@^1.10.8: - version "1.10.8" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" - integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== + version "1.10.11" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" + integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== dependencies: node-forge "^0.10.0" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: +semver@^5.3.0, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: +semver@^6.0.0, semver@^6.1.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: +semver@^7.2.1, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -10194,13 +5882,6 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - serialize-javascript@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea" @@ -10215,34 +5896,21 @@ serialize-javascript@^4.0.0: dependencies: randombytes "^2.1.0" -serialize-javascript@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== +serialize-javascript@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== dependencies: randombytes "^2.1.0" -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= +serve-placeholder@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/serve-placeholder/-/serve-placeholder-1.2.4.tgz#513eac9c435272c7fe9a86612c852ae9b1467fd4" + integrity sha512-jWD9cZXLcr4vHTTL5KEPIUBUYyOWN/z6v/tn0l6XxFhi9iqV3Fc5Y1aFeduUyz+cx8sALzGCUczkPfeOlrq9jg== dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" + defu "^5.0.0" -serve-placeholder@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/serve-placeholder/-/serve-placeholder-1.2.3.tgz#d2e778c6fedfe6e6ca48aff0b4627bbe2c4aa2ca" - integrity sha512-DC7t66WeIrlVzVMzickfHIn1zHu7eMsVNiH0nkD/wCrijFQdvgyfH2zc5lkFf79EApUgRhZntkpKjfgLkn2i/Q== - dependencies: - defu "^3.2.2" - -serve-static@1.14.1, serve-static@^1.14.1: +serve-static@^1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== @@ -10252,56 +5920,16 @@ serve-static@1.14.1, serve-static@^1.14.1: parseurl "~1.3.3" send "0.17.1" -server-destroy@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" - integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0= - set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - setprototypeof@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.11" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -10326,21 +5954,11 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shell-quote@^1.6.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" - integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== - shelljs@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8" integrity sha1-7GIRvtGSBEIIj+D3Cyg3Iy7SyKg= -shvl@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/shvl/-/shvl-2.0.3.tgz#eb4bd37644f5684bba1fc52c3010c96fb5e6afd1" - integrity sha512-V7C6S9Hlol6SzOJPnQ7qzOVEWUQImt3BNmmzh40wObhla3XOYMe4gGiYzLrJd5TFa+cI2f9LKIRJTTKZSTbWgw== - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -10350,31 +5968,17 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -signed-varint@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/signed-varint/-/signed-varint-2.0.1.tgz#50a9989da7c98c2c61dad119bc97470ef8528129" - integrity sha1-UKmYnafJjCxh2tEZvJdHDvhSgSk= - dependencies: - varint "~5.0.0" - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.5" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" + integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== sirv@^1.0.7: - version "1.0.11" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.11.tgz#81c19a29202048507d6ec0d8ba8910fda52eb5a4" - integrity sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg== + version "1.0.18" + resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.18.tgz#105fab52fb656ce8a2bebbf36b11052005952899" + integrity sha512-f2AOPogZmXgJ9Ma2M22ZEhc1dNtRIzcEkiflMFeVTRq+OViOZMvH1IPMVOwrKaxpSaHioBJiDR0SluRqGa7atA== dependencies: - "@polka/url" "^1.0.0-next.9" + "@polka/url" "^1.0.0-next.20" mime "^2.3.1" totalist "^1.0.0" @@ -10397,111 +6001,35 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -sockjs-client@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6" - integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ== - dependencies: - debug "^3.2.6" - eventsource "^1.0.7" - faye-websocket "^0.11.3" - inherits "^2.0.4" - json3 "^3.3.3" - url-parse "^1.5.1" - -sockjs@^0.3.21: - version "0.3.21" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" - integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== - dependencies: - faye-websocket "^0.11.3" - uuid "^3.4.0" - websocket-driver "^0.7.4" - -sort-keys@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" - integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= - dependencies: - is-plain-obj "^1.0.0" - -sort-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" - integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - dependencies: - is-plain-obj "^1.0.0" - -source-list-map@^2.0.0: +source-list-map@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== -source-map-support@~0.5.12, source-map-support@~0.5.19: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== +source-map-support@~0.5.20: + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - source-map@0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" integrity sha1-dc449SvwczxafwwRjYEzSiu19BI= -source-map@^0.5.0, source-map@^0.5.6: +source-map@^0.5.0: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: +source-map@^0.6.0, source-map@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== @@ -10511,174 +6039,40 @@ source-map@^0.7.3, source-map@~0.7.2: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -split-on-first@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f" - integrity sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw== - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== +sourcemap-codec@^1.4.4: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== - dependencies: - figgy-pudding "^3.5.1" - -ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== -stack-trace@0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - stackframe@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" +standard-as-callback@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45" + integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A== -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -std-env@^2.2.1, std-env@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-2.3.0.tgz#66d4a4a4d5224242ed8e43f5d65cfa9095216eee" - integrity sha512-4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw== - dependencies: - ci-info "^3.0.0" - -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-each@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" - integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== - -stream-to-it@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/stream-to-it/-/stream-to-it-0.2.3.tgz#b9320ceb26a51b313de81036d4354d9b657f4d2d" - integrity sha512-xaK9EjPtLox5rrC7YLSBXSanTtUJN/lzJlMFvy9VaROmnyvy0U/X6m2uMhXPJRn3g3M9uOSIzTszW7BPiWSg9w== - dependencies: - get-iterator "^1.0.2" - -strict-uri-encode@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" - integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= - -strict-uri-encode@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546" - integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY= +std-env@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + integrity sha512-mC1Ps9l77/97qeOZc+HrOL7TIaOboHqMZ24dGVQrlxFcpPpfCHpH+qfUT7Dz+6mlG8+JPA1KfBQo19iC/+Ngcw== string-width@^1.0.1: version "1.0.2" @@ -10689,7 +6083,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0: +"string-width@^1.0.1 || ^2.0.0", string-width@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -10697,23 +6091,14 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0, string-width@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" - integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" string.prototype.trimend@^1.0.4: version "1.0.4" @@ -10731,7 +6116,7 @@ string.prototype.trimstart@^1.0.4: call-bind "^1.0.2" define-properties "^1.1.3" -string_decoder@^1.0.0, string_decoder@^1.1.1: +string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== @@ -10752,26 +6137,26 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1: dependencies: ansi-regex "^2.0.0" -strip-ansi@^4.0.0: +"strip-ansi@^3.0.1 || ^4.0.0", strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: - ansi-regex "^4.1.0" + ansi-regex "^5.0.1" -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== +strip-ansi@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== dependencies: - ansi-regex "^5.0.0" + ansi-regex "^6.0.1" strip-bom@^3.0.0: version "3.0.0" @@ -10783,11 +6168,6 @@ strip-eof@^1.0.0: resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -10812,21 +6192,13 @@ style-resources-loader@^1.4.1: loader-utils "^2.0.0" schema-utils "^3.0.0" -stylehacks@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" - integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== +stylehacks@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" + browserslist "^4.16.0" + postcss-selector-parser "^6.0.4" supports-color@^2.0.0: version "2.0.0" @@ -10840,13 +6212,6 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -10854,29 +6219,30 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.0.0: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q= -svgo@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" - integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== +svgo@^2.7.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.37" - csso "^4.0.2" - js-yaml "^3.13.1" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" + "@trysound/sax" "0.2.0" + commander "^7.2.0" + css-select "^4.1.3" + css-tree "^1.1.3" + csso "^4.2.0" + picocolors "^1.0.0" stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" table@^3.7.8: version "3.8.3" @@ -10890,46 +6256,55 @@ table@^3.7.8: slice-ansi "0.0.4" string-width "^2.0.0" -table@^6.0.4: - version "6.6.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.6.0.tgz#905654b79df98d9e9a973de1dd58682532c40e8e" - integrity sha512-iZMtp5tUvcnAdtHpZTWLPF0M7AgiQsURR2DwmxnJwSy8I3+cY+ozzVvYha3BOLG2TB+L0CqjIz+91htuj6yCXg== +table@^6.7.3: + version "6.7.3" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.3.tgz#255388439715a738391bd2ee4cbca89a4d05a9b7" + integrity sha512-5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw== dependencies: ajv "^8.0.1" - lodash.clonedeep "^4.5.0" - lodash.flatten "^4.4.0" lodash.truncate "^4.4.2" slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" -tapable@^1.0.0, tapable@^1.0.0-beta.5, tapable@^1.1.3: +tapable@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== -tapable@^2.0.0: +tapable@^2.1.1, tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + +tar-stream@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b" - integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw== - -tar@^4.4.2: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" + integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" -tar@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== +tar@^4: + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== + dependencies: + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" + +tar@^6.1.11: + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -10938,161 +6313,51 @@ tar@^6.0.2: mkdirp "^1.0.3" yallist "^4.0.0" -tempusdominus-bootstrap-4@^5.39.0: - version "5.39.0" - resolved "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.0.tgz#f13dcfec6c41b37c5fe509f08bd513590c64411f" - integrity sha512-vYnkmQYQq4+A51WyRc/6e03eM0BHDoPaxd556K1pd4Nhr0eGeB3+Mi9b+3CDx4189fg3gQlrsKzgJiHPRwSX3Q== +terser-webpack-plugin@^5.1.3: + version "5.2.5" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" + integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== dependencies: - bootstrap "^4.5.2" - jquery "^3.5.1" - moment "^2.29.0" - moment-timezone "^0.5.31" - popper.js "^1.16.1" - -terser-webpack-plugin@^1.4.3: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" - integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== - dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" + jest-worker "^27.0.6" + schema-utils "^3.1.1" + serialize-javascript "^6.0.0" source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" + terser "^5.7.2" -terser-webpack-plugin@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a" - integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ== - dependencies: - cacache "^15.0.5" - find-cache-dir "^3.3.1" - jest-worker "^26.5.0" - p-limit "^3.0.2" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" - source-map "^0.6.1" - terser "^5.3.4" - webpack-sources "^1.4.3" - -terser@^4.1.2, terser@^4.6.3: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" - integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -terser@^5.3.4: - version "5.7.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693" - integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g== +terser@^5.0.0, terser@^5.7.2: + version "5.9.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" + integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== dependencies: commander "^2.20.0" source-map "~0.7.2" - source-map-support "~0.5.19" + source-map-support "~0.5.20" text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -thread-loader@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/thread-loader/-/thread-loader-3.0.3.tgz#c0fa0eae3b925f273a7cce868cf1f52b4a515d78" - integrity sha512-/s8dGDkKLF89qAsn2b0PNdXS68pKhj+/Rqd7YDht/OvTlBoMm0FAsndceowSX1GEKVLo8yKRil9e+W0PpI/q1g== - dependencies: - json-parse-better-errors "^1.0.2" - loader-runner "^4.1.0" - loader-utils "^2.0.0" - neo-async "^2.6.2" - schema-utils "^3.0.0" - -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - time-fix-plugin@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/time-fix-plugin/-/time-fix-plugin-2.0.7.tgz#4ba70ae2e40cedf34dabe505eda7b71b1b244f50" integrity sha512-uVFet1LQToeUX0rTcSiYVYVoGuBpc8gP/2jnlUzuHMHe+gux6XLsNzxLUweabMwiUj5ejhoIMsUI55nVSEa/Vw== -timeout-abort-controller@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/timeout-abort-controller/-/timeout-abort-controller-1.1.1.tgz#2c3c3c66f13c783237987673c276cbd7a9762f29" - integrity sha512-BsF9i3NAJag6T0ZEjki9j654zoafI2X6ayuNd6Tp8+Ul6Tr5s4jo973qFeiWrRSweqvskC+AHDKUmIW4b7pdhQ== - dependencies: - abort-controller "^3.0.0" - retimer "^2.0.0" - -timers-browserify@^2.0.4: - version "2.0.12" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" - integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== - dependencies: - setimmediate "^1.0.4" - timsort@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -11100,16 +6365,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" @@ -11125,48 +6380,28 @@ totalist@^1.0.0: resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df" integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g== -ts-pnp@^1.1.6: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" - integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= -ts-protoc-gen@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/ts-protoc-gen/-/ts-protoc-gen-0.14.0.tgz#a6f4c3fc37d1d449915551c18404fb7e9aa8fef6" - integrity sha512-2z6w2HioMCMVNcgNHBcEvudmQfzrn+3BjAlz+xgYZ9L0o8n8UG8WUiTJcbXHFiEg2SU8IltwH2pm1otLoMSKwg== +ts-protoc-gen@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/ts-protoc-gen/-/ts-protoc-gen-0.15.0.tgz#2fec5930b46def7dcc9fa73c060d770b7b076b7b" + integrity sha512-TycnzEyrdVDlATJ3bWFTtra3SCiEP0W0vySXReAuEygXCUr1j2uaVyL0DhzjwuUdQoW5oXPwk6oZWeA0955V+g== dependencies: - google-protobuf "^3.6.1" + google-protobuf "^3.15.5" -tsconfig-paths@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" - integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== +tsconfig-paths@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" + integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.9.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" - integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= - -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -11181,40 +6416,27 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-fest@^0.8.1: +type-fest@^0.8.0: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" +type-fest@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== type@^1.0.1: version "1.2.0" resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0" integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== -type@^2.0.0: +type@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d" integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw== @@ -11224,37 +6446,12 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -ua-parser-js@^0.7.26: - version "0.7.28" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" - integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== +ufo@^0.7.9: + version "0.7.9" + resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.9.tgz#0268e3734b413c9ed6f3510201f42372821b875c" + integrity sha512-6t9LrLk3FhqTS+GW3IqlITtfRB5JAVr5MMNjpBECfK827W+Vh5Ilw/LhTcHWrt6b3hkeBvcbjx4Ti7QVFzmcww== -ufo@^0.6.10: - version "0.6.11" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.6.11.tgz#69311ed4abc8ab671c83754b79ce0d396fea1075" - integrity sha512-Yu7TJThwlr23peOkX/+hm6LfkyBs+eDWV880468PTrjKBKjjsNWFFwIuOqDfmXngRo9TZ4+twFYueRH0OLl0Gw== - -uglify-js@^3.5.1: - version "3.13.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.4.tgz#592588bb9f47ae03b24916e2471218d914955574" - integrity sha512-kv7fCkIXyQIilD5/yQy8O+uagsYIOt5cZvs890W40/e/rvjMSzJw81o9Bg0tkURxzZBROtDQhW2LFjOGoK3RZw== - -uint8arrays@1.1.0, uint8arrays@^1.0.0, uint8arrays@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-1.1.0.tgz#d034aa65399a9fd213a1579e323f0b29f67d0ed2" - integrity sha512-cLdlZ6jnFczsKf5IH1gPHTtcHtPGho5r4CvctohmQjw8K7Q3gFdfIGHxSTdTaCKrL4w09SsPRJTqRS0drYeszA== - dependencies: - multibase "^3.0.0" - web-encoding "^1.0.2" - -uint8arrays@^2.0.5, uint8arrays@^2.1.3, uint8arrays@^2.1.4: - version "2.1.5" - resolved "https://registry.yarnpkg.com/uint8arrays/-/uint8arrays-2.1.5.tgz#9e6e6377a9463d5eba4620a3f0450f7eb389a351" - integrity sha512-CSR7AO+4AHUeSOnZ/NBNCElDeWfRh9bXtOck27083kc7SznmmHIhNEkEOCQOn0wvrIMjS3IH0TNLR16vuc46mA== - dependencies: - multibase "^4.0.1" - -unbox-primitive@^1.0.0: +unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== @@ -11264,68 +6461,36 @@ unbox-primitive@^1.0.0: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" -unfetch@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be" - integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA== +unctx@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unctx/-/unctx-1.0.2.tgz#d8d9c83a0965aa277f61058c94548fcee6861e48" + integrity sha512-qxRfnQZWJqkg180JeOCJEvtjj5/7wnWVqkNHln8muY5/z8kMWBFqikFBPwIPCQrZJ+jtaSWkVHJkuHUAXls6zw== -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== +undici@^4.9.5: + version "4.9.5" + resolved "https://registry.yarnpkg.com/undici/-/undici-4.9.5.tgz#6531b6b2587c2c42d77c0dded83d058a328775f8" + integrity sha512-t59IFVYiMnFThboJL9izqwsDEfSbZDPZ/8iCYBCkEFLy63x9m4YaNt0E+r5+X993syC9M0W/ksusZC9YuAamMg== -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== +unenv@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/unenv/-/unenv-0.4.1.tgz#a8cf1227112240bd3a64341c5d853fbd463eb488" + integrity sha512-Na9RJ+35eMbUdwyhXA9vZxsUpKwMvaOHkQEhzACL26/W7pa/u1lnJDx0Z00OOuks8yWg4vSKjMmF0FzPZmQRJA== dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - -unicode-match-property-value-ecmascript@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531" - integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz#dd57a99f6207bedff4628abefb94c50db941c8f4" - integrity sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg== - -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= + buffer "^6.0.2" + defu "^5.0.0" + events "^3.2.0" + inherits "^2.0.4" + mime "^2.4.6" + node-fetch "^3.0.0" + process "^0.11.10" + upath "^2.0.1" + util "^0.12.4" uniqs@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -11336,39 +6501,44 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= +unplugin@^0.2.20: + version "0.2.20" + resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-0.2.20.tgz#fd579b8f302459eb1ae3616f71c2ba93e6076187" + integrity sha512-CGnCaTqNjqeixpIlNEkpysxfR2hb4xv21xa4IURXnhYTfCp73UWuG0KcdanuhFJbwO5w+EGK4XaAaqdb/1vWbg== dependencies: - has-value "^0.3.1" - isobject "^3.0.0" + webpack-virtual-modules "^0.4.3" -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== +unstorage@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/unstorage/-/unstorage-0.3.2.tgz#fddf995dcfac3269e1289fc193a6a58aa67e5b63" + integrity sha512-I752esvZUGVtUY7qxoYtnOLBKjGKF31eEvK3TObKsuP81SWZ93KyC4EyHF1ATvHpakuo7NU2HLnW5mmYig4dTw== + dependencies: + anymatch "^3.1.1" + chokidar "^3.5.2" + destr "^1.1.0" + h3 "^0.3.3" + ioredis "^4.27.9" + listhen "^0.2.4" + mri "^1.1.6" + ohmyfetch "^0.4.5" + ufo "^0.7.9" + ws "^8.2.1" + +untyped@^0.2.12: + version "0.2.13" + resolved "https://registry.yarnpkg.com/untyped/-/untyped-0.2.13.tgz#31be48c9cf1d81b65d05f762a0332b2b5e9a9cb3" + integrity sha512-dnvCmDKTb+zg504JyQ9h1sWINAyxnP6KgmvUH6s6BjLV+3fvjZTiUklL15VvEqpDjy4Leq/xzlZ+JxskeoM5mg== upath@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -11376,11 +6546,6 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - url-loader@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" @@ -11390,42 +6555,6 @@ url-loader@^4.1.1: mime-types "^2.1.27" schema-utils "^3.0.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= - dependencies: - prepend-http "^2.0.0" - -url-parse@^1.4.3, url-parse@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" - integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -ursa-optional@^0.10.1: - version "0.10.2" - resolved "https://registry.yarnpkg.com/ursa-optional/-/ursa-optional-0.10.2.tgz#bd74e7d60289c22ac2a69a3c8dea5eb2817f9681" - integrity sha512-TKdwuLboBn7M34RcvVTuQyhvrA8gYKapuVdm0nBP0mnBc7oECOfUQZrY91cefL3/nm64ZyrejSRrhTVdX7NG/A== - dependencies: - bindings "^1.5.0" - nan "^2.14.2" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - user-home@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" @@ -11438,31 +6567,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util.promisify@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" - -util.promisify@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.2" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" - -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - util@^0.10.3: version "0.10.4" resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" @@ -11470,17 +6574,10 @@ util@^0.10.3: dependencies: inherits "2.0.3" -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - -util@^0.12.3: - version "0.12.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888" - integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog== +util@^0.12.4: + version "0.12.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" + integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== dependencies: inherits "^2.0.3" is-arguments "^1.0.4" @@ -11489,147 +6586,78 @@ util@^0.12.3: safe-buffer "^5.1.2" which-typed-array "^1.1.2" -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= - utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.3.2, uuid@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0: +v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -varint@^5.0.0, varint@^5.0.2, varint@~5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4" - integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow== - -varint@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0" - integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg== - -vary@^1.1.2, vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -vendors@^1.0.0: +vendors@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== -vm-browserify@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" - integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vite@^2.6.14: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.6.14.tgz#35c09a15e4df823410819a2a239ab11efb186271" + integrity sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA== + dependencies: + esbuild "^0.13.2" + postcss "^8.3.8" + resolve "^1.20.0" + rollup "^2.57.0" + optionalDependencies: + fsevents "~2.3.2" void-elements@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk= -vue-client-only@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/vue-client-only/-/vue-client-only-2.0.0.tgz#ddad8d675ee02c761a14229f0e440e219de1da1c" - integrity sha512-arhk1wtWAfLsJyxGMoEYhoBowM87/i6HLSG2LH/03Yog6i2d9JEN1peMP0Ceis+/n9DxdenGYZZTxbPPJyHciA== - -vue-cookies@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/vue-cookies/-/vue-cookies-1.7.4.tgz#d241d0a0431da0795837651d10b4d73e7c8d3e8d" - integrity sha512-mOS5Btr8V9zvAtkmQ7/TfqJIropOx7etDAgBywPCmHjvfJl2gFbH2XgoMghleLoyyMTi5eaJss0mPN7arMoslA== - -vue-eslint-parser@^7.6.0: - version "7.6.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz#01ea1a2932f581ff244336565d712801f8f72561" - integrity sha512-QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA== +vue-bundle-renderer@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/vue-bundle-renderer/-/vue-bundle-renderer-0.3.2.tgz#6b671da04f0685ba33dc55f9f189d21aabcc4ffc" + integrity sha512-KqluDHXysSXVV84hSgYTskd+w9zoYxtaT8ZO4J7KZI3EShpGRjr+yEIQC0/fLicx931h7unsKRgao/kjHaUH3g== dependencies: - debug "^4.1.1" - eslint-scope "^5.0.0" - eslint-visitor-keys "^1.1.0" - espree "^6.2.1" + bundle-runner "^0.0.1" + +vue-eslint-parser@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-8.0.1.tgz#25e08b20a414551531f3e19f999902e1ecf45f13" + integrity sha512-lhWjDXJhe3UZw2uu3ztX51SJAPGPey1Tff2RK3TyZURwbuI4vximQLzz4nQfCv8CZq4xx7uIiogHMMoSJPr33A== + dependencies: + debug "^4.3.2" + eslint-scope "^6.0.0" + eslint-visitor-keys "^3.0.0" + espree "^9.0.0" esquery "^1.4.0" - lodash "^4.17.15" + lodash "^4.17.21" + semver "^7.3.5" -vue-functional-data-merge@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657" - integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA== - -vue-hot-reload-api@^2.3.0: - version "2.3.4" - resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" - integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog== - -vue-loader@^15.9.6: - version "15.9.6" - resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b" - integrity sha512-j0cqiLzwbeImIC6nVIby2o/ABAWhlppyL/m5oJ67R5MloP0hj/DtFgb0Zmq3J9CG7AJ+AXIvHVnJAPBvrLyuDg== +vue-loader@^16.8.3: + version "16.8.3" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-16.8.3.tgz#d43e675def5ba9345d6c7f05914c13d861997087" + integrity sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA== dependencies: - "@vue/component-compiler-utils" "^3.1.0" - hash-sum "^1.0.2" - loader-utils "^1.1.0" - vue-hot-reload-api "^2.3.0" - vue-style-loader "^4.1.0" + chalk "^4.1.0" + hash-sum "^2.0.0" + loader-utils "^2.0.0" -vue-meta@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/vue-meta/-/vue-meta-2.4.0.tgz#a419fb4b4135ce965dab32ec641d1989c2ee4845" - integrity sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw== +vue-router@^4.0.12: + version "4.0.12" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.12.tgz#8dc792cddf5bb1abcc3908f9064136de7e13c460" + integrity sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg== dependencies: - deepmerge "^4.2.2" + "@vue/devtools-api" "^6.0.0-beta.18" -vue-moment@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/vue-moment/-/vue-moment-4.1.0.tgz#092a8ff723a96c6f85a0a8e23ad30f0bf320f3b0" - integrity sha512-Gzisqpg82ItlrUyiD9d0Kfru+JorW2o4mQOH06lEDZNgxci0tv/fua1Hl0bo4DozDV2JK1r52Atn/8QVCu8qQw== - dependencies: - moment "^2.19.2" - -vue-no-ssr@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/vue-no-ssr/-/vue-no-ssr-1.1.1.tgz#875f3be6fb0ae41568a837f3ac1a80eaa137b998" - integrity sha512-ZMjqRpWabMPqPc7gIrG0Nw6vRf1+itwf0Itft7LbMXs2g3Zs/NFmevjZGN1x7K3Q95GmIjWbQZTVerxiBxI+0g== - -vue-router@^3.4.9, vue-router@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9" - integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw== - -vue-scrollto@^2.20.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/vue-scrollto/-/vue-scrollto-2.20.0.tgz#3ba52239a62710c97003d12d4393f1f3393cd5cc" - integrity sha512-7i+AGKJTThZnMEkhIPgrZjyAX+fXV7/rGdg+CV283uZZwCxwiMXaBLTmIc5RTA4uwGnT+E6eJle3mXQfM2OD3A== - dependencies: - bezier-easing "2.1.0" - -vue-select@^3.11.2: - version "3.11.2" - resolved "https://registry.yarnpkg.com/vue-select/-/vue-select-3.11.2.tgz#3ef93e3f2707e133c2df0b2920a05eea78764d18" - integrity sha512-pIOcY8ajWNSwg8Ns4eHVr5ZWwqKCSZeQRymTnlUI8i+3QiQXF6JIM4lylK6mVfbccs4S6vOyxB7zmJBpp7tDUg== - -vue-server-renderer@^2.6.12: - version "2.6.12" - resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.12.tgz#a8cb9c49439ef205293cb41c35d0d2b0541653a5" - integrity sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw== +vue-server-renderer@^2.6.14: + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.14.tgz#c8bffff152df6b47b858818ef8d524d2fc351654" + integrity sha512-HifYRa/LW7cKywg9gd4ZtvtRuBlstQBao5ZCWlg40fyB4OPoGfEXAzxb0emSLv4pBDOHYx0UjpqvxpiQFEuoLA== dependencies: chalk "^1.1.3" hash-sum "^1.0.2" @@ -11640,7 +6668,7 @@ vue-server-renderer@^2.6.12: serialize-javascript "^3.1.0" source-map "0.5.6" -vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: +vue-style-loader@^4.1.3: version "4.1.3" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35" integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg== @@ -11648,268 +6676,143 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.3: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@^2.6.12: - version "2.6.12" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e" - integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg== +vue@^3.2.21: + version "3.2.21" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.21.tgz#55f5665172d95cf97e806b9aad0a375180be23a1" + integrity sha512-jpy7ckXdyclfRzqLjL4mtq81AkzQleE54KjZsJg/9OorNVurAxdlU5XpD49GpjKdnftuffKUvx2C5jDOrgc/zg== dependencies: - de-indent "^1.0.2" - he "^1.1.0" + "@vue/compiler-dom" "3.2.21" + "@vue/compiler-sfc" "3.2.21" + "@vue/runtime-dom" "3.2.21" + "@vue/server-renderer" "3.2.21" + "@vue/shared" "3.2.21" -vue-template-es2015-compiler@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" - integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== - -vue@^2.6.12: - version "2.6.12" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" - integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== - -vuejs-dialog@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/vuejs-dialog/-/vuejs-dialog-1.4.2.tgz#33ef5a7669291c1bb09f2e958c4a438e54cdd293" - integrity sha512-6kRse144WXDFBMKdeuqE43rHy0ZJ81uLOFh62r2d80ICKavQYHIvr+GlTFmoR23190lC4f2w+ZJ8cS4ljkCDMw== - -vuex-persistedstate@^4.0.0-beta.3: - version "4.0.0-beta.3" - resolved "https://registry.yarnpkg.com/vuex-persistedstate/-/vuex-persistedstate-4.0.0-beta.3.tgz#89dd712de72d28e85cc95467d066002c1405f277" - integrity sha512-T4IRD27qoUWh+8qr6T6zVp15xO7x/nPgnU13OD0C2uUwA7U9PhGozrj6lvVmMYDyRgc36J0msMXn3GvwHjkIhA== - dependencies: - deepmerge "^4.2.2" - shvl "^2.0.2" - -vuex@^3.6.2: - version "3.6.2" - resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71" - integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw== - -watchpack-chokidar2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" - integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== - dependencies: - chokidar "^2.1.8" - -watchpack@^1.7.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" - integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== +watchpack@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce" + integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA== dependencies: + glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" - neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.1" -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== +wcwidth@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" + integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= dependencies: - minimalistic-assert "^1.0.0" + defaults "^1.0.3" -web-encoding@^1.0.2, web-encoding@^1.0.6: - version "1.1.5" - resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864" - integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA== - dependencies: - util "^0.12.3" - optionalDependencies: - "@zxing/text-encoding" "0.9.0" +web-streams-polyfill@^3.0.3: + version "3.2.0" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965" + integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA== -webpack-bundle-analyzer@^4.4.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.1.tgz#c71fb2eaffc10a4754d7303b224adb2342069da1" - integrity sha512-j5m7WgytCkiVBoOGavzNokBOqxe6Mma13X1asfVYtKWM3wxBiRRu1u1iG0Iol5+qp9WgyhkMmBAcvjEfJ2bdDw== +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + +webpack-bundle-analyzer@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ== dependencies: acorn "^8.0.4" acorn-walk "^8.0.0" chalk "^4.1.0" - commander "^6.2.0" + commander "^7.2.0" gzip-size "^6.0.0" lodash "^4.17.20" opener "^1.5.2" sirv "^1.0.7" ws "^7.3.1" -webpack-cli@^4.3.1: - version "4.6.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.6.0.tgz#27ae86bfaec0cf393fcfd58abdc5a229ad32fd16" - integrity sha512-9YV+qTcGMjQFiY7Nb1kmnupvb1x40lfpj8pwdO/bom+sQiP4OBMKjHq29YQrlDWDPZO9r/qWaRRywKaRDKqBTA== +webpack-dev-middleware@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.2.1.tgz#97c948144349177856a3d2d9c612cc3fee180cf1" + integrity sha512-Kx1X+36Rn9JaZcQMrJ7qN3PMAuKmEDD9ZISjUj3Cgq4A6PtwYsC4mpaKotSRYH3iOF6HsUa8viHKS59FlyVifQ== dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.2" - "@webpack-cli/info" "^1.2.3" - "@webpack-cli/serve" "^1.3.1" - colorette "^1.2.1" - commander "^7.0.0" - enquirer "^2.3.6" - execa "^5.0.0" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - v8-compile-cache "^2.2.0" - webpack-merge "^5.7.3" - -webpack-dev-middleware@^3.7.2: - version "3.7.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz#0639372b143262e2b84ab95d3b91a7597061c2c5" - integrity sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ== - dependencies: - memory-fs "^0.4.1" - mime "^2.4.4" - mkdirp "^0.5.1" + colorette "^2.0.10" + memfs "^3.2.2" + mime-types "^2.1.31" range-parser "^1.2.1" - webpack-log "^2.0.0" + schema-utils "^3.1.0" -webpack-dev-middleware@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.1.0.tgz#f0c1f12ff4cd855b3b5eec89ee0f69bcc5336364" - integrity sha512-mpa/FY+DiBu5+r5JUIyTCYWRfkWgyA3/OOE9lwfzV9S70A4vJYLsVRKj5rMFEsezBroy2FmPyQ8oBRVW8QmK1A== +webpack-hot-middleware@^2.25.1: + version "2.25.1" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.1.tgz#581f59edf0781743f4ca4c200fd32c9266c6cf7c" + integrity sha512-Koh0KyU/RPYwel/khxbsDz9ibDivmUbrRuKSSQvW42KSDdO4w23WI3SkHpSUKHE76LrFnnM/L7JCrpBwu8AXYw== dependencies: - colorette "^1.2.1" - mem "^8.0.0" - memfs "^3.2.0" - mime-types "^2.1.28" - range-parser "^1.2.1" - schema-utils "^3.0.0" - -webpack-dev-server@^3.11.1: - version "3.11.2" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708" - integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ== - dependencies: - ansi-html "0.0.7" - bonjour "^3.5.0" - chokidar "^2.1.8" - compression "^1.7.4" - connect-history-api-fallback "^1.6.0" - debug "^4.1.1" - del "^4.1.1" - express "^4.17.1" - html-entities "^1.3.1" - http-proxy-middleware "0.19.1" - import-local "^2.0.0" - internal-ip "^4.3.0" - ip "^1.1.5" - is-absolute-url "^3.0.3" - killable "^1.0.1" - loglevel "^1.6.8" - opn "^5.5.0" - p-retry "^3.0.1" - portfinder "^1.0.26" - schema-utils "^1.0.0" - selfsigned "^1.10.8" - semver "^6.3.0" - serve-index "^1.9.1" - sockjs "^0.3.21" - sockjs-client "^1.5.0" - spdy "^4.0.2" - strip-ansi "^3.0.1" - supports-color "^6.1.0" - url "^0.11.0" - webpack-dev-middleware "^3.7.2" - webpack-log "^2.0.0" - ws "^6.2.1" - yargs "^13.3.2" - -webpack-hot-middleware@^2.25.0: - version "2.25.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz#4528a0a63ec37f8f8ef565cf9e534d57d09fe706" - integrity sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA== - dependencies: - ansi-html "0.0.7" - html-entities "^1.2.0" + ansi-html-community "0.0.8" + html-entities "^2.1.0" querystring "^0.2.0" - strip-ansi "^3.0.0" + strip-ansi "^6.0.0" -webpack-log@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f" - integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg== +webpack-sources@^2.2.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" + integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== dependencies: - ansi-colors "^3.0.0" - uuid "^3.3.2" + source-list-map "^2.0.1" + source-map "^0.6.1" -webpack-merge@^5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" - integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== +webpack-sources@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.1.tgz#251a7d9720d75ada1469ca07dbb62f3641a05b6d" + integrity sha512-t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA== + +webpack-virtual-modules@^0.4.3: + version "0.4.3" + resolved "https://registry.yarnpkg.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.3.tgz#cd597c6d51d5a5ecb473eea1983a58fa8a17ded9" + integrity sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw== + +webpack@^5.63.0, webpack@^5.64.0: + version "5.64.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.64.0.tgz#db3e12546f755930ccc9e0e21ba660871940c615" + integrity sha512-UclnN24m054HaPC45nmDEosX6yXWD+UGC12YtUs5i356DleAUGMDC9LBAw37xRRfgPKYIdCYjGA7RZ1AA+ZnGg== dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-node-externals@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-2.5.2.tgz#178e017a24fec6015bc9e672c77958a6afac861d" - integrity sha512-aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w== - -webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack@^4.46.0: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" + "@types/eslint-scope" "^3.7.0" + "@types/estree" "^0.0.50" + "@webassemblyjs/ast" "1.11.1" + "@webassemblyjs/wasm-edit" "1.11.1" + "@webassemblyjs/wasm-parser" "1.11.1" + acorn "^8.4.1" + acorn-import-assertions "^1.7.6" + browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^4.5.0" - eslint-scope "^4.0.3" + enhanced-resolve "^5.8.3" + es-module-lexer "^0.9.0" + eslint-scope "5.1.1" + events "^3.2.0" + glob-to-regexp "^0.4.1" + graceful-fs "^4.2.4" json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.7.4" - webpack-sources "^1.4.1" + loader-runner "^4.2.0" + mime-types "^2.1.27" + neo-async "^2.6.2" + schema-utils "^3.1.0" + tapable "^2.1.1" + terser-webpack-plugin "^5.1.3" + watchpack "^2.2.0" + webpack-sources "^3.2.0" -webpackbar@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-4.0.0.tgz#ee7a87f16077505b5720551af413c8ecd5b1f780" - integrity sha512-k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ== +webpackbar@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + integrity sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ== dependencies: - ansi-escapes "^4.2.1" - chalk "^2.4.2" - consola "^2.10.0" - figures "^3.0.0" + chalk "^4.1.0" + consola "^2.15.3" pretty-time "^1.1.0" - std-env "^2.2.1" - text-table "^0.2.0" - wrap-ansi "^6.0.0" + std-env "^3.0.1" -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== + tr46 "~0.0.3" + webidl-conversions "^3.0.0" which-boxed-primitive@^1.0.2: version "1.0.2" @@ -11922,23 +6825,17 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - which-typed-array@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" - integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + version "1.1.7" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793" + integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw== dependencies: - available-typed-arrays "^1.0.2" - call-bind "^1.0.0" - es-abstract "^1.18.0-next.1" + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-abstract "^1.18.5" foreach "^2.0.5" - function-bind "^1.1.1" - has-symbols "^1.0.1" - is-typed-array "^1.1.3" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.7" which@^1.2.9: version "1.3.1" @@ -11954,29 +6851,12 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== +wide-align@^1.1.0, wide-align@^1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== dependencies: - string-width "^1.0.2 || 2" - -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + string-width "^1.0.2 || 2 || 3 || 4" with@^7.0.0: version "7.0.2" @@ -11993,44 +6873,6 @@ word-wrap@^1.2.3, word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - -wrap-ansi@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -12045,27 +6887,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -write-file-atomic@^2.0.0: - version "2.4.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481" - integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ== - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -write-json-file@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" - integrity sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8= - dependencies: - detect-indent "^5.0.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - pify "^3.0.0" - sort-keys "^2.0.0" - write-file-atomic "^2.0.0" - write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -12073,46 +6894,34 @@ write@^0.2.1: dependencies: mkdirp "^0.5.1" -ws@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== - dependencies: - async-limiter "~1.0.0" - ws@^7.3.1: - version "7.4.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" - integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== + version "7.5.5" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" + integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== -xtend@^4.0.0, xtend@~4.0.1: +ws@^8.2.1: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + +xtend@^4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xxhashjs@^0.2.1: +xxhashjs@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8" integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw== dependencies: cuint "^0.2.2" -y18n@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -12122,52 +6931,34 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" +yaml@^1.10.0, yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -yargs@^13.3.2: - version "13.3.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== +yargs-parser@^20.2.2: + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs@^16.1.1, yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" -yargs@^3.10.0: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= +zip-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" + integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + archiver-utils "^2.1.0" + compress-commons "^4.1.0" + readable-stream "^3.6.0" diff --git a/rules/packaging/packaging.bzl b/rules/packaging/packaging.bzl index 61916d5..d368dcf 100644 --- a/rules/packaging/packaging.bzl +++ b/rules/packaging/packaging.bzl @@ -40,7 +40,10 @@ strip_prefix_by_action = { "local": "./", } -ScriptsInfo = provider(fields = ["postinst", "postrm", "preinst", "prerm"]) +ScriptsInfo = provider( + "Debian build scripts", + fields = ["postinst", "postrm", "preinst", "prerm"], +) def deploy_command(deb_package, hostname, username = "pasha"): """Command for start deployment on `target_hosts` of package. @@ -349,6 +352,7 @@ def _get_extensions(): return {"content": content, "overriden_scripts": overriden_scripts, "services": services, "symlinks": symlinks} def debian_package( + name, package_name, version, maintainer = default_maintainer, @@ -370,6 +374,7 @@ def debian_package( """Package creation, publishing and deployment targets Args: + name (str): name package_name (str): debian package name. Defaults to default_company_name + '-' + name version (str): package version diff --git a/rules/python/requirements-lock.txt b/rules/python/requirements-lock.txt new file mode 100644 index 0000000..6aaa6cc --- /dev/null +++ b/rules/python/requirements-lock.txt @@ -0,0 +1,114 @@ +aiochclient==2.1.0 +aiodns==3.0.0 +aiofiles==0.8.0 +aiohttp==3.8.1 +aiohttp-socks==0.7.1 +aiokafka==0.7.2 +aiosignal==1.2.0 +asn1crypto==1.5.1 +async-timeout==4.0.2 +attrs==21.4.0 +backports.zoneinfo==0.2.1 +base58==2.1.1 +beautifulsoup4==4.10.0 +bjoern==3.2.1 +blis==0.7.7 +Brotli==1.0.9 +cachetools==5.0.0 +catalogue==2.0.7 +cchardet==2.1.7 +certbuilder==0.14.2 +certifi==2021.10.8 +cffi==1.15.0 +charset-normalizer==2.0.12 +click==8.0.4 +cryptography==36.0.2 +cymem==2.0.6 +ecdsa==0.17.0 +emoji==1.7.0 +en-core-web-sm @ https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.2.0/en_core_web_sm-3.2.0-py3-none-any.whl +entrypoints==0.4 +fire==0.4.0 +flake8==4.0.1 +Flask==2.0.3 +Flask-SQLAlchemy==2.5.1 +Flask-WTF==1.0.0 +frozenlist==1.3.0 +greenlet==1.1.2 +grpcio==1.44.0 +idna==3.3 +isort==5.10.1 +itsdangerous==2.1.2 +Jinja2==3.1.1 +joblib==1.1.0 +kafka-python==2.0.2 +langcodes==3.3.0 +lemminflect==0.2.2 +lightgbm==3.3.2 +lru-dict==1.1.7 +lxml==4.8.0 +MarkupSafe==2.1.1 +mccabe==0.6.1 +multidict==6.0.2 +murmurhash==1.0.6 +numpy==1.22.3 +orjson==3.6.7 +oscrypto==1.3.0 +packaging==21.3 +passlib==1.7.4 +pathspec==0.9.0 +pathy==0.6.1 +pip==22.0.4 +ply==3.11 +preshed==3.0.6 +prometheus-client==0.13.1 +protobuf==3.19.4 +psycopg==3.0.10 +psycopg-binary==3.0.10 +psycopg-pool==3.1.1 +pyaes==1.6.1 +pyasn1==0.4.8 +pycares==4.1.2 +pycld3==0.22 +pycodestyle==2.8.0 +pycparser==2.21 +pydantic==1.8.2 +pyflakes==2.4.0 +PyJWT==2.3.0 +pyparsing==3.0.7 +PyPika==0.48.9 +python-socks==2.0.3 +pytimeparse==1.1.8 +PyYAML==6.0 +recordclass==0.17.2 +requests==2.27.1 +rsa==4.8 +scikit-learn==1.0.2 +scipy==1.8.0 +setuptools==61.2.0 +six==1.16.0 +smart-open==5.2.1 +soupsieve==2.3.1 +spacy==3.2.3 +spacy-legacy==3.0.9 +spacy-loggers==1.0.1 +SQLAlchemy==1.4.32 +sqlparse==0.4.2 +srsly==2.4.2 +Telethon==1.24.0 +tenacity==8.0.1 +termcolor==1.1.0 +thinc==8.0.15 +threadpoolctl==3.1.0 +tqdm==4.63.1 +typer==0.4.0 +typing_extensions==4.1.1 +urllib3==1.26.9 +uvloop==0.16.0 +wasabi==0.9.0 +Werkzeug==2.0.3 +wheel==0.37.1 +WTForms==3.0.1 +WTForms-JSON==0.3.4 +yamllint==1.26.3 +yarl==1.7.2 diff --git a/rules/python/requirements.txt b/rules/python/requirements.txt index d20e682..fdfbcc2 100644 --- a/rules/python/requirements.txt +++ b/rules/python/requirements.txt @@ -1,137 +1,56 @@ -setuptools==54.1.2 - -aiobaseclient==0.2.4 -aiochclient==2.0.0 -aiocrossref==0.2.1 -aiogrobid==0.1.2 -aiogrpcclient==0.1.2 -aiodns==2.0.0 -aioftp==0.18.1 -aiohttp[speedups]==3.7.4.post0 -aiohttp_socks==0.5.5 -git+git://github.com/izihawa/aioipfs#egg=aioipfs -aiokafka==0.7.0 -aiokit==0.2.1 -aiolibgen==0.2.0 -aiomysql==0.0.21 -aioredis==1.3.1 -aiopg==1.2.1 -aiosumma==0.1.2 -alembic==1.5.8 -aptly-api-client==0.2.3 -argon2-cffi==20.1.0 -attr==0.3.1 -attrs==20.3.0 -atomicwrites==1.4.0 -babel==2.9.0 -beautifulsoup4==4.9.3 -bencodepy==0.9.5 -bitarray==1.9.1 -bjoern==3.1.0 -blockchain==1.4.4 -brotli==1.0.9 -cachetools==4.2.1 -cchardet==2.1.7 -Celery==5.0.5 -certbot==1.14.0 -certbuilder==0.14.2 -certifi==2020.12.5 -cffi==1.14.5 -chardet==4.0.0 -click==7.1.2 -clickhouse-driver==0.2.0 -cloudinary==1.25.0 -coverage==5.5 -cryptography==3.4.7 -dataclasses-json==0.5.2 -docker==5.0.0 -ecdsa==0.16.1 -email-validator==1.1.2 -emoji==1.2.0 -emoji-country-flag==1.2.4 -fire==0.4.0 -flake8==3.9.0 -Flask==1.1.2 -Flask-Cors==3.0.10 -Flask-SQLAlchemy==2.5.1 -Flask-WTF==0.14.3 -ftfy==5.9 -geoalchemy2==0.8.5 -grpcio==1.37.0 -grpcio-tools==1.37.0 -gunicorn==20.1.0 -httpx[http2]==0.17.1 -idna==2.10 -isort==5.8.0 -itsdangerous==1.1.0 -izihawa_types==0.1.0 -izihawa_utils==0.3.2 -Jinja2==2.11.3 -jupyter==1.0.0 -kazoo==2.8.0 -kubernetes==12.0.1 -langid==1.1.6 -lemminflect==0.2.2 -lightgbm==3.2.0 -lru-dict==1.1.7 -lxml==4.6.3 -markdown-strings==3.3.0 -MarkupSafe==1.1.1 -mockredispy==2.9.3 -multidict==5.1.0 -networkx==2.5.1 -numpy==1.20.2 -orjson==3.5.1 -pandas==1.2.3 -paramiko==2.7.2 -passlib==1.7.4 -pip==21.0.1 -pluggy==0.13.1 -ply==3.11 -protobuf==3.15.7 -psutil==5.8.0 -psycopg2-binary==2.8.6 -pycld3==0.22 -pycountry==20.7.3 -pycparser==2.20 -pyjwt==2.0.1 -pymorphy2[fast]==0.9.1 -pypika==0.48.1 -pysocks==1.7.1 -pytest==6.2.3 -python-gflags==3.1.2 -python-pdfbox==0.1.8.1 -python-qbittorrent==0.4.2 -python-socks==1.2.4 -pytimeparse==1.1.8 -pyyaml==5.4.1 -rarfile==4.0 -recordclass==0.14.3 -redis==3.5.3 -retry==0.9.2 -requests==2.25.1 -ring==0.7.3 -https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.0.0/en_core_web_sm-3.0.0.tar.gz#egg=en_core_web_sm -SQLAlchemy==1.4.6 -scipy==1.6.2 -sip==6.0.3 -six==1.15.0 -spacy==3.0.5 -tantipy==0.14.0-dev0 -telethon==1.21.1 -tenacity==7.0.0 -timezonefinder==5.2.0 -tqdm==4.60.0 -unrar==0.4 -urllib3==1.26.4 -uvloop==0.15.2 -websocket==0.2.1 -Werkzeug==1.0.1 -wheel==0.36.2 -wgconfig==0.2.2 -WTForms==2.3.3 -WTForms-JSON==0.3.3 -www-authenticate==0.9.2 -xmltodict==0.12.0 -yamllint==1.26.1 -zxcvbn-python==4.4.24 +aiochclient +aiodns +aiofiles +aiohttp +aiohttp_socks +aiokafka +backports_zoneinfo +base58 +beautifulsoup4 +bjoern +brotli +cachetools +cchardet +certbuilder +cryptography +emoji +entrypoints +https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.2.0/en_core_web_sm-3.2.0-py3-none-any.whl +fire +flake8 +flask_sqlalchemy +flask_wtf +grpcio +isort +jinja2 +lemminflect +lightgbm +lru_dict +lxml +numpy +orjson +passlib +pathspec +ply +prometheus_client +protobuf +psycopg +psycopg_binary +psycopg_pool +pypika +pycld3 +pyflakes +pyjwt +python_socks +pytimeparse +pyyaml +recordclass +setuptools +spacy +sqlalchemy +telethon +tenacity +uvloop +wheel +wtforms_json +yamllint \ No newline at end of file diff --git a/rules/rust/BUILD.bazel b/rules/rust/BUILD.bazel index 0cad4cf..9978e6b 100644 --- a/rules/rust/BUILD.bazel +++ b/rules/rust/BUILD.bazel @@ -9,6 +9,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze exports_files( [ "crates.bzl", + "rustfmt.toml", ], visibility = ["//visibility:public"], ) diff --git a/rules/rust/Cargo.lock b/rules/rust/Cargo.lock new file mode 100644 index 0000000..ad5bde6 --- /dev/null +++ b/rules/rust/Cargo.lock @@ -0,0 +1,2458 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" + +[[package]] +name = "async-stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +dependencies = [ + "async-stream-impl", + "futures-core", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-trait" +version = "0.1.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitpacking" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +dependencies = [ + "crunchy", +] + +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + +[[package]] +name = "brotli" +version = "3.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838e47a451d5a8fa552371f80024dd6ace9b7acdf25c4c3d0f9bc6816fb1c39" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bumpalo" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" + +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "census" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5927edd8345aef08578bcbb4aea7314f340d80c7f4931f99fbeb40b99d8f5060" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time 0.1.44", + "winapi", +] + +[[package]] +name = "clap" +version = "3.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" +dependencies = [ + "atty", + "bitflags", + "indexmap", + "lazy_static", + "os_str_bytes", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "combine" +version = "4.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" +dependencies = [ + "memchr", +] + +[[package]] +name = "config" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86" +dependencies = [ + "async-trait", + "json5", + "lazy_static", + "nom", + "pathdiff", + "ron", + "rust-ini", + "serde", + "serde_json", + "toml", + "yaml-rust", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "lazy_static", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +dependencies = [ + "cfg-if", + "lazy_static", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "ctor" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if", + "num_cpus", +] + +[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "dlv-list" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" +dependencies = [ + "rand", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "fail" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3245a0ca564e7f3c797d20d833a6870f57a728ac967d5225b3ffdef4465011" +dependencies = [ + "lazy_static", + "log", + "rand", +] + +[[package]] +name = "fake-simd" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" + +[[package]] +name = "fastdivide" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" + +[[package]] +name = "fastfield_codecs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e8bfa31546b4ace05092c9db8d251d7bbc298a384875a08c945a473de4f1f" +dependencies = [ + "tantivy-bitpacker", + "tantivy-common 0.1.0", +] + +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] +name = "fixedbitset" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "futures" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" + +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + +[[package]] +name = "futures-io" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" + +[[package]] +name = "futures-macro" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" + +[[package]] +name = "futures-task" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" + +[[package]] +name = "futures-util" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + +[[package]] +name = "getrandom" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", +] + +[[package]] +name = "h2" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util 0.6.9", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash 0.4.7", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.6", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] +name = "http" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[package]] +name = "httparse" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-timeout" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] + +[[package]] +name = "hyperboria" +version = "0.0.0" +dependencies = [ + "clap", + "colored", + "config", + "crossbeam-channel", + "futures", + "futures-util", + "hyper", + "lazy_static", + "num_cpus", + "opentelemetry", + "opentelemetry-prometheus", + "parking_lot 0.12.0", + "prometheus", + "prost", + "prost-types", + "rand", + "rdkafka", + "serde", + "serde_derive", + "serde_yaml", + "signal-hook", + "tantivy", + "tantivy-fst", + "textwrap", + "thiserror", + "tokio", + "tonic", + "tonic-build", + "tower", + "tower-http", + "tracing", + "tracing-appender", + "tracing-futures", + "tracing-subscriber", +] + +[[package]] +name = "indexmap" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +dependencies = [ + "autocfg", + "hashbrown 0.11.2", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itertools" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "js-sys" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json5" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" +dependencies = [ + "pest", + "pest_derive", + "serde", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "levenshtein_automata" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" + +[[package]] +name = "libc" +version = "0.2.121" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" + +[[package]] +name = "libz-sys" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" + +[[package]] +name = "lock_api" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "lru" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb" +dependencies = [ + "hashbrown 0.11.2", +] + +[[package]] +name = "lz4_flex" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42c51df9d8d4842336c835df1d85ed447c4813baa237d033d95128bf5552ad8a" +dependencies = [ + "twox-hash", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "measure_time" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f07966480d8562b3622f51df0b4e3fe6ea7ddb3b48b19b0f44ef863c455bdf9" +dependencies = [ + "log", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memmap2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "mio" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +dependencies = [ + "libc", + "log", + "miow", + "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "murmurhash32" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d736ff882f0e85fe9689fb23db229616c4c00aee2b3ac282f666d8f20eb25d4a" +dependencies = [ + "byteorder", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num_threads" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +dependencies = [ + "libc", +] + +[[package]] +name = "once_cell" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" + +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "opentelemetry" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand", + "thiserror", +] + +[[package]] +name = "opentelemetry-prometheus" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9328977e479cebe12ce0d3fcecdaea4721d234895a9440c5b5dfd113f0594ac6" +dependencies = [ + "opentelemetry", + "prometheus", + "protobuf", +] + +[[package]] +name = "ordered-multimap" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown 0.9.1", +] + +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] +name = "ownedbytes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfa208b217a39411d78b85427792e4c1bc40508acbcefd2836e765f44a5c99e" +dependencies = [ + "stable_deref_trait", +] + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.1", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +dependencies = [ + "maplit", + "pest", + "sha-1", +] + +[[package]] +name = "petgraph" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pin-project" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "pretty_assertions" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c038cb5319b9c704bf9c227c261d275bfec0ad438118a2787ce47944fb228b" +dependencies = [ + "ansi_term", + "ctor", + "diff", + "output_vt100", +] + +[[package]] +name = "proc-macro-crate" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +dependencies = [ + "thiserror", + "toml", +] + +[[package]] +name = "proc-macro2" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "prometheus" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot 0.11.2", + "protobuf", + "thiserror", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost", + "prost-types", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "prost-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +dependencies = [ + "bytes", + "prost", +] + +[[package]] +name = "protobuf" +version = "2.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" + +[[package]] +name = "quote" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "rdkafka" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de127f294f2dba488ed46760b129d5ecbeabbd337ccbf3739cb29d50db2161c" +dependencies = [ + "futures", + "libc", + "log", + "rdkafka-sys", + "serde", + "serde_derive", + "serde_json", + "slab", + "tokio", +] + +[[package]] +name = "rdkafka-sys" +version = "4.2.0+1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e542c6863b04ce0fa0c5719bc6b7b348cf8dd21af1bb03c9db5f9805b2a6473" +dependencies = [ + "libc", + "libz-sys", + "num_enum", + "pkg-config", +] + +[[package]] +name = "redox_syscall" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.6.25", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.25", +] + +[[package]] +name = "regex-syntax" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "ron" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" +dependencies = [ + "base64", + "bitflags", + "serde", +] + +[[package]] +name = "rust-ini" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.8.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +dependencies = [ + "indexmap", + "ryu", + "serde", + "yaml-rust", +] + +[[package]] +name = "sha-1" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +dependencies = [ + "block-buffer", + "digest", + "fake-simd", + "opaque-debug", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "smawk" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" + +[[package]] +name = "socket2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "tantivy" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "264c2549892aa83975386a924ef8d0b8e909674c837d37ea58b4bd8739495c6e" +dependencies = [ + "async-trait", + "base64", + "bitpacking", + "brotli", + "byteorder", + "census", + "chrono", + "crc32fast", + "crossbeam", + "downcast-rs", + "fail", + "fastdivide", + "fastfield_codecs", + "fnv", + "fs2", + "futures", + "htmlescape", + "itertools", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", + "murmurhash32", + "num_cpus", + "once_cell", + "ownedbytes", + "pretty_assertions", + "rayon", + "regex", + "rust-stemmers", + "serde", + "serde_json", + "smallvec", + "stable_deref_trait", + "tantivy-bitpacker", + "tantivy-common 0.2.0", + "tantivy-fst", + "tantivy-query-grammar", + "tempfile", + "thiserror", + "uuid", + "winapi", +] + +[[package]] +name = "tantivy-bitpacker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d10a5ed75437a4f6bbbba67601cd5adab8d71f5188b677055381f0f36064f2" + +[[package]] +name = "tantivy-common" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760e44073e328f4ea3f38660da9ba2598a19ad5ad4149cfb89ad89b4d5ee88d9" +dependencies = [ + "byteorder", +] + +[[package]] +name = "tantivy-common" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078cd12c7e46eb2cd66ec813eac8472e0f9dfe816f26159effceffd2dbe4793" +dependencies = [ + "byteorder", + "ownedbytes", +] + +[[package]] +name = "tantivy-fst" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20cdc0d83e9184560bdde9cd60142dbb4af2e0f770e88fce45770495224205" +dependencies = [ + "byteorder", + "regex-syntax 0.4.2", + "utf8-ranges", +] + +[[package]] +name = "tantivy-query-grammar" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "466e0218472a9b276a73e38b2571ac02f9a1b270b4481c9cd8cc23a63d1307e9" +dependencies = [ + "combine", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +dependencies = [ + "itoa", + "libc", + "num_threads", +] + +[[package]] +name = "tokio" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +dependencies = [ + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "once_cell", + "parking_lot 0.12.0", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "winapi", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-macros" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-stream" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +dependencies = [ + "serde", +] + +[[package]] +name = "tonic" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +dependencies = [ + "async-stream", + "async-trait", + "base64", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util 0.6.9", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +dependencies = [ + "proc-macro2", + "prost-build", + "quote", + "syn", +] + +[[package]] +name = "tower" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" +dependencies = [ + "futures-core", + "futures-util", + "indexmap", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util 0.7.0", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" + +[[package]] +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +dependencies = [ + "crossbeam-channel", + "time 0.3.7", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +dependencies = [ + "lazy_static", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" +dependencies = [ + "ansi_term", + "lazy_static", + "matchers", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "twox-hash" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +dependencies = [ + "cfg-if", + "static_assertions", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "ucd-trie" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" + +[[package]] +name = "unicode-linebreak" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f" +dependencies = [ + "regex", +] + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "utf8-ranges" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" + +[[package]] +name = "which" +version = "4.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +dependencies = [ + "either", + "lazy_static", + "libc", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] diff --git a/rules/rust/Cargo.raze.lock b/rules/rust/Cargo.raze.lock index 3447e14..2f5971d 100644 --- a/rules/rust/Cargo.raze.lock +++ b/rules/rust/Cargo.raze.lock @@ -1,362 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -[[package]] -name = "actix" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be241f88f3b1e7e9a3fbe3b5a8a0f6915b5a1d7ee0d9a248d3376d01068cc60" -dependencies = [ - "actix-rt", - "actix_derive", - "bitflags", - "bytes 0.5.6", - "crossbeam-channel 0.4.4", - "derive_more", - "futures-channel", - "futures-util", - "log", - "once_cell", - "parking_lot", - "pin-project 0.4.28", - "smallvec", - "tokio 0.2.25", - "tokio-util 0.3.1", - "trust-dns-proto", - "trust-dns-resolver", -] - -[[package]] -name = "actix-codec" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380" -dependencies = [ - "bitflags", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "tokio 0.2.25", - "tokio-util 0.2.0", -] - -[[package]] -name = "actix-codec" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" -dependencies = [ - "bitflags", - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project 0.4.28", - "tokio 0.2.25", - "tokio-util 0.3.1", -] - -[[package]] -name = "actix-connect" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc" -dependencies = [ - "actix-codec 0.3.0", - "actix-rt", - "actix-service", - "actix-utils 2.0.0", - "derive_more", - "either", - "futures-util", - "http", - "log", - "trust-dns-proto", - "trust-dns-resolver", -] - -[[package]] -name = "actix-cors" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b133d8026a9f209a9aeeeacd028e7451bcca975f592881b305d37983f303d7" -dependencies = [ - "actix-web", - "derive_more", - "futures-util", - "log", - "once_cell", - "tinyvec", -] - -[[package]] -name = "actix-http" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" -dependencies = [ - "actix-codec 0.3.0", - "actix-connect", - "actix-rt", - "actix-service", - "actix-threadpool", - "actix-utils 2.0.0", - "base64 0.13.0", - "bitflags", - "bytes 0.5.6", - "cookie", - "copyless", - "derive_more", - "either", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "fxhash", - "h2", - "http", - "httparse", - "indexmap", - "itoa", - "language-tags", - "lazy_static", - "log", - "mime", - "percent-encoding", - "pin-project 1.0.7", - "rand 0.7.3", - "regex", - "serde 1.0.125", - "serde_json", - "serde_urlencoded", - "sha-1", - "slab", - "time 0.2.26", -] - -[[package]] -name = "actix-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" -dependencies = [ - "quote", - "syn", -] - -[[package]] -name = "actix-router" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" -dependencies = [ - "bytestring", - "http", - "log", - "regex", - "serde 1.0.125", -] - -[[package]] -name = "actix-rt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227" -dependencies = [ - "actix-macros", - "actix-threadpool", - "copyless", - "futures-channel", - "futures-util", - "smallvec", - "tokio 0.2.25", -] - -[[package]] -name = "actix-server" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e" -dependencies = [ - "actix-codec 0.3.0", - "actix-rt", - "actix-service", - "actix-utils 2.0.0", - "futures-channel", - "futures-util", - "log", - "mio 0.6.23", - "mio-uds", - "num_cpus", - "slab", - "socket2 0.3.19", -] - -[[package]] -name = "actix-service" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" -dependencies = [ - "futures-util", - "pin-project 0.4.28", -] - -[[package]] -name = "actix-testing" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47239ca38799ab74ee6a8a94d1ce857014b2ac36f242f70f3f75a66f691e791c" -dependencies = [ - "actix-macros", - "actix-rt", - "actix-server", - "actix-service", - "log", - "socket2 0.3.19", -] - -[[package]] -name = "actix-threadpool" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d209f04d002854b9afd3743032a27b066158817965bf5d036824d19ac2cc0e30" -dependencies = [ - "derive_more", - "futures-channel", - "lazy_static", - "log", - "num_cpus", - "parking_lot", - "threadpool", -] - -[[package]] -name = "actix-tls" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb" -dependencies = [ - "actix-codec 0.3.0", - "actix-service", - "actix-utils 2.0.0", - "futures-util", -] - -[[package]] -name = "actix-utils" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e" -dependencies = [ - "actix-codec 0.2.0", - "actix-rt", - "actix-service", - "bitflags", - "bytes 0.5.6", - "either", - "futures", - "log", - "pin-project 0.4.28", - "slab", -] - -[[package]] -name = "actix-utils" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a" -dependencies = [ - "actix-codec 0.3.0", - "actix-rt", - "actix-service", - "bitflags", - "bytes 0.5.6", - "either", - "futures-channel", - "futures-sink", - "futures-util", - "log", - "pin-project 0.4.28", - "slab", -] - -[[package]] -name = "actix-web" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" -dependencies = [ - "actix-codec 0.3.0", - "actix-http", - "actix-macros", - "actix-router", - "actix-rt", - "actix-server", - "actix-service", - "actix-testing", - "actix-threadpool", - "actix-tls", - "actix-utils 2.0.0", - "actix-web-codegen", - "awc", - "bytes 0.5.6", - "derive_more", - "encoding_rs", - "futures-channel", - "futures-core", - "futures-util", - "fxhash", - "log", - "mime", - "pin-project 1.0.7", - "regex", - "serde 1.0.125", - "serde_json", - "serde_urlencoded", - "socket2 0.3.19", - "time 0.2.26", - "tinyvec", - "url", -] - -[[package]] -name = "actix-web-codegen" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "actix_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95aceadaf327f18f0df5962fedc1bde2f870566a0b9f65c89508a3b1f79334c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "addr2line" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "ahash" version = "0.4.7" @@ -364,19 +7,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] -name = "aho-corasick" -version = "0.7.15" +name = "ahash" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] [[package]] name = "alloc-no-stdlib" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192ec435945d87bc2f70992b4d818154b5feede43c09fb7592146374eac90a6" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" [[package]] name = "alloc-stdlib" @@ -389,42 +43,34 @@ dependencies = [ [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] -name = "antidote" -version = "1.0.0" +name = "anyhow" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] -name = "arc-swap" -version = "0.4.8" +name = "async-stream" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +dependencies = [ + "async-stream-impl", + "futures-core", +] [[package]] -name = "arc-swap" -version = "1.2.0" +name = "async-stream-impl" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "async-trait" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ "proc-macro2", "quote", @@ -432,14 +78,14 @@ dependencies = [ ] [[package]] -name = "atomicwrites" -version = "0.2.5" +name = "async-trait" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2baf2feb820299c53c7ad1cc4f5914a220a1cb76d7ce321d2522a94b54651f" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ - "nix", - "tempdir", - "winapi 0.3.9", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -450,74 +96,14 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "awc" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" -dependencies = [ - "actix-codec 0.3.0", - "actix-http", - "actix-rt", - "actix-service", - "base64 0.13.0", - "bytes 0.5.6", - "cfg-if 1.0.0", - "derive_more", - "futures-core", - "log", - "mime", - "percent-encoding", - "rand 0.7.3", - "serde 1.0.125", - "serde_json", - "serde_urlencoded", -] - -[[package]] -name = "backtrace" -version = "0.3.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" -dependencies = [ - "addr2line", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" @@ -525,83 +111,47 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" -[[package]] -name = "bb8" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374bba43fc924d90393ee7768e6f75d223a98307a488fe5bc34b66c3e96932a6" -dependencies = [ - "async-trait", - "futures", - "tokio 0.2.25", -] - -[[package]] -name = "bb8-postgres" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a233af6ea3952e20d01863c87b4f6689b2f806249688b0908b5f02d4fa41ac" -dependencies = [ - "async-trait", - "bb8", - "futures", - "tokio 0.2.25", - "tokio-postgres 0.5.5", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde 1.0.125", -] - -[[package]] -name = "bit-set" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitpacking" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3744aff20a3437a99ebc0bb7733e9e60c7bf590478c9b897e95b38d57e5acb68" +checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" dependencies = [ "crunchy", ] [[package]] name = "block-buffer" -version = "0.9.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" dependencies = [ + "block-padding", + "byte-tools", + "byteorder", "generic-array", ] [[package]] -name = "brotli" -version = "3.3.0" +name = "block-padding" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f29919120f08613aadcd4383764e00526fc9f18b6c0895814faeed0dd78613e" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + +[[package]] +name = "brotli" +version = "3.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838e47a451d5a8fa552371f80024dd6ace9b7acdf25c4c3d0f9bc6816fb1c39" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -610,31 +160,25 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1052e1c3b8d4d80eb84a8b94f0a1498797b5fb96314c001156a1c761940ef4ec" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bstr" -version = "0.2.15" +name = "bumpalo" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde 1.0.125", -] +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] -name = "bumpalo" -version = "3.6.1" +name = "byte-tools" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" @@ -644,39 +188,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "0.5.6" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "bytestring" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" -dependencies = [ - "bytes 1.0.1", -] - -[[package]] -name = "cast" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75" -dependencies = [ - "rustc_version", -] +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cc" -version = "1.0.67" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "census" @@ -684,12 +204,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5927edd8345aef08578bcbb4aea7314f340d80c7f4931f99fbeb40b99d8f5060" -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -704,34 +218,25 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ "libc", "num-integer", - "num-traits 0.2.14", - "serde 1.0.125", - "time 0.1.43", - "winapi 0.3.9", + "num-traits", + "time 0.1.44", + "winapi", ] [[package]] name = "clap" -version = "2.33.3" +version = "3.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123" dependencies = [ - "ansi_term", "atty", "bitflags", + "indexmap", + "lazy_static", + "os_str_bytes", "strsim", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", + "termcolor", + "textwrap", ] [[package]] @@ -742,239 +247,112 @@ checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" dependencies = [ "atty", "lazy_static", - "winapi 0.3.9", + "winapi", ] [[package]] name = "combine" -version = "4.5.2" +version = "4.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" dependencies = [ "memchr", ] [[package]] name = "config" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" -dependencies = [ - "lazy_static", - "nom", - "serde 1.0.125", -] - -[[package]] -name = "config" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369" +checksum = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86" dependencies = [ + "async-trait", + "json5", "lazy_static", "nom", + "pathdiff", + "ron", "rust-ini", - "serde 1.0.125", - "serde-hjson", + "serde", "serde_json", "toml", "yaml-rust", ] -[[package]] -name = "const_fn" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "percent-encoding", - "time 0.2.26", - "version_check", -] - -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - -[[package]] -name = "cpuid-bool" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" - [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "criterion" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" -dependencies = [ - "atty", - "cast", - "clap", - "criterion-plot", - "csv", - "itertools 0.10.0", - "lazy_static", - "num-traits 0.2.14", - "oorandom", - "plotters", - "rayon", - "regex", - "serde 1.0.125", - "serde_cbor", - "serde_derive", - "serde_json", - "tinytemplate", - "walkdir", -] - -[[package]] -name = "criterion-plot" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" -dependencies = [ - "cast", - "itertools 0.9.0", + "cfg-if", ] [[package]] name = "crossbeam" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" +checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ - "cfg-if 0.1.10", - "crossbeam-channel 0.4.4", - "crossbeam-deque 0.7.3", - "crossbeam-epoch 0.8.2", + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.7.2", + "crossbeam-utils", ] [[package]] name = "crossbeam-channel" -version = "0.4.4" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.3", + "cfg-if", + "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.7.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.3", - "crossbeam-utils 0.8.3", + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.8.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ "autocfg", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", + "cfg-if", + "crossbeam-utils", "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.3", - "lazy_static", - "memoffset 0.6.3", + "memoffset", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.2.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", + "cfg-if", + "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", + "cfg-if", "lazy_static", ] @@ -985,287 +363,115 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-mac" -version = "0.9.1" +name = "ctor" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "crypto-mac" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "csv" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" -dependencies = [ - "bstr", - "csv-core", - "itoa", - "ryu", - "serde 1.0.125", -] - -[[package]] -name = "csv-core" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" -dependencies = [ - "memchr", -] - -[[package]] -name = "deadpool" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aaff9a7a1de9893f4004fa08527b31cb2ae4121c44e053cf53f29203c73bd23" -dependencies = [ - "async-trait", - "config 0.10.1", - "crossbeam-queue", - "num_cpus", - "serde 1.0.125", - "tokio 0.2.25", -] - -[[package]] -name = "deadpool-postgres" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faad41e7f93dd682108c72aec029e5bc6238e7df64c9d84832525d4033d2e726" -dependencies = [ - "async-trait", - "config 0.10.1", - "deadpool", - "futures", - "log", - "serde 1.0.125", - "tokio 0.2.25", - "tokio-postgres 0.5.5", -] - -[[package]] -name = "derive_more" -version = "0.99.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" -dependencies = [ - "convert_case", - "proc-macro2", "quote", "syn", ] [[package]] -name = "digest" -version = "0.9.0" +name = "dashmap" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if", + "num_cpus", +] + +[[package]] +name = "diff" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ "generic-array", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dlv-list" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", + "rand", ] -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - [[package]] name = "either" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "encoding_rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-as-inner" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "env_logger" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" -dependencies = [ - "atty", - "humantime 2.1.0", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "erased-serde" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0465971a8cc1fa2455c8465aaa377131e1f1cf4983280f474a13e68793aa770c" -dependencies = [ - "serde 1.0.125", -] - [[package]] name = "fail" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6" +checksum = "ec3245a0ca564e7f3c797d20d833a6870f57a728ac967d5225b3ffdef4465011" dependencies = [ "lazy_static", "log", - "rand 0.7.3", + "rand", ] [[package]] -name = "failure" -version = "0.1.8" +name = "fake-simd" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fancy-regex" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae91abf6555234338687bb47913978d275539235fcb77ba9863b779090b42b14" -dependencies = [ - "bit-set", - "regex", -] +checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fastdivide" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a99a2d53cf90642500986ad22e5083b09e42d44c408f5f112e2a4a0925a643c" +checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" [[package]] -name = "filetime" -version = "0.2.14" +name = "fastfield_codecs" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" +checksum = "bb0e8bfa31546b4ace05092c9db8d251d7bbc298a384875a08c945a473de4f1f" dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.6", - "winapi 0.3.9", + "tantivy-bitpacker", + "tantivy-common 0.1.0", ] [[package]] -name = "flate2" -version = "1.0.20" +name = "fastrand" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ - "cfg-if 1.0.0", - "crc32fast", - "libc", - "miniz_oxide", + "instant", ] +[[package]] +name = "fixedbitset" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e" + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - [[package]] name = "fs2" version = "0.4.3" @@ -1273,51 +479,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] -[[package]] -name = "fst" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927fb434ff9f0115b215dc0efd2e4fbdd7448522a92a1aa37c77d6a2f8f1ebd6" -dependencies = [ - "byteorder", -] - -[[package]] -name = "fst" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f" - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "futures" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -1330,9 +499,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -1340,15 +509,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -1358,17 +527,16 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-macro" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -1376,21 +544,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.14" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-channel", "futures-core", @@ -1399,96 +567,38 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab", ] -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - [[package]] name = "generic-array" -version = "0.14.4" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", - "version_check", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.10.2+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" - -[[package]] -name = "grpc" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbd563cd51f8b9d3578a8029989b090aca83b8b411bfe1c7577b8b0f92937f8" -dependencies = [ - "base64 0.9.3", - "bytes 0.5.6", - "futures", - "httpbis", - "log", - "log-ndc", - "tls-api", - "tls-api-stub", - "tokio 0.2.25", -] - -[[package]] -name = "grpc-compiler" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f971449e16e799ebbf106d2414c115ff46f2849689c61da3a3271be0884a34" -dependencies = [ - "protobuf", - "protobuf-codegen", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] name = "h2" -version = "0.2.7" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" dependencies = [ - "bytes 0.5.6", + "bytes", "fnv", "futures-core", "futures-sink", @@ -1496,76 +606,47 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 0.2.25", - "tokio-util 0.3.1", + "tokio", + "tokio-util 0.6.9", "tracing", - "tracing-futures", ] -[[package]] -name = "half" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" - [[package]] name = "hashbrown" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ - "ahash", + "ahash 0.4.7", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.6", ] [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] -[[package]] -name = "hmac" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" -dependencies = [ - "crypto-mac 0.9.1", - "digest", -] - -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac 0.10.0", - "digest", -] - -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi 0.3.9", -] - [[package]] name = "htmlescape" version = "0.3.1" @@ -1574,283 +655,172 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" [[package]] name = "http" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ - "bytes 1.0.1", + "bytes", "fnv", "itoa", ] +[[package]] +name = "http-body" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + [[package]] name = "httparse" -version = "1.4.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437" +checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" [[package]] -name = "httpbis" -version = "0.9.1" +name = "httpdate" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3e4404f8f87938a2db89336609bde64363f5a556b15af936343e7252c9648d" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" dependencies = [ - "bytes 0.5.6", - "futures", - "log", - "log-ndc", - "net2", - "rand 0.5.6", - "tls-api", - "tls-api-stub", - "tokio 0.2.25", - "unix_socket", - "void", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", ] [[package]] -name = "humantime" -version = "1.3.0" +name = "hyper-timeout" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "quick-error", + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", ] -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyperboria" version = "0.0.0" dependencies = [ - "actix", - "actix-cors", - "actix-http", - "actix-rt", - "actix-service", - "actix-threadpool", - "actix-utils 1.0.6", - "actix-web", - "async-trait", - "atomicwrites", - "autocfg", - "backtrace", - "base64 0.12.3", - "bb8", - "bb8-postgres", - "bincode", - "bitpacking", - "brotli", - "byteorder", - "bytes 0.5.6", - "census", - "chrono", "clap", "colored", - "combine", - "config 0.11.0", - "crc32fast", - "criterion", - "crossbeam", - "crossbeam-channel 0.5.1", - "deadpool", - "deadpool-postgres", - "derive_more", - "dotenv", - "downcast-rs", - "env_logger", - "erased-serde", - "fail", - "failure", - "fancy-regex", - "fastdivide", - "fnv", - "fs2", - "fst 0.4.5", + "config", "futures", - "grpc", - "grpc-compiler", - "htmlescape", - "integer-encoding", - "itertools 0.9.0", + "futures-util", + "hyper", "lazy_static", - "levenshtein_automata", - "lexical-core", - "libc", - "log", - "log4rs", - "lru", - "lz4", - "lz4-sys", - "maplit", - "matches", - "memmap", - "murmurhash32", - "num-bigint", - "num-traits 0.2.14", - "num_cpus", - "once_cell", - "owned-read", - "owning_ref", - "pin-project 0.4.28", - "postgres", - "postgres-types 0.1.3", - "proptest", - "protobuf", - "protobuf-codegen", - "r2d2", - "r2d2_postgres", - "rand 0.7.3", - "rayon", - "regex", - "reopen", - "rust-stemmers", - "rustc-serialize", - "serde 1.0.125", + "opentelemetry", + "opentelemetry-prometheus", + "parking_lot 0.12.0", + "prometheus", + "prost", + "prost-types", + "rand", + "rdkafka", + "serde", "serde_derive", - "serde_json", - "serde_qs", "serde_yaml", - "signal-hook 0.3.8", - "slog", - "slog-async", - "slog-json", - "slog-stdlog", - "slog-term", - "slog_derive", - "smallvec", - "snap", - "stable_deref_trait", - "strum", - "strum_macros", + "signal-hook", + "tantivy", "tantivy-fst", - "tar", - "tempdir", - "tempfile", - "textwrap 0.13.4", + "textwrap", "thiserror", - "time 0.2.26", - "tls-api", - "tls-api-stub", - "tokio 0.2.25", - "tokio-pg-mapper", - "tokio-pg-mapper-derive", - "tokio-postgres 0.5.5", - "typenum", - "urlparse", - "uuid", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", + "tokio", + "tonic", + "tonic-build", + "tower", + "tower-http", + "tracing", + "tracing-appender", + "tracing-futures", + "tracing-subscriber", ] [[package]] name = "indexmap" -version = "1.6.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] name = "instant" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "integer-encoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27df786dcc3a75ccd134f83ece166af0a1e5785d52b12b7375d0d063e1d5c47" - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipconfig" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" -dependencies = [ - "socket2 0.3.19", - "widestring", - "winapi 0.3.9", - "winreg", + "cfg-if", ] [[package]] name = "itertools" -version = "0.9.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.7" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] [[package]] -name = "kernel32-sys" -version = "0.2.2" +name = "json5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "pest", + "pest_derive", + "serde", ] -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - [[package]] name = "lazy_static" version = "1.4.0" @@ -1859,31 +829,27 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "levenshtein_automata" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a004f877f468548d8d0ac4977456a249d8fabbdb8416c36db163dfc8f2e8ca" -dependencies = [ - "fst 0.3.5", -] - -[[package]] -name = "lexical-core" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374" -dependencies = [ - "arrayvec", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" [[package]] name = "libc" -version = "0.2.93" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" + +[[package]] +name = "libz-sys" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] [[package]] name = "linked-hash-map" @@ -1893,9 +859,9 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -1906,86 +872,25 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 1.0.0", - "serde 1.0.125", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" - -[[package]] -name = "log-ndc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb09057c7b58b7d27498b528eaee9a1e661b2974a733fcabbbc3350360bc8bd" -dependencies = [ - "log", -] - -[[package]] -name = "log4rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853db99624c59798ddcf027dbe486541dd5cb5008ac6a6aaf217cc6fa044ee71" -dependencies = [ - "antidote", - "arc-swap 0.4.8", - "chrono", - "flate2", - "fnv", - "humantime 1.3.0", - "libc", - "log", - "log-mdc", - "serde 1.0.125", - "serde-value", - "serde_derive", - "serde_json", - "serde_yaml", - "thread-id", - "typemap", - "winapi 0.3.9", + "cfg-if", ] [[package]] name = "lru" -version = "0.6.5" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba" +checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] -name = "lru-cache" -version = "0.1.2" +name = "lz4_flex" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +checksum = "42c51df9d8d4842336c835df1d85ed447c4813baa237d033d95128bf5552ad8a" dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "lz4" -version = "1.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c" -dependencies = [ - "libc", - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae" -dependencies = [ - "cc", - "libc", + "twox-hash", ] [[package]] @@ -1995,155 +900,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] -name = "match_cfg" +name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "md-5" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "block-buffer", - "digest", - "opaque-debug", + "regex-automata", ] [[package]] -name = "md5" -version = "0.7.0" +name = "measure_time" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" +checksum = "5f07966480d8562b3622f51df0b4e3fe6ea7ddb3b48b19b0f44ef863c455bdf9" +dependencies = [ + "log", +] [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] -name = "memmap" -version = "0.7.0" +name = "memmap2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +checksum = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f" dependencies = [ "libc", - "winapi 0.3.9", ] [[package]] name = "memoffset" -version = "0.5.6" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] [[package]] -name = "memoffset" -version = "0.6.3" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.6.23" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", - "miow 0.3.7", + "miow", "ntapi", - "winapi 0.3.9", -] - -[[package]] -name = "mio-named-pipes" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" -dependencies = [ - "log", - "mio 0.6.23", - "miow 0.3.7", - "winapi 0.3.9", -] - -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "wasi 0.11.0+wasi-snapshot-preview1", + "winapi", ] [[package]] @@ -2152,9 +967,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "winapi 0.3.9", + "winapi", ] +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + [[package]] name = "murmurhash32" version = "0.2.0" @@ -2164,59 +985,23 @@ dependencies = [ "byteorder", ] -[[package]] -name = "net2" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "nix" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", - "libc", - "void", -] - [[package]] name = "nom" -version = "5.1.2" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ - "lexical-core", "memchr", - "version_check", + "minimal-lexical", ] [[package]] name = "ntapi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "num-bigint" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" -dependencies = [ - "autocfg", - "num-integer", - "num-traits 0.2.14", + "winapi", ] [[package]] @@ -2226,16 +1011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ "autocfg", - "num-traits 0.2.14", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.14", + "num-traits", ] [[package]] @@ -2249,90 +1025,179 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", ] [[package]] -name = "object" -version = "0.23.0" +name = "num_enum" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num_threads" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +dependencies = [ + "libc", +] [[package]] name = "once_cell" -version = "1.7.2" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - -[[package]] -name = "oorandom" -version = "11.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] -name = "ordered-float" -version = "1.1.1" +name = "opentelemetry" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ - "num-traits 0.2.14", + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand", + "thiserror", ] [[package]] -name = "owned-read" -version = "0.4.1" +name = "opentelemetry-prometheus" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66d1e235abcebc845cf93550b89b74f468c051496fafb433ede4104b9f71ba1" +checksum = "9328977e479cebe12ce0d3fcecdaea4721d234895a9440c5b5dfd113f0594ac6" dependencies = [ - "stable_deref_trait", + "opentelemetry", + "prometheus", + "protobuf", ] [[package]] -name = "owning_ref" -version = "0.4.1" +name = "ordered-multimap" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown 0.9.1", +] + +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + +[[package]] +name = "ownedbytes" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfa208b217a39411d78b85427792e4c1bc40508acbcefd2836e765f44a5c99e" dependencies = [ "stable_deref_trait", ] [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.1", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", - "redox_syscall 0.2.6", + "redox_syscall", "smallvec", - "winapi 0.3.9", + "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + [[package]] name = "percent-encoding" version = "2.1.0" @@ -2340,57 +1205,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "phf" -version = "0.8.0" +name = "pest" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" dependencies = [ - "phf_shared", + "ucd-trie", ] [[package]] -name = "phf_shared" -version = "0.8.0" +name = "pest_derive" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" dependencies = [ - "siphasher", + "pest", + "pest_generator", ] [[package]] -name = "pin-project" -version = "0.4.28" +name = "pest_generator" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" -dependencies = [ - "pin-project-internal 0.4.28", -] - -[[package]] -name = "pin-project" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" -dependencies = [ - "pin-project-internal 1.0.7", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ + "pest", + "pest_meta", "proc-macro2", "quote", "syn", ] [[package]] -name = "pin-project-internal" -version = "1.0.7" +name = "pest_meta" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" +checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +dependencies = [ + "maplit", + "pest", + "sha-1", +] + +[[package]] +name = "petgraph" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +dependencies = [ + "fixedbitset", + "indexmap", +] + +[[package]] +name = "pin-project" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -2399,15 +1279,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.12" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -2416,428 +1290,242 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "plotters" -version = "0.3.0" +name = "pkg-config" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "pretty_assertions" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c038cb5319b9c704bf9c227c261d275bfec0ad438118a2787ce47944fb228b" dependencies = [ - "num-traits 0.2.14", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", + "ansi_term", + "ctor", + "diff", + "output_vt100", ] [[package]] -name = "plotters-backend" -version = "0.3.0" +name = "proc-macro-crate" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" - -[[package]] -name = "plotters-svg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "plotters-backend", + "thiserror", + "toml", ] [[package]] -name = "postgres" -version = "0.17.5" +name = "proc-macro2" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d864cf6c2eabf1323afe4145ff273aad1898e4f2a3bcb30347715df8624a07" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ - "bytes 0.5.6", - "fallible-iterator", - "futures", + "unicode-xid", +] + +[[package]] +name = "prometheus" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" +dependencies = [ + "cfg-if", + "fnv", + "lazy_static", + "memchr", + "parking_lot 0.11.2", + "protobuf", + "thiserror", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +dependencies = [ + "bytes", + "heck", + "itertools", + "lazy_static", "log", - "tokio 0.2.25", - "tokio-postgres 0.5.5", + "multimap", + "petgraph", + "prost", + "prost-types", + "regex", + "tempfile", + "which", ] [[package]] -name = "postgres-derive" -version = "0.4.0" +name = "prost-derive" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c857dd221cb0e7d8414b894a0ce29eae44d453dda0baa132447878e75e701477" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ + "anyhow", + "itertools", "proc-macro2", "quote", "syn", ] [[package]] -name = "postgres-protocol" -version = "0.5.3" +name = "prost-types" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4888a0e36637ab38d76cace88c1476937d617ad015f07f6b669cec11beacc019" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ - "base64 0.13.0", - "byteorder", - "bytes 0.5.6", - "fallible-iterator", - "hmac 0.9.0", - "md5", - "memchr", - "rand 0.7.3", - "sha2", - "stringprep", -] - -[[package]] -name = "postgres-protocol" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff3e0f70d32e20923cabf2df02913be7c1842d4c772db8065c00fcfdd1d1bff3" -dependencies = [ - "base64 0.13.0", - "byteorder", - "bytes 1.0.1", - "fallible-iterator", - "hmac 0.10.1", - "md-5", - "memchr", - "rand 0.8.3", - "sha2", - "stringprep", -] - -[[package]] -name = "postgres-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc08a7d94a80665de4a83942fa8db2fdeaf2f123fc0535e384dc4fff251efae" -dependencies = [ - "bytes 0.5.6", - "fallible-iterator", - "postgres-derive", - "postgres-protocol 0.5.3", - "serde 1.0.125", - "serde_json", -] - -[[package]] -name = "postgres-types" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430f4131e1b7657b0cd9a2b0c3408d77c9a43a042d300b8c77f981dffcc43a2f" -dependencies = [ - "bytes 1.0.1", - "fallible-iterator", - "postgres-protocol 0.6.1", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro-nested" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" - -[[package]] -name = "proc-macro2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "proptest" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f" -dependencies = [ - "bit-set", - "bitflags", - "byteorder", - "lazy_static", - "num-traits 0.2.14", - "quick-error", - "rand 0.7.3", - "rand_chacha 0.2.2", - "rand_xorshift", - "regex-syntax 0.6.23", - "rusty-fork", - "tempfile", + "bytes", + "prost", ] [[package]] name = "protobuf" -version = "2.18.2" +version = "2.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8e18df92889779cfe50ccf640173141ff73c5b2817e553d6d35230f798a036" -dependencies = [ - "bytes 0.5.6", -] - -[[package]] -name = "protobuf-codegen" -version = "2.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49782fe28b5ff7d5d51cbfbe8985f3ff863acea663c515ed369c53f72e1d628" -dependencies = [ - "protobuf", -] - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57" dependencies = [ "proc-macro2", ] -[[package]] -name = "r2d2" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" -dependencies = [ - "log", - "parking_lot", - "scheduled-thread-pool", -] - -[[package]] -name = "r2d2_postgres" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707d27f66f43bac1081141f6d9611fffcce7da2841ae97c7ac53619d098efe8f" -dependencies = [ - "postgres", - "r2d2", -] - [[package]] name = "rand" -version = "0.4.6" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi 0.3.9", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha", + "rand_core", ] [[package]] name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.2", -] - -[[package]] -name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ - "rand_core 0.4.2", + "ppv-lite86", + "rand_core", ] [[package]] name = "rand_core" -version = "0.4.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom 0.2.2", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_hc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" -dependencies = [ - "rand_core 0.6.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "rayon" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg", - "crossbeam-deque 0.8.0", + "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.0", - "crossbeam-utils 0.8.3", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", "lazy_static", "num_cpus", ] [[package]] -name = "rdrand" -version = "0.4.0" +name = "rdkafka" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +checksum = "1de127f294f2dba488ed46760b129d5ecbeabbd337ccbf3739cb29d50db2161c" dependencies = [ - "rand_core 0.3.1", + "futures", + "libc", + "log", + "rdkafka-sys", + "serde", + "serde_derive", + "serde_json", + "slab", + "tokio", +] + +[[package]] +name = "rdkafka-sys" +version = "4.2.0+1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e542c6863b04ce0fa0c5719bc6b7b348cf8dd21af1bb03c9db5f9805b2a6473" +dependencies = [ + "libc", + "libz-sys", + "num_enum", + "pkg-config", ] [[package]] name = "redox_syscall" -version = "0.1.57" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" +checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" -dependencies = [ - "getrandom 0.2.2", - "redox_syscall 0.2.6", -] - [[package]] name = "regex" -version = "1.4.5" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.6.23", + "regex-syntax 0.6.25", ] [[package]] name = "regex-automata" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "byteorder", + "regex-syntax 0.6.25", ] [[package]] @@ -2848,9 +1536,9 @@ checksum = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" [[package]] name = "regex-syntax" -version = "0.6.23" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -2858,35 +1546,29 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] -name = "reopen" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5edcb3ed00766dec347874689b0a605087dee77a60912f23ce59928756e19631" -dependencies = [ - "autocfg", - "libc", - "signal-hook 0.2.3", -] - -[[package]] -name = "resolv-conf" +name = "ron" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +checksum = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678" dependencies = [ - "hostname", - "quick-error", + "base64", + "bitflags", + "serde", ] [[package]] name = "rust-ini" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if", + "ordered-multimap", +] [[package]] name = "rust-stemmers" @@ -2894,78 +1576,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" dependencies = [ - "serde 1.0.125", + "serde", "serde_derive", ] -[[package]] -name = "rustc-demangle" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" - -[[package]] -name = "rustc-serialize" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rustversion" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" -dependencies = [ - "parking_lot", -] +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "scopeguard" @@ -2973,73 +1592,20 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "0.8.23" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - -[[package]] -name = "serde" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] -[[package]] -name = "serde-hjson" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" -dependencies = [ - "lazy_static", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - -[[package]] -name = "serde-value" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb" -dependencies = [ - "ordered-float", - "serde 1.0.125", -] - -[[package]] -name = "serde_cbor" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" -dependencies = [ - "half", - "serde 1.0.125", -] - [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -3048,97 +1614,53 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.64" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ "itoa", "ryu", - "serde 1.0.125", -] - -[[package]] -name = "serde_qs" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22063cd705114614293767c69aa992531f72b0cc8a6b9145801920730fe25e4" -dependencies = [ - "percent-encoding", - "serde 1.0.125", - "thiserror", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde 1.0.125", + "serde", ] [[package]] name = "serde_yaml" -version = "0.8.17" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" +checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" dependencies = [ - "dtoa", - "linked-hash-map", - "serde 1.0.125", + "indexmap", + "ryu", + "serde", "yaml-rust", ] [[package]] name = "sha-1" -version = "0.9.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" +checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" dependencies = [ "block-buffer", - "cfg-if 1.0.0", - "cpuid-bool", "digest", + "fake-simd", "opaque-debug", ] [[package]] -name = "sha1" -version = "0.6.0" +name = "sharded-slab" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - -[[package]] -name = "sha2" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" dependencies = [ - "block-buffer", - "cfg-if 1.0.0", - "cpuid-bool", - "digest", - "opaque-debug", + "lazy_static", ] [[package]] name = "signal-hook" -version = "0.2.3" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "844024c8913df6bfbfeee3061075ccc47216a897ac0b54a683dea3dfe16d19af" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac" +checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" dependencies = [ "libc", "signal-hook-registry", @@ -3146,109 +1668,24 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] -[[package]] -name = "siphasher" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27" - [[package]] name = "slab" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - -[[package]] -name = "slog" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" -dependencies = [ - "erased-serde", -] - -[[package]] -name = "slog-async" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c60813879f820c85dbc4eabf3269befe374591289019775898d56a81a804fbdc" -dependencies = [ - "crossbeam-channel 0.5.1", - "slog", - "take_mut", - "thread_local", -] - -[[package]] -name = "slog-json" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a" -dependencies = [ - "chrono", - "serde 1.0.125", - "serde_json", - "slog", -] - -[[package]] -name = "slog-scope" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95a4b4c3274cd2869549da82b57ccc930859bdbf5bcea0424bc5f140b3c786" -dependencies = [ - "arc-swap 1.2.0", - "lazy_static", - "slog", -] - -[[package]] -name = "slog-stdlog" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8228ab7302adbf4fcb37e66f3cda78003feb521e7fd9e3847ec117a7784d0f5a" -dependencies = [ - "log", - "slog", - "slog-scope", -] - -[[package]] -name = "slog-term" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c1e7e5aab61ced6006149ea772770b84a0d16ce0f7885def313e4829946d76" -dependencies = [ - "atty", - "chrono", - "slog", - "term", - "thread_local", -] - -[[package]] -name = "slog_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smawk" @@ -3256,31 +1693,14 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" -[[package]] -name = "snap" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc725476a1398f0480d56cd0ad381f6f32acf2642704456f8f59a35df464b59a" - [[package]] name = "socket2" -version = "0.3.19" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3289,115 +1709,23 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde 1.0.125", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde 1.0.125", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "stringprep" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strum" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" - -[[package]] -name = "strum_macros" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "subtle" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.69" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" +checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" dependencies = [ "proc-macro2", "quote", @@ -3405,22 +1733,81 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.4" +name = "tantivy" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" +checksum = "264c2549892aa83975386a924ef8d0b8e909674c837d37ea58b4bd8739495c6e" dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", + "async-trait", + "base64", + "bitpacking", + "brotli", + "byteorder", + "census", + "chrono", + "crc32fast", + "crossbeam", + "downcast-rs", + "fail", + "fastdivide", + "fastfield_codecs", + "fnv", + "fs2", + "futures", + "htmlescape", + "itertools", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", + "murmurhash32", + "num_cpus", + "once_cell", + "ownedbytes", + "pretty_assertions", + "rayon", + "regex", + "rust-stemmers", + "serde", + "serde_json", + "smallvec", + "stable_deref_trait", + "tantivy-bitpacker", + "tantivy-common 0.2.0", + "tantivy-fst", + "tantivy-query-grammar", + "tempfile", + "thiserror", + "uuid", + "winapi", ] [[package]] -name = "take_mut" -version = "0.2.2" +name = "tantivy-bitpacker" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" +checksum = "66d10a5ed75437a4f6bbbba67601cd5adab8d71f5188b677055381f0f36064f2" + +[[package]] +name = "tantivy-common" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760e44073e328f4ea3f38660da9ba2598a19ad5ad4149cfb89ad89b4d5ee88d9" +dependencies = [ + "byteorder", +] + +[[package]] +name = "tantivy-common" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078cd12c7e46eb2cd66ec813eac8472e0f9dfe816f26159effceffd2dbe4793" +dependencies = [ + "byteorder", + "ownedbytes", +] [[package]] name = "tantivy-fst" @@ -3434,265 +1821,134 @@ dependencies = [ ] [[package]] -name = "tar" -version = "0.4.33" +name = "tantivy-query-grammar" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" +checksum = "466e0218472a9b276a73e38b2571ac02f9a1b270b4481c9cd8cc23a63d1307e9" dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", + "combine", ] [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", + "fastrand", "libc", - "rand 0.8.3", - "redox_syscall 0.2.6", + "redox_syscall", "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi 0.3.9", + "winapi", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd05616119e612a8041ef58f2b578906cc2531a6069047ae092cfb86a325d835" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" dependencies = [ "smawk", + "unicode-linebreak", "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "thread-id" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -dependencies = [ - "libc", - "redox_syscall 0.1.57", - "winapi 0.3.9", -] - [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] [[package]] -name = "threadpool" -version = "1.8.1" +name = "time" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +dependencies = [ + "itoa", + "libc", + "num_threads", +] + +[[package]] +name = "tokio" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +dependencies = [ + "bytes", + "libc", + "memchr", + "mio", "num_cpus", + "once_cell", + "parking_lot 0.12.0", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "winapi", ] [[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.2.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros", - "version_check", - "winapi 0.3.9", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - -[[package]] -name = "tinytemplate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" -dependencies = [ - "serde 1.0.125", - "serde_json", -] - -[[package]] -name = "tinyvec" +name = "tokio-io-timeout" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tls-api" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebb4107c167a4087349fcf08aea4debc358fe69d60fe1df991781842cfe98a3" -dependencies = [ - "log", - "tokio 0.2.25", -] - -[[package]] -name = "tls-api-stub" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8ff269def04f25ae84b9aac156a400b92c97018a184036548c91cedaafd783" -dependencies = [ - "tls-api", - "tokio 0.2.25", - "void", -] - -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "libc", - "memchr", - "mio 0.6.23", - "mio-named-pipes", - "mio-uds", - "num_cpus", - "pin-project-lite 0.1.12", - "signal-hook-registry", - "slab", - "tokio-macros", - "winapi 0.3.9", -] - -[[package]] -name = "tokio" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5" -dependencies = [ - "autocfg", - "bytes 1.0.1", - "libc", - "memchr", - "mio 0.7.11", - "pin-project-lite 0.2.6", + "pin-project-lite", + "tokio", ] [[package]] name = "tokio-macros" -version = "0.2.6" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", @@ -3700,111 +1956,42 @@ dependencies = [ ] [[package]] -name = "tokio-pg-mapper" -version = "0.2.0" +name = "tokio-stream" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f2b78f3566383ffabc553c72bbb2f129962a54886c5c4d8e8c706f84eceab8" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ - "tokio-postgres 0.7.1", -] - -[[package]] -name = "tokio-pg-mapper-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8548f756cd6eb4069c5af0fb0cec57001fb42bd1fb7330d8f24067ee3fa62608" -dependencies = [ - "quote", - "syn", - "tokio-postgres 0.7.1", -] - -[[package]] -name = "tokio-postgres" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a2482c9fe4dd481723cf5c0616f34afc710e55dcda0944e12e7b3316117892" -dependencies = [ - "async-trait", - "byteorder", - "bytes 0.5.6", - "fallible-iterator", - "futures", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite 0.1.12", - "postgres-protocol 0.5.3", - "postgres-types 0.1.3", - "tokio 0.2.25", - "tokio-util 0.3.1", -] - -[[package]] -name = "tokio-postgres" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98779a950cb6ef76f8ad71c411176115c5c1200a83eeeca4dd9f61e3fc4836c8" -dependencies = [ - "async-trait", - "byteorder", - "bytes 1.0.1", - "fallible-iterator", - "futures", - "log", - "parking_lot", - "percent-encoding", - "phf", - "pin-project-lite 0.2.6", - "postgres-protocol 0.6.1", - "postgres-types 0.2.1", - "socket2 0.4.0", - "tokio 1.5.0", - "tokio-util 0.6.6", + "futures-core", + "pin-project-lite", + "tokio", ] [[package]] name = "tokio-util" -version = "0.2.0" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ - "bytes 0.5.6", + "bytes", "futures-core", "futures-sink", "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", + "pin-project-lite", + "tokio", ] [[package]] name = "tokio-util" -version = "0.3.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1" dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio 0.2.25", -] - -[[package]] -name = "tokio-util" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e" -dependencies = [ - "bytes 1.0.1", + "bytes", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.6", - "tokio 1.5.0", + "pin-project-lite", + "tokio", ] [[package]] @@ -3813,28 +2000,146 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ - "serde 1.0.125", + "serde", ] [[package]] -name = "tracing" -version = "0.1.25" +name = "tonic" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" +checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" dependencies = [ - "cfg-if 1.0.0", + "async-stream", + "async-trait", + "base64", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util 0.6.9", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" +dependencies = [ + "proc-macro2", + "prost-build", + "quote", + "syn", +] + +[[package]] +name = "tower" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" +dependencies = [ + "futures-core", + "futures-util", + "indexmap", + "pin-project", + "pin-project-lite", + "rand", + "slab", + "tokio", + "tokio-util 0.7.0", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-layer" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" + +[[package]] +name = "tower-service" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + +[[package]] +name = "tracing" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +dependencies = [ + "cfg-if", "log", - "pin-project-lite 0.2.6", + "pin-project-lite", + "tracing-attributes", "tracing-core", ] [[package]] -name = "tracing-core" -version = "0.1.17" +name = "tracing-appender" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +dependencies = [ + "crossbeam-channel", + "time 0.3.7", + "tracing-subscriber", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -3843,142 +2148,106 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.7", + "pin-project", "tracing", ] [[package]] -name = "traitobject" -version = "0.1.0" +name = "tracing-log" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - -[[package]] -name = "trust-dns-proto" -version = "0.19.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" dependencies = [ - "async-trait", - "cfg-if 1.0.0", - "enum-as-inner", - "futures", - "idna", "lazy_static", "log", - "rand 0.7.3", - "smallvec", - "thiserror", - "tokio 0.2.25", - "url", + "tracing-core", ] [[package]] -name = "trust-dns-resolver" -version = "0.19.7" +name = "tracing-serde" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ - "cfg-if 0.1.10", - "futures", - "ipconfig", - "lazy_static", - "log", - "lru-cache", - "resolv-conf", - "smallvec", - "thiserror", - "tokio 0.2.25", - "trust-dns-proto", + "serde", + "tracing-core", ] [[package]] -name = "typemap" -version = "0.3.3" +name = "tracing-subscriber" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" dependencies = [ - "unsafe-any", + "ansi_term", + "lazy_static", + "matchers", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "twox-hash" +version = "1.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" +dependencies = [ + "cfg-if", + "static_assertions", ] [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] -name = "unicode-bidi" -version = "0.3.5" +name = "ucd-trie" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] -name = "unicode-normalization" -version = "0.1.17" +name = "unicode-linebreak" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f" dependencies = [ - "tinyvec", + "regex", ] [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-width" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "unix_socket" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564" -dependencies = [ - "cfg-if 0.1.10", - "libc", -] - -[[package]] -name = "unsafe-any" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -dependencies = [ - "traitobject", -] - -[[package]] -name = "url" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "urlparse" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110352d4e9076c67839003c7788d8604e24dcded13e0b375af3efaa8cf468517" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "utf8-ranges" @@ -3992,75 +2261,65 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.2", - "serde 1.0.125", + "getrandom", + "serde", ] [[package]] -name = "vec_map" -version = "0.8.2" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "void" -version = "1.0.2" +name = "want" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", + "log", + "try-lock", ] [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -4073,9 +2332,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4083,9 +2342,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -4096,32 +2355,21 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] -name = "web-sys" -version = "0.3.50" +name = "which" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ - "js-sys", - "wasm-bindgen", + "either", + "lazy_static", + "libc", ] -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -4132,12 +2380,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -4150,7 +2392,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4160,32 +2402,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "winreg" -version = "0.6.2" +name = "windows-sys" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" dependencies = [ - "winapi 0.3.9", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "windows_aarch64_msvc" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" [[package]] -name = "xattr" -version = "0.2.2" +name = "windows_i686_gnu" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" -dependencies = [ - "libc", -] +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "yaml-rust" diff --git a/rules/rust/Cargo.toml b/rules/rust/Cargo.toml index 593b53e..b16a6a2 100644 --- a/rules/rust/Cargo.toml +++ b/rules/rust/Cargo.toml @@ -5,132 +5,45 @@ version = "0.0.0" # Mandatory (or Cargo tooling is unhappy) [lib] -path = "src/main.rs" +path = "bin/main.rs" + +[build-dependencies] +tonic-build = { version = "0.6.2", default-features = false, features = ["prost", "transport"] } [dependencies] -actix-cors = "0.5.4" -actix = "0.10.0" -actix-http = { version = "2", default-features = false } -actix-rt = "1" -actix-service = "1" -actix-threadpool = "0.3" -async-trait = "0.1.37" -actix-web = { version = "3", default-features = false } -actix-utils = "1" -atomicwrites = { version = "0.2.5", optional = true } -autocfg = "1.0.0" -backtrace = "0.3.55" -base64 = "0.12.3" -bb8 = "0.4.2" -bb8-postgres = "0.4.0" -bincode = { version = "1.3.1", features = ["i128"] } -bitpacking = { version = "0.8", default-features = false, features = ["bitpacker4x"] } -brotli = "3.3.0" -byteorder = "1.3.4" -bytes = "0.5.6" -census = "0.4.0" -chrono = { version = "0.4.13", features = ["serde"] } -clap = "2.33.3" -colored = "2" -combine = { version = "4", default-features = false, features = [] } -config = "0.11.0" -crc32fast = "1.2.0" -criterion = "0.3.3" -crossbeam = "0.7.3" -crossbeam-channel = "0.5.0" -deadpool = "0.5.2" -deadpool-postgres = "0.5.6" -derive_more = "0.99.9" -dotenv = "0.15.0" -downcast-rs = { version="1.2.0" } -env_logger = "0.8.2" -erased-serde = "0.3.12" -fail = "0.4.0" -failure = "0.1.8" -fancy-regex = "0.3.5" -fastdivide = "0.3.0" -fnv = "1.0.7" -fs2 = { version="0.4.3", optional = true } -fst = "0.4" -futures = { version = "0.3.5", features = ["thread-pool"] } -grpc = "0.8.2" -grpc-compiler = "0.8.2" -htmlescape = "0.3.1" -integer-encoding = "2.0.0" -itertools = "0.9.0" +clap = { version = "3.1.6", features = ["cargo"] } +colored = "2.0.0" +config = "0.12.0" +crossbeam-channel = "0.5.4" +futures = "0.3.21" +futures-util = "0.3.21" +hyper = "0.14.17" lazy_static = "1.4.0" -levenshtein_automata = { version="0.1", features = ["fst_automaton"] } -lexical-core = "0.7.5" -libc = "0.2.74" -log = { version = "0.4.11", features = ["std"] } -log4rs = { version = "0.10.0", features = ["file", "json_encoder"] } -lru = "0.6.0" -lz4 = "1.23.2" -lz4-sys = "1.9.2" -maplit = "1.0.2" -matches = "0.1.8" -memmap = { version = "0.7.0", optional=true } -murmurhash32 = "0.2.0" -num-bigint = "0.3.1" -num_cpus = "1.13.0" -num-traits = "0.2.14" -once_cell = "1.4.0" -owned-read = "0.4.1" -owning_ref = "0.4.1" -pin-project = "0.4.23" -postgres = { version = "0.17.5" } -postgres-types = { version = "0.1.2", features = ["with-serde_json-1", "derive"] } -proptest = "0.10.1" -protobuf = { version = "2.18.1", features = ["with-bytes"] } -protobuf-codegen = "2.18.1" -r2d2 = "0.8.9" -r2d2_postgres = "0.16.0" -rand = "0.7.3" -rayon = "1.3.1" -regex = { version = "1.4.2", default-features = false, features = ["std"] } -reopen = { version = "1.0.1", features = ["signals"] } -rust-stemmers = "1.2.0" -rustc-serialize = "0.3.24" -serde = { version = "1.0.118", features = ["derive"] } -serde_derive = "1.0.118" -serde_json = "1.0.61" -serde_qs = "0.8.2" -serde_yaml = "0.8.15" -signal-hook = "0.3.2" -slog = { version = "2.7.0", features = ["nested-values"] } -slog-async = "2.5.0" -slog_derive = "0.2.0" -slog-json = "2.3.0" -slog-stdlog = "4.1.0" -slog-term = "2.6.0" -smallvec = "1.6.0" -snap = "1.0.3" -stable_deref_trait = "1.2.0" -strum = "0.20.0" -strum_macros = "0.20.1" +num_cpus = "1.13.1" +opentelemetry = "0.17.0" +opentelemetry-prometheus = "0.10.0" +parking_lot = { version = "0.12.0", features = ["send_guard"] } +prometheus = "0.13.0" +prost = "0.9.0" +prost-types = "0.9.0" +rand = "0.8.5" +rdkafka = "0.28.0" +serde = { version = "1.0.136", features = ["derive"] } +serde_derive = "1.0.136" +serde_yaml = "0.8.23" +signal-hook = "0.3.13" +tantivy = { version = "0.17.0", features = ["brotli-compression"] } tantivy-fst = "0.3.0" -tar = "0.4.30" -tempdir = "0.3.7" -tempfile = "3.1.0" -textwrap = "0.13.2" -thiserror = "1.0.23" -time = { version = "0.2", features = ["std"] } -tls-api = "0.4.0" -tls-api-stub = "0.4.0" -tokio = { version = "0.2", features = ["full", "time"] } -tokio-pg-mapper = "0.2.0" -tokio-pg-mapper-derive = "0.2.0" -tokio-postgres = "0.5" -typenum = { version = "1.12.0", features = ["force_unix_path_separator"] } -urlparse = "0.7.3" -uuid = { version = "0.8.1", features = ["v4", "serde"] } - -[features] -default = ["mmap"] -mmap = ["atomicwrites", "fs2", "memmap"] -failpoints = ["fail/failpoints"] -unstable = [] # useful for benches. -wasm-bindgen = ["uuid/wasm-bindgen"] +textwrap = "0.15.0" +thiserror = "1.0.30" +tokio = { version = "1.17.0", features = ["full", "time"] } +tonic = "0.6.2" +tower = "0.4.12" +tower-http = { version = "0.2.5", features = ["set-header", "trace"] } +tracing = "0.1.32" +tracing-appender = "0.2.2" +tracing-futures = "0.2.5" +tracing-subscriber = { version = "0.3.9", features = ["env-filter", "json"] } [workspace.metadata.raze] default_gen_buildrs = true @@ -143,45 +56,5 @@ targets = [ ] workspace_path = "//rules/rust" - -[package.metadata.raze.crates.indexmap.'*'] -additional_flags = [ - "--cfg=has_std", -] - -[package.metadata.raze.crates.grpc-compiler.'*'] -extra_aliased_targets = ["cargo_bin_protoc_gen_rust_grpc"] - -[package.metadata.raze.crates.libc.'*'] -additional_flags = [ - "--cfg=libc_priv_mod_use", - "--cfg=libc_union", - "--cfg=libc_const_size_of", - "--cfg=libc_core_cvoid", - "--cfg=libc_align", - "--cfg=libc_packedN", -] - -[package.metadata.raze.crates.log.'*'] -additional_flags = [ - "--cfg=atomic_cas" -] - -[package.metadata.raze.crates.proc-macro2.'*'] -additional_flags = [ - "--cfg=use_proc_macro", - "--cfg=wrap_proc_macro", -] - -[package.metadata.raze.crates.protobuf-codegen.'*'] -extra_aliased_targets = ["cargo_bin_protoc_gen_rust"] - -[package.metadata.raze.crates.serde.'*'] -additional_flags = [ - "--cfg=integer128", -] - -[package.metadata.raze.crates.time.'*'] -additional_flags = [ - "--cfg=std", -] +[package.metadata.raze.crates.json5.'*'] +data_attr = "glob([\"**/*.pest\"])" \ No newline at end of file diff --git a/rules/rust/cargo/BUILD.bazel b/rules/rust/cargo/BUILD.bazel index f502a75..978b4d4 100644 --- a/rules/rust/cargo/BUILD.bazel +++ b/rules/rust/cargo/BUILD.bazel @@ -12,207 +12,9 @@ licenses([ ]) # Aliased targets -alias( - name = "actix", - actual = "@raze__actix__0_10_0//:actix", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_cors", - actual = "@raze__actix_cors__0_5_4//:actix_cors", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_http", - actual = "@raze__actix_http__2_2_0//:actix_http", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_rt", - actual = "@raze__actix_rt__1_1_1//:actix_rt", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_service", - actual = "@raze__actix_service__1_0_6//:actix_service", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_threadpool", - actual = "@raze__actix_threadpool__0_3_3//:actix_threadpool", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_utils", - actual = "@raze__actix_utils__1_0_6//:actix_utils", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "actix_web", - actual = "@raze__actix_web__3_3_2//:actix_web", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "async_trait", - actual = "@raze__async_trait__0_1_50//:async_trait", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "atomicwrites", - actual = "@raze__atomicwrites__0_2_5//:atomicwrites", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "autocfg", - actual = "@raze__autocfg__1_0_1//:autocfg", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "backtrace", - actual = "@raze__backtrace__0_3_56//:backtrace", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "base64", - actual = "@raze__base64__0_12_3//:base64", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "bb8", - actual = "@raze__bb8__0_4_2//:bb8", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "bb8_postgres", - actual = "@raze__bb8_postgres__0_4_0//:bb8_postgres", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "bincode", - actual = "@raze__bincode__1_3_3//:bincode", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "bitpacking", - actual = "@raze__bitpacking__0_8_2//:bitpacking", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "brotli", - actual = "@raze__brotli__3_3_0//:brotli", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "byteorder", - actual = "@raze__byteorder__1_4_3//:byteorder", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "bytes", - actual = "@raze__bytes__0_5_6//:bytes", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "census", - actual = "@raze__census__0_4_0//:census", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "chrono", - actual = "@raze__chrono__0_4_19//:chrono", - tags = [ - "cargo-raze", - "manual", - ], -) - alias( name = "clap", - actual = "@raze__clap__2_33_3//:clap", + actual = "@raze__clap__3_1_6//:clap", tags = [ "cargo-raze", "manual", @@ -228,45 +30,9 @@ alias( ], ) -alias( - name = "combine", - actual = "@raze__combine__4_5_2//:combine", - tags = [ - "cargo-raze", - "manual", - ], -) - alias( name = "config", - actual = "@raze__config__0_11_0//:config", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "crc32fast", - actual = "@raze__crc32fast__1_2_1//:crc32fast", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "criterion", - actual = "@raze__criterion__0_3_4//:criterion", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "crossbeam", - actual = "@raze__crossbeam__0_7_3//:crossbeam", + actual = "@raze__config__0_12_0//:config", tags = [ "cargo-raze", "manual", @@ -275,133 +41,7 @@ alias( alias( name = "crossbeam_channel", - actual = "@raze__crossbeam_channel__0_5_1//:crossbeam_channel", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "deadpool", - actual = "@raze__deadpool__0_5_2//:deadpool", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "deadpool_postgres", - actual = "@raze__deadpool_postgres__0_5_6//:deadpool_postgres", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "derive_more", - actual = "@raze__derive_more__0_99_13//:derive_more", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "dotenv", - actual = "@raze__dotenv__0_15_0//:dotenv", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "downcast_rs", - actual = "@raze__downcast_rs__1_2_0//:downcast_rs", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "env_logger", - actual = "@raze__env_logger__0_8_3//:env_logger", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "erased_serde", - actual = "@raze__erased_serde__0_3_13//:erased_serde", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "fail", - actual = "@raze__fail__0_4_0//:fail", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "failure", - actual = "@raze__failure__0_1_8//:failure", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "fancy_regex", - actual = "@raze__fancy_regex__0_3_5//:fancy_regex", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "fastdivide", - actual = "@raze__fastdivide__0_3_0//:fastdivide", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "fnv", - actual = "@raze__fnv__1_0_7//:fnv", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "fs2", - actual = "@raze__fs2__0_4_3//:fs2", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "fst", - actual = "@raze__fst__0_4_5//:fst", + actual = "@raze__crossbeam_channel__0_5_4//:crossbeam_channel", tags = [ "cargo-raze", "manual", @@ -410,7 +50,7 @@ alias( alias( name = "futures", - actual = "@raze__futures__0_3_14//:futures", + actual = "@raze__futures__0_3_21//:futures", tags = [ "cargo-raze", "manual", @@ -418,8 +58,8 @@ alias( ) alias( - name = "grpc", - actual = "@raze__grpc__0_8_3//:grpc", + name = "futures_util", + actual = "@raze__futures_util__0_3_21//:futures_util", tags = [ "cargo-raze", "manual", @@ -427,46 +67,8 @@ alias( ) alias( - name = "grpc_compiler", - actual = "@raze__grpc_compiler__0_8_3//:grpc_compiler", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - # Extra aliased target, from raze configuration - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_protoc_gen_rust_grpc", - actual = "@raze__grpc_compiler__0_8_3//:cargo_bin_protoc_gen_rust_grpc", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "htmlescape", - actual = "@raze__htmlescape__0_3_1//:htmlescape", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "integer_encoding", - actual = "@raze__integer_encoding__2_1_3//:integer_encoding", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "itertools", - actual = "@raze__itertools__0_9_0//:itertools", + name = "hyper", + actual = "@raze__hyper__0_14_17//:hyper", tags = [ "cargo-raze", "manual", @@ -482,135 +84,9 @@ alias( ], ) -alias( - name = "levenshtein_automata", - actual = "@raze__levenshtein_automata__0_1_1//:levenshtein_automata", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "lexical_core", - actual = "@raze__lexical_core__0_7_5//:lexical_core", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "libc", - actual = "@raze__libc__0_2_93//:libc", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "log", - actual = "@raze__log__0_4_14//:log", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "log4rs", - actual = "@raze__log4rs__0_10_0//:log4rs", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "lru", - actual = "@raze__lru__0_6_5//:lru", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "lz4", - actual = "@raze__lz4__1_23_2//:lz4", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "lz4_sys", - actual = "@raze__lz4_sys__1_9_2//:lz4_sys", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "maplit", - actual = "@raze__maplit__1_0_2//:maplit", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "matches", - actual = "@raze__matches__0_1_8//:matches", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "memmap", - actual = "@raze__memmap__0_7_0//:memmap", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "murmurhash32", - actual = "@raze__murmurhash32__0_2_0//:murmurhash32", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "num_bigint", - actual = "@raze__num_bigint__0_3_2//:num_bigint", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "num_traits", - actual = "@raze__num_traits__0_2_14//:num_traits", - tags = [ - "cargo-raze", - "manual", - ], -) - alias( name = "num_cpus", - actual = "@raze__num_cpus__1_13_0//:num_cpus", + actual = "@raze__num_cpus__1_13_1//:num_cpus", tags = [ "cargo-raze", "manual", @@ -618,8 +94,8 @@ alias( ) alias( - name = "once_cell", - actual = "@raze__once_cell__1_7_2//:once_cell", + name = "opentelemetry", + actual = "@raze__opentelemetry__0_17_0//:opentelemetry", tags = [ "cargo-raze", "manual", @@ -627,8 +103,8 @@ alias( ) alias( - name = "owned_read", - actual = "@raze__owned_read__0_4_1//:owned_read", + name = "opentelemetry_prometheus", + actual = "@raze__opentelemetry_prometheus__0_10_0//:opentelemetry_prometheus", tags = [ "cargo-raze", "manual", @@ -636,8 +112,8 @@ alias( ) alias( - name = "owning_ref", - actual = "@raze__owning_ref__0_4_1//:owning_ref", + name = "parking_lot", + actual = "@raze__parking_lot__0_12_0//:parking_lot", tags = [ "cargo-raze", "manual", @@ -645,8 +121,8 @@ alias( ) alias( - name = "pin_project", - actual = "@raze__pin_project__0_4_28//:pin_project", + name = "prometheus", + actual = "@raze__prometheus__0_13_0//:prometheus", tags = [ "cargo-raze", "manual", @@ -654,8 +130,8 @@ alias( ) alias( - name = "postgres", - actual = "@raze__postgres__0_17_5//:postgres", + name = "prost", + actual = "@raze__prost__0_9_0//:prost", tags = [ "cargo-raze", "manual", @@ -663,64 +139,8 @@ alias( ) alias( - name = "postgres_types", - actual = "@raze__postgres_types__0_1_3//:postgres_types", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "proptest", - actual = "@raze__proptest__0_10_1//:proptest", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "protobuf", - actual = "@raze__protobuf__2_18_2//:protobuf", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "protobuf_codegen", - actual = "@raze__protobuf_codegen__2_18_2//:protobuf_codegen", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - # Extra aliased target, from raze configuration - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_protoc_gen_rust", - actual = "@raze__protobuf_codegen__2_18_2//:cargo_bin_protoc_gen_rust", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "r2d2", - actual = "@raze__r2d2__0_8_9//:r2d2", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "r2d2_postgres", - actual = "@raze__r2d2_postgres__0_16_0//:r2d2_postgres", + name = "prost_types", + actual = "@raze__prost_types__0_9_0//:prost_types", tags = [ "cargo-raze", "manual", @@ -729,7 +149,7 @@ alias( alias( name = "rand", - actual = "@raze__rand__0_7_3//:rand", + actual = "@raze__rand__0_8_5//:rand", tags = [ "cargo-raze", "manual", @@ -737,44 +157,8 @@ alias( ) alias( - name = "rayon", - actual = "@raze__rayon__1_5_0//:rayon", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "regex", - actual = "@raze__regex__1_4_5//:regex", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "reopen", - actual = "@raze__reopen__1_0_2//:reopen", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "rust_stemmers", - actual = "@raze__rust_stemmers__1_2_0//:rust_stemmers", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "rustc_serialize", - actual = "@raze__rustc_serialize__0_3_24//:rustc_serialize", + name = "rdkafka", + actual = "@raze__rdkafka__0_28_0//:rdkafka", tags = [ "cargo-raze", "manual", @@ -783,7 +167,7 @@ alias( alias( name = "serde", - actual = "@raze__serde__1_0_125//:serde", + actual = "@raze__serde__1_0_136//:serde", tags = [ "cargo-raze", "manual", @@ -792,25 +176,7 @@ alias( alias( name = "serde_derive", - actual = "@raze__serde_derive__1_0_125//:serde_derive", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "serde_json", - actual = "@raze__serde_json__1_0_64//:serde_json", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "serde_qs", - actual = "@raze__serde_qs__0_8_3//:serde_qs", + actual = "@raze__serde_derive__1_0_136//:serde_derive", tags = [ "cargo-raze", "manual", @@ -819,7 +185,7 @@ alias( alias( name = "serde_yaml", - actual = "@raze__serde_yaml__0_8_17//:serde_yaml", + actual = "@raze__serde_yaml__0_8_23//:serde_yaml", tags = [ "cargo-raze", "manual", @@ -828,7 +194,7 @@ alias( alias( name = "signal_hook", - actual = "@raze__signal_hook__0_3_8//:signal_hook", + actual = "@raze__signal_hook__0_3_13//:signal_hook", tags = [ "cargo-raze", "manual", @@ -836,98 +202,8 @@ alias( ) alias( - name = "slog", - actual = "@raze__slog__2_7_0//:slog", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "slog_async", - actual = "@raze__slog_async__2_6_0//:slog_async", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "slog_json", - actual = "@raze__slog_json__2_3_0//:slog_json", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "slog_stdlog", - actual = "@raze__slog_stdlog__4_1_0//:slog_stdlog", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "slog_term", - actual = "@raze__slog_term__2_8_0//:slog_term", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "slog_derive", - actual = "@raze__slog_derive__0_2_0//:slog_derive", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "smallvec", - actual = "@raze__smallvec__1_6_1//:smallvec", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "snap", - actual = "@raze__snap__1_0_4//:snap", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "stable_deref_trait", - actual = "@raze__stable_deref_trait__1_2_0//:stable_deref_trait", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "strum", - actual = "@raze__strum__0_20_0//:strum", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "strum_macros", - actual = "@raze__strum_macros__0_20_1//:strum_macros", + name = "tantivy", + actual = "@raze__tantivy__0_17_0//:tantivy", tags = [ "cargo-raze", "manual", @@ -943,36 +219,9 @@ alias( ], ) -alias( - name = "tar", - actual = "@raze__tar__0_4_33//:tar", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "tempdir", - actual = "@raze__tempdir__0_3_7//:tempdir", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "tempfile", - actual = "@raze__tempfile__3_2_0//:tempfile", - tags = [ - "cargo-raze", - "manual", - ], -) - alias( name = "textwrap", - actual = "@raze__textwrap__0_13_4//:textwrap", + actual = "@raze__textwrap__0_15_0//:textwrap", tags = [ "cargo-raze", "manual", @@ -981,34 +230,7 @@ alias( alias( name = "thiserror", - actual = "@raze__thiserror__1_0_24//:thiserror", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "time", - actual = "@raze__time__0_2_26//:time", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "tls_api", - actual = "@raze__tls_api__0_4_0//:tls_api", - tags = [ - "cargo-raze", - "manual", - ], -) - -alias( - name = "tls_api_stub", - actual = "@raze__tls_api_stub__0_4_0//:tls_api_stub", + actual = "@raze__thiserror__1_0_30//:thiserror", tags = [ "cargo-raze", "manual", @@ -1017,7 +239,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__0_2_25//:tokio", + actual = "@raze__tokio__1_17_0//:tokio", tags = [ "cargo-raze", "manual", @@ -1025,8 +247,8 @@ alias( ) alias( - name = "tokio_pg_mapper", - actual = "@raze__tokio_pg_mapper__0_2_0//:tokio_pg_mapper", + name = "tonic", + actual = "@raze__tonic__0_6_2//:tonic", tags = [ "cargo-raze", "manual", @@ -1034,8 +256,8 @@ alias( ) alias( - name = "tokio_pg_mapper_derive", - actual = "@raze__tokio_pg_mapper_derive__0_2_0//:tokio_pg_mapper_derive", + name = "tonic_build", + actual = "@raze__tonic_build__0_6_2//:tonic_build", tags = [ "cargo-raze", "manual", @@ -1043,8 +265,8 @@ alias( ) alias( - name = "tokio_postgres", - actual = "@raze__tokio_postgres__0_5_5//:tokio_postgres", + name = "tower", + actual = "@raze__tower__0_4_12//:tower", tags = [ "cargo-raze", "manual", @@ -1052,8 +274,8 @@ alias( ) alias( - name = "typenum", - actual = "@raze__typenum__1_13_0//:typenum", + name = "tower_http", + actual = "@raze__tower_http__0_2_5//:tower_http", tags = [ "cargo-raze", "manual", @@ -1061,8 +283,8 @@ alias( ) alias( - name = "urlparse", - actual = "@raze__urlparse__0_7_3//:urlparse", + name = "tracing", + actual = "@raze__tracing__0_1_32//:tracing", tags = [ "cargo-raze", "manual", @@ -1070,8 +292,26 @@ alias( ) alias( - name = "uuid", - actual = "@raze__uuid__0_8_2//:uuid", + name = "tracing_appender", + actual = "@raze__tracing_appender__0_2_2//:tracing_appender", + tags = [ + "cargo-raze", + "manual", + ], +) + +alias( + name = "tracing_futures", + actual = "@raze__tracing_futures__0_2_5//:tracing_futures", + tags = [ + "cargo-raze", + "manual", + ], +) + +alias( + name = "tracing_subscriber", + actual = "@raze__tracing_subscriber__0_3_9//:tracing_subscriber", tags = [ "cargo-raze", "manual", diff --git a/rules/rust/crates.bzl b/rules/rust/crates.bzl index 8461901..47af832 100644 --- a/rules/rust/crates.bzl +++ b/rules/rust/crates.bzl @@ -11,216 +11,6 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") # buildifier: di def raze_fetch_remote_crates(): """This function defines a collection of repos and should be called in a WORKSPACE file""" - maybe( - http_archive, - name = "raze__actix__0_10_0", - url = "https://crates.io/api/v1/crates/actix/0.10.0/download", - type = "tar.gz", - sha256 = "1be241f88f3b1e7e9a3fbe3b5a8a0f6915b5a1d7ee0d9a248d3376d01068cc60", - strip_prefix = "actix-0.10.0", - build_file = Label("//rules/rust/remote:BUILD.actix-0.10.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_codec__0_2_0", - url = "https://crates.io/api/v1/crates/actix-codec/0.2.0/download", - type = "tar.gz", - sha256 = "09e55f0a5c2ca15795035d90c46bd0e73a5123b72f68f12596d6ba5282051380", - strip_prefix = "actix-codec-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.actix-codec-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_codec__0_3_0", - url = "https://crates.io/api/v1/crates/actix-codec/0.3.0/download", - type = "tar.gz", - sha256 = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570", - strip_prefix = "actix-codec-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.actix-codec-0.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_connect__2_0_0", - url = "https://crates.io/api/v1/crates/actix-connect/2.0.0/download", - type = "tar.gz", - sha256 = "177837a10863f15ba8d3ae3ec12fac1099099529ed20083a27fdfe247381d0dc", - strip_prefix = "actix-connect-2.0.0", - build_file = Label("//rules/rust/remote:BUILD.actix-connect-2.0.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_cors__0_5_4", - url = "https://crates.io/api/v1/crates/actix-cors/0.5.4/download", - type = "tar.gz", - sha256 = "36b133d8026a9f209a9aeeeacd028e7451bcca975f592881b305d37983f303d7", - strip_prefix = "actix-cors-0.5.4", - build_file = Label("//rules/rust/remote:BUILD.actix-cors-0.5.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_http__2_2_0", - url = "https://crates.io/api/v1/crates/actix-http/2.2.0/download", - type = "tar.gz", - sha256 = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874", - strip_prefix = "actix-http-2.2.0", - build_file = Label("//rules/rust/remote:BUILD.actix-http-2.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_macros__0_1_3", - url = "https://crates.io/api/v1/crates/actix-macros/0.1.3/download", - type = "tar.gz", - sha256 = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655", - strip_prefix = "actix-macros-0.1.3", - build_file = Label("//rules/rust/remote:BUILD.actix-macros-0.1.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_router__0_2_7", - url = "https://crates.io/api/v1/crates/actix-router/0.2.7/download", - type = "tar.gz", - sha256 = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c", - strip_prefix = "actix-router-0.2.7", - build_file = Label("//rules/rust/remote:BUILD.actix-router-0.2.7.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_rt__1_1_1", - url = "https://crates.io/api/v1/crates/actix-rt/1.1.1/download", - type = "tar.gz", - sha256 = "143fcc2912e0d1de2bcf4e2f720d2a60c28652ab4179685a1ee159e0fb3db227", - strip_prefix = "actix-rt-1.1.1", - build_file = Label("//rules/rust/remote:BUILD.actix-rt-1.1.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_server__1_0_4", - url = "https://crates.io/api/v1/crates/actix-server/1.0.4/download", - type = "tar.gz", - sha256 = "45407e6e672ca24784baa667c5d32ef109ccdd8d5e0b5ebb9ef8a67f4dfb708e", - strip_prefix = "actix-server-1.0.4", - build_file = Label("//rules/rust/remote:BUILD.actix-server-1.0.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_service__1_0_6", - url = "https://crates.io/api/v1/crates/actix-service/1.0.6/download", - type = "tar.gz", - sha256 = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb", - strip_prefix = "actix-service-1.0.6", - build_file = Label("//rules/rust/remote:BUILD.actix-service-1.0.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_testing__1_0_1", - url = "https://crates.io/api/v1/crates/actix-testing/1.0.1/download", - type = "tar.gz", - sha256 = "47239ca38799ab74ee6a8a94d1ce857014b2ac36f242f70f3f75a66f691e791c", - strip_prefix = "actix-testing-1.0.1", - build_file = Label("//rules/rust/remote:BUILD.actix-testing-1.0.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_threadpool__0_3_3", - url = "https://crates.io/api/v1/crates/actix-threadpool/0.3.3/download", - type = "tar.gz", - sha256 = "d209f04d002854b9afd3743032a27b066158817965bf5d036824d19ac2cc0e30", - strip_prefix = "actix-threadpool-0.3.3", - build_file = Label("//rules/rust/remote:BUILD.actix-threadpool-0.3.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_tls__2_0_0", - url = "https://crates.io/api/v1/crates/actix-tls/2.0.0/download", - type = "tar.gz", - sha256 = "24789b7d7361cf5503a504ebe1c10806896f61e96eca9a7350e23001aca715fb", - strip_prefix = "actix-tls-2.0.0", - build_file = Label("//rules/rust/remote:BUILD.actix-tls-2.0.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_utils__1_0_6", - url = "https://crates.io/api/v1/crates/actix-utils/1.0.6/download", - type = "tar.gz", - sha256 = "fcf8f5631bf01adec2267808f00e228b761c60c0584cc9fa0b5364f41d147f4e", - strip_prefix = "actix-utils-1.0.6", - build_file = Label("//rules/rust/remote:BUILD.actix-utils-1.0.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_utils__2_0_0", - url = "https://crates.io/api/v1/crates/actix-utils/2.0.0/download", - type = "tar.gz", - sha256 = "2e9022dec56632d1d7979e59af14f0597a28a830a9c1c7fec8b2327eb9f16b5a", - strip_prefix = "actix-utils-2.0.0", - build_file = Label("//rules/rust/remote:BUILD.actix-utils-2.0.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_web__3_3_2", - url = "https://crates.io/api/v1/crates/actix-web/3.3.2/download", - type = "tar.gz", - sha256 = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86", - strip_prefix = "actix-web-3.3.2", - build_file = Label("//rules/rust/remote:BUILD.actix-web-3.3.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_web_codegen__0_4_0", - url = "https://crates.io/api/v1/crates/actix-web-codegen/0.4.0/download", - type = "tar.gz", - sha256 = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb", - strip_prefix = "actix-web-codegen-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.actix-web-codegen-0.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__actix_derive__0_5_0", - url = "https://crates.io/api/v1/crates/actix_derive/0.5.0/download", - type = "tar.gz", - sha256 = "b95aceadaf327f18f0df5962fedc1bde2f870566a0b9f65c89508a3b1f79334c", - strip_prefix = "actix_derive-0.5.0", - build_file = Label("//rules/rust/remote:BUILD.actix_derive-0.5.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__addr2line__0_14_1", - url = "https://crates.io/api/v1/crates/addr2line/0.14.1/download", - type = "tar.gz", - sha256 = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7", - strip_prefix = "addr2line-0.14.1", - build_file = Label("//rules/rust/remote:BUILD.addr2line-0.14.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__adler__1_0_2", - url = "https://crates.io/api/v1/crates/adler/1.0.2/download", - type = "tar.gz", - sha256 = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe", - strip_prefix = "adler-1.0.2", - build_file = Label("//rules/rust/remote:BUILD.adler-1.0.2.bazel"), - ) - maybe( http_archive, name = "raze__ahash__0_4_7", @@ -233,22 +23,32 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__aho_corasick__0_7_15", - url = "https://crates.io/api/v1/crates/aho-corasick/0.7.15/download", + name = "raze__ahash__0_7_6", + url = "https://crates.io/api/v1/crates/ahash/0.7.6/download", type = "tar.gz", - sha256 = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5", - strip_prefix = "aho-corasick-0.7.15", - build_file = Label("//rules/rust/remote:BUILD.aho-corasick-0.7.15.bazel"), + sha256 = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47", + strip_prefix = "ahash-0.7.6", + build_file = Label("//rules/rust/remote:BUILD.ahash-0.7.6.bazel"), ) maybe( http_archive, - name = "raze__alloc_no_stdlib__2_0_1", - url = "https://crates.io/api/v1/crates/alloc-no-stdlib/2.0.1/download", + name = "raze__aho_corasick__0_7_18", + url = "https://crates.io/api/v1/crates/aho-corasick/0.7.18/download", type = "tar.gz", - sha256 = "5192ec435945d87bc2f70992b4d818154b5feede43c09fb7592146374eac90a6", - strip_prefix = "alloc-no-stdlib-2.0.1", - build_file = Label("//rules/rust/remote:BUILD.alloc-no-stdlib-2.0.1.bazel"), + sha256 = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f", + strip_prefix = "aho-corasick-0.7.18", + build_file = Label("//rules/rust/remote:BUILD.aho-corasick-0.7.18.bazel"), + ) + + maybe( + http_archive, + name = "raze__alloc_no_stdlib__2_0_3", + url = "https://crates.io/api/v1/crates/alloc-no-stdlib/2.0.3/download", + type = "tar.gz", + sha256 = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3", + strip_prefix = "alloc-no-stdlib-2.0.3", + build_file = Label("//rules/rust/remote:BUILD.alloc-no-stdlib-2.0.3.bazel"), ) maybe( @@ -263,72 +63,52 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__ansi_term__0_11_0", - url = "https://crates.io/api/v1/crates/ansi_term/0.11.0/download", + name = "raze__ansi_term__0_12_1", + url = "https://crates.io/api/v1/crates/ansi_term/0.12.1/download", type = "tar.gz", - sha256 = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b", - strip_prefix = "ansi_term-0.11.0", - build_file = Label("//rules/rust/remote:BUILD.ansi_term-0.11.0.bazel"), + sha256 = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2", + strip_prefix = "ansi_term-0.12.1", + build_file = Label("//rules/rust/remote:BUILD.ansi_term-0.12.1.bazel"), ) maybe( http_archive, - name = "raze__antidote__1_0_0", - url = "https://crates.io/api/v1/crates/antidote/1.0.0/download", + name = "raze__anyhow__1_0_56", + url = "https://crates.io/api/v1/crates/anyhow/1.0.56/download", type = "tar.gz", - sha256 = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5", - strip_prefix = "antidote-1.0.0", - build_file = Label("//rules/rust/remote:BUILD.antidote-1.0.0.bazel"), + sha256 = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27", + strip_prefix = "anyhow-1.0.56", + build_file = Label("//rules/rust/remote:BUILD.anyhow-1.0.56.bazel"), ) maybe( http_archive, - name = "raze__arc_swap__0_4_8", - url = "https://crates.io/api/v1/crates/arc-swap/0.4.8/download", + name = "raze__async_stream__0_3_3", + url = "https://crates.io/api/v1/crates/async-stream/0.3.3/download", type = "tar.gz", - sha256 = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8", - strip_prefix = "arc-swap-0.4.8", - build_file = Label("//rules/rust/remote:BUILD.arc-swap-0.4.8.bazel"), + sha256 = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e", + strip_prefix = "async-stream-0.3.3", + build_file = Label("//rules/rust/remote:BUILD.async-stream-0.3.3.bazel"), ) maybe( http_archive, - name = "raze__arc_swap__1_2_0", - url = "https://crates.io/api/v1/crates/arc-swap/1.2.0/download", + name = "raze__async_stream_impl__0_3_3", + url = "https://crates.io/api/v1/crates/async-stream-impl/0.3.3/download", type = "tar.gz", - sha256 = "d4d7d63395147b81a9e570bcc6243aaf71c017bd666d4909cfef0085bdda8d73", - strip_prefix = "arc-swap-1.2.0", - build_file = Label("//rules/rust/remote:BUILD.arc-swap-1.2.0.bazel"), + sha256 = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27", + strip_prefix = "async-stream-impl-0.3.3", + build_file = Label("//rules/rust/remote:BUILD.async-stream-impl-0.3.3.bazel"), ) maybe( http_archive, - name = "raze__arrayvec__0_5_2", - url = "https://crates.io/api/v1/crates/arrayvec/0.5.2/download", + name = "raze__async_trait__0_1_52", + url = "https://crates.io/api/v1/crates/async-trait/0.1.52/download", type = "tar.gz", - sha256 = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b", - strip_prefix = "arrayvec-0.5.2", - build_file = Label("//rules/rust/remote:BUILD.arrayvec-0.5.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__async_trait__0_1_50", - url = "https://crates.io/api/v1/crates/async-trait/0.1.50/download", - type = "tar.gz", - sha256 = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722", - strip_prefix = "async-trait-0.1.50", - build_file = Label("//rules/rust/remote:BUILD.async-trait-0.1.50.bazel"), - ) - - maybe( - http_archive, - name = "raze__atomicwrites__0_2_5", - url = "https://crates.io/api/v1/crates/atomicwrites/0.2.5/download", - type = "tar.gz", - sha256 = "6a2baf2feb820299c53c7ad1cc4f5914a220a1cb76d7ce321d2522a94b54651f", - strip_prefix = "atomicwrites-0.2.5", - build_file = Label("//rules/rust/remote:BUILD.atomicwrites-0.2.5.bazel"), + sha256 = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3", + strip_prefix = "async-trait-0.1.52", + build_file = Label("//rules/rust/remote:BUILD.async-trait-0.1.52.bazel"), ) maybe( @@ -343,52 +123,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__autocfg__1_0_1", - url = "https://crates.io/api/v1/crates/autocfg/1.0.1/download", + name = "raze__autocfg__1_1_0", + url = "https://crates.io/api/v1/crates/autocfg/1.1.0/download", type = "tar.gz", - sha256 = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a", - strip_prefix = "autocfg-1.0.1", - build_file = Label("//rules/rust/remote:BUILD.autocfg-1.0.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__awc__2_0_3", - url = "https://crates.io/api/v1/crates/awc/2.0.3/download", - type = "tar.gz", - sha256 = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691", - strip_prefix = "awc-2.0.3", - build_file = Label("//rules/rust/remote:BUILD.awc-2.0.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__backtrace__0_3_56", - url = "https://crates.io/api/v1/crates/backtrace/0.3.56/download", - type = "tar.gz", - sha256 = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc", - strip_prefix = "backtrace-0.3.56", - build_file = Label("//rules/rust/remote:BUILD.backtrace-0.3.56.bazel"), - ) - - maybe( - http_archive, - name = "raze__base_x__0_2_8", - url = "https://crates.io/api/v1/crates/base-x/0.2.8/download", - type = "tar.gz", - sha256 = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b", - strip_prefix = "base-x-0.2.8", - build_file = Label("//rules/rust/remote:BUILD.base-x-0.2.8.bazel"), - ) - - maybe( - http_archive, - name = "raze__base64__0_12_3", - url = "https://crates.io/api/v1/crates/base64/0.12.3/download", - type = "tar.gz", - sha256 = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff", - strip_prefix = "base64-0.12.3", - build_file = Label("//rules/rust/remote:BUILD.base64-0.12.3.bazel"), + sha256 = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa", + strip_prefix = "autocfg-1.1.0", + build_file = Label("//rules/rust/remote:BUILD.autocfg-1.1.0.bazel"), ) maybe( @@ -403,132 +143,82 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__base64__0_9_3", - url = "https://crates.io/api/v1/crates/base64/0.9.3/download", + name = "raze__bitflags__1_3_2", + url = "https://crates.io/api/v1/crates/bitflags/1.3.2/download", type = "tar.gz", - sha256 = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643", - strip_prefix = "base64-0.9.3", - build_file = Label("//rules/rust/remote:BUILD.base64-0.9.3.bazel"), + sha256 = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a", + strip_prefix = "bitflags-1.3.2", + build_file = Label("//rules/rust/remote:BUILD.bitflags-1.3.2.bazel"), ) maybe( http_archive, - name = "raze__bb8__0_4_2", - url = "https://crates.io/api/v1/crates/bb8/0.4.2/download", + name = "raze__bitpacking__0_8_4", + url = "https://crates.io/api/v1/crates/bitpacking/0.8.4/download", type = "tar.gz", - sha256 = "374bba43fc924d90393ee7768e6f75d223a98307a488fe5bc34b66c3e96932a6", - strip_prefix = "bb8-0.4.2", - build_file = Label("//rules/rust/remote:BUILD.bb8-0.4.2.bazel"), + sha256 = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7", + strip_prefix = "bitpacking-0.8.4", + build_file = Label("//rules/rust/remote:BUILD.bitpacking-0.8.4.bazel"), ) maybe( http_archive, - name = "raze__bb8_postgres__0_4_0", - url = "https://crates.io/api/v1/crates/bb8-postgres/0.4.0/download", + name = "raze__block_buffer__0_7_3", + url = "https://crates.io/api/v1/crates/block-buffer/0.7.3/download", type = "tar.gz", - sha256 = "39a233af6ea3952e20d01863c87b4f6689b2f806249688b0908b5f02d4fa41ac", - strip_prefix = "bb8-postgres-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.bb8-postgres-0.4.0.bazel"), + sha256 = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b", + strip_prefix = "block-buffer-0.7.3", + build_file = Label("//rules/rust/remote:BUILD.block-buffer-0.7.3.bazel"), ) maybe( http_archive, - name = "raze__bincode__1_3_3", - url = "https://crates.io/api/v1/crates/bincode/1.3.3/download", + name = "raze__block_padding__0_1_5", + url = "https://crates.io/api/v1/crates/block-padding/0.1.5/download", type = "tar.gz", - sha256 = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad", - strip_prefix = "bincode-1.3.3", - build_file = Label("//rules/rust/remote:BUILD.bincode-1.3.3.bazel"), + sha256 = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5", + strip_prefix = "block-padding-0.1.5", + build_file = Label("//rules/rust/remote:BUILD.block-padding-0.1.5.bazel"), ) maybe( http_archive, - name = "raze__bit_set__0_5_2", - url = "https://crates.io/api/v1/crates/bit-set/0.5.2/download", + name = "raze__brotli__3_3_3", + url = "https://crates.io/api/v1/crates/brotli/3.3.3/download", type = "tar.gz", - sha256 = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de", - strip_prefix = "bit-set-0.5.2", - build_file = Label("//rules/rust/remote:BUILD.bit-set-0.5.2.bazel"), + sha256 = "f838e47a451d5a8fa552371f80024dd6ace9b7acdf25c4c3d0f9bc6816fb1c39", + strip_prefix = "brotli-3.3.3", + build_file = Label("//rules/rust/remote:BUILD.brotli-3.3.3.bazel"), ) maybe( http_archive, - name = "raze__bit_vec__0_6_3", - url = "https://crates.io/api/v1/crates/bit-vec/0.6.3/download", + name = "raze__brotli_decompressor__2_3_2", + url = "https://crates.io/api/v1/crates/brotli-decompressor/2.3.2/download", type = "tar.gz", - sha256 = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb", - strip_prefix = "bit-vec-0.6.3", - build_file = Label("//rules/rust/remote:BUILD.bit-vec-0.6.3.bazel"), + sha256 = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80", + strip_prefix = "brotli-decompressor-2.3.2", + build_file = Label("//rules/rust/remote:BUILD.brotli-decompressor-2.3.2.bazel"), ) maybe( http_archive, - name = "raze__bitflags__1_2_1", - url = "https://crates.io/api/v1/crates/bitflags/1.2.1/download", + name = "raze__bumpalo__3_9_1", + url = "https://crates.io/api/v1/crates/bumpalo/3.9.1/download", type = "tar.gz", - sha256 = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693", - strip_prefix = "bitflags-1.2.1", - build_file = Label("//rules/rust/remote:BUILD.bitflags-1.2.1.bazel"), + sha256 = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899", + strip_prefix = "bumpalo-3.9.1", + build_file = Label("//rules/rust/remote:BUILD.bumpalo-3.9.1.bazel"), ) maybe( http_archive, - name = "raze__bitpacking__0_8_2", - url = "https://crates.io/api/v1/crates/bitpacking/0.8.2/download", + name = "raze__byte_tools__0_3_1", + url = "https://crates.io/api/v1/crates/byte-tools/0.3.1/download", type = "tar.gz", - sha256 = "3744aff20a3437a99ebc0bb7733e9e60c7bf590478c9b897e95b38d57e5acb68", - strip_prefix = "bitpacking-0.8.2", - build_file = Label("//rules/rust/remote:BUILD.bitpacking-0.8.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__block_buffer__0_9_0", - url = "https://crates.io/api/v1/crates/block-buffer/0.9.0/download", - type = "tar.gz", - sha256 = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4", - strip_prefix = "block-buffer-0.9.0", - build_file = Label("//rules/rust/remote:BUILD.block-buffer-0.9.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__brotli__3_3_0", - url = "https://crates.io/api/v1/crates/brotli/3.3.0/download", - type = "tar.gz", - sha256 = "7f29919120f08613aadcd4383764e00526fc9f18b6c0895814faeed0dd78613e", - strip_prefix = "brotli-3.3.0", - build_file = Label("//rules/rust/remote:BUILD.brotli-3.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__brotli_decompressor__2_3_1", - url = "https://crates.io/api/v1/crates/brotli-decompressor/2.3.1/download", - type = "tar.gz", - sha256 = "1052e1c3b8d4d80eb84a8b94f0a1498797b5fb96314c001156a1c761940ef4ec", - strip_prefix = "brotli-decompressor-2.3.1", - build_file = Label("//rules/rust/remote:BUILD.brotli-decompressor-2.3.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__bstr__0_2_15", - url = "https://crates.io/api/v1/crates/bstr/0.2.15/download", - type = "tar.gz", - sha256 = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d", - strip_prefix = "bstr-0.2.15", - build_file = Label("//rules/rust/remote:BUILD.bstr-0.2.15.bazel"), - ) - - maybe( - http_archive, - name = "raze__bumpalo__3_6_1", - url = "https://crates.io/api/v1/crates/bumpalo/3.6.1/download", - type = "tar.gz", - sha256 = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe", - strip_prefix = "bumpalo-3.6.1", - build_file = Label("//rules/rust/remote:BUILD.bumpalo-3.6.1.bazel"), + sha256 = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7", + strip_prefix = "byte-tools-0.3.1", + build_file = Label("//rules/rust/remote:BUILD.byte-tools-0.3.1.bazel"), ) maybe( @@ -543,52 +233,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__bytes__0_5_6", - url = "https://crates.io/api/v1/crates/bytes/0.5.6/download", + name = "raze__bytes__1_1_0", + url = "https://crates.io/api/v1/crates/bytes/1.1.0/download", type = "tar.gz", - sha256 = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38", - strip_prefix = "bytes-0.5.6", - build_file = Label("//rules/rust/remote:BUILD.bytes-0.5.6.bazel"), + sha256 = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8", + strip_prefix = "bytes-1.1.0", + build_file = Label("//rules/rust/remote:BUILD.bytes-1.1.0.bazel"), ) maybe( http_archive, - name = "raze__bytes__1_0_1", - url = "https://crates.io/api/v1/crates/bytes/1.0.1/download", + name = "raze__cc__1_0_73", + url = "https://crates.io/api/v1/crates/cc/1.0.73/download", type = "tar.gz", - sha256 = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040", - strip_prefix = "bytes-1.0.1", - build_file = Label("//rules/rust/remote:BUILD.bytes-1.0.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__bytestring__1_0_0", - url = "https://crates.io/api/v1/crates/bytestring/1.0.0/download", - type = "tar.gz", - sha256 = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d", - strip_prefix = "bytestring-1.0.0", - build_file = Label("//rules/rust/remote:BUILD.bytestring-1.0.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__cast__0_2_5", - url = "https://crates.io/api/v1/crates/cast/0.2.5/download", - type = "tar.gz", - sha256 = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75", - strip_prefix = "cast-0.2.5", - build_file = Label("//rules/rust/remote:BUILD.cast-0.2.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__cc__1_0_67", - url = "https://crates.io/api/v1/crates/cc/1.0.67/download", - type = "tar.gz", - sha256 = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd", - strip_prefix = "cc-1.0.67", - build_file = Label("//rules/rust/remote:BUILD.cc-1.0.67.bazel"), + sha256 = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11", + strip_prefix = "cc-1.0.73", + build_file = Label("//rules/rust/remote:BUILD.cc-1.0.73.bazel"), ) maybe( @@ -601,16 +261,6 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.census-0.4.0.bazel"), ) - maybe( - http_archive, - name = "raze__cfg_if__0_1_10", - url = "https://crates.io/api/v1/crates/cfg-if/0.1.10/download", - type = "tar.gz", - sha256 = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822", - strip_prefix = "cfg-if-0.1.10", - build_file = Label("//rules/rust/remote:BUILD.cfg-if-0.1.10.bazel"), - ) - maybe( http_archive, name = "raze__cfg_if__1_0_0", @@ -633,22 +283,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__clap__2_33_3", - url = "https://crates.io/api/v1/crates/clap/2.33.3/download", + name = "raze__clap__3_1_6", + url = "https://crates.io/api/v1/crates/clap/3.1.6/download", type = "tar.gz", - sha256 = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002", - strip_prefix = "clap-2.33.3", - build_file = Label("//rules/rust/remote:BUILD.clap-2.33.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__cloudabi__0_0_3", - url = "https://crates.io/api/v1/crates/cloudabi/0.0.3/download", - type = "tar.gz", - sha256 = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f", - strip_prefix = "cloudabi-0.0.3", - build_file = Label("//rules/rust/remote:BUILD.cloudabi-0.0.3.bazel"), + sha256 = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123", + strip_prefix = "clap-3.1.6", + build_file = Label("//rules/rust/remote:BUILD.clap-3.1.6.bazel"), ) maybe( @@ -663,212 +303,92 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__combine__4_5_2", - url = "https://crates.io/api/v1/crates/combine/4.5.2/download", + name = "raze__combine__4_6_3", + url = "https://crates.io/api/v1/crates/combine/4.6.3/download", type = "tar.gz", - sha256 = "cc4369b5e4c0cddf64ad8981c0111e7df4f7078f4d6ba98fb31f2e17c4c57b7e", - strip_prefix = "combine-4.5.2", - build_file = Label("//rules/rust/remote:BUILD.combine-4.5.2.bazel"), + sha256 = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062", + strip_prefix = "combine-4.6.3", + build_file = Label("//rules/rust/remote:BUILD.combine-4.6.3.bazel"), ) maybe( http_archive, - name = "raze__config__0_10_1", - url = "https://crates.io/api/v1/crates/config/0.10.1/download", + name = "raze__config__0_12_0", + url = "https://crates.io/api/v1/crates/config/0.12.0/download", type = "tar.gz", - sha256 = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3", - strip_prefix = "config-0.10.1", - build_file = Label("//rules/rust/remote:BUILD.config-0.10.1.bazel"), + sha256 = "54ad70579325f1a38ea4c13412b82241c5900700a69785d73e2736bd65a33f86", + strip_prefix = "config-0.12.0", + build_file = Label("//rules/rust/remote:BUILD.config-0.12.0.bazel"), ) maybe( http_archive, - name = "raze__config__0_11_0", - url = "https://crates.io/api/v1/crates/config/0.11.0/download", + name = "raze__crc32fast__1_3_2", + url = "https://crates.io/api/v1/crates/crc32fast/1.3.2/download", type = "tar.gz", - sha256 = "1b1b9d958c2b1368a663f05538fc1b5975adce1e19f435acceae987aceeeb369", - strip_prefix = "config-0.11.0", - build_file = Label("//rules/rust/remote:BUILD.config-0.11.0.bazel"), + sha256 = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d", + strip_prefix = "crc32fast-1.3.2", + build_file = Label("//rules/rust/remote:BUILD.crc32fast-1.3.2.bazel"), ) maybe( http_archive, - name = "raze__const_fn__0_4_7", - url = "https://crates.io/api/v1/crates/const_fn/0.4.7/download", + name = "raze__crossbeam__0_8_1", + url = "https://crates.io/api/v1/crates/crossbeam/0.8.1/download", type = "tar.gz", - sha256 = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec", - strip_prefix = "const_fn-0.4.7", - build_file = Label("//rules/rust/remote:BUILD.const_fn-0.4.7.bazel"), + sha256 = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845", + strip_prefix = "crossbeam-0.8.1", + build_file = Label("//rules/rust/remote:BUILD.crossbeam-0.8.1.bazel"), ) maybe( http_archive, - name = "raze__convert_case__0_4_0", - url = "https://crates.io/api/v1/crates/convert_case/0.4.0/download", + name = "raze__crossbeam_channel__0_5_4", + url = "https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download", type = "tar.gz", - sha256 = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e", - strip_prefix = "convert_case-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.convert_case-0.4.0.bazel"), + sha256 = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53", + strip_prefix = "crossbeam-channel-0.5.4", + build_file = Label("//rules/rust/remote:BUILD.crossbeam-channel-0.5.4.bazel"), ) maybe( http_archive, - name = "raze__cookie__0_14_4", - url = "https://crates.io/api/v1/crates/cookie/0.14.4/download", + name = "raze__crossbeam_deque__0_8_1", + url = "https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download", type = "tar.gz", - sha256 = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951", - strip_prefix = "cookie-0.14.4", - build_file = Label("//rules/rust/remote:BUILD.cookie-0.14.4.bazel"), + sha256 = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e", + strip_prefix = "crossbeam-deque-0.8.1", + build_file = Label("//rules/rust/remote:BUILD.crossbeam-deque-0.8.1.bazel"), ) maybe( http_archive, - name = "raze__copyless__0_1_5", - url = "https://crates.io/api/v1/crates/copyless/0.1.5/download", + name = "raze__crossbeam_epoch__0_9_8", + url = "https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download", type = "tar.gz", - sha256 = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536", - strip_prefix = "copyless-0.1.5", - build_file = Label("//rules/rust/remote:BUILD.copyless-0.1.5.bazel"), + sha256 = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c", + strip_prefix = "crossbeam-epoch-0.9.8", + build_file = Label("//rules/rust/remote:BUILD.crossbeam-epoch-0.9.8.bazel"), ) maybe( http_archive, - name = "raze__cpuid_bool__0_1_2", - url = "https://crates.io/api/v1/crates/cpuid-bool/0.1.2/download", + name = "raze__crossbeam_queue__0_3_5", + url = "https://crates.io/api/v1/crates/crossbeam-queue/0.3.5/download", type = "tar.gz", - sha256 = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634", - strip_prefix = "cpuid-bool-0.1.2", - build_file = Label("//rules/rust/remote:BUILD.cpuid-bool-0.1.2.bazel"), + sha256 = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2", + strip_prefix = "crossbeam-queue-0.3.5", + build_file = Label("//rules/rust/remote:BUILD.crossbeam-queue-0.3.5.bazel"), ) maybe( http_archive, - name = "raze__crc32fast__1_2_1", - url = "https://crates.io/api/v1/crates/crc32fast/1.2.1/download", + name = "raze__crossbeam_utils__0_8_8", + url = "https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download", type = "tar.gz", - sha256 = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a", - strip_prefix = "crc32fast-1.2.1", - build_file = Label("//rules/rust/remote:BUILD.crc32fast-1.2.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__criterion__0_3_4", - url = "https://crates.io/api/v1/crates/criterion/0.3.4/download", - type = "tar.gz", - sha256 = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23", - strip_prefix = "criterion-0.3.4", - build_file = Label("//rules/rust/remote:BUILD.criterion-0.3.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__criterion_plot__0_4_3", - url = "https://crates.io/api/v1/crates/criterion-plot/0.4.3/download", - type = "tar.gz", - sha256 = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d", - strip_prefix = "criterion-plot-0.4.3", - build_file = Label("//rules/rust/remote:BUILD.criterion-plot-0.4.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam__0_7_3", - url = "https://crates.io/api/v1/crates/crossbeam/0.7.3/download", - type = "tar.gz", - sha256 = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e", - strip_prefix = "crossbeam-0.7.3", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-0.7.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_channel__0_4_4", - url = "https://crates.io/api/v1/crates/crossbeam-channel/0.4.4/download", - type = "tar.gz", - sha256 = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87", - strip_prefix = "crossbeam-channel-0.4.4", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-channel-0.4.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_channel__0_5_1", - url = "https://crates.io/api/v1/crates/crossbeam-channel/0.5.1/download", - type = "tar.gz", - sha256 = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4", - strip_prefix = "crossbeam-channel-0.5.1", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-channel-0.5.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_deque__0_7_3", - url = "https://crates.io/api/v1/crates/crossbeam-deque/0.7.3/download", - type = "tar.gz", - sha256 = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285", - strip_prefix = "crossbeam-deque-0.7.3", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-deque-0.7.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_deque__0_8_0", - url = "https://crates.io/api/v1/crates/crossbeam-deque/0.8.0/download", - type = "tar.gz", - sha256 = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9", - strip_prefix = "crossbeam-deque-0.8.0", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-deque-0.8.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_epoch__0_8_2", - url = "https://crates.io/api/v1/crates/crossbeam-epoch/0.8.2/download", - type = "tar.gz", - sha256 = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace", - strip_prefix = "crossbeam-epoch-0.8.2", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-epoch-0.8.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_epoch__0_9_3", - url = "https://crates.io/api/v1/crates/crossbeam-epoch/0.9.3/download", - type = "tar.gz", - sha256 = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12", - strip_prefix = "crossbeam-epoch-0.9.3", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-epoch-0.9.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_queue__0_2_3", - url = "https://crates.io/api/v1/crates/crossbeam-queue/0.2.3/download", - type = "tar.gz", - sha256 = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570", - strip_prefix = "crossbeam-queue-0.2.3", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-queue-0.2.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_utils__0_7_2", - url = "https://crates.io/api/v1/crates/crossbeam-utils/0.7.2/download", - type = "tar.gz", - sha256 = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8", - strip_prefix = "crossbeam-utils-0.7.2", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-utils-0.7.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__crossbeam_utils__0_8_3", - url = "https://crates.io/api/v1/crates/crossbeam-utils/0.8.3/download", - type = "tar.gz", - sha256 = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49", - strip_prefix = "crossbeam-utils-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.crossbeam-utils-0.8.3.bazel"), + sha256 = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38", + strip_prefix = "crossbeam-utils-0.8.8", + build_file = Label("//rules/rust/remote:BUILD.crossbeam-utils-0.8.8.bazel"), ) maybe( @@ -883,122 +403,52 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__crypto_mac__0_10_0", - url = "https://crates.io/api/v1/crates/crypto-mac/0.10.0/download", + name = "raze__ctor__0_1_22", + url = "https://crates.io/api/v1/crates/ctor/0.1.22/download", type = "tar.gz", - sha256 = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6", - strip_prefix = "crypto-mac-0.10.0", - build_file = Label("//rules/rust/remote:BUILD.crypto-mac-0.10.0.bazel"), + sha256 = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c", + strip_prefix = "ctor-0.1.22", + build_file = Label("//rules/rust/remote:BUILD.ctor-0.1.22.bazel"), ) maybe( http_archive, - name = "raze__crypto_mac__0_9_1", - url = "https://crates.io/api/v1/crates/crypto-mac/0.9.1/download", + name = "raze__dashmap__4_0_2", + url = "https://crates.io/api/v1/crates/dashmap/4.0.2/download", type = "tar.gz", - sha256 = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca", - strip_prefix = "crypto-mac-0.9.1", - build_file = Label("//rules/rust/remote:BUILD.crypto-mac-0.9.1.bazel"), + sha256 = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c", + strip_prefix = "dashmap-4.0.2", + build_file = Label("//rules/rust/remote:BUILD.dashmap-4.0.2.bazel"), ) maybe( http_archive, - name = "raze__csv__1_1_6", - url = "https://crates.io/api/v1/crates/csv/1.1.6/download", + name = "raze__diff__0_1_12", + url = "https://crates.io/api/v1/crates/diff/0.1.12/download", type = "tar.gz", - sha256 = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1", - strip_prefix = "csv-1.1.6", - build_file = Label("//rules/rust/remote:BUILD.csv-1.1.6.bazel"), + sha256 = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499", + strip_prefix = "diff-0.1.12", + build_file = Label("//rules/rust/remote:BUILD.diff-0.1.12.bazel"), ) maybe( http_archive, - name = "raze__csv_core__0_1_10", - url = "https://crates.io/api/v1/crates/csv-core/0.1.10/download", + name = "raze__digest__0_8_1", + url = "https://crates.io/api/v1/crates/digest/0.8.1/download", type = "tar.gz", - sha256 = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90", - strip_prefix = "csv-core-0.1.10", - build_file = Label("//rules/rust/remote:BUILD.csv-core-0.1.10.bazel"), + sha256 = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5", + strip_prefix = "digest-0.8.1", + build_file = Label("//rules/rust/remote:BUILD.digest-0.8.1.bazel"), ) maybe( http_archive, - name = "raze__deadpool__0_5_2", - url = "https://crates.io/api/v1/crates/deadpool/0.5.2/download", + name = "raze__dlv_list__0_2_3", + url = "https://crates.io/api/v1/crates/dlv-list/0.2.3/download", type = "tar.gz", - sha256 = "4aaff9a7a1de9893f4004fa08527b31cb2ae4121c44e053cf53f29203c73bd23", - strip_prefix = "deadpool-0.5.2", - build_file = Label("//rules/rust/remote:BUILD.deadpool-0.5.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__deadpool_postgres__0_5_6", - url = "https://crates.io/api/v1/crates/deadpool-postgres/0.5.6/download", - type = "tar.gz", - sha256 = "faad41e7f93dd682108c72aec029e5bc6238e7df64c9d84832525d4033d2e726", - strip_prefix = "deadpool-postgres-0.5.6", - build_file = Label("//rules/rust/remote:BUILD.deadpool-postgres-0.5.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__derive_more__0_99_13", - url = "https://crates.io/api/v1/crates/derive_more/0.99.13/download", - type = "tar.gz", - sha256 = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6", - strip_prefix = "derive_more-0.99.13", - build_file = Label("//rules/rust/remote:BUILD.derive_more-0.99.13.bazel"), - ) - - maybe( - http_archive, - name = "raze__digest__0_9_0", - url = "https://crates.io/api/v1/crates/digest/0.9.0/download", - type = "tar.gz", - sha256 = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066", - strip_prefix = "digest-0.9.0", - build_file = Label("//rules/rust/remote:BUILD.digest-0.9.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__dirs_next__2_0_0", - url = "https://crates.io/api/v1/crates/dirs-next/2.0.0/download", - type = "tar.gz", - sha256 = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1", - strip_prefix = "dirs-next-2.0.0", - build_file = Label("//rules/rust/remote:BUILD.dirs-next-2.0.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__dirs_sys_next__0_1_2", - url = "https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download", - type = "tar.gz", - sha256 = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d", - strip_prefix = "dirs-sys-next-0.1.2", - build_file = Label("//rules/rust/remote:BUILD.dirs-sys-next-0.1.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__discard__1_0_4", - url = "https://crates.io/api/v1/crates/discard/1.0.4/download", - type = "tar.gz", - sha256 = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0", - strip_prefix = "discard-1.0.4", - build_file = Label("//rules/rust/remote:BUILD.discard-1.0.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__dotenv__0_15_0", - url = "https://crates.io/api/v1/crates/dotenv/0.15.0/download", - type = "tar.gz", - sha256 = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f", - strip_prefix = "dotenv-0.15.0", - build_file = Label("//rules/rust/remote:BUILD.dotenv-0.15.0.bazel"), + sha256 = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b", + strip_prefix = "dlv-list-0.2.3", + build_file = Label("//rules/rust/remote:BUILD.dlv-list-0.2.3.bazel"), ) maybe( @@ -1011,16 +461,6 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.downcast-rs-1.2.0.bazel"), ) - maybe( - http_archive, - name = "raze__dtoa__0_4_8", - url = "https://crates.io/api/v1/crates/dtoa/0.4.8/download", - type = "tar.gz", - sha256 = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0", - strip_prefix = "dtoa-0.4.8", - build_file = Label("//rules/rust/remote:BUILD.dtoa-0.4.8.bazel"), - ) - maybe( http_archive, name = "raze__either__1_6_1", @@ -1033,122 +473,62 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__encoding_rs__0_8_28", - url = "https://crates.io/api/v1/crates/encoding_rs/0.8.28/download", + name = "raze__fail__0_5_0", + url = "https://crates.io/api/v1/crates/fail/0.5.0/download", type = "tar.gz", - sha256 = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065", - strip_prefix = "encoding_rs-0.8.28", - build_file = Label("//rules/rust/remote:BUILD.encoding_rs-0.8.28.bazel"), + sha256 = "ec3245a0ca564e7f3c797d20d833a6870f57a728ac967d5225b3ffdef4465011", + strip_prefix = "fail-0.5.0", + build_file = Label("//rules/rust/remote:BUILD.fail-0.5.0.bazel"), ) maybe( http_archive, - name = "raze__enum_as_inner__0_3_3", - url = "https://crates.io/api/v1/crates/enum-as-inner/0.3.3/download", + name = "raze__fake_simd__0_1_2", + url = "https://crates.io/api/v1/crates/fake-simd/0.1.2/download", type = "tar.gz", - sha256 = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595", - strip_prefix = "enum-as-inner-0.3.3", - build_file = Label("//rules/rust/remote:BUILD.enum-as-inner-0.3.3.bazel"), + sha256 = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed", + strip_prefix = "fake-simd-0.1.2", + build_file = Label("//rules/rust/remote:BUILD.fake-simd-0.1.2.bazel"), ) maybe( http_archive, - name = "raze__env_logger__0_8_3", - url = "https://crates.io/api/v1/crates/env_logger/0.8.3/download", + name = "raze__fastdivide__0_4_0", + url = "https://crates.io/api/v1/crates/fastdivide/0.4.0/download", type = "tar.gz", - sha256 = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f", - strip_prefix = "env_logger-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.env_logger-0.8.3.bazel"), + sha256 = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04", + strip_prefix = "fastdivide-0.4.0", + build_file = Label("//rules/rust/remote:BUILD.fastdivide-0.4.0.bazel"), ) maybe( http_archive, - name = "raze__erased_serde__0_3_13", - url = "https://crates.io/api/v1/crates/erased-serde/0.3.13/download", + name = "raze__fastfield_codecs__0_1_0", + url = "https://crates.io/api/v1/crates/fastfield_codecs/0.1.0/download", type = "tar.gz", - sha256 = "0465971a8cc1fa2455c8465aaa377131e1f1cf4983280f474a13e68793aa770c", - strip_prefix = "erased-serde-0.3.13", - build_file = Label("//rules/rust/remote:BUILD.erased-serde-0.3.13.bazel"), + sha256 = "bb0e8bfa31546b4ace05092c9db8d251d7bbc298a384875a08c945a473de4f1f", + strip_prefix = "fastfield_codecs-0.1.0", + build_file = Label("//rules/rust/remote:BUILD.fastfield_codecs-0.1.0.bazel"), ) maybe( http_archive, - name = "raze__fail__0_4_0", - url = "https://crates.io/api/v1/crates/fail/0.4.0/download", + name = "raze__fastrand__1_7_0", + url = "https://crates.io/api/v1/crates/fastrand/1.7.0/download", type = "tar.gz", - sha256 = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6", - strip_prefix = "fail-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.fail-0.4.0.bazel"), + sha256 = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf", + strip_prefix = "fastrand-1.7.0", + build_file = Label("//rules/rust/remote:BUILD.fastrand-1.7.0.bazel"), ) maybe( http_archive, - name = "raze__failure__0_1_8", - url = "https://crates.io/api/v1/crates/failure/0.1.8/download", + name = "raze__fixedbitset__0_4_1", + url = "https://crates.io/api/v1/crates/fixedbitset/0.4.1/download", type = "tar.gz", - sha256 = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86", - strip_prefix = "failure-0.1.8", - build_file = Label("//rules/rust/remote:BUILD.failure-0.1.8.bazel"), - ) - - maybe( - http_archive, - name = "raze__failure_derive__0_1_8", - url = "https://crates.io/api/v1/crates/failure_derive/0.1.8/download", - type = "tar.gz", - sha256 = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4", - strip_prefix = "failure_derive-0.1.8", - build_file = Label("//rules/rust/remote:BUILD.failure_derive-0.1.8.bazel"), - ) - - maybe( - http_archive, - name = "raze__fallible_iterator__0_2_0", - url = "https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download", - type = "tar.gz", - sha256 = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7", - strip_prefix = "fallible-iterator-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.fallible-iterator-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__fancy_regex__0_3_5", - url = "https://crates.io/api/v1/crates/fancy-regex/0.3.5/download", - type = "tar.gz", - sha256 = "ae91abf6555234338687bb47913978d275539235fcb77ba9863b779090b42b14", - strip_prefix = "fancy-regex-0.3.5", - build_file = Label("//rules/rust/remote:BUILD.fancy-regex-0.3.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__fastdivide__0_3_0", - url = "https://crates.io/api/v1/crates/fastdivide/0.3.0/download", - type = "tar.gz", - sha256 = "4a99a2d53cf90642500986ad22e5083b09e42d44c408f5f112e2a4a0925a643c", - strip_prefix = "fastdivide-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.fastdivide-0.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__filetime__0_2_14", - url = "https://crates.io/api/v1/crates/filetime/0.2.14/download", - type = "tar.gz", - sha256 = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8", - strip_prefix = "filetime-0.2.14", - build_file = Label("//rules/rust/remote:BUILD.filetime-0.2.14.bazel"), - ) - - maybe( - http_archive, - name = "raze__flate2__1_0_20", - url = "https://crates.io/api/v1/crates/flate2/1.0.20/download", - type = "tar.gz", - sha256 = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0", - strip_prefix = "flate2-1.0.20", - build_file = Label("//rules/rust/remote:BUILD.flate2-1.0.20.bazel"), + sha256 = "279fb028e20b3c4c320317955b77c5e0c9701f05a1d309905d6fc702cdc5053e", + strip_prefix = "fixedbitset-0.4.1", + build_file = Label("//rules/rust/remote:BUILD.fixedbitset-0.4.1.bazel"), ) maybe( @@ -1161,16 +541,6 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.fnv-1.0.7.bazel"), ) - maybe( - http_archive, - name = "raze__form_urlencoded__1_0_1", - url = "https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download", - type = "tar.gz", - sha256 = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191", - strip_prefix = "form_urlencoded-1.0.1", - build_file = Label("//rules/rust/remote:BUILD.form_urlencoded-1.0.1.bazel"), - ) - maybe( http_archive, name = "raze__fs2__0_4_3", @@ -1183,232 +553,132 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__fst__0_3_5", - url = "https://crates.io/api/v1/crates/fst/0.3.5/download", + name = "raze__futures__0_3_21", + url = "https://crates.io/api/v1/crates/futures/0.3.21/download", type = "tar.gz", - sha256 = "927fb434ff9f0115b215dc0efd2e4fbdd7448522a92a1aa37c77d6a2f8f1ebd6", - strip_prefix = "fst-0.3.5", - build_file = Label("//rules/rust/remote:BUILD.fst-0.3.5.bazel"), + sha256 = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e", + strip_prefix = "futures-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__fst__0_4_5", - url = "https://crates.io/api/v1/crates/fst/0.4.5/download", + name = "raze__futures_channel__0_3_21", + url = "https://crates.io/api/v1/crates/futures-channel/0.3.21/download", type = "tar.gz", - sha256 = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f", - strip_prefix = "fst-0.4.5", - build_file = Label("//rules/rust/remote:BUILD.fst-0.4.5.bazel"), + sha256 = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010", + strip_prefix = "futures-channel-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-channel-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__fuchsia_cprng__0_1_1", - url = "https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download", + name = "raze__futures_core__0_3_21", + url = "https://crates.io/api/v1/crates/futures-core/0.3.21/download", type = "tar.gz", - sha256 = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba", - strip_prefix = "fuchsia-cprng-0.1.1", - build_file = Label("//rules/rust/remote:BUILD.fuchsia-cprng-0.1.1.bazel"), + sha256 = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3", + strip_prefix = "futures-core-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-core-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__fuchsia_zircon__0_3_3", - url = "https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download", + name = "raze__futures_executor__0_3_21", + url = "https://crates.io/api/v1/crates/futures-executor/0.3.21/download", type = "tar.gz", - sha256 = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82", - strip_prefix = "fuchsia-zircon-0.3.3", - build_file = Label("//rules/rust/remote:BUILD.fuchsia-zircon-0.3.3.bazel"), + sha256 = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6", + strip_prefix = "futures-executor-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-executor-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__fuchsia_zircon_sys__0_3_3", - url = "https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download", + name = "raze__futures_io__0_3_21", + url = "https://crates.io/api/v1/crates/futures-io/0.3.21/download", type = "tar.gz", - sha256 = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7", - strip_prefix = "fuchsia-zircon-sys-0.3.3", - build_file = Label("//rules/rust/remote:BUILD.fuchsia-zircon-sys-0.3.3.bazel"), + sha256 = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b", + strip_prefix = "futures-io-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-io-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__futures__0_3_14", - url = "https://crates.io/api/v1/crates/futures/0.3.14/download", + name = "raze__futures_macro__0_3_21", + url = "https://crates.io/api/v1/crates/futures-macro/0.3.21/download", type = "tar.gz", - sha256 = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253", - strip_prefix = "futures-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-0.3.14.bazel"), + sha256 = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512", + strip_prefix = "futures-macro-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-macro-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__futures_channel__0_3_14", - url = "https://crates.io/api/v1/crates/futures-channel/0.3.14/download", + name = "raze__futures_sink__0_3_21", + url = "https://crates.io/api/v1/crates/futures-sink/0.3.21/download", type = "tar.gz", - sha256 = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25", - strip_prefix = "futures-channel-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-channel-0.3.14.bazel"), + sha256 = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868", + strip_prefix = "futures-sink-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-sink-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__futures_core__0_3_14", - url = "https://crates.io/api/v1/crates/futures-core/0.3.14/download", + name = "raze__futures_task__0_3_21", + url = "https://crates.io/api/v1/crates/futures-task/0.3.21/download", type = "tar.gz", - sha256 = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815", - strip_prefix = "futures-core-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-core-0.3.14.bazel"), + sha256 = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a", + strip_prefix = "futures-task-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-task-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__futures_executor__0_3_14", - url = "https://crates.io/api/v1/crates/futures-executor/0.3.14/download", + name = "raze__futures_util__0_3_21", + url = "https://crates.io/api/v1/crates/futures-util/0.3.21/download", type = "tar.gz", - sha256 = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d", - strip_prefix = "futures-executor-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-executor-0.3.14.bazel"), + sha256 = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a", + strip_prefix = "futures-util-0.3.21", + build_file = Label("//rules/rust/remote:BUILD.futures-util-0.3.21.bazel"), ) maybe( http_archive, - name = "raze__futures_io__0_3_14", - url = "https://crates.io/api/v1/crates/futures-io/0.3.14/download", + name = "raze__generic_array__0_12_4", + url = "https://crates.io/api/v1/crates/generic-array/0.12.4/download", type = "tar.gz", - sha256 = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04", - strip_prefix = "futures-io-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-io-0.3.14.bazel"), + sha256 = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd", + strip_prefix = "generic-array-0.12.4", + build_file = Label("//rules/rust/remote:BUILD.generic-array-0.12.4.bazel"), ) maybe( http_archive, - name = "raze__futures_macro__0_3_14", - url = "https://crates.io/api/v1/crates/futures-macro/0.3.14/download", + name = "raze__getrandom__0_2_5", + url = "https://crates.io/api/v1/crates/getrandom/0.2.5/download", type = "tar.gz", - sha256 = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b", - strip_prefix = "futures-macro-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-macro-0.3.14.bazel"), + sha256 = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77", + strip_prefix = "getrandom-0.2.5", + build_file = Label("//rules/rust/remote:BUILD.getrandom-0.2.5.bazel"), ) maybe( http_archive, - name = "raze__futures_sink__0_3_14", - url = "https://crates.io/api/v1/crates/futures-sink/0.3.14/download", + name = "raze__h2__0_3_12", + url = "https://crates.io/api/v1/crates/h2/0.3.12/download", type = "tar.gz", - sha256 = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23", - strip_prefix = "futures-sink-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-sink-0.3.14.bazel"), + sha256 = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b", + strip_prefix = "h2-0.3.12", + build_file = Label("//rules/rust/remote:BUILD.h2-0.3.12.bazel"), ) maybe( http_archive, - name = "raze__futures_task__0_3_14", - url = "https://crates.io/api/v1/crates/futures-task/0.3.14/download", + name = "raze__hashbrown__0_11_2", + url = "https://crates.io/api/v1/crates/hashbrown/0.11.2/download", type = "tar.gz", - sha256 = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc", - strip_prefix = "futures-task-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-task-0.3.14.bazel"), - ) - - maybe( - http_archive, - name = "raze__futures_util__0_3_14", - url = "https://crates.io/api/v1/crates/futures-util/0.3.14/download", - type = "tar.gz", - sha256 = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025", - strip_prefix = "futures-util-0.3.14", - build_file = Label("//rules/rust/remote:BUILD.futures-util-0.3.14.bazel"), - ) - - maybe( - http_archive, - name = "raze__fxhash__0_2_1", - url = "https://crates.io/api/v1/crates/fxhash/0.2.1/download", - type = "tar.gz", - sha256 = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c", - strip_prefix = "fxhash-0.2.1", - build_file = Label("//rules/rust/remote:BUILD.fxhash-0.2.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__generic_array__0_14_4", - url = "https://crates.io/api/v1/crates/generic-array/0.14.4/download", - type = "tar.gz", - sha256 = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817", - strip_prefix = "generic-array-0.14.4", - build_file = Label("//rules/rust/remote:BUILD.generic-array-0.14.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__getrandom__0_1_16", - url = "https://crates.io/api/v1/crates/getrandom/0.1.16/download", - type = "tar.gz", - sha256 = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce", - strip_prefix = "getrandom-0.1.16", - build_file = Label("//rules/rust/remote:BUILD.getrandom-0.1.16.bazel"), - ) - - maybe( - http_archive, - name = "raze__getrandom__0_2_2", - url = "https://crates.io/api/v1/crates/getrandom/0.2.2/download", - type = "tar.gz", - sha256 = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8", - strip_prefix = "getrandom-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.getrandom-0.2.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__gimli__0_23_0", - url = "https://crates.io/api/v1/crates/gimli/0.23.0/download", - type = "tar.gz", - sha256 = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce", - strip_prefix = "gimli-0.23.0", - build_file = Label("//rules/rust/remote:BUILD.gimli-0.23.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__grpc__0_8_3", - url = "https://crates.io/api/v1/crates/grpc/0.8.3/download", - type = "tar.gz", - sha256 = "efbd563cd51f8b9d3578a8029989b090aca83b8b411bfe1c7577b8b0f92937f8", - strip_prefix = "grpc-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.grpc-0.8.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__grpc_compiler__0_8_3", - url = "https://crates.io/api/v1/crates/grpc-compiler/0.8.3/download", - type = "tar.gz", - sha256 = "45f971449e16e799ebbf106d2414c115ff46f2849689c61da3a3271be0884a34", - strip_prefix = "grpc-compiler-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.grpc-compiler-0.8.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__h2__0_2_7", - url = "https://crates.io/api/v1/crates/h2/0.2.7/download", - type = "tar.gz", - sha256 = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535", - strip_prefix = "h2-0.2.7", - build_file = Label("//rules/rust/remote:BUILD.h2-0.2.7.bazel"), - ) - - maybe( - http_archive, - name = "raze__half__1_7_1", - url = "https://crates.io/api/v1/crates/half/1.7.1/download", - type = "tar.gz", - sha256 = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3", - strip_prefix = "half-1.7.1", - build_file = Label("//rules/rust/remote:BUILD.half-1.7.1.bazel"), + sha256 = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e", + strip_prefix = "hashbrown-0.11.2", + build_file = Label("//rules/rust/remote:BUILD.hashbrown-0.11.2.bazel"), ) maybe( @@ -1423,52 +693,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__heck__0_3_2", - url = "https://crates.io/api/v1/crates/heck/0.3.2/download", + name = "raze__heck__0_3_3", + url = "https://crates.io/api/v1/crates/heck/0.3.3/download", type = "tar.gz", - sha256 = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac", - strip_prefix = "heck-0.3.2", - build_file = Label("//rules/rust/remote:BUILD.heck-0.3.2.bazel"), + sha256 = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c", + strip_prefix = "heck-0.3.3", + build_file = Label("//rules/rust/remote:BUILD.heck-0.3.3.bazel"), ) maybe( http_archive, - name = "raze__hermit_abi__0_1_18", - url = "https://crates.io/api/v1/crates/hermit-abi/0.1.18/download", + name = "raze__hermit_abi__0_1_19", + url = "https://crates.io/api/v1/crates/hermit-abi/0.1.19/download", type = "tar.gz", - sha256 = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c", - strip_prefix = "hermit-abi-0.1.18", - build_file = Label("//rules/rust/remote:BUILD.hermit-abi-0.1.18.bazel"), - ) - - maybe( - http_archive, - name = "raze__hmac__0_10_1", - url = "https://crates.io/api/v1/crates/hmac/0.10.1/download", - type = "tar.gz", - sha256 = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15", - strip_prefix = "hmac-0.10.1", - build_file = Label("//rules/rust/remote:BUILD.hmac-0.10.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__hmac__0_9_0", - url = "https://crates.io/api/v1/crates/hmac/0.9.0/download", - type = "tar.gz", - sha256 = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff", - strip_prefix = "hmac-0.9.0", - build_file = Label("//rules/rust/remote:BUILD.hmac-0.9.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__hostname__0_3_1", - url = "https://crates.io/api/v1/crates/hostname/0.3.1/download", - type = "tar.gz", - sha256 = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867", - strip_prefix = "hostname-0.3.1", - build_file = Label("//rules/rust/remote:BUILD.hostname-0.3.1.bazel"), + sha256 = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33", + strip_prefix = "hermit-abi-0.1.19", + build_file = Label("//rules/rust/remote:BUILD.hermit-abi-0.1.19.bazel"), ) maybe( @@ -1483,172 +723,132 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__http__0_2_4", - url = "https://crates.io/api/v1/crates/http/0.2.4/download", + name = "raze__http__0_2_6", + url = "https://crates.io/api/v1/crates/http/0.2.6/download", type = "tar.gz", - sha256 = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11", - strip_prefix = "http-0.2.4", - build_file = Label("//rules/rust/remote:BUILD.http-0.2.4.bazel"), + sha256 = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03", + strip_prefix = "http-0.2.6", + build_file = Label("//rules/rust/remote:BUILD.http-0.2.6.bazel"), ) maybe( http_archive, - name = "raze__httparse__1_4_0", - url = "https://crates.io/api/v1/crates/httparse/1.4.0/download", + name = "raze__http_body__0_4_4", + url = "https://crates.io/api/v1/crates/http-body/0.4.4/download", type = "tar.gz", - sha256 = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437", - strip_prefix = "httparse-1.4.0", - build_file = Label("//rules/rust/remote:BUILD.httparse-1.4.0.bazel"), + sha256 = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6", + strip_prefix = "http-body-0.4.4", + build_file = Label("//rules/rust/remote:BUILD.http-body-0.4.4.bazel"), ) maybe( http_archive, - name = "raze__httpbis__0_9_1", - url = "https://crates.io/api/v1/crates/httpbis/0.9.1/download", + name = "raze__http_range_header__0_3_0", + url = "https://crates.io/api/v1/crates/http-range-header/0.3.0/download", type = "tar.gz", - sha256 = "3d3e4404f8f87938a2db89336609bde64363f5a556b15af936343e7252c9648d", - strip_prefix = "httpbis-0.9.1", - build_file = Label("//rules/rust/remote:BUILD.httpbis-0.9.1.bazel"), + sha256 = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29", + strip_prefix = "http-range-header-0.3.0", + build_file = Label("//rules/rust/remote:BUILD.http-range-header-0.3.0.bazel"), ) maybe( http_archive, - name = "raze__humantime__1_3_0", - url = "https://crates.io/api/v1/crates/humantime/1.3.0/download", + name = "raze__httparse__1_6_0", + url = "https://crates.io/api/v1/crates/httparse/1.6.0/download", type = "tar.gz", - sha256 = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f", - strip_prefix = "humantime-1.3.0", - build_file = Label("//rules/rust/remote:BUILD.humantime-1.3.0.bazel"), + sha256 = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4", + strip_prefix = "httparse-1.6.0", + build_file = Label("//rules/rust/remote:BUILD.httparse-1.6.0.bazel"), ) maybe( http_archive, - name = "raze__humantime__2_1_0", - url = "https://crates.io/api/v1/crates/humantime/2.1.0/download", + name = "raze__httpdate__1_0_2", + url = "https://crates.io/api/v1/crates/httpdate/1.0.2/download", type = "tar.gz", - sha256 = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4", - strip_prefix = "humantime-2.1.0", - build_file = Label("//rules/rust/remote:BUILD.humantime-2.1.0.bazel"), + sha256 = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421", + strip_prefix = "httpdate-1.0.2", + build_file = Label("//rules/rust/remote:BUILD.httpdate-1.0.2.bazel"), ) maybe( http_archive, - name = "raze__idna__0_2_3", - url = "https://crates.io/api/v1/crates/idna/0.2.3/download", + name = "raze__hyper__0_14_17", + url = "https://crates.io/api/v1/crates/hyper/0.14.17/download", type = "tar.gz", - sha256 = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8", - strip_prefix = "idna-0.2.3", - build_file = Label("//rules/rust/remote:BUILD.idna-0.2.3.bazel"), + sha256 = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd", + strip_prefix = "hyper-0.14.17", + build_file = Label("//rules/rust/remote:BUILD.hyper-0.14.17.bazel"), ) maybe( http_archive, - name = "raze__indexmap__1_6_2", - url = "https://crates.io/api/v1/crates/indexmap/1.6.2/download", + name = "raze__hyper_timeout__0_4_1", + url = "https://crates.io/api/v1/crates/hyper-timeout/0.4.1/download", type = "tar.gz", - sha256 = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3", - strip_prefix = "indexmap-1.6.2", - build_file = Label("//rules/rust/remote:BUILD.indexmap-1.6.2.bazel"), + sha256 = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1", + strip_prefix = "hyper-timeout-0.4.1", + build_file = Label("//rules/rust/remote:BUILD.hyper-timeout-0.4.1.bazel"), ) maybe( http_archive, - name = "raze__instant__0_1_9", - url = "https://crates.io/api/v1/crates/instant/0.1.9/download", + name = "raze__indexmap__1_8_0", + url = "https://crates.io/api/v1/crates/indexmap/1.8.0/download", type = "tar.gz", - sha256 = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec", - strip_prefix = "instant-0.1.9", - build_file = Label("//rules/rust/remote:BUILD.instant-0.1.9.bazel"), + sha256 = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223", + strip_prefix = "indexmap-1.8.0", + build_file = Label("//rules/rust/remote:BUILD.indexmap-1.8.0.bazel"), ) maybe( http_archive, - name = "raze__integer_encoding__2_1_3", - url = "https://crates.io/api/v1/crates/integer-encoding/2.1.3/download", + name = "raze__instant__0_1_12", + url = "https://crates.io/api/v1/crates/instant/0.1.12/download", type = "tar.gz", - sha256 = "c27df786dcc3a75ccd134f83ece166af0a1e5785d52b12b7375d0d063e1d5c47", - strip_prefix = "integer-encoding-2.1.3", - build_file = Label("//rules/rust/remote:BUILD.integer-encoding-2.1.3.bazel"), + sha256 = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c", + strip_prefix = "instant-0.1.12", + build_file = Label("//rules/rust/remote:BUILD.instant-0.1.12.bazel"), ) maybe( http_archive, - name = "raze__iovec__0_1_4", - url = "https://crates.io/api/v1/crates/iovec/0.1.4/download", + name = "raze__itertools__0_10_3", + url = "https://crates.io/api/v1/crates/itertools/0.10.3/download", type = "tar.gz", - sha256 = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e", - strip_prefix = "iovec-0.1.4", - build_file = Label("//rules/rust/remote:BUILD.iovec-0.1.4.bazel"), + sha256 = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3", + strip_prefix = "itertools-0.10.3", + build_file = Label("//rules/rust/remote:BUILD.itertools-0.10.3.bazel"), ) maybe( http_archive, - name = "raze__ipconfig__0_2_2", - url = "https://crates.io/api/v1/crates/ipconfig/0.2.2/download", + name = "raze__itoa__1_0_1", + url = "https://crates.io/api/v1/crates/itoa/1.0.1/download", type = "tar.gz", - sha256 = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7", - strip_prefix = "ipconfig-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.ipconfig-0.2.2.bazel"), + sha256 = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35", + strip_prefix = "itoa-1.0.1", + build_file = Label("//rules/rust/remote:BUILD.itoa-1.0.1.bazel"), ) maybe( http_archive, - name = "raze__itertools__0_10_0", - url = "https://crates.io/api/v1/crates/itertools/0.10.0/download", + name = "raze__js_sys__0_3_56", + url = "https://crates.io/api/v1/crates/js-sys/0.3.56/download", type = "tar.gz", - sha256 = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319", - strip_prefix = "itertools-0.10.0", - build_file = Label("//rules/rust/remote:BUILD.itertools-0.10.0.bazel"), + sha256 = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04", + strip_prefix = "js-sys-0.3.56", + build_file = Label("//rules/rust/remote:BUILD.js-sys-0.3.56.bazel"), ) maybe( http_archive, - name = "raze__itertools__0_9_0", - url = "https://crates.io/api/v1/crates/itertools/0.9.0/download", + name = "raze__json5__0_4_1", + url = "https://crates.io/api/v1/crates/json5/0.4.1/download", type = "tar.gz", - sha256 = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b", - strip_prefix = "itertools-0.9.0", - build_file = Label("//rules/rust/remote:BUILD.itertools-0.9.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__itoa__0_4_7", - url = "https://crates.io/api/v1/crates/itoa/0.4.7/download", - type = "tar.gz", - sha256 = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736", - strip_prefix = "itoa-0.4.7", - build_file = Label("//rules/rust/remote:BUILD.itoa-0.4.7.bazel"), - ) - - maybe( - http_archive, - name = "raze__js_sys__0_3_50", - url = "https://crates.io/api/v1/crates/js-sys/0.3.50/download", - type = "tar.gz", - sha256 = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c", - strip_prefix = "js-sys-0.3.50", - build_file = Label("//rules/rust/remote:BUILD.js-sys-0.3.50.bazel"), - ) - - maybe( - http_archive, - name = "raze__kernel32_sys__0_2_2", - url = "https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download", - type = "tar.gz", - sha256 = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d", - strip_prefix = "kernel32-sys-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.kernel32-sys-0.2.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__language_tags__0_2_2", - url = "https://crates.io/api/v1/crates/language-tags/0.2.2/download", - type = "tar.gz", - sha256 = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a", - strip_prefix = "language-tags-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.language-tags-0.2.2.bazel"), + sha256 = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1", + strip_prefix = "json5-0.4.1", + build_file = Label("//rules/rust/remote:BUILD.json5-0.4.1.bazel"), ) maybe( @@ -1663,32 +863,32 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__levenshtein_automata__0_1_1", - url = "https://crates.io/api/v1/crates/levenshtein_automata/0.1.1/download", + name = "raze__levenshtein_automata__0_2_1", + url = "https://crates.io/api/v1/crates/levenshtein_automata/0.2.1/download", type = "tar.gz", - sha256 = "73a004f877f468548d8d0ac4977456a249d8fabbdb8416c36db163dfc8f2e8ca", - strip_prefix = "levenshtein_automata-0.1.1", - build_file = Label("//rules/rust/remote:BUILD.levenshtein_automata-0.1.1.bazel"), + sha256 = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25", + strip_prefix = "levenshtein_automata-0.2.1", + build_file = Label("//rules/rust/remote:BUILD.levenshtein_automata-0.2.1.bazel"), ) maybe( http_archive, - name = "raze__lexical_core__0_7_5", - url = "https://crates.io/api/v1/crates/lexical-core/0.7.5/download", + name = "raze__libc__0_2_121", + url = "https://crates.io/api/v1/crates/libc/0.2.121/download", type = "tar.gz", - sha256 = "21f866863575d0e1d654fbeeabdc927292fdf862873dc3c96c6f753357e13374", - strip_prefix = "lexical-core-0.7.5", - build_file = Label("//rules/rust/remote:BUILD.lexical-core-0.7.5.bazel"), + sha256 = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f", + strip_prefix = "libc-0.2.121", + build_file = Label("//rules/rust/remote:BUILD.libc-0.2.121.bazel"), ) maybe( http_archive, - name = "raze__libc__0_2_93", - url = "https://crates.io/api/v1/crates/libc/0.2.93/download", + name = "raze__libz_sys__1_1_5", + url = "https://crates.io/api/v1/crates/libz-sys/1.1.5/download", type = "tar.gz", - sha256 = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41", - strip_prefix = "libc-0.2.93", - build_file = Label("//rules/rust/remote:BUILD.libc-0.2.93.bazel"), + sha256 = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859", + strip_prefix = "libz-sys-1.1.5", + build_file = Label("//rules/rust/remote:BUILD.libz-sys-1.1.5.bazel"), ) maybe( @@ -1703,12 +903,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__lock_api__0_4_3", - url = "https://crates.io/api/v1/crates/lock_api/0.4.3/download", + name = "raze__lock_api__0_4_6", + url = "https://crates.io/api/v1/crates/lock_api/0.4.6/download", type = "tar.gz", - sha256 = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176", - strip_prefix = "lock_api-0.4.3", - build_file = Label("//rules/rust/remote:BUILD.lock_api-0.4.3.bazel"), + sha256 = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b", + strip_prefix = "lock_api-0.4.6", + build_file = Label("//rules/rust/remote:BUILD.lock_api-0.4.6.bazel"), ) maybe( @@ -1723,72 +923,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__log_mdc__0_1_0", - url = "https://crates.io/api/v1/crates/log-mdc/0.1.0/download", + name = "raze__lru__0_7_3", + url = "https://crates.io/api/v1/crates/lru/0.7.3/download", type = "tar.gz", - sha256 = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7", - strip_prefix = "log-mdc-0.1.0", - build_file = Label("//rules/rust/remote:BUILD.log-mdc-0.1.0.bazel"), + sha256 = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb", + strip_prefix = "lru-0.7.3", + build_file = Label("//rules/rust/remote:BUILD.lru-0.7.3.bazel"), ) maybe( http_archive, - name = "raze__log_ndc__0_2_0", - url = "https://crates.io/api/v1/crates/log-ndc/0.2.0/download", + name = "raze__lz4_flex__0_9_2", + url = "https://crates.io/api/v1/crates/lz4_flex/0.9.2/download", type = "tar.gz", - sha256 = "edb09057c7b58b7d27498b528eaee9a1e661b2974a733fcabbbc3350360bc8bd", - strip_prefix = "log-ndc-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.log-ndc-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__log4rs__0_10_0", - url = "https://crates.io/api/v1/crates/log4rs/0.10.0/download", - type = "tar.gz", - sha256 = "853db99624c59798ddcf027dbe486541dd5cb5008ac6a6aaf217cc6fa044ee71", - strip_prefix = "log4rs-0.10.0", - build_file = Label("//rules/rust/remote:BUILD.log4rs-0.10.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__lru__0_6_5", - url = "https://crates.io/api/v1/crates/lru/0.6.5/download", - type = "tar.gz", - sha256 = "1f374d42cdfc1d7dbf3d3dec28afab2eb97ffbf43a3234d795b5986dbf4b90ba", - strip_prefix = "lru-0.6.5", - build_file = Label("//rules/rust/remote:BUILD.lru-0.6.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__lru_cache__0_1_2", - url = "https://crates.io/api/v1/crates/lru-cache/0.1.2/download", - type = "tar.gz", - sha256 = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c", - strip_prefix = "lru-cache-0.1.2", - build_file = Label("//rules/rust/remote:BUILD.lru-cache-0.1.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__lz4__1_23_2", - url = "https://crates.io/api/v1/crates/lz4/1.23.2/download", - type = "tar.gz", - sha256 = "aac20ed6991e01bf6a2e68cc73df2b389707403662a8ba89f68511fb340f724c", - strip_prefix = "lz4-1.23.2", - build_file = Label("//rules/rust/remote:BUILD.lz4-1.23.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__lz4_sys__1_9_2", - url = "https://crates.io/api/v1/crates/lz4-sys/1.9.2/download", - type = "tar.gz", - sha256 = "dca79aa95d8b3226213ad454d328369853be3a1382d89532a854f4d69640acae", - strip_prefix = "lz4-sys-1.9.2", - build_file = Label("//rules/rust/remote:BUILD.lz4-sys-1.9.2.bazel"), + sha256 = "42c51df9d8d4842336c835df1d85ed447c4813baa237d033d95128bf5552ad8a", + strip_prefix = "lz4_flex-0.9.2", + build_file = Label("//rules/rust/remote:BUILD.lz4_flex-0.9.2.bazel"), ) maybe( @@ -1803,162 +953,72 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__match_cfg__0_1_0", - url = "https://crates.io/api/v1/crates/match_cfg/0.1.0/download", + name = "raze__matchers__0_1_0", + url = "https://crates.io/api/v1/crates/matchers/0.1.0/download", type = "tar.gz", - sha256 = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4", - strip_prefix = "match_cfg-0.1.0", - build_file = Label("//rules/rust/remote:BUILD.match_cfg-0.1.0.bazel"), + sha256 = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558", + strip_prefix = "matchers-0.1.0", + build_file = Label("//rules/rust/remote:BUILD.matchers-0.1.0.bazel"), ) maybe( http_archive, - name = "raze__matches__0_1_8", - url = "https://crates.io/api/v1/crates/matches/0.1.8/download", + name = "raze__measure_time__0_8_0", + url = "https://crates.io/api/v1/crates/measure_time/0.8.0/download", type = "tar.gz", - sha256 = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08", - strip_prefix = "matches-0.1.8", - build_file = Label("//rules/rust/remote:BUILD.matches-0.1.8.bazel"), + sha256 = "5f07966480d8562b3622f51df0b4e3fe6ea7ddb3b48b19b0f44ef863c455bdf9", + strip_prefix = "measure_time-0.8.0", + build_file = Label("//rules/rust/remote:BUILD.measure_time-0.8.0.bazel"), ) maybe( http_archive, - name = "raze__maybe_uninit__2_0_0", - url = "https://crates.io/api/v1/crates/maybe-uninit/2.0.0/download", + name = "raze__memchr__2_4_1", + url = "https://crates.io/api/v1/crates/memchr/2.4.1/download", type = "tar.gz", - sha256 = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00", - strip_prefix = "maybe-uninit-2.0.0", - build_file = Label("//rules/rust/remote:BUILD.maybe-uninit-2.0.0.bazel"), + sha256 = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a", + strip_prefix = "memchr-2.4.1", + build_file = Label("//rules/rust/remote:BUILD.memchr-2.4.1.bazel"), ) maybe( http_archive, - name = "raze__md_5__0_9_1", - url = "https://crates.io/api/v1/crates/md-5/0.9.1/download", + name = "raze__memmap2__0_5_3", + url = "https://crates.io/api/v1/crates/memmap2/0.5.3/download", type = "tar.gz", - sha256 = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15", - strip_prefix = "md-5-0.9.1", - build_file = Label("//rules/rust/remote:BUILD.md-5-0.9.1.bazel"), + sha256 = "057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f", + strip_prefix = "memmap2-0.5.3", + build_file = Label("//rules/rust/remote:BUILD.memmap2-0.5.3.bazel"), ) maybe( http_archive, - name = "raze__md5__0_7_0", - url = "https://crates.io/api/v1/crates/md5/0.7.0/download", + name = "raze__memoffset__0_6_5", + url = "https://crates.io/api/v1/crates/memoffset/0.6.5/download", type = "tar.gz", - sha256 = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771", - strip_prefix = "md5-0.7.0", - build_file = Label("//rules/rust/remote:BUILD.md5-0.7.0.bazel"), + sha256 = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce", + strip_prefix = "memoffset-0.6.5", + build_file = Label("//rules/rust/remote:BUILD.memoffset-0.6.5.bazel"), ) maybe( http_archive, - name = "raze__memchr__2_3_4", - url = "https://crates.io/api/v1/crates/memchr/2.3.4/download", + name = "raze__minimal_lexical__0_2_1", + url = "https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download", type = "tar.gz", - sha256 = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525", - strip_prefix = "memchr-2.3.4", - build_file = Label("//rules/rust/remote:BUILD.memchr-2.3.4.bazel"), + sha256 = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a", + strip_prefix = "minimal-lexical-0.2.1", + build_file = Label("//rules/rust/remote:BUILD.minimal-lexical-0.2.1.bazel"), ) maybe( http_archive, - name = "raze__memmap__0_7_0", - url = "https://crates.io/api/v1/crates/memmap/0.7.0/download", + name = "raze__mio__0_8_2", + url = "https://crates.io/api/v1/crates/mio/0.8.2/download", type = "tar.gz", - sha256 = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b", - strip_prefix = "memmap-0.7.0", - build_file = Label("//rules/rust/remote:BUILD.memmap-0.7.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__memoffset__0_5_6", - url = "https://crates.io/api/v1/crates/memoffset/0.5.6/download", - type = "tar.gz", - sha256 = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa", - strip_prefix = "memoffset-0.5.6", - build_file = Label("//rules/rust/remote:BUILD.memoffset-0.5.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__memoffset__0_6_3", - url = "https://crates.io/api/v1/crates/memoffset/0.6.3/download", - type = "tar.gz", - sha256 = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d", - strip_prefix = "memoffset-0.6.3", - build_file = Label("//rules/rust/remote:BUILD.memoffset-0.6.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__mime__0_3_16", - url = "https://crates.io/api/v1/crates/mime/0.3.16/download", - type = "tar.gz", - sha256 = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d", - strip_prefix = "mime-0.3.16", - build_file = Label("//rules/rust/remote:BUILD.mime-0.3.16.bazel"), - ) - - maybe( - http_archive, - name = "raze__miniz_oxide__0_4_4", - url = "https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download", - type = "tar.gz", - sha256 = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b", - strip_prefix = "miniz_oxide-0.4.4", - build_file = Label("//rules/rust/remote:BUILD.miniz_oxide-0.4.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__mio__0_6_23", - url = "https://crates.io/api/v1/crates/mio/0.6.23/download", - type = "tar.gz", - sha256 = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4", - strip_prefix = "mio-0.6.23", - build_file = Label("//rules/rust/remote:BUILD.mio-0.6.23.bazel"), - ) - - maybe( - http_archive, - name = "raze__mio__0_7_11", - url = "https://crates.io/api/v1/crates/mio/0.7.11/download", - type = "tar.gz", - sha256 = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956", - strip_prefix = "mio-0.7.11", - build_file = Label("//rules/rust/remote:BUILD.mio-0.7.11.bazel"), - ) - - maybe( - http_archive, - name = "raze__mio_named_pipes__0_1_7", - url = "https://crates.io/api/v1/crates/mio-named-pipes/0.1.7/download", - type = "tar.gz", - sha256 = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656", - strip_prefix = "mio-named-pipes-0.1.7", - build_file = Label("//rules/rust/remote:BUILD.mio-named-pipes-0.1.7.bazel"), - ) - - maybe( - http_archive, - name = "raze__mio_uds__0_6_8", - url = "https://crates.io/api/v1/crates/mio-uds/0.6.8/download", - type = "tar.gz", - sha256 = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0", - strip_prefix = "mio-uds-0.6.8", - build_file = Label("//rules/rust/remote:BUILD.mio-uds-0.6.8.bazel"), - ) - - maybe( - http_archive, - name = "raze__miow__0_2_2", - url = "https://crates.io/api/v1/crates/miow/0.2.2/download", - type = "tar.gz", - sha256 = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d", - strip_prefix = "miow-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.miow-0.2.2.bazel"), + sha256 = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9", + strip_prefix = "mio-0.8.2", + build_file = Label("//rules/rust/remote:BUILD.mio-0.8.2.bazel"), ) maybe( @@ -1971,6 +1031,16 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.miow-0.3.7.bazel"), ) + maybe( + http_archive, + name = "raze__multimap__0_8_3", + url = "https://crates.io/api/v1/crates/multimap/0.8.3/download", + type = "tar.gz", + sha256 = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a", + strip_prefix = "multimap-0.8.3", + build_file = Label("//rules/rust/remote:BUILD.multimap-0.8.3.bazel"), + ) + maybe( http_archive, name = "raze__murmurhash32__0_2_0", @@ -1983,52 +1053,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__net2__0_2_37", - url = "https://crates.io/api/v1/crates/net2/0.2.37/download", + name = "raze__nom__7_1_1", + url = "https://crates.io/api/v1/crates/nom/7.1.1/download", type = "tar.gz", - sha256 = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae", - strip_prefix = "net2-0.2.37", - build_file = Label("//rules/rust/remote:BUILD.net2-0.2.37.bazel"), + sha256 = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36", + strip_prefix = "nom-7.1.1", + build_file = Label("//rules/rust/remote:BUILD.nom-7.1.1.bazel"), ) maybe( http_archive, - name = "raze__nix__0_14_1", - url = "https://crates.io/api/v1/crates/nix/0.14.1/download", + name = "raze__ntapi__0_3_7", + url = "https://crates.io/api/v1/crates/ntapi/0.3.7/download", type = "tar.gz", - sha256 = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce", - strip_prefix = "nix-0.14.1", - build_file = Label("//rules/rust/remote:BUILD.nix-0.14.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__nom__5_1_2", - url = "https://crates.io/api/v1/crates/nom/5.1.2/download", - type = "tar.gz", - sha256 = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af", - strip_prefix = "nom-5.1.2", - build_file = Label("//rules/rust/remote:BUILD.nom-5.1.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__ntapi__0_3_6", - url = "https://crates.io/api/v1/crates/ntapi/0.3.6/download", - type = "tar.gz", - sha256 = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44", - strip_prefix = "ntapi-0.3.6", - build_file = Label("//rules/rust/remote:BUILD.ntapi-0.3.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__num_bigint__0_3_2", - url = "https://crates.io/api/v1/crates/num-bigint/0.3.2/download", - type = "tar.gz", - sha256 = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba", - strip_prefix = "num-bigint-0.3.2", - build_file = Label("//rules/rust/remote:BUILD.num-bigint-0.3.2.bazel"), + sha256 = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f", + strip_prefix = "ntapi-0.3.7", + build_file = Label("//rules/rust/remote:BUILD.ntapi-0.3.7.bazel"), ) maybe( @@ -2041,16 +1081,6 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.num-integer-0.1.44.bazel"), ) - maybe( - http_archive, - name = "raze__num_traits__0_1_43", - url = "https://crates.io/api/v1/crates/num-traits/0.1.43/download", - type = "tar.gz", - sha256 = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31", - strip_prefix = "num-traits-0.1.43", - build_file = Label("//rules/rust/remote:BUILD.num-traits-0.1.43.bazel"), - ) - maybe( http_archive, name = "raze__num_traits__0_2_14", @@ -2063,102 +1093,172 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__num_cpus__1_13_0", - url = "https://crates.io/api/v1/crates/num_cpus/1.13.0/download", + name = "raze__num_cpus__1_13_1", + url = "https://crates.io/api/v1/crates/num_cpus/1.13.1/download", type = "tar.gz", - sha256 = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3", - strip_prefix = "num_cpus-1.13.0", - build_file = Label("//rules/rust/remote:BUILD.num_cpus-1.13.0.bazel"), + sha256 = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1", + strip_prefix = "num_cpus-1.13.1", + build_file = Label("//rules/rust/remote:BUILD.num_cpus-1.13.1.bazel"), ) maybe( http_archive, - name = "raze__object__0_23_0", - url = "https://crates.io/api/v1/crates/object/0.23.0/download", + name = "raze__num_enum__0_5_7", + url = "https://crates.io/api/v1/crates/num_enum/0.5.7/download", type = "tar.gz", - sha256 = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4", - strip_prefix = "object-0.23.0", - build_file = Label("//rules/rust/remote:BUILD.object-0.23.0.bazel"), + sha256 = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9", + strip_prefix = "num_enum-0.5.7", + build_file = Label("//rules/rust/remote:BUILD.num_enum-0.5.7.bazel"), ) maybe( http_archive, - name = "raze__once_cell__1_7_2", - url = "https://crates.io/api/v1/crates/once_cell/1.7.2/download", + name = "raze__num_enum_derive__0_5_7", + url = "https://crates.io/api/v1/crates/num_enum_derive/0.5.7/download", type = "tar.gz", - sha256 = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3", - strip_prefix = "once_cell-1.7.2", - build_file = Label("//rules/rust/remote:BUILD.once_cell-1.7.2.bazel"), + sha256 = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce", + strip_prefix = "num_enum_derive-0.5.7", + build_file = Label("//rules/rust/remote:BUILD.num_enum_derive-0.5.7.bazel"), ) maybe( http_archive, - name = "raze__oorandom__11_1_3", - url = "https://crates.io/api/v1/crates/oorandom/11.1.3/download", + name = "raze__num_threads__0_1_5", + url = "https://crates.io/api/v1/crates/num_threads/0.1.5/download", type = "tar.gz", - sha256 = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575", - strip_prefix = "oorandom-11.1.3", - build_file = Label("//rules/rust/remote:BUILD.oorandom-11.1.3.bazel"), + sha256 = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0", + strip_prefix = "num_threads-0.1.5", + build_file = Label("//rules/rust/remote:BUILD.num_threads-0.1.5.bazel"), ) maybe( http_archive, - name = "raze__opaque_debug__0_3_0", - url = "https://crates.io/api/v1/crates/opaque-debug/0.3.0/download", + name = "raze__once_cell__1_10_0", + url = "https://crates.io/api/v1/crates/once_cell/1.10.0/download", type = "tar.gz", - sha256 = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5", - strip_prefix = "opaque-debug-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.opaque-debug-0.3.0.bazel"), + sha256 = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9", + strip_prefix = "once_cell-1.10.0", + build_file = Label("//rules/rust/remote:BUILD.once_cell-1.10.0.bazel"), ) maybe( http_archive, - name = "raze__ordered_float__1_1_1", - url = "https://crates.io/api/v1/crates/ordered-float/1.1.1/download", + name = "raze__opaque_debug__0_2_3", + url = "https://crates.io/api/v1/crates/opaque-debug/0.2.3/download", type = "tar.gz", - sha256 = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7", - strip_prefix = "ordered-float-1.1.1", - build_file = Label("//rules/rust/remote:BUILD.ordered-float-1.1.1.bazel"), + sha256 = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c", + strip_prefix = "opaque-debug-0.2.3", + build_file = Label("//rules/rust/remote:BUILD.opaque-debug-0.2.3.bazel"), ) maybe( http_archive, - name = "raze__owned_read__0_4_1", - url = "https://crates.io/api/v1/crates/owned-read/0.4.1/download", + name = "raze__opentelemetry__0_17_0", + url = "https://crates.io/api/v1/crates/opentelemetry/0.17.0/download", type = "tar.gz", - sha256 = "b66d1e235abcebc845cf93550b89b74f468c051496fafb433ede4104b9f71ba1", - strip_prefix = "owned-read-0.4.1", - build_file = Label("//rules/rust/remote:BUILD.owned-read-0.4.1.bazel"), + sha256 = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8", + strip_prefix = "opentelemetry-0.17.0", + build_file = Label("//rules/rust/remote:BUILD.opentelemetry-0.17.0.bazel"), ) maybe( http_archive, - name = "raze__owning_ref__0_4_1", - url = "https://crates.io/api/v1/crates/owning_ref/0.4.1/download", + name = "raze__opentelemetry_prometheus__0_10_0", + url = "https://crates.io/api/v1/crates/opentelemetry-prometheus/0.10.0/download", type = "tar.gz", - sha256 = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce", - strip_prefix = "owning_ref-0.4.1", - build_file = Label("//rules/rust/remote:BUILD.owning_ref-0.4.1.bazel"), + sha256 = "9328977e479cebe12ce0d3fcecdaea4721d234895a9440c5b5dfd113f0594ac6", + strip_prefix = "opentelemetry-prometheus-0.10.0", + build_file = Label("//rules/rust/remote:BUILD.opentelemetry-prometheus-0.10.0.bazel"), ) maybe( http_archive, - name = "raze__parking_lot__0_11_1", - url = "https://crates.io/api/v1/crates/parking_lot/0.11.1/download", + name = "raze__ordered_multimap__0_3_1", + url = "https://crates.io/api/v1/crates/ordered-multimap/0.3.1/download", type = "tar.gz", - sha256 = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb", - strip_prefix = "parking_lot-0.11.1", - build_file = Label("//rules/rust/remote:BUILD.parking_lot-0.11.1.bazel"), + sha256 = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485", + strip_prefix = "ordered-multimap-0.3.1", + build_file = Label("//rules/rust/remote:BUILD.ordered-multimap-0.3.1.bazel"), ) maybe( http_archive, - name = "raze__parking_lot_core__0_8_3", - url = "https://crates.io/api/v1/crates/parking_lot_core/0.8.3/download", + name = "raze__os_str_bytes__6_0_0", + url = "https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download", type = "tar.gz", - sha256 = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018", - strip_prefix = "parking_lot_core-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.parking_lot_core-0.8.3.bazel"), + sha256 = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64", + strip_prefix = "os_str_bytes-6.0.0", + build_file = Label("//rules/rust/remote:BUILD.os_str_bytes-6.0.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__output_vt100__0_1_3", + url = "https://crates.io/api/v1/crates/output_vt100/0.1.3/download", + type = "tar.gz", + sha256 = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66", + strip_prefix = "output_vt100-0.1.3", + build_file = Label("//rules/rust/remote:BUILD.output_vt100-0.1.3.bazel"), + ) + + maybe( + http_archive, + name = "raze__ownedbytes__0_2_0", + url = "https://crates.io/api/v1/crates/ownedbytes/0.2.0/download", + type = "tar.gz", + sha256 = "0bfa208b217a39411d78b85427792e4c1bc40508acbcefd2836e765f44a5c99e", + strip_prefix = "ownedbytes-0.2.0", + build_file = Label("//rules/rust/remote:BUILD.ownedbytes-0.2.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__parking_lot__0_11_2", + url = "https://crates.io/api/v1/crates/parking_lot/0.11.2/download", + type = "tar.gz", + sha256 = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99", + strip_prefix = "parking_lot-0.11.2", + build_file = Label("//rules/rust/remote:BUILD.parking_lot-0.11.2.bazel"), + ) + + maybe( + http_archive, + name = "raze__parking_lot__0_12_0", + url = "https://crates.io/api/v1/crates/parking_lot/0.12.0/download", + type = "tar.gz", + sha256 = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58", + strip_prefix = "parking_lot-0.12.0", + build_file = Label("//rules/rust/remote:BUILD.parking_lot-0.12.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__parking_lot_core__0_8_5", + url = "https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download", + type = "tar.gz", + sha256 = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216", + strip_prefix = "parking_lot_core-0.8.5", + build_file = Label("//rules/rust/remote:BUILD.parking_lot_core-0.8.5.bazel"), + ) + + maybe( + http_archive, + name = "raze__parking_lot_core__0_9_1", + url = "https://crates.io/api/v1/crates/parking_lot_core/0.9.1/download", + type = "tar.gz", + sha256 = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954", + strip_prefix = "parking_lot_core-0.9.1", + build_file = Label("//rules/rust/remote:BUILD.parking_lot_core-0.9.1.bazel"), + ) + + maybe( + http_archive, + name = "raze__pathdiff__0_2_1", + url = "https://crates.io/api/v1/crates/pathdiff/0.2.1/download", + type = "tar.gz", + sha256 = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd", + strip_prefix = "pathdiff-0.2.1", + build_file = Label("//rules/rust/remote:BUILD.pathdiff-0.2.1.bazel"), ) maybe( @@ -2173,82 +1273,82 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__phf__0_8_0", - url = "https://crates.io/api/v1/crates/phf/0.8.0/download", + name = "raze__pest__2_1_3", + url = "https://crates.io/api/v1/crates/pest/2.1.3/download", type = "tar.gz", - sha256 = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12", - strip_prefix = "phf-0.8.0", - build_file = Label("//rules/rust/remote:BUILD.phf-0.8.0.bazel"), + sha256 = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53", + strip_prefix = "pest-2.1.3", + build_file = Label("//rules/rust/remote:BUILD.pest-2.1.3.bazel"), ) maybe( http_archive, - name = "raze__phf_shared__0_8_0", - url = "https://crates.io/api/v1/crates/phf_shared/0.8.0/download", + name = "raze__pest_derive__2_1_0", + url = "https://crates.io/api/v1/crates/pest_derive/2.1.0/download", type = "tar.gz", - sha256 = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7", - strip_prefix = "phf_shared-0.8.0", - build_file = Label("//rules/rust/remote:BUILD.phf_shared-0.8.0.bazel"), + sha256 = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0", + strip_prefix = "pest_derive-2.1.0", + build_file = Label("//rules/rust/remote:BUILD.pest_derive-2.1.0.bazel"), ) maybe( http_archive, - name = "raze__pin_project__0_4_28", - url = "https://crates.io/api/v1/crates/pin-project/0.4.28/download", + name = "raze__pest_generator__2_1_3", + url = "https://crates.io/api/v1/crates/pest_generator/2.1.3/download", type = "tar.gz", - sha256 = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f", - strip_prefix = "pin-project-0.4.28", - build_file = Label("//rules/rust/remote:BUILD.pin-project-0.4.28.bazel"), + sha256 = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55", + strip_prefix = "pest_generator-2.1.3", + build_file = Label("//rules/rust/remote:BUILD.pest_generator-2.1.3.bazel"), ) maybe( http_archive, - name = "raze__pin_project__1_0_7", - url = "https://crates.io/api/v1/crates/pin-project/1.0.7/download", + name = "raze__pest_meta__2_1_3", + url = "https://crates.io/api/v1/crates/pest_meta/2.1.3/download", type = "tar.gz", - sha256 = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4", - strip_prefix = "pin-project-1.0.7", - build_file = Label("//rules/rust/remote:BUILD.pin-project-1.0.7.bazel"), + sha256 = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d", + strip_prefix = "pest_meta-2.1.3", + build_file = Label("//rules/rust/remote:BUILD.pest_meta-2.1.3.bazel"), ) maybe( http_archive, - name = "raze__pin_project_internal__0_4_28", - url = "https://crates.io/api/v1/crates/pin-project-internal/0.4.28/download", + name = "raze__petgraph__0_6_0", + url = "https://crates.io/api/v1/crates/petgraph/0.6.0/download", type = "tar.gz", - sha256 = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e", - strip_prefix = "pin-project-internal-0.4.28", - build_file = Label("//rules/rust/remote:BUILD.pin-project-internal-0.4.28.bazel"), + sha256 = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f", + strip_prefix = "petgraph-0.6.0", + build_file = Label("//rules/rust/remote:BUILD.petgraph-0.6.0.bazel"), ) maybe( http_archive, - name = "raze__pin_project_internal__1_0_7", - url = "https://crates.io/api/v1/crates/pin-project-internal/1.0.7/download", + name = "raze__pin_project__1_0_10", + url = "https://crates.io/api/v1/crates/pin-project/1.0.10/download", type = "tar.gz", - sha256 = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f", - strip_prefix = "pin-project-internal-1.0.7", - build_file = Label("//rules/rust/remote:BUILD.pin-project-internal-1.0.7.bazel"), + sha256 = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e", + strip_prefix = "pin-project-1.0.10", + build_file = Label("//rules/rust/remote:BUILD.pin-project-1.0.10.bazel"), ) maybe( http_archive, - name = "raze__pin_project_lite__0_1_12", - url = "https://crates.io/api/v1/crates/pin-project-lite/0.1.12/download", + name = "raze__pin_project_internal__1_0_10", + url = "https://crates.io/api/v1/crates/pin-project-internal/1.0.10/download", type = "tar.gz", - sha256 = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777", - strip_prefix = "pin-project-lite-0.1.12", - build_file = Label("//rules/rust/remote:BUILD.pin-project-lite-0.1.12.bazel"), + sha256 = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb", + strip_prefix = "pin-project-internal-1.0.10", + build_file = Label("//rules/rust/remote:BUILD.pin-project-internal-1.0.10.bazel"), ) maybe( http_archive, - name = "raze__pin_project_lite__0_2_6", - url = "https://crates.io/api/v1/crates/pin-project-lite/0.2.6/download", + name = "raze__pin_project_lite__0_2_8", + url = "https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download", type = "tar.gz", - sha256 = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905", - strip_prefix = "pin-project-lite-0.2.6", - build_file = Label("//rules/rust/remote:BUILD.pin-project-lite-0.2.6.bazel"), + sha256 = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c", + strip_prefix = "pin-project-lite-0.2.8", + build_file = Label("//rules/rust/remote:BUILD.pin-project-lite-0.2.8.bazel"), ) maybe( @@ -2263,412 +1363,222 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__plotters__0_3_0", - url = "https://crates.io/api/v1/crates/plotters/0.3.0/download", + name = "raze__pkg_config__0_3_24", + url = "https://crates.io/api/v1/crates/pkg-config/0.3.24/download", type = "tar.gz", - sha256 = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a", - strip_prefix = "plotters-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.plotters-0.3.0.bazel"), + sha256 = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe", + strip_prefix = "pkg-config-0.3.24", + build_file = Label("//rules/rust/remote:BUILD.pkg-config-0.3.24.bazel"), ) maybe( http_archive, - name = "raze__plotters_backend__0_3_0", - url = "https://crates.io/api/v1/crates/plotters-backend/0.3.0/download", + name = "raze__ppv_lite86__0_2_16", + url = "https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download", type = "tar.gz", - sha256 = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590", - strip_prefix = "plotters-backend-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.plotters-backend-0.3.0.bazel"), + sha256 = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872", + strip_prefix = "ppv-lite86-0.2.16", + build_file = Label("//rules/rust/remote:BUILD.ppv-lite86-0.2.16.bazel"), ) maybe( http_archive, - name = "raze__plotters_svg__0_3_0", - url = "https://crates.io/api/v1/crates/plotters-svg/0.3.0/download", + name = "raze__pretty_assertions__1_2_0", + url = "https://crates.io/api/v1/crates/pretty_assertions/1.2.0/download", type = "tar.gz", - sha256 = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211", - strip_prefix = "plotters-svg-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.plotters-svg-0.3.0.bazel"), + sha256 = "57c038cb5319b9c704bf9c227c261d275bfec0ad438118a2787ce47944fb228b", + strip_prefix = "pretty_assertions-1.2.0", + build_file = Label("//rules/rust/remote:BUILD.pretty_assertions-1.2.0.bazel"), ) maybe( http_archive, - name = "raze__postgres__0_17_5", - url = "https://crates.io/api/v1/crates/postgres/0.17.5/download", + name = "raze__proc_macro_crate__1_1_3", + url = "https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download", type = "tar.gz", - sha256 = "14d864cf6c2eabf1323afe4145ff273aad1898e4f2a3bcb30347715df8624a07", - strip_prefix = "postgres-0.17.5", - build_file = Label("//rules/rust/remote:BUILD.postgres-0.17.5.bazel"), + sha256 = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a", + strip_prefix = "proc-macro-crate-1.1.3", + build_file = Label("//rules/rust/remote:BUILD.proc-macro-crate-1.1.3.bazel"), ) maybe( http_archive, - name = "raze__postgres_derive__0_4_0", - url = "https://crates.io/api/v1/crates/postgres-derive/0.4.0/download", + name = "raze__proc_macro2__1_0_36", + url = "https://crates.io/api/v1/crates/proc-macro2/1.0.36/download", type = "tar.gz", - sha256 = "c857dd221cb0e7d8414b894a0ce29eae44d453dda0baa132447878e75e701477", - strip_prefix = "postgres-derive-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.postgres-derive-0.4.0.bazel"), + sha256 = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029", + strip_prefix = "proc-macro2-1.0.36", + build_file = Label("//rules/rust/remote:BUILD.proc-macro2-1.0.36.bazel"), ) maybe( http_archive, - name = "raze__postgres_protocol__0_5_3", - url = "https://crates.io/api/v1/crates/postgres-protocol/0.5.3/download", + name = "raze__prometheus__0_13_0", + url = "https://crates.io/api/v1/crates/prometheus/0.13.0/download", type = "tar.gz", - sha256 = "4888a0e36637ab38d76cace88c1476937d617ad015f07f6b669cec11beacc019", - strip_prefix = "postgres-protocol-0.5.3", - build_file = Label("//rules/rust/remote:BUILD.postgres-protocol-0.5.3.bazel"), + sha256 = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504", + strip_prefix = "prometheus-0.13.0", + build_file = Label("//rules/rust/remote:BUILD.prometheus-0.13.0.bazel"), ) maybe( http_archive, - name = "raze__postgres_protocol__0_6_1", - url = "https://crates.io/api/v1/crates/postgres-protocol/0.6.1/download", + name = "raze__prost__0_9_0", + url = "https://crates.io/api/v1/crates/prost/0.9.0/download", type = "tar.gz", - sha256 = "ff3e0f70d32e20923cabf2df02913be7c1842d4c772db8065c00fcfdd1d1bff3", - strip_prefix = "postgres-protocol-0.6.1", - build_file = Label("//rules/rust/remote:BUILD.postgres-protocol-0.6.1.bazel"), + sha256 = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001", + strip_prefix = "prost-0.9.0", + build_file = Label("//rules/rust/remote:BUILD.prost-0.9.0.bazel"), ) maybe( http_archive, - name = "raze__postgres_types__0_1_3", - url = "https://crates.io/api/v1/crates/postgres-types/0.1.3/download", + name = "raze__prost_build__0_9_0", + url = "https://crates.io/api/v1/crates/prost-build/0.9.0/download", type = "tar.gz", - sha256 = "cfc08a7d94a80665de4a83942fa8db2fdeaf2f123fc0535e384dc4fff251efae", - strip_prefix = "postgres-types-0.1.3", - build_file = Label("//rules/rust/remote:BUILD.postgres-types-0.1.3.bazel"), + sha256 = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5", + strip_prefix = "prost-build-0.9.0", + build_file = Label("//rules/rust/remote:BUILD.prost-build-0.9.0.bazel"), ) maybe( http_archive, - name = "raze__postgres_types__0_2_1", - url = "https://crates.io/api/v1/crates/postgres-types/0.2.1/download", + name = "raze__prost_derive__0_9_0", + url = "https://crates.io/api/v1/crates/prost-derive/0.9.0/download", type = "tar.gz", - sha256 = "430f4131e1b7657b0cd9a2b0c3408d77c9a43a042d300b8c77f981dffcc43a2f", - strip_prefix = "postgres-types-0.2.1", - build_file = Label("//rules/rust/remote:BUILD.postgres-types-0.2.1.bazel"), + sha256 = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe", + strip_prefix = "prost-derive-0.9.0", + build_file = Label("//rules/rust/remote:BUILD.prost-derive-0.9.0.bazel"), ) maybe( http_archive, - name = "raze__ppv_lite86__0_2_10", - url = "https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download", + name = "raze__prost_types__0_9_0", + url = "https://crates.io/api/v1/crates/prost-types/0.9.0/download", type = "tar.gz", - sha256 = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857", - strip_prefix = "ppv-lite86-0.2.10", - build_file = Label("//rules/rust/remote:BUILD.ppv-lite86-0.2.10.bazel"), + sha256 = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a", + strip_prefix = "prost-types-0.9.0", + build_file = Label("//rules/rust/remote:BUILD.prost-types-0.9.0.bazel"), ) maybe( http_archive, - name = "raze__proc_macro_hack__0_5_19", - url = "https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download", + name = "raze__protobuf__2_27_1", + url = "https://crates.io/api/v1/crates/protobuf/2.27.1/download", type = "tar.gz", - sha256 = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5", - strip_prefix = "proc-macro-hack-0.5.19", - build_file = Label("//rules/rust/remote:BUILD.proc-macro-hack-0.5.19.bazel"), + sha256 = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96", + strip_prefix = "protobuf-2.27.1", + build_file = Label("//rules/rust/remote:BUILD.protobuf-2.27.1.bazel"), ) maybe( http_archive, - name = "raze__proc_macro_nested__0_1_7", - url = "https://crates.io/api/v1/crates/proc-macro-nested/0.1.7/download", + name = "raze__quote__1_0_16", + url = "https://crates.io/api/v1/crates/quote/1.0.16/download", type = "tar.gz", - sha256 = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086", - strip_prefix = "proc-macro-nested-0.1.7", - build_file = Label("//rules/rust/remote:BUILD.proc-macro-nested-0.1.7.bazel"), + sha256 = "b4af2ec4714533fcdf07e886f17025ace8b997b9ce51204ee69b6da831c3da57", + strip_prefix = "quote-1.0.16", + build_file = Label("//rules/rust/remote:BUILD.quote-1.0.16.bazel"), ) maybe( http_archive, - name = "raze__proc_macro2__1_0_26", - url = "https://crates.io/api/v1/crates/proc-macro2/1.0.26/download", + name = "raze__rand__0_8_5", + url = "https://crates.io/api/v1/crates/rand/0.8.5/download", type = "tar.gz", - sha256 = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec", - strip_prefix = "proc-macro2-1.0.26", - build_file = Label("//rules/rust/remote:BUILD.proc-macro2-1.0.26.bazel"), + sha256 = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404", + strip_prefix = "rand-0.8.5", + build_file = Label("//rules/rust/remote:BUILD.rand-0.8.5.bazel"), ) maybe( http_archive, - name = "raze__proptest__0_10_1", - url = "https://crates.io/api/v1/crates/proptest/0.10.1/download", + name = "raze__rand_chacha__0_3_1", + url = "https://crates.io/api/v1/crates/rand_chacha/0.3.1/download", type = "tar.gz", - sha256 = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f", - strip_prefix = "proptest-0.10.1", - build_file = Label("//rules/rust/remote:BUILD.proptest-0.10.1.bazel"), + sha256 = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88", + strip_prefix = "rand_chacha-0.3.1", + build_file = Label("//rules/rust/remote:BUILD.rand_chacha-0.3.1.bazel"), ) maybe( http_archive, - name = "raze__protobuf__2_18_2", - url = "https://crates.io/api/v1/crates/protobuf/2.18.2/download", + name = "raze__rand_core__0_6_3", + url = "https://crates.io/api/v1/crates/rand_core/0.6.3/download", type = "tar.gz", - sha256 = "fe8e18df92889779cfe50ccf640173141ff73c5b2817e553d6d35230f798a036", - strip_prefix = "protobuf-2.18.2", - build_file = Label("//rules/rust/remote:BUILD.protobuf-2.18.2.bazel"), + sha256 = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7", + strip_prefix = "rand_core-0.6.3", + build_file = Label("//rules/rust/remote:BUILD.rand_core-0.6.3.bazel"), ) maybe( http_archive, - name = "raze__protobuf_codegen__2_18_2", - url = "https://crates.io/api/v1/crates/protobuf-codegen/2.18.2/download", + name = "raze__rayon__1_5_1", + url = "https://crates.io/api/v1/crates/rayon/1.5.1/download", type = "tar.gz", - sha256 = "f49782fe28b5ff7d5d51cbfbe8985f3ff863acea663c515ed369c53f72e1d628", - strip_prefix = "protobuf-codegen-2.18.2", - build_file = Label("//rules/rust/remote:BUILD.protobuf-codegen-2.18.2.bazel"), + sha256 = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90", + strip_prefix = "rayon-1.5.1", + build_file = Label("//rules/rust/remote:BUILD.rayon-1.5.1.bazel"), ) maybe( http_archive, - name = "raze__quick_error__1_2_3", - url = "https://crates.io/api/v1/crates/quick-error/1.2.3/download", + name = "raze__rayon_core__1_9_1", + url = "https://crates.io/api/v1/crates/rayon-core/1.9.1/download", type = "tar.gz", - sha256 = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0", - strip_prefix = "quick-error-1.2.3", - build_file = Label("//rules/rust/remote:BUILD.quick-error-1.2.3.bazel"), + sha256 = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e", + strip_prefix = "rayon-core-1.9.1", + build_file = Label("//rules/rust/remote:BUILD.rayon-core-1.9.1.bazel"), ) maybe( http_archive, - name = "raze__quote__1_0_9", - url = "https://crates.io/api/v1/crates/quote/1.0.9/download", + name = "raze__rdkafka__0_28_0", + url = "https://crates.io/api/v1/crates/rdkafka/0.28.0/download", type = "tar.gz", - sha256 = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7", - strip_prefix = "quote-1.0.9", - build_file = Label("//rules/rust/remote:BUILD.quote-1.0.9.bazel"), + sha256 = "1de127f294f2dba488ed46760b129d5ecbeabbd337ccbf3739cb29d50db2161c", + strip_prefix = "rdkafka-0.28.0", + build_file = Label("//rules/rust/remote:BUILD.rdkafka-0.28.0.bazel"), ) maybe( http_archive, - name = "raze__r2d2__0_8_9", - url = "https://crates.io/api/v1/crates/r2d2/0.8.9/download", + name = "raze__rdkafka_sys__4_2_0_1_8_2", + url = "https://crates.io/api/v1/crates/rdkafka-sys/4.2.0+1.8.2/download", type = "tar.gz", - sha256 = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f", - strip_prefix = "r2d2-0.8.9", - build_file = Label("//rules/rust/remote:BUILD.r2d2-0.8.9.bazel"), + sha256 = "9e542c6863b04ce0fa0c5719bc6b7b348cf8dd21af1bb03c9db5f9805b2a6473", + strip_prefix = "rdkafka-sys-4.2.0+1.8.2", + build_file = Label("//rules/rust/remote:BUILD.rdkafka-sys-4.2.0+1.8.2.bazel"), ) maybe( http_archive, - name = "raze__r2d2_postgres__0_16_0", - url = "https://crates.io/api/v1/crates/r2d2_postgres/0.16.0/download", + name = "raze__redox_syscall__0_2_11", + url = "https://crates.io/api/v1/crates/redox_syscall/0.2.11/download", type = "tar.gz", - sha256 = "707d27f66f43bac1081141f6d9611fffcce7da2841ae97c7ac53619d098efe8f", - strip_prefix = "r2d2_postgres-0.16.0", - build_file = Label("//rules/rust/remote:BUILD.r2d2_postgres-0.16.0.bazel"), + sha256 = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c", + strip_prefix = "redox_syscall-0.2.11", + build_file = Label("//rules/rust/remote:BUILD.redox_syscall-0.2.11.bazel"), ) maybe( http_archive, - name = "raze__rand__0_4_6", - url = "https://crates.io/api/v1/crates/rand/0.4.6/download", + name = "raze__regex__1_5_5", + url = "https://crates.io/api/v1/crates/regex/1.5.5/download", type = "tar.gz", - sha256 = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293", - strip_prefix = "rand-0.4.6", - build_file = Label("//rules/rust/remote:BUILD.rand-0.4.6.bazel"), + sha256 = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286", + strip_prefix = "regex-1.5.5", + build_file = Label("//rules/rust/remote:BUILD.regex-1.5.5.bazel"), ) maybe( http_archive, - name = "raze__rand__0_5_6", - url = "https://crates.io/api/v1/crates/rand/0.5.6/download", + name = "raze__regex_automata__0_1_10", + url = "https://crates.io/api/v1/crates/regex-automata/0.1.10/download", type = "tar.gz", - sha256 = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9", - strip_prefix = "rand-0.5.6", - build_file = Label("//rules/rust/remote:BUILD.rand-0.5.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand__0_7_3", - url = "https://crates.io/api/v1/crates/rand/0.7.3/download", - type = "tar.gz", - sha256 = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03", - strip_prefix = "rand-0.7.3", - build_file = Label("//rules/rust/remote:BUILD.rand-0.7.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand__0_8_3", - url = "https://crates.io/api/v1/crates/rand/0.8.3/download", - type = "tar.gz", - sha256 = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e", - strip_prefix = "rand-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.rand-0.8.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_chacha__0_2_2", - url = "https://crates.io/api/v1/crates/rand_chacha/0.2.2/download", - type = "tar.gz", - sha256 = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402", - strip_prefix = "rand_chacha-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.rand_chacha-0.2.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_chacha__0_3_0", - url = "https://crates.io/api/v1/crates/rand_chacha/0.3.0/download", - type = "tar.gz", - sha256 = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d", - strip_prefix = "rand_chacha-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.rand_chacha-0.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_core__0_3_1", - url = "https://crates.io/api/v1/crates/rand_core/0.3.1/download", - type = "tar.gz", - sha256 = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b", - strip_prefix = "rand_core-0.3.1", - build_file = Label("//rules/rust/remote:BUILD.rand_core-0.3.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_core__0_4_2", - url = "https://crates.io/api/v1/crates/rand_core/0.4.2/download", - type = "tar.gz", - sha256 = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc", - strip_prefix = "rand_core-0.4.2", - build_file = Label("//rules/rust/remote:BUILD.rand_core-0.4.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_core__0_5_1", - url = "https://crates.io/api/v1/crates/rand_core/0.5.1/download", - type = "tar.gz", - sha256 = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19", - strip_prefix = "rand_core-0.5.1", - build_file = Label("//rules/rust/remote:BUILD.rand_core-0.5.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_core__0_6_2", - url = "https://crates.io/api/v1/crates/rand_core/0.6.2/download", - type = "tar.gz", - sha256 = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7", - strip_prefix = "rand_core-0.6.2", - build_file = Label("//rules/rust/remote:BUILD.rand_core-0.6.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_hc__0_2_0", - url = "https://crates.io/api/v1/crates/rand_hc/0.2.0/download", - type = "tar.gz", - sha256 = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c", - strip_prefix = "rand_hc-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.rand_hc-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_hc__0_3_0", - url = "https://crates.io/api/v1/crates/rand_hc/0.3.0/download", - type = "tar.gz", - sha256 = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73", - strip_prefix = "rand_hc-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.rand_hc-0.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rand_xorshift__0_2_0", - url = "https://crates.io/api/v1/crates/rand_xorshift/0.2.0/download", - type = "tar.gz", - sha256 = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8", - strip_prefix = "rand_xorshift-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.rand_xorshift-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rayon__1_5_0", - url = "https://crates.io/api/v1/crates/rayon/1.5.0/download", - type = "tar.gz", - sha256 = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674", - strip_prefix = "rayon-1.5.0", - build_file = Label("//rules/rust/remote:BUILD.rayon-1.5.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rayon_core__1_9_0", - url = "https://crates.io/api/v1/crates/rayon-core/1.9.0/download", - type = "tar.gz", - sha256 = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a", - strip_prefix = "rayon-core-1.9.0", - build_file = Label("//rules/rust/remote:BUILD.rayon-core-1.9.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rdrand__0_4_0", - url = "https://crates.io/api/v1/crates/rdrand/0.4.0/download", - type = "tar.gz", - sha256 = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2", - strip_prefix = "rdrand-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.rdrand-0.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__redox_syscall__0_1_57", - url = "https://crates.io/api/v1/crates/redox_syscall/0.1.57/download", - type = "tar.gz", - sha256 = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce", - strip_prefix = "redox_syscall-0.1.57", - build_file = Label("//rules/rust/remote:BUILD.redox_syscall-0.1.57.bazel"), - ) - - maybe( - http_archive, - name = "raze__redox_syscall__0_2_6", - url = "https://crates.io/api/v1/crates/redox_syscall/0.2.6/download", - type = "tar.gz", - sha256 = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041", - strip_prefix = "redox_syscall-0.2.6", - build_file = Label("//rules/rust/remote:BUILD.redox_syscall-0.2.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__redox_users__0_4_0", - url = "https://crates.io/api/v1/crates/redox_users/0.4.0/download", - type = "tar.gz", - sha256 = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64", - strip_prefix = "redox_users-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.redox_users-0.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__regex__1_4_5", - url = "https://crates.io/api/v1/crates/regex/1.4.5/download", - type = "tar.gz", - sha256 = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19", - strip_prefix = "regex-1.4.5", - build_file = Label("//rules/rust/remote:BUILD.regex-1.4.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__regex_automata__0_1_9", - url = "https://crates.io/api/v1/crates/regex-automata/0.1.9/download", - type = "tar.gz", - sha256 = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4", - strip_prefix = "regex-automata-0.1.9", - build_file = Label("//rules/rust/remote:BUILD.regex-automata-0.1.9.bazel"), + sha256 = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132", + strip_prefix = "regex-automata-0.1.10", + build_file = Label("//rules/rust/remote:BUILD.regex-automata-0.1.10.bazel"), ) maybe( @@ -2683,12 +1593,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__regex_syntax__0_6_23", - url = "https://crates.io/api/v1/crates/regex-syntax/0.6.23/download", + name = "raze__regex_syntax__0_6_25", + url = "https://crates.io/api/v1/crates/regex-syntax/0.6.25/download", type = "tar.gz", - sha256 = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548", - strip_prefix = "regex-syntax-0.6.23", - build_file = Label("//rules/rust/remote:BUILD.regex-syntax-0.6.23.bazel"), + sha256 = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b", + strip_prefix = "regex-syntax-0.6.25", + build_file = Label("//rules/rust/remote:BUILD.regex-syntax-0.6.25.bazel"), ) maybe( @@ -2703,32 +1613,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__reopen__1_0_2", - url = "https://crates.io/api/v1/crates/reopen/1.0.2/download", + name = "raze__ron__0_7_0", + url = "https://crates.io/api/v1/crates/ron/0.7.0/download", type = "tar.gz", - sha256 = "5edcb3ed00766dec347874689b0a605087dee77a60912f23ce59928756e19631", - strip_prefix = "reopen-1.0.2", - build_file = Label("//rules/rust/remote:BUILD.reopen-1.0.2.bazel"), + sha256 = "1b861ecaade43ac97886a512b360d01d66be9f41f3c61088b42cedf92e03d678", + strip_prefix = "ron-0.7.0", + build_file = Label("//rules/rust/remote:BUILD.ron-0.7.0.bazel"), ) maybe( http_archive, - name = "raze__resolv_conf__0_7_0", - url = "https://crates.io/api/v1/crates/resolv-conf/0.7.0/download", + name = "raze__rust_ini__0_17_0", + url = "https://crates.io/api/v1/crates/rust-ini/0.17.0/download", type = "tar.gz", - sha256 = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00", - strip_prefix = "resolv-conf-0.7.0", - build_file = Label("//rules/rust/remote:BUILD.resolv-conf-0.7.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__rust_ini__0_13_0", - url = "https://crates.io/api/v1/crates/rust-ini/0.13.0/download", - type = "tar.gz", - sha256 = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2", - strip_prefix = "rust-ini-0.13.0", - build_file = Label("//rules/rust/remote:BUILD.rust-ini-0.13.0.bazel"), + sha256 = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22", + strip_prefix = "rust-ini-0.17.0", + build_file = Label("//rules/rust/remote:BUILD.rust-ini-0.17.0.bazel"), ) maybe( @@ -2743,92 +1643,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__rustc_demangle__0_1_18", - url = "https://crates.io/api/v1/crates/rustc-demangle/0.1.18/download", + name = "raze__ryu__1_0_9", + url = "https://crates.io/api/v1/crates/ryu/1.0.9/download", type = "tar.gz", - sha256 = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232", - strip_prefix = "rustc-demangle-0.1.18", - build_file = Label("//rules/rust/remote:BUILD.rustc-demangle-0.1.18.bazel"), - ) - - maybe( - http_archive, - name = "raze__rustc_serialize__0_3_24", - url = "https://crates.io/api/v1/crates/rustc-serialize/0.3.24/download", - type = "tar.gz", - sha256 = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda", - strip_prefix = "rustc-serialize-0.3.24", - build_file = Label("//rules/rust/remote:BUILD.rustc-serialize-0.3.24.bazel"), - ) - - maybe( - http_archive, - name = "raze__rustc_version__0_2_3", - url = "https://crates.io/api/v1/crates/rustc_version/0.2.3/download", - type = "tar.gz", - sha256 = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a", - strip_prefix = "rustc_version-0.2.3", - build_file = Label("//rules/rust/remote:BUILD.rustc_version-0.2.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__rustversion__1_0_4", - url = "https://crates.io/api/v1/crates/rustversion/1.0.4/download", - type = "tar.gz", - sha256 = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd", - strip_prefix = "rustversion-1.0.4", - build_file = Label("//rules/rust/remote:BUILD.rustversion-1.0.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__rusty_fork__0_3_0", - url = "https://crates.io/api/v1/crates/rusty-fork/0.3.0/download", - type = "tar.gz", - sha256 = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f", - strip_prefix = "rusty-fork-0.3.0", - build_file = Label("//rules/rust/remote:BUILD.rusty-fork-0.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__ryu__1_0_5", - url = "https://crates.io/api/v1/crates/ryu/1.0.5/download", - type = "tar.gz", - sha256 = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e", - strip_prefix = "ryu-1.0.5", - build_file = Label("//rules/rust/remote:BUILD.ryu-1.0.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__safemem__0_3_3", - url = "https://crates.io/api/v1/crates/safemem/0.3.3/download", - type = "tar.gz", - sha256 = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072", - strip_prefix = "safemem-0.3.3", - build_file = Label("//rules/rust/remote:BUILD.safemem-0.3.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__same_file__1_0_6", - url = "https://crates.io/api/v1/crates/same-file/1.0.6/download", - type = "tar.gz", - sha256 = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502", - strip_prefix = "same-file-1.0.6", - build_file = Label("//rules/rust/remote:BUILD.same-file-1.0.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__scheduled_thread_pool__0_2_5", - url = "https://crates.io/api/v1/crates/scheduled-thread-pool/0.2.5/download", - type = "tar.gz", - sha256 = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7", - strip_prefix = "scheduled-thread-pool-0.2.5", - build_file = Label("//rules/rust/remote:BUILD.scheduled-thread-pool-0.2.5.bazel"), + sha256 = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f", + strip_prefix = "ryu-1.0.9", + build_file = Label("//rules/rust/remote:BUILD.ryu-1.0.9.bazel"), ) maybe( @@ -2843,282 +1663,102 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__semver__0_9_0", - url = "https://crates.io/api/v1/crates/semver/0.9.0/download", + name = "raze__serde__1_0_136", + url = "https://crates.io/api/v1/crates/serde/1.0.136/download", type = "tar.gz", - sha256 = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403", - strip_prefix = "semver-0.9.0", - build_file = Label("//rules/rust/remote:BUILD.semver-0.9.0.bazel"), + sha256 = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789", + strip_prefix = "serde-1.0.136", + build_file = Label("//rules/rust/remote:BUILD.serde-1.0.136.bazel"), ) maybe( http_archive, - name = "raze__semver_parser__0_7_0", - url = "https://crates.io/api/v1/crates/semver-parser/0.7.0/download", + name = "raze__serde_derive__1_0_136", + url = "https://crates.io/api/v1/crates/serde_derive/1.0.136/download", type = "tar.gz", - sha256 = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3", - strip_prefix = "semver-parser-0.7.0", - build_file = Label("//rules/rust/remote:BUILD.semver-parser-0.7.0.bazel"), + sha256 = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9", + strip_prefix = "serde_derive-1.0.136", + build_file = Label("//rules/rust/remote:BUILD.serde_derive-1.0.136.bazel"), ) maybe( http_archive, - name = "raze__serde__0_8_23", - url = "https://crates.io/api/v1/crates/serde/0.8.23/download", + name = "raze__serde_json__1_0_79", + url = "https://crates.io/api/v1/crates/serde_json/1.0.79/download", type = "tar.gz", - sha256 = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8", - strip_prefix = "serde-0.8.23", - build_file = Label("//rules/rust/remote:BUILD.serde-0.8.23.bazel"), + sha256 = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95", + strip_prefix = "serde_json-1.0.79", + build_file = Label("//rules/rust/remote:BUILD.serde_json-1.0.79.bazel"), ) maybe( http_archive, - name = "raze__serde__1_0_125", - url = "https://crates.io/api/v1/crates/serde/1.0.125/download", + name = "raze__serde_yaml__0_8_23", + url = "https://crates.io/api/v1/crates/serde_yaml/0.8.23/download", type = "tar.gz", - sha256 = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171", - strip_prefix = "serde-1.0.125", - build_file = Label("//rules/rust/remote:BUILD.serde-1.0.125.bazel"), + sha256 = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0", + strip_prefix = "serde_yaml-0.8.23", + build_file = Label("//rules/rust/remote:BUILD.serde_yaml-0.8.23.bazel"), ) maybe( http_archive, - name = "raze__serde_hjson__0_9_1", - url = "https://crates.io/api/v1/crates/serde-hjson/0.9.1/download", + name = "raze__sha_1__0_8_2", + url = "https://crates.io/api/v1/crates/sha-1/0.8.2/download", type = "tar.gz", - sha256 = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8", - strip_prefix = "serde-hjson-0.9.1", - build_file = Label("//rules/rust/remote:BUILD.serde-hjson-0.9.1.bazel"), + sha256 = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df", + strip_prefix = "sha-1-0.8.2", + build_file = Label("//rules/rust/remote:BUILD.sha-1-0.8.2.bazel"), ) maybe( http_archive, - name = "raze__serde_value__0_6_0", - url = "https://crates.io/api/v1/crates/serde-value/0.6.0/download", + name = "raze__sharded_slab__0_1_4", + url = "https://crates.io/api/v1/crates/sharded-slab/0.1.4/download", type = "tar.gz", - sha256 = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb", - strip_prefix = "serde-value-0.6.0", - build_file = Label("//rules/rust/remote:BUILD.serde-value-0.6.0.bazel"), + sha256 = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31", + strip_prefix = "sharded-slab-0.1.4", + build_file = Label("//rules/rust/remote:BUILD.sharded-slab-0.1.4.bazel"), ) maybe( http_archive, - name = "raze__serde_cbor__0_11_1", - url = "https://crates.io/api/v1/crates/serde_cbor/0.11.1/download", + name = "raze__signal_hook__0_3_13", + url = "https://crates.io/api/v1/crates/signal-hook/0.3.13/download", type = "tar.gz", - sha256 = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622", - strip_prefix = "serde_cbor-0.11.1", - build_file = Label("//rules/rust/remote:BUILD.serde_cbor-0.11.1.bazel"), + sha256 = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d", + strip_prefix = "signal-hook-0.3.13", + build_file = Label("//rules/rust/remote:BUILD.signal-hook-0.3.13.bazel"), ) maybe( http_archive, - name = "raze__serde_derive__1_0_125", - url = "https://crates.io/api/v1/crates/serde_derive/1.0.125/download", + name = "raze__signal_hook_registry__1_4_0", + url = "https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download", type = "tar.gz", - sha256 = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d", - strip_prefix = "serde_derive-1.0.125", - build_file = Label("//rules/rust/remote:BUILD.serde_derive-1.0.125.bazel"), + sha256 = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0", + strip_prefix = "signal-hook-registry-1.4.0", + build_file = Label("//rules/rust/remote:BUILD.signal-hook-registry-1.4.0.bazel"), ) maybe( http_archive, - name = "raze__serde_json__1_0_64", - url = "https://crates.io/api/v1/crates/serde_json/1.0.64/download", + name = "raze__slab__0_4_5", + url = "https://crates.io/api/v1/crates/slab/0.4.5/download", type = "tar.gz", - sha256 = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79", - strip_prefix = "serde_json-1.0.64", - build_file = Label("//rules/rust/remote:BUILD.serde_json-1.0.64.bazel"), + sha256 = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5", + strip_prefix = "slab-0.4.5", + build_file = Label("//rules/rust/remote:BUILD.slab-0.4.5.bazel"), ) maybe( http_archive, - name = "raze__serde_qs__0_8_3", - url = "https://crates.io/api/v1/crates/serde_qs/0.8.3/download", + name = "raze__smallvec__1_8_0", + url = "https://crates.io/api/v1/crates/smallvec/1.8.0/download", type = "tar.gz", - sha256 = "b22063cd705114614293767c69aa992531f72b0cc8a6b9145801920730fe25e4", - strip_prefix = "serde_qs-0.8.3", - build_file = Label("//rules/rust/remote:BUILD.serde_qs-0.8.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__serde_urlencoded__0_7_0", - url = "https://crates.io/api/v1/crates/serde_urlencoded/0.7.0/download", - type = "tar.gz", - sha256 = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9", - strip_prefix = "serde_urlencoded-0.7.0", - build_file = Label("//rules/rust/remote:BUILD.serde_urlencoded-0.7.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__serde_yaml__0_8_17", - url = "https://crates.io/api/v1/crates/serde_yaml/0.8.17/download", - type = "tar.gz", - sha256 = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23", - strip_prefix = "serde_yaml-0.8.17", - build_file = Label("//rules/rust/remote:BUILD.serde_yaml-0.8.17.bazel"), - ) - - maybe( - http_archive, - name = "raze__sha_1__0_9_4", - url = "https://crates.io/api/v1/crates/sha-1/0.9.4/download", - type = "tar.gz", - sha256 = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f", - strip_prefix = "sha-1-0.9.4", - build_file = Label("//rules/rust/remote:BUILD.sha-1-0.9.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__sha1__0_6_0", - url = "https://crates.io/api/v1/crates/sha1/0.6.0/download", - type = "tar.gz", - sha256 = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d", - strip_prefix = "sha1-0.6.0", - build_file = Label("//rules/rust/remote:BUILD.sha1-0.6.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__sha2__0_9_3", - url = "https://crates.io/api/v1/crates/sha2/0.9.3/download", - type = "tar.gz", - sha256 = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de", - strip_prefix = "sha2-0.9.3", - build_file = Label("//rules/rust/remote:BUILD.sha2-0.9.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__signal_hook__0_2_3", - url = "https://crates.io/api/v1/crates/signal-hook/0.2.3/download", - type = "tar.gz", - sha256 = "844024c8913df6bfbfeee3061075ccc47216a897ac0b54a683dea3dfe16d19af", - strip_prefix = "signal-hook-0.2.3", - build_file = Label("//rules/rust/remote:BUILD.signal-hook-0.2.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__signal_hook__0_3_8", - url = "https://crates.io/api/v1/crates/signal-hook/0.3.8/download", - type = "tar.gz", - sha256 = "ef33d6d0cd06e0840fba9985aab098c147e67e05cee14d412d3345ed14ff30ac", - strip_prefix = "signal-hook-0.3.8", - build_file = Label("//rules/rust/remote:BUILD.signal-hook-0.3.8.bazel"), - ) - - maybe( - http_archive, - name = "raze__signal_hook_registry__1_3_0", - url = "https://crates.io/api/v1/crates/signal-hook-registry/1.3.0/download", - type = "tar.gz", - sha256 = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6", - strip_prefix = "signal-hook-registry-1.3.0", - build_file = Label("//rules/rust/remote:BUILD.signal-hook-registry-1.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__siphasher__0_3_5", - url = "https://crates.io/api/v1/crates/siphasher/0.3.5/download", - type = "tar.gz", - sha256 = "cbce6d4507c7e4a3962091436e56e95290cb71fa302d0d270e32130b75fbff27", - strip_prefix = "siphasher-0.3.5", - build_file = Label("//rules/rust/remote:BUILD.siphasher-0.3.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__slab__0_4_2", - url = "https://crates.io/api/v1/crates/slab/0.4.2/download", - type = "tar.gz", - sha256 = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8", - strip_prefix = "slab-0.4.2", - build_file = Label("//rules/rust/remote:BUILD.slab-0.4.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog__2_7_0", - url = "https://crates.io/api/v1/crates/slog/2.7.0/download", - type = "tar.gz", - sha256 = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06", - strip_prefix = "slog-2.7.0", - build_file = Label("//rules/rust/remote:BUILD.slog-2.7.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog_async__2_6_0", - url = "https://crates.io/api/v1/crates/slog-async/2.6.0/download", - type = "tar.gz", - sha256 = "c60813879f820c85dbc4eabf3269befe374591289019775898d56a81a804fbdc", - strip_prefix = "slog-async-2.6.0", - build_file = Label("//rules/rust/remote:BUILD.slog-async-2.6.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog_json__2_3_0", - url = "https://crates.io/api/v1/crates/slog-json/2.3.0/download", - type = "tar.gz", - sha256 = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a", - strip_prefix = "slog-json-2.3.0", - build_file = Label("//rules/rust/remote:BUILD.slog-json-2.3.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog_scope__4_4_0", - url = "https://crates.io/api/v1/crates/slog-scope/4.4.0/download", - type = "tar.gz", - sha256 = "2f95a4b4c3274cd2869549da82b57ccc930859bdbf5bcea0424bc5f140b3c786", - strip_prefix = "slog-scope-4.4.0", - build_file = Label("//rules/rust/remote:BUILD.slog-scope-4.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog_stdlog__4_1_0", - url = "https://crates.io/api/v1/crates/slog-stdlog/4.1.0/download", - type = "tar.gz", - sha256 = "8228ab7302adbf4fcb37e66f3cda78003feb521e7fd9e3847ec117a7784d0f5a", - strip_prefix = "slog-stdlog-4.1.0", - build_file = Label("//rules/rust/remote:BUILD.slog-stdlog-4.1.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog_term__2_8_0", - url = "https://crates.io/api/v1/crates/slog-term/2.8.0/download", - type = "tar.gz", - sha256 = "95c1e7e5aab61ced6006149ea772770b84a0d16ce0f7885def313e4829946d76", - strip_prefix = "slog-term-2.8.0", - build_file = Label("//rules/rust/remote:BUILD.slog-term-2.8.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__slog_derive__0_2_0", - url = "https://crates.io/api/v1/crates/slog_derive/0.2.0/download", - type = "tar.gz", - sha256 = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b", - strip_prefix = "slog_derive-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.slog_derive-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__smallvec__1_6_1", - url = "https://crates.io/api/v1/crates/smallvec/1.6.1/download", - type = "tar.gz", - sha256 = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e", - strip_prefix = "smallvec-1.6.1", - build_file = Label("//rules/rust/remote:BUILD.smallvec-1.6.1.bazel"), + sha256 = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83", + strip_prefix = "smallvec-1.8.0", + build_file = Label("//rules/rust/remote:BUILD.smallvec-1.8.0.bazel"), ) maybe( @@ -3133,32 +1773,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__snap__1_0_4", - url = "https://crates.io/api/v1/crates/snap/1.0.4/download", + name = "raze__socket2__0_4_4", + url = "https://crates.io/api/v1/crates/socket2/0.4.4/download", type = "tar.gz", - sha256 = "dc725476a1398f0480d56cd0ad381f6f32acf2642704456f8f59a35df464b59a", - strip_prefix = "snap-1.0.4", - build_file = Label("//rules/rust/remote:BUILD.snap-1.0.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__socket2__0_3_19", - url = "https://crates.io/api/v1/crates/socket2/0.3.19/download", - type = "tar.gz", - sha256 = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e", - strip_prefix = "socket2-0.3.19", - build_file = Label("//rules/rust/remote:BUILD.socket2-0.3.19.bazel"), - ) - - maybe( - http_archive, - name = "raze__socket2__0_4_0", - url = "https://crates.io/api/v1/crates/socket2/0.4.0/download", - type = "tar.gz", - sha256 = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2", - strip_prefix = "socket2-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.socket2-0.4.0.bazel"), + sha256 = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0", + strip_prefix = "socket2-0.4.4", + build_file = Label("//rules/rust/remote:BUILD.socket2-0.4.4.bazel"), ) maybe( @@ -3171,16 +1791,6 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.stable_deref_trait-1.2.0.bazel"), ) - maybe( - http_archive, - name = "raze__standback__0_2_17", - url = "https://crates.io/api/v1/crates/standback/0.2.17/download", - type = "tar.gz", - sha256 = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff", - strip_prefix = "standback-0.2.17", - build_file = Label("//rules/rust/remote:BUILD.standback-0.2.17.bazel"), - ) - maybe( http_archive, name = "raze__static_assertions__1_1_0", @@ -3193,122 +1803,62 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__stdweb__0_4_20", - url = "https://crates.io/api/v1/crates/stdweb/0.4.20/download", + name = "raze__strsim__0_10_0", + url = "https://crates.io/api/v1/crates/strsim/0.10.0/download", type = "tar.gz", - sha256 = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5", - strip_prefix = "stdweb-0.4.20", - build_file = Label("//rules/rust/remote:BUILD.stdweb-0.4.20.bazel"), + sha256 = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623", + strip_prefix = "strsim-0.10.0", + build_file = Label("//rules/rust/remote:BUILD.strsim-0.10.0.bazel"), ) maybe( http_archive, - name = "raze__stdweb_derive__0_5_3", - url = "https://crates.io/api/v1/crates/stdweb-derive/0.5.3/download", + name = "raze__syn__1_0_89", + url = "https://crates.io/api/v1/crates/syn/1.0.89/download", type = "tar.gz", - sha256 = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef", - strip_prefix = "stdweb-derive-0.5.3", - build_file = Label("//rules/rust/remote:BUILD.stdweb-derive-0.5.3.bazel"), + sha256 = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54", + strip_prefix = "syn-1.0.89", + build_file = Label("//rules/rust/remote:BUILD.syn-1.0.89.bazel"), ) maybe( http_archive, - name = "raze__stdweb_internal_macros__0_2_9", - url = "https://crates.io/api/v1/crates/stdweb-internal-macros/0.2.9/download", + name = "raze__tantivy__0_17_0", + url = "https://crates.io/api/v1/crates/tantivy/0.17.0/download", type = "tar.gz", - sha256 = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11", - strip_prefix = "stdweb-internal-macros-0.2.9", - build_file = Label("//rules/rust/remote:BUILD.stdweb-internal-macros-0.2.9.bazel"), + sha256 = "264c2549892aa83975386a924ef8d0b8e909674c837d37ea58b4bd8739495c6e", + strip_prefix = "tantivy-0.17.0", + build_file = Label("//rules/rust/remote:BUILD.tantivy-0.17.0.bazel"), ) maybe( http_archive, - name = "raze__stdweb_internal_runtime__0_1_5", - url = "https://crates.io/api/v1/crates/stdweb-internal-runtime/0.1.5/download", + name = "raze__tantivy_bitpacker__0_1_1", + url = "https://crates.io/api/v1/crates/tantivy-bitpacker/0.1.1/download", type = "tar.gz", - sha256 = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0", - strip_prefix = "stdweb-internal-runtime-0.1.5", - build_file = Label("//rules/rust/remote:BUILD.stdweb-internal-runtime-0.1.5.bazel"), + sha256 = "66d10a5ed75437a4f6bbbba67601cd5adab8d71f5188b677055381f0f36064f2", + strip_prefix = "tantivy-bitpacker-0.1.1", + build_file = Label("//rules/rust/remote:BUILD.tantivy-bitpacker-0.1.1.bazel"), ) maybe( http_archive, - name = "raze__stringprep__0_1_2", - url = "https://crates.io/api/v1/crates/stringprep/0.1.2/download", + name = "raze__tantivy_common__0_1_0", + url = "https://crates.io/api/v1/crates/tantivy-common/0.1.0/download", type = "tar.gz", - sha256 = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1", - strip_prefix = "stringprep-0.1.2", - build_file = Label("//rules/rust/remote:BUILD.stringprep-0.1.2.bazel"), + sha256 = "760e44073e328f4ea3f38660da9ba2598a19ad5ad4149cfb89ad89b4d5ee88d9", + strip_prefix = "tantivy-common-0.1.0", + build_file = Label("//rules/rust/remote:BUILD.tantivy-common-0.1.0.bazel"), ) maybe( http_archive, - name = "raze__strsim__0_8_0", - url = "https://crates.io/api/v1/crates/strsim/0.8.0/download", + name = "raze__tantivy_common__0_2_0", + url = "https://crates.io/api/v1/crates/tantivy-common/0.2.0/download", type = "tar.gz", - sha256 = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a", - strip_prefix = "strsim-0.8.0", - build_file = Label("//rules/rust/remote:BUILD.strsim-0.8.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__strum__0_20_0", - url = "https://crates.io/api/v1/crates/strum/0.20.0/download", - type = "tar.gz", - sha256 = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c", - strip_prefix = "strum-0.20.0", - build_file = Label("//rules/rust/remote:BUILD.strum-0.20.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__strum_macros__0_20_1", - url = "https://crates.io/api/v1/crates/strum_macros/0.20.1/download", - type = "tar.gz", - sha256 = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149", - strip_prefix = "strum_macros-0.20.1", - build_file = Label("//rules/rust/remote:BUILD.strum_macros-0.20.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__subtle__2_4_0", - url = "https://crates.io/api/v1/crates/subtle/2.4.0/download", - type = "tar.gz", - sha256 = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2", - strip_prefix = "subtle-2.4.0", - build_file = Label("//rules/rust/remote:BUILD.subtle-2.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__syn__1_0_69", - url = "https://crates.io/api/v1/crates/syn/1.0.69/download", - type = "tar.gz", - sha256 = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb", - strip_prefix = "syn-1.0.69", - build_file = Label("//rules/rust/remote:BUILD.syn-1.0.69.bazel"), - ) - - maybe( - http_archive, - name = "raze__synstructure__0_12_4", - url = "https://crates.io/api/v1/crates/synstructure/0.12.4/download", - type = "tar.gz", - sha256 = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701", - strip_prefix = "synstructure-0.12.4", - build_file = Label("//rules/rust/remote:BUILD.synstructure-0.12.4.bazel"), - ) - - maybe( - http_archive, - name = "raze__take_mut__0_2_2", - url = "https://crates.io/api/v1/crates/take_mut/0.2.2/download", - type = "tar.gz", - sha256 = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60", - strip_prefix = "take_mut-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.take_mut-0.2.2.bazel"), + sha256 = "2078cd12c7e46eb2cd66ec813eac8472e0f9dfe816f26159effceffd2dbe4793", + strip_prefix = "tantivy-common-0.2.0", + build_file = Label("//rules/rust/remote:BUILD.tantivy-common-0.2.0.bazel"), ) maybe( @@ -3323,312 +1873,152 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tar__0_4_33", - url = "https://crates.io/api/v1/crates/tar/0.4.33/download", + name = "raze__tantivy_query_grammar__0_15_0", + url = "https://crates.io/api/v1/crates/tantivy-query-grammar/0.15.0/download", type = "tar.gz", - sha256 = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228", - strip_prefix = "tar-0.4.33", - build_file = Label("//rules/rust/remote:BUILD.tar-0.4.33.bazel"), + sha256 = "466e0218472a9b276a73e38b2571ac02f9a1b270b4481c9cd8cc23a63d1307e9", + strip_prefix = "tantivy-query-grammar-0.15.0", + build_file = Label("//rules/rust/remote:BUILD.tantivy-query-grammar-0.15.0.bazel"), ) maybe( http_archive, - name = "raze__tempdir__0_3_7", - url = "https://crates.io/api/v1/crates/tempdir/0.3.7/download", + name = "raze__tempfile__3_3_0", + url = "https://crates.io/api/v1/crates/tempfile/3.3.0/download", type = "tar.gz", - sha256 = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8", - strip_prefix = "tempdir-0.3.7", - build_file = Label("//rules/rust/remote:BUILD.tempdir-0.3.7.bazel"), + sha256 = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4", + strip_prefix = "tempfile-3.3.0", + build_file = Label("//rules/rust/remote:BUILD.tempfile-3.3.0.bazel"), ) maybe( http_archive, - name = "raze__tempfile__3_2_0", - url = "https://crates.io/api/v1/crates/tempfile/3.2.0/download", + name = "raze__termcolor__1_1_3", + url = "https://crates.io/api/v1/crates/termcolor/1.1.3/download", type = "tar.gz", - sha256 = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22", - strip_prefix = "tempfile-3.2.0", - build_file = Label("//rules/rust/remote:BUILD.tempfile-3.2.0.bazel"), + sha256 = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755", + strip_prefix = "termcolor-1.1.3", + build_file = Label("//rules/rust/remote:BUILD.termcolor-1.1.3.bazel"), ) maybe( http_archive, - name = "raze__term__0_7_0", - url = "https://crates.io/api/v1/crates/term/0.7.0/download", + name = "raze__textwrap__0_15_0", + url = "https://crates.io/api/v1/crates/textwrap/0.15.0/download", type = "tar.gz", - sha256 = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f", - strip_prefix = "term-0.7.0", - build_file = Label("//rules/rust/remote:BUILD.term-0.7.0.bazel"), + sha256 = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb", + strip_prefix = "textwrap-0.15.0", + build_file = Label("//rules/rust/remote:BUILD.textwrap-0.15.0.bazel"), ) maybe( http_archive, - name = "raze__termcolor__1_1_2", - url = "https://crates.io/api/v1/crates/termcolor/1.1.2/download", + name = "raze__thiserror__1_0_30", + url = "https://crates.io/api/v1/crates/thiserror/1.0.30/download", type = "tar.gz", - sha256 = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4", - strip_prefix = "termcolor-1.1.2", - build_file = Label("//rules/rust/remote:BUILD.termcolor-1.1.2.bazel"), + sha256 = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417", + strip_prefix = "thiserror-1.0.30", + build_file = Label("//rules/rust/remote:BUILD.thiserror-1.0.30.bazel"), ) maybe( http_archive, - name = "raze__textwrap__0_11_0", - url = "https://crates.io/api/v1/crates/textwrap/0.11.0/download", + name = "raze__thiserror_impl__1_0_30", + url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download", type = "tar.gz", - sha256 = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060", - strip_prefix = "textwrap-0.11.0", - build_file = Label("//rules/rust/remote:BUILD.textwrap-0.11.0.bazel"), + sha256 = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b", + strip_prefix = "thiserror-impl-1.0.30", + build_file = Label("//rules/rust/remote:BUILD.thiserror-impl-1.0.30.bazel"), ) maybe( http_archive, - name = "raze__textwrap__0_13_4", - url = "https://crates.io/api/v1/crates/textwrap/0.13.4/download", + name = "raze__thread_local__1_1_4", + url = "https://crates.io/api/v1/crates/thread_local/1.1.4/download", type = "tar.gz", - sha256 = "cd05616119e612a8041ef58f2b578906cc2531a6069047ae092cfb86a325d835", - strip_prefix = "textwrap-0.13.4", - build_file = Label("//rules/rust/remote:BUILD.textwrap-0.13.4.bazel"), + sha256 = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180", + strip_prefix = "thread_local-1.1.4", + build_file = Label("//rules/rust/remote:BUILD.thread_local-1.1.4.bazel"), ) maybe( http_archive, - name = "raze__thiserror__1_0_24", - url = "https://crates.io/api/v1/crates/thiserror/1.0.24/download", + name = "raze__time__0_1_44", + url = "https://crates.io/api/v1/crates/time/0.1.44/download", type = "tar.gz", - sha256 = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e", - strip_prefix = "thiserror-1.0.24", - build_file = Label("//rules/rust/remote:BUILD.thiserror-1.0.24.bazel"), + sha256 = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255", + strip_prefix = "time-0.1.44", + build_file = Label("//rules/rust/remote:BUILD.time-0.1.44.bazel"), ) maybe( http_archive, - name = "raze__thiserror_impl__1_0_24", - url = "https://crates.io/api/v1/crates/thiserror-impl/1.0.24/download", + name = "raze__time__0_3_7", + url = "https://crates.io/api/v1/crates/time/0.3.7/download", type = "tar.gz", - sha256 = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0", - strip_prefix = "thiserror-impl-1.0.24", - build_file = Label("//rules/rust/remote:BUILD.thiserror-impl-1.0.24.bazel"), + sha256 = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d", + strip_prefix = "time-0.3.7", + build_file = Label("//rules/rust/remote:BUILD.time-0.3.7.bazel"), ) maybe( http_archive, - name = "raze__thread_id__3_3_0", - url = "https://crates.io/api/v1/crates/thread-id/3.3.0/download", + name = "raze__tokio__1_17_0", + url = "https://crates.io/api/v1/crates/tokio/1.17.0/download", type = "tar.gz", - sha256 = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1", - strip_prefix = "thread-id-3.3.0", - build_file = Label("//rules/rust/remote:BUILD.thread-id-3.3.0.bazel"), + sha256 = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee", + strip_prefix = "tokio-1.17.0", + build_file = Label("//rules/rust/remote:BUILD.tokio-1.17.0.bazel"), ) maybe( http_archive, - name = "raze__thread_local__1_1_3", - url = "https://crates.io/api/v1/crates/thread_local/1.1.3/download", + name = "raze__tokio_io_timeout__1_2_0", + url = "https://crates.io/api/v1/crates/tokio-io-timeout/1.2.0/download", type = "tar.gz", - sha256 = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd", - strip_prefix = "thread_local-1.1.3", - build_file = Label("//rules/rust/remote:BUILD.thread_local-1.1.3.bazel"), + sha256 = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf", + strip_prefix = "tokio-io-timeout-1.2.0", + build_file = Label("//rules/rust/remote:BUILD.tokio-io-timeout-1.2.0.bazel"), ) maybe( http_archive, - name = "raze__threadpool__1_8_1", - url = "https://crates.io/api/v1/crates/threadpool/1.8.1/download", + name = "raze__tokio_macros__1_7_0", + url = "https://crates.io/api/v1/crates/tokio-macros/1.7.0/download", type = "tar.gz", - sha256 = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa", - strip_prefix = "threadpool-1.8.1", - build_file = Label("//rules/rust/remote:BUILD.threadpool-1.8.1.bazel"), + sha256 = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7", + strip_prefix = "tokio-macros-1.7.0", + build_file = Label("//rules/rust/remote:BUILD.tokio-macros-1.7.0.bazel"), ) maybe( http_archive, - name = "raze__time__0_1_43", - url = "https://crates.io/api/v1/crates/time/0.1.43/download", + name = "raze__tokio_stream__0_1_8", + url = "https://crates.io/api/v1/crates/tokio-stream/0.1.8/download", type = "tar.gz", - sha256 = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438", - strip_prefix = "time-0.1.43", - build_file = Label("//rules/rust/remote:BUILD.time-0.1.43.bazel"), + sha256 = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3", + strip_prefix = "tokio-stream-0.1.8", + build_file = Label("//rules/rust/remote:BUILD.tokio-stream-0.1.8.bazel"), ) maybe( http_archive, - name = "raze__time__0_2_26", - url = "https://crates.io/api/v1/crates/time/0.2.26/download", + name = "raze__tokio_util__0_6_9", + url = "https://crates.io/api/v1/crates/tokio-util/0.6.9/download", type = "tar.gz", - sha256 = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372", - strip_prefix = "time-0.2.26", - build_file = Label("//rules/rust/remote:BUILD.time-0.2.26.bazel"), + sha256 = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0", + strip_prefix = "tokio-util-0.6.9", + build_file = Label("//rules/rust/remote:BUILD.tokio-util-0.6.9.bazel"), ) maybe( http_archive, - name = "raze__time_macros__0_1_1", - url = "https://crates.io/api/v1/crates/time-macros/0.1.1/download", + name = "raze__tokio_util__0_7_0", + url = "https://crates.io/api/v1/crates/tokio-util/0.7.0/download", type = "tar.gz", - sha256 = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1", - strip_prefix = "time-macros-0.1.1", - build_file = Label("//rules/rust/remote:BUILD.time-macros-0.1.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__time_macros_impl__0_1_1", - url = "https://crates.io/api/v1/crates/time-macros-impl/0.1.1/download", - type = "tar.gz", - sha256 = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa", - strip_prefix = "time-macros-impl-0.1.1", - build_file = Label("//rules/rust/remote:BUILD.time-macros-impl-0.1.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__tinytemplate__1_2_1", - url = "https://crates.io/api/v1/crates/tinytemplate/1.2.1/download", - type = "tar.gz", - sha256 = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc", - strip_prefix = "tinytemplate-1.2.1", - build_file = Label("//rules/rust/remote:BUILD.tinytemplate-1.2.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__tinyvec__1_2_0", - url = "https://crates.io/api/v1/crates/tinyvec/1.2.0/download", - type = "tar.gz", - sha256 = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342", - strip_prefix = "tinyvec-1.2.0", - build_file = Label("//rules/rust/remote:BUILD.tinyvec-1.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tinyvec_macros__0_1_0", - url = "https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download", - type = "tar.gz", - sha256 = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c", - strip_prefix = "tinyvec_macros-0.1.0", - build_file = Label("//rules/rust/remote:BUILD.tinyvec_macros-0.1.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tls_api__0_4_0", - url = "https://crates.io/api/v1/crates/tls-api/0.4.0/download", - type = "tar.gz", - sha256 = "4ebb4107c167a4087349fcf08aea4debc358fe69d60fe1df991781842cfe98a3", - strip_prefix = "tls-api-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.tls-api-0.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tls_api_stub__0_4_0", - url = "https://crates.io/api/v1/crates/tls-api-stub/0.4.0/download", - type = "tar.gz", - sha256 = "6f8ff269def04f25ae84b9aac156a400b92c97018a184036548c91cedaafd783", - strip_prefix = "tls-api-stub-0.4.0", - build_file = Label("//rules/rust/remote:BUILD.tls-api-stub-0.4.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio__0_2_25", - url = "https://crates.io/api/v1/crates/tokio/0.2.25/download", - type = "tar.gz", - sha256 = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092", - strip_prefix = "tokio-0.2.25", - build_file = Label("//rules/rust/remote:BUILD.tokio-0.2.25.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio__1_5_0", - url = "https://crates.io/api/v1/crates/tokio/1.5.0/download", - type = "tar.gz", - sha256 = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5", - strip_prefix = "tokio-1.5.0", - build_file = Label("//rules/rust/remote:BUILD.tokio-1.5.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_macros__0_2_6", - url = "https://crates.io/api/v1/crates/tokio-macros/0.2.6/download", - type = "tar.gz", - sha256 = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a", - strip_prefix = "tokio-macros-0.2.6", - build_file = Label("//rules/rust/remote:BUILD.tokio-macros-0.2.6.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_pg_mapper__0_2_0", - url = "https://crates.io/api/v1/crates/tokio-pg-mapper/0.2.0/download", - type = "tar.gz", - sha256 = "93f2b78f3566383ffabc553c72bbb2f129962a54886c5c4d8e8c706f84eceab8", - strip_prefix = "tokio-pg-mapper-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.tokio-pg-mapper-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_pg_mapper_derive__0_2_0", - url = "https://crates.io/api/v1/crates/tokio-pg-mapper-derive/0.2.0/download", - type = "tar.gz", - sha256 = "8548f756cd6eb4069c5af0fb0cec57001fb42bd1fb7330d8f24067ee3fa62608", - strip_prefix = "tokio-pg-mapper-derive-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.tokio-pg-mapper-derive-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_postgres__0_5_5", - url = "https://crates.io/api/v1/crates/tokio-postgres/0.5.5/download", - type = "tar.gz", - sha256 = "55a2482c9fe4dd481723cf5c0616f34afc710e55dcda0944e12e7b3316117892", - strip_prefix = "tokio-postgres-0.5.5", - build_file = Label("//rules/rust/remote:BUILD.tokio-postgres-0.5.5.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_postgres__0_7_1", - url = "https://crates.io/api/v1/crates/tokio-postgres/0.7.1/download", - type = "tar.gz", - sha256 = "98779a950cb6ef76f8ad71c411176115c5c1200a83eeeca4dd9f61e3fc4836c8", - strip_prefix = "tokio-postgres-0.7.1", - build_file = Label("//rules/rust/remote:BUILD.tokio-postgres-0.7.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_util__0_2_0", - url = "https://crates.io/api/v1/crates/tokio-util/0.2.0/download", - type = "tar.gz", - sha256 = "571da51182ec208780505a32528fc5512a8fe1443ab960b3f2f3ef093cd16930", - strip_prefix = "tokio-util-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.tokio-util-0.2.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_util__0_3_1", - url = "https://crates.io/api/v1/crates/tokio-util/0.3.1/download", - type = "tar.gz", - sha256 = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499", - strip_prefix = "tokio-util-0.3.1", - build_file = Label("//rules/rust/remote:BUILD.tokio-util-0.3.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__tokio_util__0_6_6", - url = "https://crates.io/api/v1/crates/tokio-util/0.6.6/download", - type = "tar.gz", - sha256 = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e", - strip_prefix = "tokio-util-0.6.6", - build_file = Label("//rules/rust/remote:BUILD.tokio-util-0.6.6.bazel"), + sha256 = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1", + strip_prefix = "tokio-util-0.7.0", + build_file = Label("//rules/rust/remote:BUILD.tokio-util-0.7.0.bazel"), ) maybe( @@ -3643,22 +2033,102 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tracing__0_1_25", - url = "https://crates.io/api/v1/crates/tracing/0.1.25/download", + name = "raze__tonic__0_6_2", + url = "https://crates.io/api/v1/crates/tonic/0.6.2/download", type = "tar.gz", - sha256 = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f", - strip_prefix = "tracing-0.1.25", - build_file = Label("//rules/rust/remote:BUILD.tracing-0.1.25.bazel"), + sha256 = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a", + strip_prefix = "tonic-0.6.2", + build_file = Label("//rules/rust/remote:BUILD.tonic-0.6.2.bazel"), ) maybe( http_archive, - name = "raze__tracing_core__0_1_17", - url = "https://crates.io/api/v1/crates/tracing-core/0.1.17/download", + name = "raze__tonic_build__0_6_2", + url = "https://crates.io/api/v1/crates/tonic-build/0.6.2/download", type = "tar.gz", - sha256 = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f", - strip_prefix = "tracing-core-0.1.17", - build_file = Label("//rules/rust/remote:BUILD.tracing-core-0.1.17.bazel"), + sha256 = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757", + strip_prefix = "tonic-build-0.6.2", + build_file = Label("//rules/rust/remote:BUILD.tonic-build-0.6.2.bazel"), + ) + + maybe( + http_archive, + name = "raze__tower__0_4_12", + url = "https://crates.io/api/v1/crates/tower/0.4.12/download", + type = "tar.gz", + sha256 = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e", + strip_prefix = "tower-0.4.12", + build_file = Label("//rules/rust/remote:BUILD.tower-0.4.12.bazel"), + ) + + maybe( + http_archive, + name = "raze__tower_http__0_2_5", + url = "https://crates.io/api/v1/crates/tower-http/0.2.5/download", + type = "tar.gz", + sha256 = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8", + strip_prefix = "tower-http-0.2.5", + build_file = Label("//rules/rust/remote:BUILD.tower-http-0.2.5.bazel"), + ) + + maybe( + http_archive, + name = "raze__tower_layer__0_3_1", + url = "https://crates.io/api/v1/crates/tower-layer/0.3.1/download", + type = "tar.gz", + sha256 = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62", + strip_prefix = "tower-layer-0.3.1", + build_file = Label("//rules/rust/remote:BUILD.tower-layer-0.3.1.bazel"), + ) + + maybe( + http_archive, + name = "raze__tower_service__0_3_1", + url = "https://crates.io/api/v1/crates/tower-service/0.3.1/download", + type = "tar.gz", + sha256 = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6", + strip_prefix = "tower-service-0.3.1", + build_file = Label("//rules/rust/remote:BUILD.tower-service-0.3.1.bazel"), + ) + + maybe( + http_archive, + name = "raze__tracing__0_1_32", + url = "https://crates.io/api/v1/crates/tracing/0.1.32/download", + type = "tar.gz", + sha256 = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f", + strip_prefix = "tracing-0.1.32", + build_file = Label("//rules/rust/remote:BUILD.tracing-0.1.32.bazel"), + ) + + maybe( + http_archive, + name = "raze__tracing_appender__0_2_2", + url = "https://crates.io/api/v1/crates/tracing-appender/0.2.2/download", + type = "tar.gz", + sha256 = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e", + strip_prefix = "tracing-appender-0.2.2", + build_file = Label("//rules/rust/remote:BUILD.tracing-appender-0.2.2.bazel"), + ) + + maybe( + http_archive, + name = "raze__tracing_attributes__0_1_20", + url = "https://crates.io/api/v1/crates/tracing-attributes/0.1.20/download", + type = "tar.gz", + sha256 = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b", + strip_prefix = "tracing-attributes-0.1.20", + build_file = Label("//rules/rust/remote:BUILD.tracing-attributes-0.1.20.bazel"), + ) + + maybe( + http_archive, + name = "raze__tracing_core__0_1_23", + url = "https://crates.io/api/v1/crates/tracing-core/0.1.23/download", + type = "tar.gz", + sha256 = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c", + strip_prefix = "tracing-core-0.1.23", + build_file = Label("//rules/rust/remote:BUILD.tracing-core-0.1.23.bazel"), ) maybe( @@ -3673,142 +2143,112 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__traitobject__0_1_0", - url = "https://crates.io/api/v1/crates/traitobject/0.1.0/download", + name = "raze__tracing_log__0_1_2", + url = "https://crates.io/api/v1/crates/tracing-log/0.1.2/download", type = "tar.gz", - sha256 = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079", - strip_prefix = "traitobject-0.1.0", - build_file = Label("//rules/rust/remote:BUILD.traitobject-0.1.0.bazel"), + sha256 = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3", + strip_prefix = "tracing-log-0.1.2", + build_file = Label("//rules/rust/remote:BUILD.tracing-log-0.1.2.bazel"), ) maybe( http_archive, - name = "raze__trust_dns_proto__0_19_7", - url = "https://crates.io/api/v1/crates/trust-dns-proto/0.19.7/download", + name = "raze__tracing_serde__0_1_3", + url = "https://crates.io/api/v1/crates/tracing-serde/0.1.3/download", type = "tar.gz", - sha256 = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9", - strip_prefix = "trust-dns-proto-0.19.7", - build_file = Label("//rules/rust/remote:BUILD.trust-dns-proto-0.19.7.bazel"), + sha256 = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1", + strip_prefix = "tracing-serde-0.1.3", + build_file = Label("//rules/rust/remote:BUILD.tracing-serde-0.1.3.bazel"), ) maybe( http_archive, - name = "raze__trust_dns_resolver__0_19_7", - url = "https://crates.io/api/v1/crates/trust-dns-resolver/0.19.7/download", + name = "raze__tracing_subscriber__0_3_9", + url = "https://crates.io/api/v1/crates/tracing-subscriber/0.3.9/download", type = "tar.gz", - sha256 = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb", - strip_prefix = "trust-dns-resolver-0.19.7", - build_file = Label("//rules/rust/remote:BUILD.trust-dns-resolver-0.19.7.bazel"), + sha256 = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce", + strip_prefix = "tracing-subscriber-0.3.9", + build_file = Label("//rules/rust/remote:BUILD.tracing-subscriber-0.3.9.bazel"), ) maybe( http_archive, - name = "raze__typemap__0_3_3", - url = "https://crates.io/api/v1/crates/typemap/0.3.3/download", + name = "raze__try_lock__0_2_3", + url = "https://crates.io/api/v1/crates/try-lock/0.2.3/download", type = "tar.gz", - sha256 = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6", - strip_prefix = "typemap-0.3.3", - build_file = Label("//rules/rust/remote:BUILD.typemap-0.3.3.bazel"), + sha256 = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642", + strip_prefix = "try-lock-0.2.3", + build_file = Label("//rules/rust/remote:BUILD.try-lock-0.2.3.bazel"), ) maybe( http_archive, - name = "raze__typenum__1_13_0", - url = "https://crates.io/api/v1/crates/typenum/1.13.0/download", + name = "raze__twox_hash__1_6_2", + url = "https://crates.io/api/v1/crates/twox-hash/1.6.2/download", type = "tar.gz", - sha256 = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06", - strip_prefix = "typenum-1.13.0", - build_file = Label("//rules/rust/remote:BUILD.typenum-1.13.0.bazel"), + sha256 = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0", + strip_prefix = "twox-hash-1.6.2", + build_file = Label("//rules/rust/remote:BUILD.twox-hash-1.6.2.bazel"), ) maybe( http_archive, - name = "raze__unicode_bidi__0_3_5", - url = "https://crates.io/api/v1/crates/unicode-bidi/0.3.5/download", + name = "raze__typenum__1_15_0", + url = "https://crates.io/api/v1/crates/typenum/1.15.0/download", type = "tar.gz", - sha256 = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0", - strip_prefix = "unicode-bidi-0.3.5", - build_file = Label("//rules/rust/remote:BUILD.unicode-bidi-0.3.5.bazel"), + sha256 = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987", + strip_prefix = "typenum-1.15.0", + build_file = Label("//rules/rust/remote:BUILD.typenum-1.15.0.bazel"), ) maybe( http_archive, - name = "raze__unicode_normalization__0_1_17", - url = "https://crates.io/api/v1/crates/unicode-normalization/0.1.17/download", + name = "raze__ucd_trie__0_1_3", + url = "https://crates.io/api/v1/crates/ucd-trie/0.1.3/download", type = "tar.gz", - sha256 = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef", - strip_prefix = "unicode-normalization-0.1.17", - build_file = Label("//rules/rust/remote:BUILD.unicode-normalization-0.1.17.bazel"), + sha256 = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c", + strip_prefix = "ucd-trie-0.1.3", + build_file = Label("//rules/rust/remote:BUILD.ucd-trie-0.1.3.bazel"), ) maybe( http_archive, - name = "raze__unicode_segmentation__1_7_1", - url = "https://crates.io/api/v1/crates/unicode-segmentation/1.7.1/download", + name = "raze__unicode_linebreak__0_1_2", + url = "https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download", type = "tar.gz", - sha256 = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796", - strip_prefix = "unicode-segmentation-1.7.1", - build_file = Label("//rules/rust/remote:BUILD.unicode-segmentation-1.7.1.bazel"), + sha256 = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f", + strip_prefix = "unicode-linebreak-0.1.2", + build_file = Label("//rules/rust/remote:BUILD.unicode-linebreak-0.1.2.bazel"), ) maybe( http_archive, - name = "raze__unicode_width__0_1_8", - url = "https://crates.io/api/v1/crates/unicode-width/0.1.8/download", + name = "raze__unicode_segmentation__1_9_0", + url = "https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download", type = "tar.gz", - sha256 = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3", - strip_prefix = "unicode-width-0.1.8", - build_file = Label("//rules/rust/remote:BUILD.unicode-width-0.1.8.bazel"), + sha256 = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99", + strip_prefix = "unicode-segmentation-1.9.0", + build_file = Label("//rules/rust/remote:BUILD.unicode-segmentation-1.9.0.bazel"), ) maybe( http_archive, - name = "raze__unicode_xid__0_2_1", - url = "https://crates.io/api/v1/crates/unicode-xid/0.2.1/download", + name = "raze__unicode_width__0_1_9", + url = "https://crates.io/api/v1/crates/unicode-width/0.1.9/download", type = "tar.gz", - sha256 = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564", - strip_prefix = "unicode-xid-0.2.1", - build_file = Label("//rules/rust/remote:BUILD.unicode-xid-0.2.1.bazel"), + sha256 = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973", + strip_prefix = "unicode-width-0.1.9", + build_file = Label("//rules/rust/remote:BUILD.unicode-width-0.1.9.bazel"), ) maybe( http_archive, - name = "raze__unix_socket__0_5_0", - url = "https://crates.io/api/v1/crates/unix_socket/0.5.0/download", + name = "raze__unicode_xid__0_2_2", + url = "https://crates.io/api/v1/crates/unicode-xid/0.2.2/download", type = "tar.gz", - sha256 = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564", - strip_prefix = "unix_socket-0.5.0", - build_file = Label("//rules/rust/remote:BUILD.unix_socket-0.5.0.bazel"), - ) - - maybe( - http_archive, - name = "raze__unsafe_any__0_4_2", - url = "https://crates.io/api/v1/crates/unsafe-any/0.4.2/download", - type = "tar.gz", - sha256 = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f", - strip_prefix = "unsafe-any-0.4.2", - build_file = Label("//rules/rust/remote:BUILD.unsafe-any-0.4.2.bazel"), - ) - - maybe( - http_archive, - name = "raze__url__2_2_1", - url = "https://crates.io/api/v1/crates/url/2.2.1/download", - type = "tar.gz", - sha256 = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b", - strip_prefix = "url-2.2.1", - build_file = Label("//rules/rust/remote:BUILD.url-2.2.1.bazel"), - ) - - maybe( - http_archive, - name = "raze__urlparse__0_7_3", - url = "https://crates.io/api/v1/crates/urlparse/0.7.3/download", - type = "tar.gz", - sha256 = "110352d4e9076c67839003c7788d8604e24dcded13e0b375af3efaa8cf468517", - strip_prefix = "urlparse-0.7.3", - build_file = Label("//rules/rust/remote:BUILD.urlparse-0.7.3.bazel"), + sha256 = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3", + strip_prefix = "unicode-xid-0.2.2", + build_file = Label("//rules/rust/remote:BUILD.unicode-xid-0.2.2.bazel"), ) maybe( @@ -3833,152 +2273,122 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__vec_map__0_8_2", - url = "https://crates.io/api/v1/crates/vec_map/0.8.2/download", + name = "raze__valuable__0_1_0", + url = "https://crates.io/api/v1/crates/valuable/0.1.0/download", type = "tar.gz", - sha256 = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191", - strip_prefix = "vec_map-0.8.2", - build_file = Label("//rules/rust/remote:BUILD.vec_map-0.8.2.bazel"), + sha256 = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d", + strip_prefix = "valuable-0.1.0", + build_file = Label("//rules/rust/remote:BUILD.valuable-0.1.0.bazel"), ) maybe( http_archive, - name = "raze__version_check__0_9_3", - url = "https://crates.io/api/v1/crates/version_check/0.9.3/download", + name = "raze__vcpkg__0_2_15", + url = "https://crates.io/api/v1/crates/vcpkg/0.2.15/download", type = "tar.gz", - sha256 = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe", - strip_prefix = "version_check-0.9.3", - build_file = Label("//rules/rust/remote:BUILD.version_check-0.9.3.bazel"), + sha256 = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426", + strip_prefix = "vcpkg-0.2.15", + build_file = Label("//rules/rust/remote:BUILD.vcpkg-0.2.15.bazel"), ) maybe( http_archive, - name = "raze__void__1_0_2", - url = "https://crates.io/api/v1/crates/void/1.0.2/download", + name = "raze__version_check__0_9_4", + url = "https://crates.io/api/v1/crates/version_check/0.9.4/download", type = "tar.gz", - sha256 = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d", - strip_prefix = "void-1.0.2", - build_file = Label("//rules/rust/remote:BUILD.void-1.0.2.bazel"), + sha256 = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f", + strip_prefix = "version_check-0.9.4", + build_file = Label("//rules/rust/remote:BUILD.version_check-0.9.4.bazel"), ) maybe( http_archive, - name = "raze__wait_timeout__0_2_0", - url = "https://crates.io/api/v1/crates/wait-timeout/0.2.0/download", + name = "raze__want__0_3_0", + url = "https://crates.io/api/v1/crates/want/0.3.0/download", type = "tar.gz", - sha256 = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6", - strip_prefix = "wait-timeout-0.2.0", - build_file = Label("//rules/rust/remote:BUILD.wait-timeout-0.2.0.bazel"), + sha256 = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0", + strip_prefix = "want-0.3.0", + build_file = Label("//rules/rust/remote:BUILD.want-0.3.0.bazel"), ) maybe( http_archive, - name = "raze__walkdir__2_3_2", - url = "https://crates.io/api/v1/crates/walkdir/2.3.2/download", + name = "raze__wasi__0_10_0_wasi_snapshot_preview1", + url = "https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download", type = "tar.gz", - sha256 = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56", - strip_prefix = "walkdir-2.3.2", - build_file = Label("//rules/rust/remote:BUILD.walkdir-2.3.2.bazel"), + sha256 = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f", + strip_prefix = "wasi-0.10.0+wasi-snapshot-preview1", + build_file = Label("//rules/rust/remote:BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel"), ) maybe( http_archive, - name = "raze__wasi__0_10_2_wasi_snapshot_preview1", - url = "https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download", + name = "raze__wasi__0_11_0_wasi_snapshot_preview1", + url = "https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download", type = "tar.gz", - sha256 = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6", - strip_prefix = "wasi-0.10.2+wasi-snapshot-preview1", - build_file = Label("//rules/rust/remote:BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel"), + sha256 = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423", + strip_prefix = "wasi-0.11.0+wasi-snapshot-preview1", + build_file = Label("//rules/rust/remote:BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel"), ) maybe( http_archive, - name = "raze__wasi__0_9_0_wasi_snapshot_preview1", - url = "https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download", + name = "raze__wasm_bindgen__0_2_79", + url = "https://crates.io/api/v1/crates/wasm-bindgen/0.2.79/download", type = "tar.gz", - sha256 = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519", - strip_prefix = "wasi-0.9.0+wasi-snapshot-preview1", - build_file = Label("//rules/rust/remote:BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel"), + sha256 = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06", + strip_prefix = "wasm-bindgen-0.2.79", + build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-0.2.79.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen__0_2_73", - url = "https://crates.io/api/v1/crates/wasm-bindgen/0.2.73/download", + name = "raze__wasm_bindgen_backend__0_2_79", + url = "https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.79/download", type = "tar.gz", - sha256 = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9", - strip_prefix = "wasm-bindgen-0.2.73", - build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-0.2.73.bazel"), + sha256 = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca", + strip_prefix = "wasm-bindgen-backend-0.2.79", + build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-backend-0.2.79.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_backend__0_2_73", - url = "https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.73/download", + name = "raze__wasm_bindgen_macro__0_2_79", + url = "https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.79/download", type = "tar.gz", - sha256 = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae", - strip_prefix = "wasm-bindgen-backend-0.2.73", - build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-backend-0.2.73.bazel"), + sha256 = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01", + strip_prefix = "wasm-bindgen-macro-0.2.79", + build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-macro-0.2.79.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_macro__0_2_73", - url = "https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.73/download", + name = "raze__wasm_bindgen_macro_support__0_2_79", + url = "https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.79/download", type = "tar.gz", - sha256 = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f", - strip_prefix = "wasm-bindgen-macro-0.2.73", - build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-macro-0.2.73.bazel"), + sha256 = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc", + strip_prefix = "wasm-bindgen-macro-support-0.2.79", + build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-macro-support-0.2.79.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_macro_support__0_2_73", - url = "https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.73/download", + name = "raze__wasm_bindgen_shared__0_2_79", + url = "https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.79/download", type = "tar.gz", - sha256 = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c", - strip_prefix = "wasm-bindgen-macro-support-0.2.73", - build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-macro-support-0.2.73.bazel"), + sha256 = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2", + strip_prefix = "wasm-bindgen-shared-0.2.79", + build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-shared-0.2.79.bazel"), ) maybe( http_archive, - name = "raze__wasm_bindgen_shared__0_2_73", - url = "https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.73/download", + name = "raze__which__4_2_5", + url = "https://crates.io/api/v1/crates/which/4.2.5/download", type = "tar.gz", - sha256 = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489", - strip_prefix = "wasm-bindgen-shared-0.2.73", - build_file = Label("//rules/rust/remote:BUILD.wasm-bindgen-shared-0.2.73.bazel"), - ) - - maybe( - http_archive, - name = "raze__web_sys__0_3_50", - url = "https://crates.io/api/v1/crates/web-sys/0.3.50/download", - type = "tar.gz", - sha256 = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be", - strip_prefix = "web-sys-0.3.50", - build_file = Label("//rules/rust/remote:BUILD.web-sys-0.3.50.bazel"), - ) - - maybe( - http_archive, - name = "raze__widestring__0_4_3", - url = "https://crates.io/api/v1/crates/widestring/0.4.3/download", - type = "tar.gz", - sha256 = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c", - strip_prefix = "widestring-0.4.3", - build_file = Label("//rules/rust/remote:BUILD.widestring-0.4.3.bazel"), - ) - - maybe( - http_archive, - name = "raze__winapi__0_2_8", - url = "https://crates.io/api/v1/crates/winapi/0.2.8/download", - type = "tar.gz", - sha256 = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a", - strip_prefix = "winapi-0.2.8", - build_file = Label("//rules/rust/remote:BUILD.winapi-0.2.8.bazel"), + sha256 = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae", + strip_prefix = "which-4.2.5", + build_file = Label("//rules/rust/remote:BUILD.which-4.2.5.bazel"), ) maybe( @@ -3991,16 +2401,6 @@ def raze_fetch_remote_crates(): build_file = Label("//rules/rust/remote:BUILD.winapi-0.3.9.bazel"), ) - maybe( - http_archive, - name = "raze__winapi_build__0_1_1", - url = "https://crates.io/api/v1/crates/winapi-build/0.1.1/download", - type = "tar.gz", - sha256 = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc", - strip_prefix = "winapi-build-0.1.1", - build_file = Label("//rules/rust/remote:BUILD.winapi-build-0.1.1.bazel"), - ) - maybe( http_archive, name = "raze__winapi_i686_pc_windows_gnu__0_4_0", @@ -4033,32 +2433,62 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__winreg__0_6_2", - url = "https://crates.io/api/v1/crates/winreg/0.6.2/download", + name = "raze__windows_sys__0_32_0", + url = "https://crates.io/api/v1/crates/windows-sys/0.32.0/download", type = "tar.gz", - sha256 = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9", - strip_prefix = "winreg-0.6.2", - build_file = Label("//rules/rust/remote:BUILD.winreg-0.6.2.bazel"), + sha256 = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6", + strip_prefix = "windows-sys-0.32.0", + build_file = Label("//rules/rust/remote:BUILD.windows-sys-0.32.0.bazel"), ) maybe( http_archive, - name = "raze__ws2_32_sys__0_2_1", - url = "https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download", + name = "raze__windows_aarch64_msvc__0_32_0", + url = "https://crates.io/api/v1/crates/windows_aarch64_msvc/0.32.0/download", type = "tar.gz", - sha256 = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e", - strip_prefix = "ws2_32-sys-0.2.1", - build_file = Label("//rules/rust/remote:BUILD.ws2_32-sys-0.2.1.bazel"), + sha256 = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5", + strip_prefix = "windows_aarch64_msvc-0.32.0", + build_file = Label("//rules/rust/remote:BUILD.windows_aarch64_msvc-0.32.0.bazel"), ) maybe( http_archive, - name = "raze__xattr__0_2_2", - url = "https://crates.io/api/v1/crates/xattr/0.2.2/download", + name = "raze__windows_i686_gnu__0_32_0", + url = "https://crates.io/api/v1/crates/windows_i686_gnu/0.32.0/download", type = "tar.gz", - sha256 = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c", - strip_prefix = "xattr-0.2.2", - build_file = Label("//rules/rust/remote:BUILD.xattr-0.2.2.bazel"), + sha256 = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615", + strip_prefix = "windows_i686_gnu-0.32.0", + build_file = Label("//rules/rust/remote:BUILD.windows_i686_gnu-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_i686_msvc__0_32_0", + url = "https://crates.io/api/v1/crates/windows_i686_msvc/0.32.0/download", + type = "tar.gz", + sha256 = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172", + strip_prefix = "windows_i686_msvc-0.32.0", + build_file = Label("//rules/rust/remote:BUILD.windows_i686_msvc-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_x86_64_gnu__0_32_0", + url = "https://crates.io/api/v1/crates/windows_x86_64_gnu/0.32.0/download", + type = "tar.gz", + sha256 = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc", + strip_prefix = "windows_x86_64_gnu-0.32.0", + build_file = Label("//rules/rust/remote:BUILD.windows_x86_64_gnu-0.32.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__windows_x86_64_msvc__0_32_0", + url = "https://crates.io/api/v1/crates/windows_x86_64_msvc/0.32.0/download", + type = "tar.gz", + sha256 = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316", + strip_prefix = "windows_x86_64_msvc-0.32.0", + build_file = Label("//rules/rust/remote:BUILD.windows_x86_64_msvc-0.32.0.bazel"), ) maybe( diff --git a/rules/rust/remote/BUILD.actix-0.10.0.bazel b/rules/rust/remote/BUILD.actix-0.10.0.bazel deleted file mode 100644 index c57f867..0000000 --- a/rules/rust/remote/BUILD.actix-0.10.0.bazel +++ /dev/null @@ -1,108 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "fibonacci" with type "example" omitted - -# Unsupported target "ping" with type "example" omitted - -# Unsupported target "ring" with type "example" omitted - -rust_library( - name = "actix", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "resolver", - "trust-dns-proto", - "trust-dns-resolver", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__actix_derive__0_5_0//:actix_derive", - "@raze__derive_more__0_99_13//:derive_more", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.10.0", - # buildifier: leave-alone - deps = [ - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__bytes__0_5_6//:bytes", - "@raze__crossbeam_channel__0_4_4//:crossbeam_channel", - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__log__0_4_14//:log", - "@raze__once_cell__1_7_2//:once_cell", - "@raze__parking_lot__0_11_1//:parking_lot", - "@raze__pin_project__0_4_28//:pin_project", - "@raze__smallvec__1_6_1//:smallvec", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_util__0_3_1//:tokio_util", - "@raze__trust_dns_proto__0_19_7//:trust_dns_proto", - "@raze__trust_dns_resolver__0_19_7//:trust_dns_resolver", - ], -) - -# Unsupported target "derive" with type "test" omitted - -# Unsupported target "test_actor" with type "test" omitted - -# Unsupported target "test_actors" with type "test" omitted - -# Unsupported target "test_address" with type "test" omitted - -# Unsupported target "test_arbiter" with type "test" omitted - -# Unsupported target "test_atomic_response" with type "test" omitted - -# Unsupported target "test_connected" with type "test" omitted - -# Unsupported target "test_context" with type "test" omitted - -# Unsupported target "test_fut" with type "test" omitted - -# Unsupported target "test_lifecycle" with type "test" omitted - -# Unsupported target "test_sink" with type "test" omitted - -# Unsupported target "test_supervisor" with type "test" omitted - -# Unsupported target "test_sync" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-codec-0.2.0.bazel b/rules/rust/remote/BUILD.actix-codec-0.2.0.bazel deleted file mode 100644 index ded7fd6..0000000 --- a/rules/rust/remote/BUILD.actix-codec-0.2.0.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_codec", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - "@raze__bitflags__1_2_1//:bitflags", - "@raze__bytes__0_5_6//:bytes", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__log__0_4_14//:log", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_util__0_2_0//:tokio_util", - ], -) diff --git a/rules/rust/remote/BUILD.actix-codec-0.3.0.bazel b/rules/rust/remote/BUILD.actix-codec-0.3.0.bazel deleted file mode 100644 index 48beb1e..0000000 --- a/rules/rust/remote/BUILD.actix-codec-0.3.0.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_codec", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.0", - # buildifier: leave-alone - deps = [ - "@raze__bitflags__1_2_1//:bitflags", - "@raze__bytes__0_5_6//:bytes", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__log__0_4_14//:log", - "@raze__pin_project__0_4_28//:pin_project", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_util__0_3_1//:tokio_util", - ], -) diff --git a/rules/rust/remote/BUILD.actix-connect-2.0.0.bazel b/rules/rust/remote/BUILD.actix-connect-2.0.0.bazel deleted file mode 100644 index cecebb8..0000000 --- a/rules/rust/remote/BUILD.actix-connect-2.0.0.bazel +++ /dev/null @@ -1,71 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_connect", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "http", - "uri", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__derive_more__0_99_13//:derive_more", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.0.0", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__actix_utils__2_0_0//:actix_utils", - "@raze__either__1_6_1//:either", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__http__0_2_4//:http", - "@raze__log__0_4_14//:log", - "@raze__trust_dns_proto__0_19_7//:trust_dns_proto", - "@raze__trust_dns_resolver__0_19_7//:trust_dns_resolver", - ], -) - -# Unsupported target "test_connect" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-cors-0.5.4.bazel b/rules/rust/remote/BUILD.actix-cors-0.5.4.bazel deleted file mode 100644 index 84be8bf..0000000 --- a/rules/rust/remote/BUILD.actix-cors-0.5.4.bazel +++ /dev/null @@ -1,65 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "cors" with type "example" omitted - -rust_library( - name = "actix_cors", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__derive_more__0_99_13//:derive_more", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.4", - # buildifier: leave-alone - deps = [ - "@raze__actix_web__3_3_2//:actix_web", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__log__0_4_14//:log", - "@raze__once_cell__1_7_2//:once_cell", - "@raze__tinyvec__1_2_0//:tinyvec", - ], -) - -# Unsupported target "tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-http-2.2.0.bazel b/rules/rust/remote/BUILD.actix-http-2.2.0.bazel deleted file mode 100644 index e8d5a33..0000000 --- a/rules/rust/remote/BUILD.actix-http-2.2.0.bazel +++ /dev/null @@ -1,115 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "content-length" with type "bench" omitted - -# Unsupported target "status-line" with type "bench" omitted - -# Unsupported target "uninit-headers" with type "bench" omitted - -# Unsupported target "echo" with type "example" omitted - -# Unsupported target "echo2" with type "example" omitted - -# Unsupported target "hello-world" with type "example" omitted - -rust_library( - name = "actix_http", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__derive_more__0_99_13//:derive_more", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.2.0", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_connect__2_0_0//:actix_connect", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__actix_threadpool__0_3_3//:actix_threadpool", - "@raze__actix_utils__2_0_0//:actix_utils", - "@raze__base64__0_13_0//:base64", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__bytes__0_5_6//:bytes", - "@raze__cookie__0_14_4//:cookie", - "@raze__copyless__0_1_5//:copyless", - "@raze__either__1_6_1//:either", - "@raze__encoding_rs__0_8_28//:encoding_rs", - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__fxhash__0_2_1//:fxhash", - "@raze__h2__0_2_7//:h2", - "@raze__http__0_2_4//:http", - "@raze__httparse__1_4_0//:httparse", - "@raze__indexmap__1_6_2//:indexmap", - "@raze__itoa__0_4_7//:itoa", - "@raze__language_tags__0_2_2//:language_tags", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__log__0_4_14//:log", - "@raze__mime__0_3_16//:mime", - "@raze__percent_encoding__2_1_0//:percent_encoding", - "@raze__pin_project__1_0_7//:pin_project", - "@raze__rand__0_7_3//:rand", - "@raze__regex__1_4_5//:regex", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__serde_urlencoded__0_7_0//:serde_urlencoded", - "@raze__sha_1__0_9_4//:sha_1", - "@raze__slab__0_4_2//:slab", - "@raze__time__0_2_26//:time", - ], -) - -# Unsupported target "test_client" with type "test" omitted - -# Unsupported target "test_openssl" with type "test" omitted - -# Unsupported target "test_rustls" with type "test" omitted - -# Unsupported target "test_server" with type "test" omitted - -# Unsupported target "test_ws" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-router-0.2.7.bazel b/rules/rust/remote/BUILD.actix-router-0.2.7.bazel deleted file mode 100644 index d85bbdf..0000000 --- a/rules/rust/remote/BUILD.actix-router-0.2.7.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_router", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "http", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.7", - # buildifier: leave-alone - deps = [ - "@raze__bytestring__1_0_0//:bytestring", - "@raze__http__0_2_4//:http", - "@raze__log__0_4_14//:log", - "@raze__regex__1_4_5//:regex", - "@raze__serde__1_0_125//:serde", - ], -) diff --git a/rules/rust/remote/BUILD.actix-server-1.0.4.bazel b/rules/rust/remote/BUILD.actix-server-1.0.4.bazel deleted file mode 100644 index e7f31be..0000000 --- a/rules/rust/remote/BUILD.actix-server-1.0.4.bazel +++ /dev/null @@ -1,68 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_server", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.4", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__actix_utils__2_0_0//:actix_utils", - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__log__0_4_14//:log", - "@raze__mio__0_6_23//:mio", - "@raze__mio_uds__0_6_8//:mio_uds", - "@raze__num_cpus__1_13_0//:num_cpus", - "@raze__slab__0_4_2//:slab", - "@raze__socket2__0_3_19//:socket2", - ], -) - -# Unsupported target "test_server" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-service-1.0.6.bazel b/rules/rust/remote/BUILD.actix-service-1.0.6.bazel deleted file mode 100644 index 2fb07f1..0000000 --- a/rules/rust/remote/BUILD.actix-service-1.0.6.bazel +++ /dev/null @@ -1,59 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "and_then" with type "bench" omitted - -# Unsupported target "unsafecell_vs_refcell" with type "bench" omitted - -rust_library( - name = "actix_service", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.6", - # buildifier: leave-alone - deps = [ - "@raze__futures_util__0_3_14//:futures_util", - "@raze__pin_project__0_4_28//:pin_project", - ], -) diff --git a/rules/rust/remote/BUILD.actix-testing-1.0.1.bazel b/rules/rust/remote/BUILD.actix-testing-1.0.1.bazel deleted file mode 100644 index 8f4be1d..0000000 --- a/rules/rust/remote/BUILD.actix-testing-1.0.1.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_testing", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__actix_macros__0_1_3//:actix_macros", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.1", - # buildifier: leave-alone - deps = [ - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_server__1_0_4//:actix_server", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__log__0_4_14//:log", - "@raze__socket2__0_3_19//:socket2", - ], -) diff --git a/rules/rust/remote/BUILD.actix-utils-1.0.6.bazel b/rules/rust/remote/BUILD.actix-utils-1.0.6.bazel deleted file mode 100644 index 6cdaf03..0000000 --- a/rules/rust/remote/BUILD.actix-utils-1.0.6.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_utils", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.6", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_2_0//:actix_codec", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__bytes__0_5_6//:bytes", - "@raze__either__1_6_1//:either", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__pin_project__0_4_28//:pin_project", - "@raze__slab__0_4_2//:slab", - ], -) diff --git a/rules/rust/remote/BUILD.actix-utils-2.0.0.bazel b/rules/rust/remote/BUILD.actix-utils-2.0.0.bazel deleted file mode 100644 index 4d1aee9..0000000 --- a/rules/rust/remote/BUILD.actix-utils-2.0.0.bazel +++ /dev/null @@ -1,65 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_utils", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.0.0", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__bytes__0_5_6//:bytes", - "@raze__either__1_6_1//:either", - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__log__0_4_14//:log", - "@raze__pin_project__0_4_28//:pin_project", - "@raze__slab__0_4_2//:slab", - ], -) diff --git a/rules/rust/remote/BUILD.actix-web-3.3.2.bazel b/rules/rust/remote/BUILD.actix-web-3.3.2.bazel deleted file mode 100644 index e350123..0000000 --- a/rules/rust/remote/BUILD.actix-web-3.3.2.bazel +++ /dev/null @@ -1,104 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "server" with type "bench" omitted - -# Unsupported target "service" with type "bench" omitted - -# Unsupported target "basic" with type "example" omitted - -# Unsupported target "client" with type "example" omitted - -# Unsupported target "on_connect" with type "example" omitted - -# Unsupported target "uds" with type "example" omitted - -rust_library( - name = "actix_web", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__actix_macros__0_1_3//:actix_macros", - "@raze__actix_web_codegen__0_4_0//:actix_web_codegen", - "@raze__derive_more__0_99_13//:derive_more", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "3.3.2", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_http__2_2_0//:actix_http", - "@raze__actix_router__0_2_7//:actix_router", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_server__1_0_4//:actix_server", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__actix_testing__1_0_1//:actix_testing", - "@raze__actix_threadpool__0_3_3//:actix_threadpool", - "@raze__actix_tls__2_0_0//:actix_tls", - "@raze__actix_utils__2_0_0//:actix_utils", - "@raze__awc__2_0_3//:awc", - "@raze__bytes__0_5_6//:bytes", - "@raze__encoding_rs__0_8_28//:encoding_rs", - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__fxhash__0_2_1//:fxhash", - "@raze__log__0_4_14//:log", - "@raze__mime__0_3_16//:mime", - "@raze__pin_project__1_0_7//:pin_project", - "@raze__regex__1_4_5//:regex", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__serde_urlencoded__0_7_0//:serde_urlencoded", - "@raze__socket2__0_3_19//:socket2", - "@raze__time__0_2_26//:time", - "@raze__tinyvec__1_2_0//:tinyvec", - "@raze__url__2_2_1//:url", - ], -) - -# Unsupported target "test_httpserver" with type "test" omitted - -# Unsupported target "test_server" with type "test" omitted - -# Unsupported target "test_weird_poll" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix_derive-0.5.0.bazel b/rules/rust/remote/BUILD.actix_derive-0.5.0.bazel deleted file mode 100644 index 0ae14ae..0000000 --- a/rules/rust/remote/BUILD.actix_derive-0.5.0.bazel +++ /dev/null @@ -1,58 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "actix_derive", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.0", - # buildifier: leave-alone - deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) - -# Unsupported target "test_macro" with type "test" omitted diff --git a/rules/rust/remote/BUILD.addr2line-0.14.1.bazel b/rules/rust/remote/BUILD.addr2line-0.14.1.bazel deleted file mode 100644 index c0722c0..0000000 --- a/rules/rust/remote/BUILD.addr2line-0.14.1.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "addr2line" with type "example" omitted - -rust_library( - name = "addr2line", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.14.1", - # buildifier: leave-alone - deps = [ - "@raze__gimli__0_23_0//:gimli", - ], -) - -# Unsupported target "correctness" with type "test" omitted - -# Unsupported target "output_equivalence" with type "test" omitted - -# Unsupported target "parse" with type "test" omitted diff --git a/rules/rust/remote/BUILD.adler-1.0.2.bazel b/rules/rust/remote/BUILD.adler-1.0.2.bazel deleted file mode 100644 index b484536..0000000 --- a/rules/rust/remote/BUILD.adler-1.0.2.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "0BSD OR (MIT OR Apache-2.0)" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -rust_library( - name = "adler", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.2", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.ahash-0.4.7.bazel b/rules/rust/remote/BUILD.ahash-0.4.7.bazel index caee713..b6524f9 100644 --- a/rules/rust/remote/BUILD.ahash-0.4.7.bazel +++ b/rules/rust/remote/BUILD.ahash-0.4.7.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -40,7 +41,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -48,6 +48,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ahash", "manual", ], version = "0.4.7", diff --git a/rules/rust/remote/BUILD.httpbis-0.9.1.bazel b/rules/rust/remote/BUILD.ahash-0.7.6.bazel similarity index 52% rename from rules/rust/remote/BUILD.httpbis-0.9.1.bazel rename to rules/rust/remote/BUILD.ahash-0.7.6.bazel index 3bd6ca6..62b097a 100644 --- a/rules/rust/remote/BUILD.httpbis-0.9.1.bazel +++ b/rules/rust/remote/BUILD.ahash-0.7.6.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,7 @@ load( ) cargo_build_script( - name = "httpbis_build_script", + name = "ahash_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, @@ -53,11 +54,20 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.9.1", + version = "0.7.6", visibility = ["//visibility:private"], deps = [ + "@raze__version_check__0_9_4//:version_check", ] + selects.with_or({ - # cfg(unix) + # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) + ( + "@rules_rust//rust/platform:x86_64-apple-darwin", + "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(not(all(target_arch = "arm", target_os = "none"))) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", @@ -67,65 +77,18 @@ cargo_build_script( }), ) -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_client_server_loop", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/bin/client_server_loop.rs", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.1", - # buildifier: leave-alone - deps = [ - ":httpbis", - ":httpbis_build_script", - "@raze__bytes__0_5_6//:bytes", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__log_ndc__0_2_0//:log_ndc", - "@raze__net2__0_2_37//:net2", - "@raze__rand__0_5_6//:rand", - "@raze__tls_api__0_4_0//:tls_api", - "@raze__tls_api_stub__0_4_0//:tls_api_stub", - "@raze__tokio__0_2_25//:tokio", - "@raze__void__1_0_2//:void", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__unix_socket__0_5_0//:unix_socket", - ], - "//conditions:default": [], - }), -) +# Unsupported target "ahash" with type "bench" omitted -# Unsupported target "client" with type "example" omitted - -# Unsupported target "server" with type "example" omitted +# Unsupported target "map" with type "bench" omitted rust_library( - name = "httpbis", + name = "ahash", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -133,30 +96,36 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ahash", "manual", ], - version = "0.9.1", + version = "0.7.6", # buildifier: leave-alone deps = [ - ":httpbis_build_script", - "@raze__bytes__0_5_6//:bytes", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__log_ndc__0_2_0//:log_ndc", - "@raze__net2__0_2_37//:net2", - "@raze__rand__0_5_6//:rand", - "@raze__tls_api__0_4_0//:tls_api", - "@raze__tls_api_stub__0_4_0//:tls_api_stub", - "@raze__tokio__0_2_25//:tokio", - "@raze__void__1_0_2//:void", + ":ahash_build_script", ] + selects.with_or({ - # cfg(unix) + # cfg(any(target_os = "linux", target_os = "android", target_os = "windows", target_os = "macos", target_os = "ios", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonfly", target_os = "solaris", target_os = "illumos", target_os = "fuchsia", target_os = "redox", target_os = "cloudabi", target_os = "haiku", target_os = "vxworks", target_os = "emscripten", target_os = "wasi")) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__unix_socket__0_5_0//:unix_socket", + "@raze__getrandom__0_2_5//:getrandom", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(not(all(target_arch = "arm", target_os = "none"))) + ( + "@rules_rust//rust/platform:x86_64-apple-darwin", + "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + "@raze__once_cell__1_10_0//:once_cell", ], "//conditions:default": [], }), ) + +# Unsupported target "bench" with type "test" omitted + +# Unsupported target "map_tests" with type "test" omitted + +# Unsupported target "nopanic" with type "test" omitted diff --git a/rules/rust/remote/BUILD.aho-corasick-0.7.15.bazel b/rules/rust/remote/BUILD.aho-corasick-0.7.18.bazel similarity index 84% rename from rules/rust/remote/BUILD.aho-corasick-0.7.15.bazel rename to rules/rust/remote/BUILD.aho-corasick-0.7.18.bazel index 03bdd89..44e5062 100644 --- a/rules/rust/remote/BUILD.aho-corasick-0.7.15.bazel +++ b/rules/rust/remote/BUILD.aho-corasick-0.7.18.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,19 +39,19 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=aho_corasick", "manual", ], - version = "0.7.15", + version = "0.7.18", # buildifier: leave-alone deps = [ - "@raze__memchr__2_3_4//:memchr", + "@raze__memchr__2_4_1//:memchr", ], ) diff --git a/rules/rust/remote/BUILD.alloc-no-stdlib-2.0.1.bazel b/rules/rust/remote/BUILD.alloc-no-stdlib-2.0.3.bazel similarity index 89% rename from rules/rust/remote/BUILD.alloc-no-stdlib-2.0.1.bazel rename to rules/rust/remote/BUILD.alloc-no-stdlib-2.0.3.bazel index ffd6711..7cd49ee 100644 --- a/rules/rust/remote/BUILD.alloc-no-stdlib-2.0.1.bazel +++ b/rules/rust/remote/BUILD.alloc-no-stdlib-2.0.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -45,9 +46,10 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=example", "manual", ], - version = "2.0.1", + version = "2.0.3", # buildifier: leave-alone deps = [ ":alloc_no_stdlib", @@ -60,7 +62,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -68,9 +69,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=alloc-no-stdlib", "manual", ], - version = "2.0.1", + version = "2.0.3", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.alloc-stdlib-0.2.1.bazel b/rules/rust/remote/BUILD.alloc-stdlib-0.2.1.bazel index 20a66b5..f421471 100644 --- a/rules/rust/remote/BUILD.alloc-stdlib-0.2.1.bazel +++ b/rules/rust/remote/BUILD.alloc-stdlib-0.2.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -45,13 +46,14 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=example", "manual", ], version = "0.2.1", # buildifier: leave-alone deps = [ ":alloc_stdlib", - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", ], ) @@ -61,7 +63,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -69,12 +70,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=alloc-stdlib", "manual", ], version = "0.2.1", # buildifier: leave-alone deps = [ - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", ], ) diff --git a/rules/rust/remote/BUILD.ansi_term-0.11.0.bazel b/rules/rust/remote/BUILD.ansi_term-0.12.1.bazel similarity index 75% rename from rules/rust/remote/BUILD.ansi_term-0.11.0.bazel rename to rules/rust/remote/BUILD.ansi_term-0.12.1.bazel index 7a11bc6..a3d5a90 100644 --- a/rules/rust/remote/BUILD.ansi_term-0.11.0.bazel +++ b/rules/rust/remote/BUILD.ansi_term-0.12.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,7 +31,11 @@ licenses([ # Generated Targets -# Unsupported target "colours" with type "example" omitted +# Unsupported target "256_colours" with type "example" omitted + +# Unsupported target "basic_colours" with type "example" omitted + +# Unsupported target "rgb_colours" with type "example" omitted rust_library( name = "ansi_term", @@ -38,7 +43,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,9 +50,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ansi_term", "manual", ], - version = "0.11.0", + version = "0.12.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.num-bigint-0.3.2.bazel b/rules/rust/remote/BUILD.anyhow-1.0.56.bazel similarity index 58% rename from rules/rust/remote/BUILD.num-bigint-0.3.2.bazel rename to rules/rust/remote/BUILD.anyhow-1.0.56.bazel index 3f0d091..16f4019 100644 --- a/rules/rust/remote/BUILD.num-bigint-0.3.2.bazel +++ b/rules/rust/remote/BUILD.anyhow-1.0.56.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,7 @@ load( ) cargo_build_script( - name = "num_bigint_build_script", + name = "anyhow_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, @@ -55,32 +56,20 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.3.2", + version = "1.0.56", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", ], ) -# Unsupported target "bigint" with type "bench" omitted - -# Unsupported target "factorial" with type "bench" omitted - -# Unsupported target "gcd" with type "bench" omitted - -# Unsupported target "roots" with type "bench" omitted - -# Unsupported target "shootout-pidigits" with type "bench" omitted - rust_library( - name = "num_bigint", + name = "anyhow", srcs = glob(["**/*.rs"]), crate_features = [ "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -88,27 +77,40 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=anyhow", "manual", ], - version = "0.3.2", + version = "1.0.56", # buildifier: leave-alone deps = [ - ":num_bigint_build_script", - "@raze__num_integer__0_1_44//:num_integer", - "@raze__num_traits__0_2_14//:num_traits", + ":anyhow_build_script", ], ) -# Unsupported target "bigint" with type "test" omitted +# Unsupported target "compiletest" with type "test" omitted -# Unsupported target "bigint_bitwise" with type "test" omitted +# Unsupported target "test_autotrait" with type "test" omitted -# Unsupported target "bigint_scalar" with type "test" omitted +# Unsupported target "test_backtrace" with type "test" omitted -# Unsupported target "biguint" with type "test" omitted +# Unsupported target "test_boxed" with type "test" omitted -# Unsupported target "biguint_scalar" with type "test" omitted +# Unsupported target "test_chain" with type "test" omitted -# Unsupported target "modpow" with type "test" omitted +# Unsupported target "test_context" with type "test" omitted -# Unsupported target "roots" with type "test" omitted +# Unsupported target "test_convert" with type "test" omitted + +# Unsupported target "test_downcast" with type "test" omitted + +# Unsupported target "test_ensure" with type "test" omitted + +# Unsupported target "test_ffi" with type "test" omitted + +# Unsupported target "test_fmt" with type "test" omitted + +# Unsupported target "test_macros" with type "test" omitted + +# Unsupported target "test_repr" with type "test" omitted + +# Unsupported target "test_source" with type "test" omitted diff --git a/rules/rust/remote/BUILD.arc-swap-0.4.8.bazel b/rules/rust/remote/BUILD.arc-swap-0.4.8.bazel deleted file mode 100644 index f72c2e4..0000000 --- a/rules/rust/remote/BUILD.arc-swap-0.4.8.bazel +++ /dev/null @@ -1,59 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -rust_library( - name = "arc_swap", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.8", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "random" with type "test" omitted - -# Unsupported target "stress" with type "test" omitted - -# Unsupported target "version" with type "test" omitted diff --git a/rules/rust/remote/BUILD.arc-swap-1.2.0.bazel b/rules/rust/remote/BUILD.arc-swap-1.2.0.bazel deleted file mode 100644 index 60c6b28..0000000 --- a/rules/rust/remote/BUILD.arc-swap-1.2.0.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "background" with type "bench" omitted - -# Unsupported target "int-access" with type "bench" omitted - -# Unsupported target "track" with type "bench" omitted - -rust_library( - name = "arc_swap", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.2.0", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "random" with type "test" omitted - -# Unsupported target "stress" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-threadpool-0.3.3.bazel b/rules/rust/remote/BUILD.async-stream-0.3.3.bazel similarity index 63% rename from rules/rust/remote/BUILD.actix-threadpool-0.3.3.bazel rename to rules/rust/remote/BUILD.async-stream-0.3.3.bazel index ff0bfc5..d83765c 100644 --- a/rules/rust/remote/BUILD.actix-threadpool-0.3.3.bazel +++ b/rules/rust/remote/BUILD.async-stream-0.3.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,38 +26,41 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # MIT from expression "MIT" ]) # Generated Targets +# Unsupported target "tcp_accept" with type "example" omitted + rust_library( - name = "actix_threadpool", + name = "async_stream", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", proc_macro_deps = [ - "@raze__derive_more__0_99_13//:derive_more", + "@raze__async_stream_impl__0_3_3//:async_stream_impl", ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=async-stream", "manual", ], version = "0.3.3", # buildifier: leave-alone deps = [ - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__log__0_4_14//:log", - "@raze__num_cpus__1_13_0//:num_cpus", - "@raze__parking_lot__0_11_1//:parking_lot", - "@raze__threadpool__1_8_1//:threadpool", + "@raze__futures_core__0_3_21//:futures_core", ], ) + +# Unsupported target "for_await" with type "test" omitted + +# Unsupported target "stream" with type "test" omitted + +# Unsupported target "try_stream" with type "test" omitted diff --git a/rules/rust/remote/BUILD.typemap-0.3.3.bazel b/rules/rust/remote/BUILD.async-stream-impl-0.3.3.bazel similarity index 75% rename from rules/rust/remote/BUILD.typemap-0.3.3.bazel rename to rules/rust/remote/BUILD.async-stream-impl-0.3.3.bazel index 2e367c0..8983c06 100644 --- a/rules/rust/remote/BUILD.typemap-0.3.3.bazel +++ b/rules/rust/remote/BUILD.async-stream-impl-0.3.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,25 +31,27 @@ licenses([ # Generated Targets -rust_library( - name = "typemap", +rust_proc_macro( + name = "async_stream_impl", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=async-stream-impl", "manual", ], version = "0.3.3", # buildifier: leave-alone deps = [ - "@raze__unsafe_any__0_4_2//:unsafe_any", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.async-trait-0.1.50.bazel b/rules/rust/remote/BUILD.async-trait-0.1.52.bazel similarity index 85% rename from rules/rust/remote/BUILD.async-trait-0.1.50.bazel rename to rules/rust/remote/BUILD.async-trait-0.1.52.bazel index d7d782f..b6fdb2c 100644 --- a/rules/rust/remote/BUILD.async-trait-0.1.50.bazel +++ b/rules/rust/remote/BUILD.async-trait-0.1.52.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -53,19 +54,18 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.1.50", + version = "0.1.52", visibility = ["//visibility:private"], deps = [ ], ) -rust_library( +rust_proc_macro( name = "async_trait", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -73,15 +73,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=async-trait", "manual", ], - version = "0.1.50", + version = "0.1.52", # buildifier: leave-alone deps = [ ":async_trait_build_script", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.atomicwrites-0.2.5.bazel b/rules/rust/remote/BUILD.atomicwrites-0.2.5.bazel deleted file mode 100644 index 768e2d1..0000000 --- a/rules/rust/remote/BUILD.atomicwrites-0.2.5.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "atomicwrites", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.5", - # buildifier: leave-alone - deps = [ - "@raze__tempdir__0_3_7//:tempdir", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__nix__0_14_1//:nix", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "lib" with type "test" omitted diff --git a/rules/rust/remote/BUILD.atty-0.2.14.bazel b/rules/rust/remote/BUILD.atty-0.2.14.bazel index 5b7314b..99f2432 100644 --- a/rules/rust/remote/BUILD.atty-0.2.14.bazel +++ b/rules/rust/remote/BUILD.atty-0.2.14.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -40,7 +41,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -48,6 +48,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=atty", "manual", ], version = "0.2.14", @@ -59,7 +60,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.autocfg-1.0.1.bazel b/rules/rust/remote/BUILD.autocfg-1.1.0.bazel similarity index 91% rename from rules/rust/remote/BUILD.autocfg-1.0.1.bazel rename to rules/rust/remote/BUILD.autocfg-1.1.0.bazel index 812cdbb..9cdb4ac 100644 --- a/rules/rust/remote/BUILD.autocfg-1.0.1.bazel +++ b/rules/rust/remote/BUILD.autocfg-1.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -44,7 +45,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -52,9 +52,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=autocfg", "manual", ], - version = "1.0.1", + version = "1.1.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.awc-2.0.3.bazel b/rules/rust/remote/BUILD.awc-2.0.3.bazel deleted file mode 100644 index 0abe990..0000000 --- a/rules/rust/remote/BUILD.awc-2.0.3.bazel +++ /dev/null @@ -1,81 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "awc", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__derive_more__0_99_13//:derive_more", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.0.3", - # buildifier: leave-alone - deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_http__2_2_0//:actix_http", - "@raze__actix_rt__1_1_1//:actix_rt", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__base64__0_13_0//:base64", - "@raze__bytes__0_5_6//:bytes", - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__log__0_4_14//:log", - "@raze__mime__0_3_16//:mime", - "@raze__percent_encoding__2_1_0//:percent_encoding", - "@raze__rand__0_7_3//:rand", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__serde_urlencoded__0_7_0//:serde_urlencoded", - ], -) - -# Unsupported target "test_client" with type "test" omitted - -# Unsupported target "test_connector" with type "test" omitted - -# Unsupported target "test_rustls_client" with type "test" omitted - -# Unsupported target "test_ssl_client" with type "test" omitted - -# Unsupported target "test_ws" with type "test" omitted diff --git a/rules/rust/remote/BUILD.backtrace-0.3.56.bazel b/rules/rust/remote/BUILD.backtrace-0.3.56.bazel deleted file mode 100644 index b795ee9..0000000 --- a/rules/rust/remote/BUILD.backtrace-0.3.56.bazel +++ /dev/null @@ -1,81 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "benchmarks" with type "bench" omitted - -# Unsupported target "backtrace" with type "example" omitted - -# Unsupported target "raw" with type "example" omitted - -rust_library( - name = "backtrace", - srcs = glob(["**/*.rs"]), - crate_features = [ - "addr2line", - "default", - "gimli-symbolize", - "miniz_oxide", - "object", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.56", - # buildifier: leave-alone - deps = [ - "@raze__addr2line__0_14_1//:addr2line", - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__libc__0_2_93//:libc", - "@raze__miniz_oxide__0_4_4//:miniz_oxide", - "@raze__object__0_23_0//:object", - "@raze__rustc_demangle__0_1_18//:rustc_demangle", - ], -) - -# Unsupported target "accuracy" with type "test" omitted - -# Unsupported target "concurrent-panics" with type "test" omitted - -# Unsupported target "long_fn_name" with type "test" omitted - -# Unsupported target "skip_inner_frames" with type "test" omitted - -# Unsupported target "smoke" with type "test" omitted diff --git a/rules/rust/remote/BUILD.base-x-0.2.8.bazel b/rules/rust/remote/BUILD.base-x-0.2.8.bazel deleted file mode 100644 index d0de725..0000000 --- a/rules/rust/remote/BUILD.base-x-0.2.8.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "base" with type "bench" omitted - -rust_library( - name = "base_x", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.8", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.base64-0.12.3.bazel b/rules/rust/remote/BUILD.base64-0.12.3.bazel deleted file mode 100644 index ce64fbb..0000000 --- a/rules/rust/remote/BUILD.base64-0.12.3.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "benchmarks" with type "bench" omitted - -# Unsupported target "make_tables" with type "example" omitted - -rust_library( - name = "base64", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.12.3", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "decode" with type "test" omitted - -# Unsupported target "encode" with type "test" omitted - -# Unsupported target "helpers" with type "test" omitted - -# Unsupported target "tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.base64-0.13.0.bazel b/rules/rust/remote/BUILD.base64-0.13.0.bazel index 8dd321e..27550b7 100644 --- a/rules/rust/remote/BUILD.base64-0.13.0.bazel +++ b/rules/rust/remote/BUILD.base64-0.13.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -44,7 +45,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -52,6 +52,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=base64", "manual", ], version = "0.13.0", diff --git a/rules/rust/remote/BUILD.base64-0.9.3.bazel b/rules/rust/remote/BUILD.base64-0.9.3.bazel deleted file mode 100644 index 1293d8f..0000000 --- a/rules/rust/remote/BUILD.base64-0.9.3.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "benchmarks" with type "bench" omitted - -# Unsupported target "make_tables" with type "example" omitted - -rust_library( - name = "base64", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.3", - # buildifier: leave-alone - deps = [ - "@raze__byteorder__1_4_3//:byteorder", - "@raze__safemem__0_3_3//:safemem", - ], -) - -# Unsupported target "decode" with type "test" omitted - -# Unsupported target "encode" with type "test" omitted - -# Unsupported target "helpers" with type "test" omitted - -# Unsupported target "tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.bb8-postgres-0.4.0.bazel b/rules/rust/remote/BUILD.bb8-postgres-0.4.0.bazel deleted file mode 100644 index c0216dd..0000000 --- a/rules/rust/remote/BUILD.bb8-postgres-0.4.0.bazel +++ /dev/null @@ -1,68 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "async_await" with type "example" omitted - -# Unsupported target "hyper" with type "example" omitted - -# Unsupported target "static_select" with type "example" omitted - -# Unsupported target "txn" with type "example" omitted - -rust_library( - name = "bb8_postgres", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.0", - # buildifier: leave-alone - deps = [ - "@raze__bb8__0_4_2//:bb8", - "@raze__futures__0_3_14//:futures", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_postgres__0_5_5//:tokio_postgres", - ], -) diff --git a/rules/rust/remote/BUILD.bincode-1.3.3.bazel b/rules/rust/remote/BUILD.bincode-1.3.3.bazel deleted file mode 100644 index f0da0b7..0000000 --- a/rules/rust/remote/BUILD.bincode-1.3.3.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "bincode", - srcs = glob(["**/*.rs"]), - crate_features = [ - "i128", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.3.3", - # buildifier: leave-alone - deps = [ - "@raze__serde__1_0_125//:serde", - ], -) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.term-0.7.0.bazel b/rules/rust/remote/BUILD.bitflags-1.3.2.bazel similarity index 79% rename from rules/rust/remote/BUILD.term-0.7.0.bazel rename to rules/rust/remote/BUILD.bitflags-1.3.2.bazel index 07481b8..802e633 100644 --- a/rules/rust/remote/BUILD.term-0.7.0.bazel +++ b/rules/rust/remote/BUILD.bitflags-1.3.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,13 +32,12 @@ licenses([ # Generated Targets rust_library( - name = "term", + name = "bitflags", srcs = glob(["**/*.rs"]), crate_features = [ "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,13 +45,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=bitflags", "manual", ], - version = "0.7.0", + version = "1.3.2", # buildifier: leave-alone deps = [ - "@raze__dirs_next__2_0_0//:dirs_next", ], ) -# Unsupported target "terminfo" with type "test" omitted +# Unsupported target "basic" with type "test" omitted + +# Unsupported target "compile" with type "test" omitted diff --git a/rules/rust/remote/BUILD.bitpacking-0.8.2.bazel b/rules/rust/remote/BUILD.bitpacking-0.8.4.bazel similarity index 90% rename from rules/rust/remote/BUILD.bitpacking-0.8.2.bazel rename to rules/rust/remote/BUILD.bitpacking-0.8.4.bazel index 09f0943..37bd86f 100644 --- a/rules/rust/remote/BUILD.bitpacking-0.8.2.bazel +++ b/rules/rust/remote/BUILD.bitpacking-0.8.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -39,7 +40,6 @@ rust_library( "bitpacker4x", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -47,9 +47,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=bitpacking", "manual", ], - version = "0.8.2", + version = "0.8.4", # buildifier: leave-alone deps = [ "@raze__crunchy__0_2_2//:crunchy", diff --git a/rules/rust/remote/BUILD.bit-vec-0.6.3.bazel b/rules/rust/remote/BUILD.block-buffer-0.7.3.bazel similarity index 72% rename from rules/rust/remote/BUILD.bit-vec-0.6.3.bazel rename to rules/rust/remote/BUILD.block-buffer-0.7.3.bazel index 1e26ee3..459aa26 100644 --- a/rules/rust/remote/BUILD.bit-vec-0.6.3.bazel +++ b/rules/rust/remote/BUILD.block-buffer-0.7.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,16 +31,12 @@ licenses([ # Generated Targets -# Unsupported target "bench" with type "bench" omitted - rust_library( - name = "bit_vec", + name = "block_buffer", srcs = glob(["**/*.rs"]), crate_features = [ - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -47,10 +44,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=block-buffer", "manual", ], - version = "0.6.3", + version = "0.7.3", # buildifier: leave-alone deps = [ + "@raze__block_padding__0_1_5//:block_padding", + "@raze__byte_tools__0_3_1//:byte_tools", + "@raze__byteorder__1_4_3//:byteorder", + "@raze__generic_array__0_12_4//:generic_array", ], ) diff --git a/rules/rust/remote/BUILD.copyless-0.1.5.bazel b/rules/rust/remote/BUILD.block-padding-0.1.5.bazel similarity index 82% rename from rules/rust/remote/BUILD.copyless-0.1.5.bazel rename to rules/rust/remote/BUILD.block-padding-0.1.5.bazel index 474094f..833dc07 100644 --- a/rules/rust/remote/BUILD.copyless-0.1.5.bazel +++ b/rules/rust/remote/BUILD.block-padding-0.1.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,23 +32,24 @@ licenses([ # Generated Targets rust_library( - name = "copyless", + name = "block_padding", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=block-padding", "manual", ], version = "0.1.5", # buildifier: leave-alone deps = [ + "@raze__byte_tools__0_3_1//:byte_tools", ], ) diff --git a/rules/rust/remote/BUILD.brotli-3.3.0.bazel b/rules/rust/remote/BUILD.brotli-3.3.3.bazel similarity index 79% rename from rules/rust/remote/BUILD.brotli-3.3.0.bazel rename to rules/rust/remote/BUILD.brotli-3.3.3.bazel index b234db1..bc8dbfb 100644 --- a/rules/rust/remote/BUILD.brotli-3.3.0.bazel +++ b/rules/rust/remote/BUILD.brotli-3.3.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,6 +39,7 @@ rust_binary( crate_features = [ "alloc-stdlib", "default", + "ffi-api", "std", ], crate_root = "src/bin/brotli.rs", @@ -48,15 +50,16 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=brotli", "manual", ], - version = "3.3.0", + version = "3.3.3", # buildifier: leave-alone deps = [ ":brotli", - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", "@raze__alloc_stdlib__0_2_1//:alloc_stdlib", - "@raze__brotli_decompressor__2_3_1//:brotli_decompressor", + "@raze__brotli_decompressor__2_3_2//:brotli_decompressor", ], ) @@ -68,6 +71,7 @@ rust_binary( crate_features = [ "alloc-stdlib", "default", + "ffi-api", "std", ], crate_root = "src/bin/catbrotli.rs", @@ -78,15 +82,16 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=catbrotli", "manual", ], - version = "3.3.0", + version = "3.3.3", # buildifier: leave-alone deps = [ ":brotli", - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", "@raze__alloc_stdlib__0_2_1//:alloc_stdlib", - "@raze__brotli_decompressor__2_3_1//:brotli_decompressor", + "@raze__brotli_decompressor__2_3_2//:brotli_decompressor", ], ) @@ -100,10 +105,10 @@ rust_library( crate_features = [ "alloc-stdlib", "default", + "ffi-api", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -111,13 +116,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=brotli", "manual", ], - version = "3.3.0", + version = "3.3.3", # buildifier: leave-alone deps = [ - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", "@raze__alloc_stdlib__0_2_1//:alloc_stdlib", - "@raze__brotli_decompressor__2_3_1//:brotli_decompressor", + "@raze__brotli_decompressor__2_3_2//:brotli_decompressor", ], ) diff --git a/rules/rust/remote/BUILD.brotli-decompressor-2.3.1.bazel b/rules/rust/remote/BUILD.brotli-decompressor-2.3.2.bazel similarity index 85% rename from rules/rust/remote/BUILD.brotli-decompressor-2.3.1.bazel rename to rules/rust/remote/BUILD.brotli-decompressor-2.3.2.bazel index 281efb6..96636ba 100644 --- a/rules/rust/remote/BUILD.brotli-decompressor-2.3.1.bazel +++ b/rules/rust/remote/BUILD.brotli-decompressor-2.3.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -47,13 +48,14 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=brotli-decompressor", "manual", ], - version = "2.3.1", + version = "2.3.2", # buildifier: leave-alone deps = [ ":brotli_decompressor", - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", "@raze__alloc_stdlib__0_2_1//:alloc_stdlib", ], ) @@ -68,7 +70,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -76,12 +77,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=brotli-decompressor", "manual", ], - version = "2.3.1", + version = "2.3.2", # buildifier: leave-alone deps = [ - "@raze__alloc_no_stdlib__2_0_1//:alloc_no_stdlib", + "@raze__alloc_no_stdlib__2_0_3//:alloc_no_stdlib", "@raze__alloc_stdlib__0_2_1//:alloc_stdlib", ], ) diff --git a/rules/rust/remote/BUILD.bstr-0.2.15.bazel b/rules/rust/remote/BUILD.bstr-0.2.15.bazel deleted file mode 100644 index b1683b9..0000000 --- a/rules/rust/remote/BUILD.bstr-0.2.15.bazel +++ /dev/null @@ -1,81 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "graphemes" with type "example" omitted - -# Unsupported target "graphemes-std" with type "example" omitted - -# Unsupported target "lines" with type "example" omitted - -# Unsupported target "lines-std" with type "example" omitted - -# Unsupported target "uppercase" with type "example" omitted - -# Unsupported target "uppercase-std" with type "example" omitted - -# Unsupported target "words" with type "example" omitted - -# Unsupported target "words-std" with type "example" omitted - -rust_library( - name = "bstr", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "lazy_static", - "regex-automata", - "serde", - "serde1", - "serde1-nostd", - "std", - "unicode", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.15", - # buildifier: leave-alone - deps = [ - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__memchr__2_3_4//:memchr", - "@raze__regex_automata__0_1_9//:regex_automata", - "@raze__serde__1_0_125//:serde", - ], -) diff --git a/rules/rust/remote/BUILD.bumpalo-3.6.1.bazel b/rules/rust/remote/BUILD.bumpalo-3.6.1.bazel deleted file mode 100644 index acf62b1..0000000 --- a/rules/rust/remote/BUILD.bumpalo-3.6.1.bazel +++ /dev/null @@ -1,80 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "benches" with type "bench" omitted - -rust_library( - name = "bumpalo", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "3.6.1", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "alloc_fill" with type "test" omitted - -# Unsupported target "alloc_try_with" with type "test" omitted - -# Unsupported target "alloc_with" with type "test" omitted - -# Unsupported target "allocator_api" with type "test" omitted - -# Unsupported target "quickchecks" with type "test" omitted - -# Unsupported target "readme_up_to_date" with type "test" omitted - -# Unsupported target "string" with type "test" omitted - -# Unsupported target "tests" with type "test" omitted - -# Unsupported target "try_alloc" with type "test" omitted - -# Unsupported target "try_alloc_try_with" with type "test" omitted - -# Unsupported target "try_alloc_with" with type "test" omitted - -# Unsupported target "vec" with type "test" omitted diff --git a/rules/rust/remote/BUILD.fallible-iterator-0.2.0.bazel b/rules/rust/remote/BUILD.bumpalo-3.9.1.bazel similarity index 79% rename from rules/rust/remote/BUILD.fallible-iterator-0.2.0.bazel rename to rules/rust/remote/BUILD.bumpalo-3.9.1.bazel index a0a6a6e..4ddccc5 100644 --- a/rules/rust/remote/BUILD.fallible-iterator-0.2.0.bazel +++ b/rules/rust/remote/BUILD.bumpalo-3.9.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,15 +31,15 @@ licenses([ # Generated Targets +# Unsupported target "benches" with type "bench" omitted + rust_library( - name = "fallible_iterator", + name = "bumpalo", srcs = glob(["**/*.rs"]), crate_features = [ "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,10 +47,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=bumpalo", "manual", ], - version = "0.2.0", + version = "3.9.1", # buildifier: leave-alone deps = [ ], ) + +# Unsupported target "try_alloc" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rand_core-0.4.2.bazel b/rules/rust/remote/BUILD.byte-tools-0.3.1.bazel similarity index 86% rename from rules/rust/remote/BUILD.rand_core-0.4.2.bazel rename to rules/rust/remote/BUILD.byte-tools-0.3.1.bazel index ba57586..f07e046 100644 --- a/rules/rust/remote/BUILD.rand_core-0.4.2.bazel +++ b/rules/rust/remote/BUILD.byte-tools-0.3.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "rand_core", + name = "byte_tools", srcs = glob(["**/*.rs"]), crate_features = [ - "alloc", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=byte-tools", "manual", ], - version = "0.4.2", + version = "0.3.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.byteorder-1.4.3.bazel b/rules/rust/remote/BUILD.byteorder-1.4.3.bazel index 6f8c19f..560fca6 100644 --- a/rules/rust/remote/BUILD.byteorder-1.4.3.bazel +++ b/rules/rust/remote/BUILD.byteorder-1.4.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -40,7 +41,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -48,6 +48,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=byteorder", "manual", ], version = "1.4.3", diff --git a/rules/rust/remote/BUILD.bytes-1.0.1.bazel b/rules/rust/remote/BUILD.bytes-1.0.1.bazel deleted file mode 100644 index 9b66380..0000000 --- a/rules/rust/remote/BUILD.bytes-1.0.1.bazel +++ /dev/null @@ -1,83 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "buf" with type "bench" omitted - -# Unsupported target "bytes" with type "bench" omitted - -# Unsupported target "bytes_mut" with type "bench" omitted - -rust_library( - name = "bytes", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.1", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "test_buf" with type "test" omitted - -# Unsupported target "test_buf_mut" with type "test" omitted - -# Unsupported target "test_bytes" with type "test" omitted - -# Unsupported target "test_bytes_odd_alloc" with type "test" omitted - -# Unsupported target "test_bytes_vec_alloc" with type "test" omitted - -# Unsupported target "test_chain" with type "test" omitted - -# Unsupported target "test_debug" with type "test" omitted - -# Unsupported target "test_iter" with type "test" omitted - -# Unsupported target "test_reader" with type "test" omitted - -# Unsupported target "test_serde" with type "test" omitted - -# Unsupported target "test_take" with type "test" omitted diff --git a/rules/rust/remote/BUILD.bytes-0.5.6.bazel b/rules/rust/remote/BUILD.bytes-1.1.0.bazel similarity index 94% rename from rules/rust/remote/BUILD.bytes-0.5.6.bazel rename to rules/rust/remote/BUILD.bytes-1.1.0.bazel index c1c1070..093327e 100644 --- a/rules/rust/remote/BUILD.bytes-0.5.6.bazel +++ b/rules/rust/remote/BUILD.bytes-1.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -44,7 +45,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -52,9 +52,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=bytes", "manual", ], - version = "0.5.6", + version = "1.1.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.bytestring-1.0.0.bazel b/rules/rust/remote/BUILD.bytestring-1.0.0.bazel deleted file mode 100644 index 11d7811..0000000 --- a/rules/rust/remote/BUILD.bytestring-1.0.0.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "bytestring", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.0", - # buildifier: leave-alone - deps = [ - "@raze__bytes__1_0_1//:bytes", - ], -) diff --git a/rules/rust/remote/BUILD.cc-1.0.67.bazel b/rules/rust/remote/BUILD.cc-1.0.73.bazel similarity index 91% rename from rules/rust/remote/BUILD.cc-1.0.67.bazel rename to rules/rust/remote/BUILD.cc-1.0.73.bazel index 04fb8ca..14fd75b 100644 --- a/rules/rust/remote/BUILD.cc-1.0.67.bazel +++ b/rules/rust/remote/BUILD.cc-1.0.73.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -45,9 +46,10 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=gcc-shim", "manual", ], - version = "1.0.67", + version = "1.0.73", # buildifier: leave-alone deps = [ ":cc", @@ -60,7 +62,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -68,9 +69,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=cc", "manual", ], - version = "1.0.67", + version = "1.0.73", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.census-0.4.0.bazel b/rules/rust/remote/BUILD.census-0.4.0.bazel index 3473f3a..c335d5e 100644 --- a/rules/rust/remote/BUILD.census-0.4.0.bazel +++ b/rules/rust/remote/BUILD.census-0.4.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=census", "manual", ], version = "0.4.0", diff --git a/rules/rust/remote/BUILD.cfg-if-0.1.10.bazel b/rules/rust/remote/BUILD.cfg-if-0.1.10.bazel deleted file mode 100644 index f24605f..0000000 --- a/rules/rust/remote/BUILD.cfg-if-0.1.10.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "cfg_if", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.10", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "xcrate" with type "test" omitted diff --git a/rules/rust/remote/BUILD.cfg-if-1.0.0.bazel b/rules/rust/remote/BUILD.cfg-if-1.0.0.bazel index e10a267..2e4ca44 100644 --- a/rules/rust/remote/BUILD.cfg-if-1.0.0.bazel +++ b/rules/rust/remote/BUILD.cfg-if-1.0.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=cfg-if", "manual", ], version = "1.0.0", diff --git a/rules/rust/remote/BUILD.chrono-0.4.19.bazel b/rules/rust/remote/BUILD.chrono-0.4.19.bazel index fcb8922..bc73a2e 100644 --- a/rules/rust/remote/BUILD.chrono-0.4.19.bazel +++ b/rules/rust/remote/BUILD.chrono-0.4.19.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,13 +43,11 @@ rust_library( "default", "libc", "oldtime", - "serde", "std", "time", "winapi", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -56,16 +55,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=chrono", "manual", ], version = "0.4.19", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", "@raze__num_integer__0_1_44//:num_integer", "@raze__num_traits__0_2_14//:num_traits", - "@raze__serde__1_0_125//:serde", - "@raze__time__0_1_43//:time", + "@raze__time__0_1_44//:time", ], ) diff --git a/rules/rust/remote/BUILD.clap-2.33.3.bazel b/rules/rust/remote/BUILD.clap-2.33.3.bazel deleted file mode 100644 index d273f39..0000000 --- a/rules/rust/remote/BUILD.clap-2.33.3.bazel +++ /dev/null @@ -1,77 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "clap", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "ansi_term", - "atty", - "color", - "default", - "strsim", - "suggestions", - "vec_map", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.33.3", - # buildifier: leave-alone - deps = [ - "@raze__atty__0_2_14//:atty", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__strsim__0_8_0//:strsim", - "@raze__textwrap__0_11_0//:textwrap", - "@raze__unicode_width__0_1_8//:unicode_width", - "@raze__vec_map__0_8_2//:vec_map", - ] + selects.with_or({ - # cfg(not(windows)) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__ansi_term__0_11_0//:ansi_term", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.clap-3.1.6.bazel b/rules/rust/remote/BUILD.clap-3.1.6.bazel new file mode 100644 index 0000000..dcf2014 --- /dev/null +++ b/rules/rust/remote/BUILD.clap-3.1.6.bazel @@ -0,0 +1,175 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "01_default" with type "bench" omitted + +# Unsupported target "02_simple" with type "bench" omitted + +# Unsupported target "03_complex" with type "bench" omitted + +# Unsupported target "04_new_help" with type "bench" omitted + +# Unsupported target "05_ripgrep" with type "bench" omitted + +# Unsupported target "06_rustup" with type "bench" omitted + +# Unsupported target "01_quick" with type "example" omitted + +# Unsupported target "01_quick_derive" with type "example" omitted + +# Unsupported target "02_app_settings" with type "example" omitted + +# Unsupported target "02_app_settings_derive" with type "example" omitted + +# Unsupported target "02_apps" with type "example" omitted + +# Unsupported target "02_apps_derive" with type "example" omitted + +# Unsupported target "02_crate" with type "example" omitted + +# Unsupported target "02_crate_derive" with type "example" omitted + +# Unsupported target "03_01_flag_bool" with type "example" omitted + +# Unsupported target "03_01_flag_bool_derive" with type "example" omitted + +# Unsupported target "03_01_flag_count" with type "example" omitted + +# Unsupported target "03_01_flag_count_derive" with type "example" omitted + +# Unsupported target "03_02_option" with type "example" omitted + +# Unsupported target "03_02_option_derive" with type "example" omitted + +# Unsupported target "03_03_positional" with type "example" omitted + +# Unsupported target "03_03_positional_derive" with type "example" omitted + +# Unsupported target "03_04_subcommands" with type "example" omitted + +# Unsupported target "03_04_subcommands_alt_derive" with type "example" omitted + +# Unsupported target "03_04_subcommands_derive" with type "example" omitted + +# Unsupported target "03_05_default_values" with type "example" omitted + +# Unsupported target "03_05_default_values_derive" with type "example" omitted + +# Unsupported target "04_01_enum" with type "example" omitted + +# Unsupported target "04_01_enum_derive" with type "example" omitted + +# Unsupported target "04_01_possible" with type "example" omitted + +# Unsupported target "04_02_parse" with type "example" omitted + +# Unsupported target "04_02_parse_derive" with type "example" omitted + +# Unsupported target "04_02_validate" with type "example" omitted + +# Unsupported target "04_02_validate_derive" with type "example" omitted + +# Unsupported target "04_03_relations" with type "example" omitted + +# Unsupported target "04_03_relations_derive" with type "example" omitted + +# Unsupported target "04_04_custom" with type "example" omitted + +# Unsupported target "04_04_custom_derive" with type "example" omitted + +# Unsupported target "05_01_assert" with type "example" omitted + +# Unsupported target "05_01_assert_derive" with type "example" omitted + +# Unsupported target "busybox" with type "example" omitted + +# Unsupported target "cargo-example" with type "example" omitted + +# Unsupported target "cargo-example-derive" with type "example" omitted + +# Unsupported target "custom-bool" with type "example" omitted + +# Unsupported target "demo" with type "example" omitted + +# Unsupported target "escaped-positional" with type "example" omitted + +# Unsupported target "escaped-positional-derive" with type "example" omitted + +# Unsupported target "git" with type "example" omitted + +# Unsupported target "git-derive" with type "example" omitted + +# Unsupported target "hostname" with type "example" omitted + +# Unsupported target "keyvalue-derive" with type "example" omitted + +# Unsupported target "pacman" with type "example" omitted + +rust_library( + name = "clap", + srcs = glob(["**/*.rs"]), + crate_features = [ + "atty", + "cargo", + "color", + "default", + "lazy_static", + "std", + "strsim", + "suggestions", + "termcolor", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=clap", + "manual", + ], + version = "3.1.6", + # buildifier: leave-alone + deps = [ + "@raze__atty__0_2_14//:atty", + "@raze__bitflags__1_3_2//:bitflags", + "@raze__indexmap__1_8_0//:indexmap", + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__os_str_bytes__6_0_0//:os_str_bytes", + "@raze__strsim__0_10_0//:strsim", + "@raze__termcolor__1_1_3//:termcolor", + "@raze__textwrap__0_15_0//:textwrap", + ], +) diff --git a/rules/rust/remote/BUILD.cloudabi-0.0.3.bazel b/rules/rust/remote/BUILD.cloudabi-0.0.3.bazel deleted file mode 100644 index 0038588..0000000 --- a/rules/rust/remote/BUILD.cloudabi-0.0.3.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "restricted", # BSD-2-Clause from expression "BSD-2-Clause" -]) - -# Generated Targets - -rust_library( - name = "cloudabi", - srcs = glob(["**/*.rs"]), - crate_features = [ - "bitflags", - "default", - ], - crate_root = "cloudabi.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.0.3", - # buildifier: leave-alone - deps = [ - "@raze__bitflags__1_2_1//:bitflags", - ], -) diff --git a/rules/rust/remote/BUILD.colored-2.0.0.bazel b/rules/rust/remote/BUILD.colored-2.0.0.bazel index 943a43b..724d34b 100644 --- a/rules/rust/remote/BUILD.colored-2.0.0.bazel +++ b/rules/rust/remote/BUILD.colored-2.0.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -44,7 +45,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -52,6 +52,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=colored", "manual", ], version = "2.0.0", diff --git a/rules/rust/remote/BUILD.combine-4.5.2.bazel b/rules/rust/remote/BUILD.combine-4.6.3.bazel similarity index 91% rename from rules/rust/remote/BUILD.combine-4.5.2.bazel rename to rules/rust/remote/BUILD.combine-4.6.3.bazel index 8381447..9a9261a 100644 --- a/rules/rust/remote/BUILD.combine-4.5.2.bazel +++ b/rules/rust/remote/BUILD.combine-4.6.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -52,7 +53,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -60,12 +60,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=combine", "manual", ], - version = "4.5.2", + version = "4.6.3", # buildifier: leave-alone deps = [ - "@raze__memchr__2_3_4//:memchr", + "@raze__memchr__2_4_1//:memchr", ], ) diff --git a/rules/rust/remote/BUILD.config-0.10.1.bazel b/rules/rust/remote/BUILD.config-0.10.1.bazel deleted file mode 100644 index 75e3dc5..0000000 --- a/rules/rust/remote/BUILD.config-0.10.1.bazel +++ /dev/null @@ -1,84 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "config", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.10.1", - # buildifier: leave-alone - deps = [ - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__nom__5_1_2//:nom", - "@raze__serde__1_0_125//:serde", - ], -) - -# Unsupported target "datetime" with type "test" omitted - -# Unsupported target "defaults" with type "test" omitted - -# Unsupported target "empty" with type "test" omitted - -# Unsupported target "env" with type "test" omitted - -# Unsupported target "errors" with type "test" omitted - -# Unsupported target "file" with type "test" omitted - -# Unsupported target "file_hjson" with type "test" omitted - -# Unsupported target "file_ini" with type "test" omitted - -# Unsupported target "file_json" with type "test" omitted - -# Unsupported target "file_toml" with type "test" omitted - -# Unsupported target "file_yaml" with type "test" omitted - -# Unsupported target "get" with type "test" omitted - -# Unsupported target "merge" with type "test" omitted - -# Unsupported target "set" with type "test" omitted diff --git a/rules/rust/remote/BUILD.config-0.11.0.bazel b/rules/rust/remote/BUILD.config-0.12.0.bazel similarity index 57% rename from rules/rust/remote/BUILD.config-0.11.0.bazel rename to rules/rust/remote/BUILD.config-0.12.0.bazel index 9b55b59..6765dac 100644 --- a/rules/rust/remote/BUILD.config-0.11.0.bazel +++ b/rules/rust/remote/BUILD.config-0.12.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,46 +31,71 @@ licenses([ # Generated Targets +# Unsupported target "async_source" with type "example" omitted + +# Unsupported target "custom_format" with type "example" omitted + +# Unsupported target "glob" with type "example" omitted + +# Unsupported target "global" with type "example" omitted + +# Unsupported target "hierarchical-env" with type "example" omitted + +# Unsupported target "simple" with type "example" omitted + +# Unsupported target "watch" with type "example" omitted + rust_library( name = "config", srcs = glob(["**/*.rs"]), + aliases = { + "@raze__json5__0_4_1//:json5": "json5_rs", + }, crate_features = [ "default", - "hjson", "ini", "json", + "json5", + "json5_rs", + "ron", "rust-ini", - "serde-hjson", "serde_json", "toml", "yaml", "yaml-rust", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", + proc_macro_deps = [ + "@raze__async_trait__0_1_52//:async_trait", + ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=config", "manual", ], - version = "0.11.0", + version = "0.12.0", # buildifier: leave-alone deps = [ + "@raze__json5__0_4_1//:json5", "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__nom__5_1_2//:nom", - "@raze__rust_ini__0_13_0//:rust_ini", - "@raze__serde__1_0_125//:serde", - "@raze__serde_hjson__0_9_1//:serde_hjson", - "@raze__serde_json__1_0_64//:serde_json", + "@raze__nom__7_1_1//:nom", + "@raze__pathdiff__0_2_1//:pathdiff", + "@raze__ron__0_7_0//:ron", + "@raze__rust_ini__0_17_0//:rust_ini", + "@raze__serde__1_0_136//:serde", + "@raze__serde_json__1_0_79//:serde_json", "@raze__toml__0_5_8//:toml", "@raze__yaml_rust__0_4_5//:yaml_rust", ], ) +# Unsupported target "async_builder" with type "test" omitted + # Unsupported target "datetime" with type "test" omitted # Unsupported target "defaults" with type "test" omitted @@ -82,18 +108,26 @@ rust_library( # Unsupported target "file" with type "test" omitted -# Unsupported target "file_hjson" with type "test" omitted - # Unsupported target "file_ini" with type "test" omitted # Unsupported target "file_json" with type "test" omitted +# Unsupported target "file_json5" with type "test" omitted + +# Unsupported target "file_ron" with type "test" omitted + # Unsupported target "file_toml" with type "test" omitted # Unsupported target "file_yaml" with type "test" omitted # Unsupported target "get" with type "test" omitted +# Unsupported target "integer_range" with type "test" omitted + +# Unsupported target "legacy_tests" with type "test" omitted + # Unsupported target "merge" with type "test" omitted # Unsupported target "set" with type "test" omitted + +# Unsupported target "weird_keys" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crc32fast-1.2.1.bazel b/rules/rust/remote/BUILD.crc32fast-1.3.2.bazel similarity index 92% rename from rules/rust/remote/BUILD.crc32fast-1.2.1.bazel rename to rules/rust/remote/BUILD.crc32fast-1.3.2.bazel index b2fef8d..e7838c8 100644 --- a/rules/rust/remote/BUILD.crc32fast-1.2.1.bazel +++ b/rules/rust/remote/BUILD.crc32fast-1.3.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -55,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.2.1", + version = "1.3.2", visibility = ["//visibility:private"], deps = [ ], @@ -71,7 +72,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -79,9 +79,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=crc32fast", "manual", ], - version = "1.2.1", + version = "1.3.2", # buildifier: leave-alone deps = [ ":crc32fast_build_script", diff --git a/rules/rust/remote/BUILD.criterion-0.3.4.bazel b/rules/rust/remote/BUILD.criterion-0.3.4.bazel deleted file mode 100644 index 16e458c..0000000 --- a/rules/rust/remote/BUILD.criterion-0.3.4.bazel +++ /dev/null @@ -1,79 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "bench_main" with type "bench" omitted - -rust_library( - name = "criterion", - srcs = glob(["**/*.rs"]), - crate_features = [ - "cargo_bench_support", - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__serde_derive__1_0_125//:serde_derive", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.4", - # buildifier: leave-alone - deps = [ - "@raze__atty__0_2_14//:atty", - "@raze__cast__0_2_5//:cast", - "@raze__clap__2_33_3//:clap", - "@raze__criterion_plot__0_4_3//:criterion_plot", - "@raze__csv__1_1_6//:csv", - "@raze__itertools__0_10_0//:itertools", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__num_traits__0_2_14//:num_traits", - "@raze__oorandom__11_1_3//:oorandom", - "@raze__plotters__0_3_0//:plotters", - "@raze__rayon__1_5_0//:rayon", - "@raze__regex__1_4_5//:regex", - "@raze__serde__1_0_125//:serde", - "@raze__serde_cbor__0_11_1//:serde_cbor", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__tinytemplate__1_2_1//:tinytemplate", - "@raze__walkdir__2_3_2//:walkdir", - ], -) - -# Unsupported target "criterion_tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.criterion-plot-0.4.3.bazel b/rules/rust/remote/BUILD.criterion-plot-0.4.3.bazel deleted file mode 100644 index 8de4c3e..0000000 --- a/rules/rust/remote/BUILD.criterion-plot-0.4.3.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "criterion_plot", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.3", - # buildifier: leave-alone - deps = [ - "@raze__cast__0_2_5//:cast", - "@raze__itertools__0_9_0//:itertools", - ], -) diff --git a/rules/rust/remote/BUILD.crossbeam-0.7.3.bazel b/rules/rust/remote/BUILD.crossbeam-0.8.1.bazel similarity index 67% rename from rules/rust/remote/BUILD.crossbeam-0.7.3.bazel rename to rules/rust/remote/BUILD.crossbeam-0.8.1.bazel index f255a71..f37193e 100644 --- a/rules/rust/remote/BUILD.crossbeam-0.7.3.bazel +++ b/rules/rust/remote/BUILD.crossbeam-0.8.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,32 +35,34 @@ rust_library( name = "crossbeam", srcs = glob(["**/*.rs"]), crate_features = [ + "alloc", "crossbeam-channel", "crossbeam-deque", + "crossbeam-epoch", "crossbeam-queue", "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=crossbeam", "manual", ], - version = "0.7.3", + version = "0.8.1", # buildifier: leave-alone deps = [ - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__crossbeam_channel__0_4_4//:crossbeam_channel", - "@raze__crossbeam_deque__0_7_3//:crossbeam_deque", - "@raze__crossbeam_epoch__0_8_2//:crossbeam_epoch", - "@raze__crossbeam_queue__0_2_3//:crossbeam_queue", - "@raze__crossbeam_utils__0_7_2//:crossbeam_utils", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__crossbeam_channel__0_5_4//:crossbeam_channel", + "@raze__crossbeam_deque__0_8_1//:crossbeam_deque", + "@raze__crossbeam_epoch__0_9_8//:crossbeam_epoch", + "@raze__crossbeam_queue__0_3_5//:crossbeam_queue", + "@raze__crossbeam_utils__0_8_8//:crossbeam_utils", ], ) diff --git a/rules/rust/remote/BUILD.crossbeam-channel-0.4.4.bazel b/rules/rust/remote/BUILD.crossbeam-channel-0.4.4.bazel deleted file mode 100644 index 51fc132..0000000 --- a/rules/rust/remote/BUILD.crossbeam-channel-0.4.4.bazel +++ /dev/null @@ -1,91 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "crossbeam" with type "bench" omitted - -# Unsupported target "fibonacci" with type "example" omitted - -# Unsupported target "matching" with type "example" omitted - -# Unsupported target "stopwatch" with type "example" omitted - -rust_library( - name = "crossbeam_channel", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.4", - # buildifier: leave-alone - deps = [ - "@raze__crossbeam_utils__0_7_2//:crossbeam_utils", - "@raze__maybe_uninit__2_0_0//:maybe_uninit", - ], -) - -# Unsupported target "after" with type "test" omitted - -# Unsupported target "array" with type "test" omitted - -# Unsupported target "golang" with type "test" omitted - -# Unsupported target "iter" with type "test" omitted - -# Unsupported target "list" with type "test" omitted - -# Unsupported target "mpsc" with type "test" omitted - -# Unsupported target "never" with type "test" omitted - -# Unsupported target "ready" with type "test" omitted - -# Unsupported target "same_channel" with type "test" omitted - -# Unsupported target "select" with type "test" omitted - -# Unsupported target "select_macro" with type "test" omitted - -# Unsupported target "thread_locals" with type "test" omitted - -# Unsupported target "tick" with type "test" omitted - -# Unsupported target "zero" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crossbeam-channel-0.5.1.bazel b/rules/rust/remote/BUILD.crossbeam-channel-0.5.4.bazel similarity index 92% rename from rules/rust/remote/BUILD.crossbeam-channel-0.5.1.bazel rename to rules/rust/remote/BUILD.crossbeam-channel-0.5.4.bazel index 25246df..cb9d207 100644 --- a/rules/rust/remote/BUILD.crossbeam-channel-0.5.1.bazel +++ b/rules/rust/remote/BUILD.crossbeam-channel-0.5.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -47,7 +48,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -55,13 +55,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=crossbeam-channel", "manual", ], - version = "0.5.1", + version = "0.5.4", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__crossbeam_utils__0_8_3//:crossbeam_utils", + "@raze__crossbeam_utils__0_8_8//:crossbeam_utils", ], ) diff --git a/rules/rust/remote/BUILD.crossbeam-deque-0.7.3.bazel b/rules/rust/remote/BUILD.crossbeam-deque-0.7.3.bazel deleted file mode 100644 index 477378f..0000000 --- a/rules/rust/remote/BUILD.crossbeam-deque-0.7.3.bazel +++ /dev/null @@ -1,64 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "crossbeam_deque", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.3", - # buildifier: leave-alone - deps = [ - "@raze__crossbeam_epoch__0_8_2//:crossbeam_epoch", - "@raze__crossbeam_utils__0_7_2//:crossbeam_utils", - "@raze__maybe_uninit__2_0_0//:maybe_uninit", - ], -) - -# Unsupported target "fifo" with type "test" omitted - -# Unsupported target "injector" with type "test" omitted - -# Unsupported target "lifo" with type "test" omitted - -# Unsupported target "steal" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crossbeam-deque-0.8.0.bazel b/rules/rust/remote/BUILD.crossbeam-deque-0.8.1.bazel similarity index 84% rename from rules/rust/remote/BUILD.crossbeam-deque-0.8.0.bazel rename to rules/rust/remote/BUILD.crossbeam-deque-0.8.1.bazel index b373c4f..bec86d3 100644 --- a/rules/rust/remote/BUILD.crossbeam-deque-0.8.0.bazel +++ b/rules/rust/remote/BUILD.crossbeam-deque-0.8.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -40,7 +41,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -48,14 +48,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=crossbeam-deque", "manual", ], - version = "0.8.0", + version = "0.8.1", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__crossbeam_epoch__0_9_3//:crossbeam_epoch", - "@raze__crossbeam_utils__0_8_3//:crossbeam_utils", + "@raze__crossbeam_epoch__0_9_8//:crossbeam_epoch", + "@raze__crossbeam_utils__0_8_8//:crossbeam_utils", ], ) diff --git a/rules/rust/remote/BUILD.crossbeam-epoch-0.9.3.bazel b/rules/rust/remote/BUILD.crossbeam-epoch-0.9.3.bazel deleted file mode 100644 index 5418096..0000000 --- a/rules/rust/remote/BUILD.crossbeam-epoch-0.9.3.bazel +++ /dev/null @@ -1,71 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "defer" with type "bench" omitted - -# Unsupported target "flush" with type "bench" omitted - -# Unsupported target "pin" with type "bench" omitted - -# Unsupported target "sanitize" with type "example" omitted - -rust_library( - name = "crossbeam_epoch", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "lazy_static", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.3", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__crossbeam_utils__0_8_3//:crossbeam_utils", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__memoffset__0_6_3//:memoffset", - "@raze__scopeguard__1_1_0//:scopeguard", - ], -) - -# Unsupported target "loom" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crossbeam-epoch-0.8.2.bazel b/rules/rust/remote/BUILD.crossbeam-epoch-0.9.8.bazel similarity index 79% rename from rules/rust/remote/BUILD.crossbeam-epoch-0.8.2.bazel rename to rules/rust/remote/BUILD.crossbeam-epoch-0.9.8.bazel index 50beec1..895d459 100644 --- a/rules/rust/remote/BUILD.crossbeam-epoch-0.8.2.bazel +++ b/rules/rust/remote/BUILD.crossbeam-epoch-0.9.8.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,13 +43,13 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "default", + "alloc", "lazy_static", "std", ], crate_root = "build.rs", data = glob(["**"]), - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], @@ -56,10 +57,10 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.8.2", + version = "0.9.8", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", + "@raze__autocfg__1_1_0//:autocfg", ], ) @@ -71,36 +72,35 @@ cargo_build_script( # Unsupported target "sanitize" with type "example" omitted -# Unsupported target "treiber_stack" with type "example" omitted - rust_library( name = "crossbeam_epoch", srcs = glob(["**/*.rs"]), crate_features = [ - "default", + "alloc", "lazy_static", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=crossbeam-epoch", "manual", ], - version = "0.8.2", + version = "0.9.8", # buildifier: leave-alone deps = [ ":crossbeam_epoch_build_script", - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__crossbeam_utils__0_7_2//:crossbeam_utils", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__crossbeam_utils__0_8_8//:crossbeam_utils", "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__maybe_uninit__2_0_0//:maybe_uninit", - "@raze__memoffset__0_5_6//:memoffset", + "@raze__memoffset__0_6_5//:memoffset", "@raze__scopeguard__1_1_0//:scopeguard", ], ) + +# Unsupported target "loom" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crossbeam-queue-0.2.3.bazel b/rules/rust/remote/BUILD.crossbeam-queue-0.2.3.bazel deleted file mode 100644 index 7a3ee1d..0000000 --- a/rules/rust/remote/BUILD.crossbeam-queue-0.2.3.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR (Apache-2.0 AND BSD-2-Clause)" -]) - -# Generated Targets - -rust_library( - name = "crossbeam_queue", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.3", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__crossbeam_utils__0_7_2//:crossbeam_utils", - "@raze__maybe_uninit__2_0_0//:maybe_uninit", - ], -) - -# Unsupported target "array_queue" with type "test" omitted - -# Unsupported target "seg_queue" with type "test" omitted diff --git a/rules/rust/remote/BUILD.serde_json-1.0.64.bazel b/rules/rust/remote/BUILD.crossbeam-queue-0.3.5.bazel similarity index 74% rename from rules/rust/remote/BUILD.serde_json-1.0.64.bazel rename to rules/rust/remote/BUILD.crossbeam-queue-0.3.5.bazel index bf8f2f9..8c979af 100644 --- a/rules/rust/remote/BUILD.serde_json-1.0.64.bazel +++ b/rules/rust/remote/BUILD.crossbeam-queue-0.3.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,12 +38,12 @@ load( ) cargo_build_script( - name = "serde_json_build_script", + name = "crossbeam_queue_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ - "default", + "alloc", "std", ], crate_root = "build.rs", @@ -55,21 +56,20 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.64", + version = "0.3.5", visibility = ["//visibility:private"], deps = [ ], ) rust_library( - name = "serde_json", + name = "crossbeam_queue", srcs = glob(["**/*.rs"]), crate_features = [ - "default", + "alloc", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -77,14 +77,18 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=crossbeam-queue", "manual", ], - version = "1.0.64", + version = "0.3.5", # buildifier: leave-alone deps = [ - ":serde_json_build_script", - "@raze__itoa__0_4_7//:itoa", - "@raze__ryu__1_0_5//:ryu", - "@raze__serde__1_0_125//:serde", + ":crossbeam_queue_build_script", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__crossbeam_utils__0_8_8//:crossbeam_utils", ], ) + +# Unsupported target "array_queue" with type "test" omitted + +# Unsupported target "seg_queue" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crossbeam-utils-0.7.2.bazel b/rules/rust/remote/BUILD.crossbeam-utils-0.7.2.bazel deleted file mode 100644 index 44bab94..0000000 --- a/rules/rust/remote/BUILD.crossbeam-utils-0.7.2.bazel +++ /dev/null @@ -1,106 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "crossbeam_utils_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "default", - "lazy_static", - "std", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.2", - visibility = ["//visibility:private"], - deps = [ - "@raze__autocfg__1_0_1//:autocfg", - ], -) - -# Unsupported target "atomic_cell" with type "bench" omitted - -rust_library( - name = "crossbeam_utils", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "lazy_static", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.2", - # buildifier: leave-alone - deps = [ - ":crossbeam_utils_build_script", - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__lazy_static__1_4_0//:lazy_static", - ], -) - -# Unsupported target "atomic_cell" with type "test" omitted - -# Unsupported target "cache_padded" with type "test" omitted - -# Unsupported target "parker" with type "test" omitted - -# Unsupported target "sharded_lock" with type "test" omitted - -# Unsupported target "thread" with type "test" omitted - -# Unsupported target "wait_group" with type "test" omitted diff --git a/rules/rust/remote/BUILD.crossbeam-utils-0.8.3.bazel b/rules/rust/remote/BUILD.crossbeam-utils-0.8.8.bazel similarity index 93% rename from rules/rust/remote/BUILD.crossbeam-utils-0.8.3.bazel rename to rules/rust/remote/BUILD.crossbeam-utils-0.8.8.bazel index 400e9e3..6e63e94 100644 --- a/rules/rust/remote/BUILD.crossbeam-utils-0.8.3.bazel +++ b/rules/rust/remote/BUILD.crossbeam-utils-0.8.8.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -56,10 +57,9 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.8.3", + version = "0.8.8", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", ], ) @@ -74,7 +74,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -82,9 +81,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=crossbeam-utils", "manual", ], - version = "0.8.3", + version = "0.8.8", # buildifier: leave-alone deps = [ ":crossbeam_utils_build_script", diff --git a/rules/rust/remote/BUILD.crunchy-0.2.2.bazel b/rules/rust/remote/BUILD.crunchy-0.2.2.bazel index 1777a3d..6fe907b 100644 --- a/rules/rust/remote/BUILD.crunchy-0.2.2.bazel +++ b/rules/rust/remote/BUILD.crunchy-0.2.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -69,7 +70,6 @@ rust_library( "limit_128", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -77,6 +77,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=crunchy", "manual", ], version = "0.2.2", diff --git a/rules/rust/remote/BUILD.crypto-mac-0.9.1.bazel b/rules/rust/remote/BUILD.crypto-mac-0.9.1.bazel deleted file mode 100644 index f3eca2c..0000000 --- a/rules/rust/remote/BUILD.crypto-mac-0.9.1.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "crypto_mac", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.1", - # buildifier: leave-alone - deps = [ - "@raze__generic_array__0_14_4//:generic_array", - "@raze__subtle__2_4_0//:subtle", - ], -) diff --git a/rules/rust/remote/BUILD.csv-1.1.6.bazel b/rules/rust/remote/BUILD.csv-1.1.6.bazel deleted file mode 100644 index d4ce251..0000000 --- a/rules/rust/remote/BUILD.csv-1.1.6.bazel +++ /dev/null @@ -1,134 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "unencumbered", # Unlicense from expression "Unlicense OR MIT" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -# Unsupported target "cookbook-read-basic" with type "example" omitted - -# Unsupported target "cookbook-read-colon" with type "example" omitted - -# Unsupported target "cookbook-read-no-headers" with type "example" omitted - -# Unsupported target "cookbook-read-serde" with type "example" omitted - -# Unsupported target "cookbook-write-basic" with type "example" omitted - -# Unsupported target "cookbook-write-serde" with type "example" omitted - -# Unsupported target "tutorial-error-01" with type "example" omitted - -# Unsupported target "tutorial-error-02" with type "example" omitted - -# Unsupported target "tutorial-error-03" with type "example" omitted - -# Unsupported target "tutorial-error-04" with type "example" omitted - -# Unsupported target "tutorial-perf-alloc-01" with type "example" omitted - -# Unsupported target "tutorial-perf-alloc-02" with type "example" omitted - -# Unsupported target "tutorial-perf-alloc-03" with type "example" omitted - -# Unsupported target "tutorial-perf-core-01" with type "example" omitted - -# Unsupported target "tutorial-perf-serde-01" with type "example" omitted - -# Unsupported target "tutorial-perf-serde-02" with type "example" omitted - -# Unsupported target "tutorial-perf-serde-03" with type "example" omitted - -# Unsupported target "tutorial-pipeline-pop-01" with type "example" omitted - -# Unsupported target "tutorial-pipeline-search-01" with type "example" omitted - -# Unsupported target "tutorial-pipeline-search-02" with type "example" omitted - -# Unsupported target "tutorial-read-01" with type "example" omitted - -# Unsupported target "tutorial-read-delimiter-01" with type "example" omitted - -# Unsupported target "tutorial-read-headers-01" with type "example" omitted - -# Unsupported target "tutorial-read-headers-02" with type "example" omitted - -# Unsupported target "tutorial-read-serde-01" with type "example" omitted - -# Unsupported target "tutorial-read-serde-02" with type "example" omitted - -# Unsupported target "tutorial-read-serde-03" with type "example" omitted - -# Unsupported target "tutorial-read-serde-04" with type "example" omitted - -# Unsupported target "tutorial-read-serde-invalid-01" with type "example" omitted - -# Unsupported target "tutorial-read-serde-invalid-02" with type "example" omitted - -# Unsupported target "tutorial-setup-01" with type "example" omitted - -# Unsupported target "tutorial-write-01" with type "example" omitted - -# Unsupported target "tutorial-write-02" with type "example" omitted - -# Unsupported target "tutorial-write-delimiter-01" with type "example" omitted - -# Unsupported target "tutorial-write-serde-01" with type "example" omitted - -# Unsupported target "tutorial-write-serde-02" with type "example" omitted - -rust_library( - name = "csv", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.1.6", - # buildifier: leave-alone - deps = [ - "@raze__bstr__0_2_15//:bstr", - "@raze__csv_core__0_1_10//:csv_core", - "@raze__itoa__0_4_7//:itoa", - "@raze__ryu__1_0_5//:ryu", - "@raze__serde__1_0_125//:serde", - ], -) - -# Unsupported target "tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.md5-0.7.0.bazel b/rules/rust/remote/BUILD.ctor-0.1.22.bazel similarity index 74% rename from rules/rust/remote/BUILD.md5-0.7.0.bazel rename to rules/rust/remote/BUILD.ctor-0.1.22.bazel index c019d7e..e6d6824 100644 --- a/rules/rust/remote/BUILD.md5-0.7.0.bazel +++ b/rules/rust/remote/BUILD.ctor-0.1.22.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,28 +31,28 @@ licenses([ # Generated Targets -# Unsupported target "lib" with type "bench" omitted +# Unsupported target "example" with type "example" omitted -rust_library( - name = "md5", +rust_proc_macro( + name = "ctor", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=ctor", "manual", ], - version = "0.7.0", + version = "0.1.22", # buildifier: leave-alone deps = [ + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.phf_shared-0.8.0.bazel b/rules/rust/remote/BUILD.dashmap-4.0.2.bazel similarity index 80% rename from rules/rust/remote/BUILD.phf_shared-0.8.0.bazel rename to rules/rust/remote/BUILD.dashmap-4.0.2.bazel index 4c54e38..72ad1b2 100644 --- a/rules/rust/remote/BUILD.phf_shared-0.8.0.bazel +++ b/rules/rust/remote/BUILD.dashmap-4.0.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,12 @@ licenses([ # Generated Targets rust_library( - name = "phf_shared", + name = "dashmap", srcs = glob(["**/*.rs"]), crate_features = [ "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,11 +45,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=dashmap", "manual", ], - version = "0.8.0", + version = "4.0.2", # buildifier: leave-alone deps = [ - "@raze__siphasher__0_3_5//:siphasher", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__num_cpus__1_13_1//:num_cpus", ], ) diff --git a/rules/rust/remote/BUILD.deadpool-0.5.2.bazel b/rules/rust/remote/BUILD.deadpool-0.5.2.bazel deleted file mode 100644 index ab5da35..0000000 --- a/rules/rust/remote/BUILD.deadpool-0.5.2.bazel +++ /dev/null @@ -1,81 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "deadpool", - srcs = glob(["**/*.rs"]), - aliases = { - "@raze__config__0_10_1//:config": "config_crate", - }, - crate_features = [ - "async-trait", - "config", - "config-crate", - "default", - "managed", - "serde", - "unmanaged", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.2", - # buildifier: leave-alone - deps = [ - "@raze__config__0_10_1//:config", - "@raze__crossbeam_queue__0_2_3//:crossbeam_queue", - "@raze__num_cpus__1_13_0//:num_cpus", - "@raze__serde__1_0_125//:serde", - "@raze__tokio__0_2_25//:tokio", - ], -) - -# Unsupported target "managed" with type "test" omitted - -# Unsupported target "managed_config" with type "test" omitted - -# Unsupported target "managed_deadlock" with type "test" omitted - -# Unsupported target "managed_unreliable_manager" with type "test" omitted - -# Unsupported target "unmanaged" with type "test" omitted diff --git a/rules/rust/remote/BUILD.deadpool-postgres-0.5.6.bazel b/rules/rust/remote/BUILD.deadpool-postgres-0.5.6.bazel deleted file mode 100644 index 2faf817..0000000 --- a/rules/rust/remote/BUILD.deadpool-postgres-0.5.6.bazel +++ /dev/null @@ -1,72 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "deadpool_postgres", - srcs = glob(["**/*.rs"]), - aliases = { - "@raze__config__0_10_1//:config": "config_crate", - }, - crate_features = [ - "config", - "config-crate", - "default", - "serde", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.6", - # buildifier: leave-alone - deps = [ - "@raze__config__0_10_1//:config", - "@raze__deadpool__0_5_2//:deadpool", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__serde__1_0_125//:serde", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_postgres__0_5_5//:tokio_postgres", - ], -) - -# Unsupported target "postgres" with type "test" omitted diff --git a/rules/rust/remote/BUILD.derive_more-0.99.13.bazel b/rules/rust/remote/BUILD.derive_more-0.99.13.bazel deleted file mode 100644 index d118d3e..0000000 --- a/rules/rust/remote/BUILD.derive_more-0.99.13.bazel +++ /dev/null @@ -1,133 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "deny_missing_docs" with type "example" omitted - -rust_library( - name = "derive_more", - srcs = glob(["**/*.rs"]), - crate_features = [ - "add", - "add_assign", - "as_mut", - "as_ref", - "constructor", - "convert_case", - "default", - "deref", - "deref_mut", - "display", - "error", - "from", - "from_str", - "index", - "index_mut", - "into", - "into_iterator", - "is_variant", - "iterator", - "mul", - "mul_assign", - "not", - "sum", - "try_into", - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.99.13", - # buildifier: leave-alone - deps = [ - "@raze__convert_case__0_4_0//:convert_case", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) - -# Unsupported target "add" with type "test" omitted - -# Unsupported target "add_assign" with type "test" omitted - -# Unsupported target "as_mut" with type "test" omitted - -# Unsupported target "as_ref" with type "test" omitted - -# Unsupported target "boats_display_derive" with type "test" omitted - -# Unsupported target "constructor" with type "test" omitted - -# Unsupported target "deref" with type "test" omitted - -# Unsupported target "deref_mut" with type "test" omitted - -# Unsupported target "display" with type "test" omitted - -# Unsupported target "error" with type "test" omitted - -# Unsupported target "from" with type "test" omitted - -# Unsupported target "from_str" with type "test" omitted - -# Unsupported target "generics" with type "test" omitted - -# Unsupported target "index" with type "test" omitted - -# Unsupported target "index_mut" with type "test" omitted - -# Unsupported target "into" with type "test" omitted - -# Unsupported target "into_iterator" with type "test" omitted - -# Unsupported target "is_variant" with type "test" omitted - -# Unsupported target "lib" with type "test" omitted - -# Unsupported target "mul" with type "test" omitted - -# Unsupported target "mul_assign" with type "test" omitted - -# Unsupported target "no_std" with type "test" omitted - -# Unsupported target "not" with type "test" omitted - -# Unsupported target "sum" with type "test" omitted - -# Unsupported target "try_into" with type "test" omitted diff --git a/rules/rust/remote/BUILD.humantime-1.3.0.bazel b/rules/rust/remote/BUILD.diff-0.1.12.bazel similarity index 75% rename from rules/rust/remote/BUILD.humantime-1.3.0.bazel rename to rules/rust/remote/BUILD.diff-0.1.12.bazel index 63f7577..2a6f634 100644 --- a/rules/rust/remote/BUILD.humantime-1.3.0.bazel +++ b/rules/rust/remote/BUILD.diff-0.1.12.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,17 +31,16 @@ licenses([ # Generated Targets -# Unsupported target "datetime_format" with type "bench" omitted +# Unsupported target "benches" with type "bench" omitted -# Unsupported target "datetime_parse" with type "bench" omitted +# Unsupported target "simple" with type "example" omitted rust_library( - name = "humantime", + name = "diff", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -48,11 +48,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=diff", "manual", ], - version = "1.3.0", + version = "0.1.12", # buildifier: leave-alone deps = [ - "@raze__quick_error__1_2_3//:quick_error", ], ) + +# Unsupported target "tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.bit-set-0.5.2.bazel b/rules/rust/remote/BUILD.digest-0.8.1.bazel similarity index 83% rename from rules/rust/remote/BUILD.bit-set-0.5.2.bazel rename to rules/rust/remote/BUILD.digest-0.8.1.bazel index 75480ba..9c3d2d0 100644 --- a/rules/rust/remote/BUILD.bit-set-0.5.2.bazel +++ b/rules/rust/remote/BUILD.digest-0.8.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "bit_set", + name = "digest", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,11 +44,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=digest", "manual", ], - version = "0.5.2", + version = "0.8.1", # buildifier: leave-alone deps = [ - "@raze__bit_vec__0_6_3//:bit_vec", + "@raze__generic_array__0_12_4//:generic_array", ], ) diff --git a/rules/rust/remote/BUILD.dirs-next-2.0.0.bazel b/rules/rust/remote/BUILD.dirs-next-2.0.0.bazel deleted file mode 100644 index 48fc7d2..0000000 --- a/rules/rust/remote/BUILD.dirs-next-2.0.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "dirs_next", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.0.0", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__dirs_sys_next__0_1_2//:dirs_sys_next", - ], -) diff --git a/rules/rust/remote/BUILD.dirs-sys-next-0.1.2.bazel b/rules/rust/remote/BUILD.dirs-sys-next-0.1.2.bazel deleted file mode 100644 index fa4b380..0000000 --- a/rules/rust/remote/BUILD.dirs-sys-next-0.1.2.bazel +++ /dev/null @@ -1,64 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "dirs_sys_next", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.2", - # buildifier: leave-alone - deps = [ - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.discard-1.0.4.bazel b/rules/rust/remote/BUILD.discard-1.0.4.bazel deleted file mode 100644 index 337c14b..0000000 --- a/rules/rust/remote/BUILD.discard-1.0.4.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "discard", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.4", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.convert_case-0.4.0.bazel b/rules/rust/remote/BUILD.dlv-list-0.2.3.bazel similarity index 84% rename from rules/rust/remote/BUILD.convert_case-0.4.0.bazel rename to rules/rust/remote/BUILD.dlv-list-0.2.3.bazel index ba52db5..51ce2c4 100644 --- a/rules/rust/remote/BUILD.convert_case-0.4.0.bazel +++ b/rules/rust/remote/BUILD.dlv-list-0.2.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "convert_case", + name = "dlv_list", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,10 +44,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=dlv-list", "manual", ], - version = "0.4.0", + version = "0.2.3", # buildifier: leave-alone deps = [ + "@raze__rand__0_8_5//:rand", ], ) diff --git a/rules/rust/remote/BUILD.dotenv-0.15.0.bazel b/rules/rust/remote/BUILD.dotenv-0.15.0.bazel deleted file mode 100644 index 946cc11..0000000 --- a/rules/rust/remote/BUILD.dotenv-0.15.0.bazel +++ /dev/null @@ -1,99 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_dotenv", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/bin/dotenv.rs", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.15.0", - # buildifier: leave-alone - deps = [ - ":dotenv", - ], -) - -# Unsupported target "simple" with type "example" omitted - -rust_library( - name = "dotenv", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.15.0", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "test-child-dir" with type "test" omitted - -# Unsupported target "test-default-location" with type "test" omitted - -# Unsupported target "test-dotenv-iter" with type "test" omitted - -# Unsupported target "test-from-filename" with type "test" omitted - -# Unsupported target "test-from-filename-iter" with type "test" omitted - -# Unsupported target "test-from-path" with type "test" omitted - -# Unsupported target "test-from-path-iter" with type "test" omitted - -# Unsupported target "test-var" with type "test" omitted - -# Unsupported target "test-variable-substitution" with type "test" omitted - -# Unsupported target "test-vars" with type "test" omitted diff --git a/rules/rust/remote/BUILD.downcast-rs-1.2.0.bazel b/rules/rust/remote/BUILD.downcast-rs-1.2.0.bazel index a9755c7..e8d289e 100644 --- a/rules/rust/remote/BUILD.downcast-rs-1.2.0.bazel +++ b/rules/rust/remote/BUILD.downcast-rs-1.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=downcast-rs", "manual", ], version = "1.2.0", diff --git a/rules/rust/remote/BUILD.either-1.6.1.bazel b/rules/rust/remote/BUILD.either-1.6.1.bazel index 19c50ee..069fd09 100644 --- a/rules/rust/remote/BUILD.either-1.6.1.bazel +++ b/rules/rust/remote/BUILD.either-1.6.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "use_std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=either", "manual", ], version = "1.6.1", diff --git a/rules/rust/remote/BUILD.encoding_rs-0.8.28.bazel b/rules/rust/remote/BUILD.encoding_rs-0.8.28.bazel deleted file mode 100644 index ebfcd4e..0000000 --- a/rules/rust/remote/BUILD.encoding_rs-0.8.28.bazel +++ /dev/null @@ -1,84 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "encoding_rs_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.28", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "encoding_rs", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.28", - # buildifier: leave-alone - deps = [ - ":encoding_rs_build_script", - "@raze__cfg_if__1_0_0//:cfg_if", - ], -) diff --git a/rules/rust/remote/BUILD.enum-as-inner-0.3.3.bazel b/rules/rust/remote/BUILD.enum-as-inner-0.3.3.bazel deleted file mode 100644 index 56200f0..0000000 --- a/rules/rust/remote/BUILD.enum-as-inner-0.3.3.bazel +++ /dev/null @@ -1,69 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "enum_as_inner", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.3", - # buildifier: leave-alone - deps = [ - "@raze__heck__0_3_2//:heck", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) - -# Unsupported target "basic" with type "test" omitted - -# Unsupported target "generics" with type "test" omitted - -# Unsupported target "named" with type "test" omitted - -# Unsupported target "snake_case" with type "test" omitted - -# Unsupported target "unit" with type "test" omitted - -# Unsupported target "unnamed" with type "test" omitted diff --git a/rules/rust/remote/BUILD.env_logger-0.8.3.bazel b/rules/rust/remote/BUILD.env_logger-0.8.3.bazel deleted file mode 100644 index 051c436..0000000 --- a/rules/rust/remote/BUILD.env_logger-0.8.3.bazel +++ /dev/null @@ -1,71 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "env_logger", - srcs = glob(["**/*.rs"]), - crate_features = [ - "atty", - "default", - "humantime", - "regex", - "termcolor", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.3", - # buildifier: leave-alone - deps = [ - "@raze__atty__0_2_14//:atty", - "@raze__humantime__2_1_0//:humantime", - "@raze__log__0_4_14//:log", - "@raze__regex__1_4_5//:regex", - "@raze__termcolor__1_1_2//:termcolor", - ], -) - -# Unsupported target "init-twice-retains-filter" with type "test" omitted - -# Unsupported target "log-in-log" with type "test" omitted - -# Unsupported target "log_tls_dtors" with type "test" omitted - -# Unsupported target "regexp_filter" with type "test" omitted diff --git a/rules/rust/remote/BUILD.fail-0.4.0.bazel b/rules/rust/remote/BUILD.fail-0.5.0.bazel similarity index 88% rename from rules/rust/remote/BUILD.fail-0.4.0.bazel rename to rules/rust/remote/BUILD.fail-0.5.0.bazel index 6ecb57e..e7e8c84 100644 --- a/rules/rust/remote/BUILD.fail-0.4.0.bazel +++ b/rules/rust/remote/BUILD.fail-0.5.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,14 +44,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=fail", "manual", ], - version = "0.4.0", + version = "0.5.0", # buildifier: leave-alone deps = [ "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_14//:log", - "@raze__rand__0_7_3//:rand", + "@raze__rand__0_8_5//:rand", ], ) diff --git a/rules/rust/remote/BUILD.failure-0.1.8.bazel b/rules/rust/remote/BUILD.failure-0.1.8.bazel deleted file mode 100644 index 1d74837..0000000 --- a/rules/rust/remote/BUILD.failure-0.1.8.bazel +++ /dev/null @@ -1,76 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "bail_ensure" with type "example" omitted - -# Unsupported target "error_as_cause" with type "example" omitted - -# Unsupported target "simple" with type "example" omitted - -# Unsupported target "string_custom_error_pattern" with type "example" omitted - -rust_library( - name = "failure", - srcs = glob(["**/*.rs"]), - crate_features = [ - "backtrace", - "default", - "derive", - "failure_derive", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - proc_macro_deps = [ - "@raze__failure_derive__0_1_8//:failure_derive", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.8", - # buildifier: leave-alone - deps = [ - "@raze__backtrace__0_3_56//:backtrace", - ], -) - -# Unsupported target "basic_fail" with type "test" omitted - -# Unsupported target "fail_compat" with type "test" omitted - -# Unsupported target "macro_trailing_comma" with type "test" omitted diff --git a/rules/rust/remote/BUILD.failure_derive-0.1.8.bazel b/rules/rust/remote/BUILD.failure_derive-0.1.8.bazel deleted file mode 100644 index 7b23a23..0000000 --- a/rules/rust/remote/BUILD.failure_derive-0.1.8.bazel +++ /dev/null @@ -1,97 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "failure_derive_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.8", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "failure_derive", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.8", - # buildifier: leave-alone - deps = [ - ":failure_derive_build_script", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - "@raze__synstructure__0_12_4//:synstructure", - ], -) - -# Unsupported target "backtrace" with type "test" omitted - -# Unsupported target "custom_type_bounds" with type "test" omitted - -# Unsupported target "no_derive_display" with type "test" omitted - -# Unsupported target "tests" with type "test" omitted - -# Unsupported target "wraps" with type "test" omitted diff --git a/rules/rust/remote/BUILD.log-mdc-0.1.0.bazel b/rules/rust/remote/BUILD.fake-simd-0.1.2.bazel similarity index 87% rename from rules/rust/remote/BUILD.log-mdc-0.1.0.bazel rename to rules/rust/remote/BUILD.fake-simd-0.1.2.bazel index ae80ca2..438101c 100644 --- a/rules/rust/remote/BUILD.log-mdc-0.1.0.bazel +++ b/rules/rust/remote/BUILD.fake-simd-0.1.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "log_mdc", + name = "fake_simd", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=fake-simd", "manual", ], - version = "0.1.0", + version = "0.1.2", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.fancy-regex-0.3.5.bazel b/rules/rust/remote/BUILD.fancy-regex-0.3.5.bazel deleted file mode 100644 index b9601d1..0000000 --- a/rules/rust/remote/BUILD.fancy-regex-0.3.5.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -# Unsupported target "toy" with type "example" omitted - -rust_library( - name = "fancy_regex", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.5", - # buildifier: leave-alone - deps = [ - "@raze__bit_set__0_5_2//:bit_set", - "@raze__regex__1_4_5//:regex", - ], -) - -# Unsupported target "captures" with type "test" omitted - -# Unsupported target "finding" with type "test" omitted - -# Unsupported target "matching" with type "test" omitted - -# Unsupported target "oniguruma" with type "test" omitted diff --git a/rules/rust/remote/BUILD.fastdivide-0.3.0.bazel b/rules/rust/remote/BUILD.fastdivide-0.4.0.bazel similarity index 88% rename from rules/rust/remote/BUILD.fastdivide-0.3.0.bazel rename to rules/rust/remote/BUILD.fastdivide-0.4.0.bazel index aa42dea..8bd3a61 100644 --- a/rules/rust/remote/BUILD.fastdivide-0.3.0.bazel +++ b/rules/rust/remote/BUILD.fastdivide-0.4.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,17 +39,17 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=fastdivide", "manual", ], - version = "0.3.0", + version = "0.4.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.grpc-compiler-0.8.3.bazel b/rules/rust/remote/BUILD.fastfield_codecs-0.1.0.bazel similarity index 60% rename from rules/rust/remote/BUILD.grpc-compiler-0.8.3.bazel rename to rules/rust/remote/BUILD.fastfield_codecs-0.1.0.bazel index c70116f..daf6273 100644 --- a/rules/rust/remote/BUILD.grpc-compiler-0.8.3.bazel +++ b/rules/rust/remote/BUILD.fastfield_codecs-0.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,19 +26,24 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # MIT from expression "MIT" ]) # Generated Targets +# Unsupported target "bench" with type "bench" omitted + rust_binary( # Prefix bin name to disambiguate from (probable) collision with lib name # N.B.: The exact form of this is subject to change. - name = "cargo_bin_protoc_gen_rust_grpc", + name = "cargo_bin_fastfield_codecs", srcs = glob(["**/*.rs"]), + aliases = { + "@raze__tantivy_common__0_1_0//:tantivy_common": "common", + }, crate_features = [ ], - crate_root = "src/bin/protoc-gen-rust-grpc.rs", + crate_root = "src/main.rs", data = [], edition = "2018", rustc_flags = [ @@ -45,24 +51,27 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=fastfield_codecs", "manual", ], - version = "0.8.3", + version = "0.1.0", # buildifier: leave-alone deps = [ - ":grpc_compiler", - "@raze__protobuf__2_18_2//:protobuf", - "@raze__protobuf_codegen__2_18_2//:protobuf_codegen", + ":fastfield_codecs", + "@raze__tantivy_bitpacker__0_1_1//:tantivy_bitpacker", + "@raze__tantivy_common__0_1_0//:tantivy_common", ], ) rust_library( - name = "grpc_compiler", + name = "fastfield_codecs", srcs = glob(["**/*.rs"]), + aliases = { + "@raze__tantivy_common__0_1_0//:tantivy_common": "common", + }, crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -70,12 +79,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=fastfield_codecs", "manual", ], - version = "0.8.3", + version = "0.1.0", # buildifier: leave-alone deps = [ - "@raze__protobuf__2_18_2//:protobuf", - "@raze__protobuf_codegen__2_18_2//:protobuf_codegen", + "@raze__tantivy_bitpacker__0_1_1//:tantivy_bitpacker", + "@raze__tantivy_common__0_1_0//:tantivy_common", ], ) diff --git a/rules/rust/remote/BUILD.fastrand-1.7.0.bazel b/rules/rust/remote/BUILD.fastrand-1.7.0.bazel new file mode 100644 index 0000000..22d3826 --- /dev/null +++ b/rules/rust/remote/BUILD.fastrand-1.7.0.bazel @@ -0,0 +1,60 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" +]) + +# Generated Targets + +# Unsupported target "bench" with type "bench" omitted + +rust_library( + name = "fastrand", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=fastrand", + "manual", + ], + version = "1.7.0", + # buildifier: leave-alone + deps = [ + ], +) + +# Unsupported target "char" with type "test" omitted + +# Unsupported target "smoke" with type "test" omitted diff --git a/rules/rust/remote/BUILD.quick-error-1.2.3.bazel b/rules/rust/remote/BUILD.fixedbitset-0.4.1.bazel similarity index 82% rename from rules/rust/remote/BUILD.quick-error-1.2.3.bazel rename to rules/rust/remote/BUILD.fixedbitset-0.4.1.bazel index 4c7280d..69d426c 100644 --- a/rules/rust/remote/BUILD.quick-error-1.2.3.bazel +++ b/rules/rust/remote/BUILD.fixedbitset-0.4.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,15 +31,14 @@ licenses([ # Generated Targets -# Unsupported target "context" with type "example" omitted +# Unsupported target "benches" with type "bench" omitted rust_library( - name = "quick_error", + name = "fixedbitset", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,9 +46,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=fixedbitset", "manual", ], - version = "1.2.3", + version = "0.4.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.flate2-1.0.20.bazel b/rules/rust/remote/BUILD.flate2-1.0.20.bazel deleted file mode 100644 index ec044fc..0000000 --- a/rules/rust/remote/BUILD.flate2-1.0.20.bazel +++ /dev/null @@ -1,116 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "compress_file" with type "example" omitted - -# Unsupported target "deflatedecoder-bufread" with type "example" omitted - -# Unsupported target "deflatedecoder-read" with type "example" omitted - -# Unsupported target "deflatedecoder-write" with type "example" omitted - -# Unsupported target "deflateencoder-bufread" with type "example" omitted - -# Unsupported target "deflateencoder-read" with type "example" omitted - -# Unsupported target "deflateencoder-write" with type "example" omitted - -# Unsupported target "gzbuilder" with type "example" omitted - -# Unsupported target "gzdecoder-bufread" with type "example" omitted - -# Unsupported target "gzdecoder-read" with type "example" omitted - -# Unsupported target "gzdecoder-write" with type "example" omitted - -# Unsupported target "gzencoder-bufread" with type "example" omitted - -# Unsupported target "gzencoder-read" with type "example" omitted - -# Unsupported target "gzencoder-write" with type "example" omitted - -# Unsupported target "gzmultidecoder-bufread" with type "example" omitted - -# Unsupported target "gzmultidecoder-read" with type "example" omitted - -# Unsupported target "zlibdecoder-bufread" with type "example" omitted - -# Unsupported target "zlibdecoder-read" with type "example" omitted - -# Unsupported target "zlibdecoder-write" with type "example" omitted - -# Unsupported target "zlibencoder-bufread" with type "example" omitted - -# Unsupported target "zlibencoder-read" with type "example" omitted - -# Unsupported target "zlibencoder-write" with type "example" omitted - -rust_library( - name = "flate2", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "miniz_oxide", - "rust_backend", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.20", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__crc32fast__1_2_1//:crc32fast", - "@raze__libc__0_2_93//:libc", - "@raze__miniz_oxide__0_4_4//:miniz_oxide", - ], -) - -# Unsupported target "async-reader" with type "test" omitted - -# Unsupported target "early-flush" with type "test" omitted - -# Unsupported target "empty-read" with type "test" omitted - -# Unsupported target "gunzip" with type "test" omitted - -# Unsupported target "tokio" with type "test" omitted - -# Unsupported target "zero-write" with type "test" omitted diff --git a/rules/rust/remote/BUILD.fnv-1.0.7.bazel b/rules/rust/remote/BUILD.fnv-1.0.7.bazel index f1d8183..bf50f44 100644 --- a/rules/rust/remote/BUILD.fnv-1.0.7.bazel +++ b/rules/rust/remote/BUILD.fnv-1.0.7.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "std", ], crate_root = "lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=fnv", "manual", ], version = "1.0.7", diff --git a/rules/rust/remote/BUILD.form_urlencoded-1.0.1.bazel b/rules/rust/remote/BUILD.form_urlencoded-1.0.1.bazel deleted file mode 100644 index d7815c9..0000000 --- a/rules/rust/remote/BUILD.form_urlencoded-1.0.1.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "form_urlencoded", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.1", - # buildifier: leave-alone - deps = [ - "@raze__matches__0_1_8//:matches", - "@raze__percent_encoding__2_1_0//:percent_encoding", - ], -) diff --git a/rules/rust/remote/BUILD.fs2-0.4.3.bazel b/rules/rust/remote/BUILD.fs2-0.4.3.bazel index 530ecf6..1d1bffa 100644 --- a/rules/rust/remote/BUILD.fs2-0.4.3.bazel +++ b/rules/rust/remote/BUILD.fs2-0.4.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=fs2", "manual", ], version = "0.4.3", @@ -57,7 +58,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.fst-0.3.5.bazel b/rules/rust/remote/BUILD.fst-0.3.5.bazel deleted file mode 100644 index 76e761e..0000000 --- a/rules/rust/remote/BUILD.fst-0.3.5.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "unencumbered", # Unlicense from expression "Unlicense OR MIT" -]) - -# Generated Targets - -# Unsupported target "build" with type "bench" omitted - -# Unsupported target "search" with type "bench" omitted - -rust_library( - name = "fst", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.5", - # buildifier: leave-alone - deps = [ - "@raze__byteorder__1_4_3//:byteorder", - ], -) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.fst-0.4.5.bazel b/rules/rust/remote/BUILD.fst-0.4.5.bazel deleted file mode 100644 index f7eb2b4..0000000 --- a/rules/rust/remote/BUILD.fst-0.4.5.bazel +++ /dev/null @@ -1,87 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "unencumbered", # Unlicense from expression "Unlicense OR MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "fst_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "default", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.5", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "fst", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.5", - # buildifier: leave-alone - deps = [ - ":fst_build_script", - ], -) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.fuchsia-cprng-0.1.1.bazel b/rules/rust/remote/BUILD.fuchsia-cprng-0.1.1.bazel deleted file mode 100644 index e895e98..0000000 --- a/rules/rust/remote/BUILD.fuchsia-cprng-0.1.1.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "restricted", # no license -]) - -# Generated Targets - -rust_library( - name = "fuchsia_cprng", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.1", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.fuchsia-zircon-0.3.3.bazel b/rules/rust/remote/BUILD.fuchsia-zircon-0.3.3.bazel deleted file mode 100644 index 86f1b03..0000000 --- a/rules/rust/remote/BUILD.fuchsia-zircon-0.3.3.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # BSD-3-Clause from expression "BSD-3-Clause" -]) - -# Generated Targets - -rust_library( - name = "fuchsia_zircon", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.3", - # buildifier: leave-alone - deps = [ - "@raze__bitflags__1_2_1//:bitflags", - "@raze__fuchsia_zircon_sys__0_3_3//:fuchsia_zircon_sys", - ], -) diff --git a/rules/rust/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel b/rules/rust/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel deleted file mode 100644 index f25e6d4..0000000 --- a/rules/rust/remote/BUILD.fuchsia-zircon-sys-0.3.3.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # BSD-3-Clause from expression "BSD-3-Clause" -]) - -# Generated Targets - -# Unsupported target "hello" with type "example" omitted - -rust_library( - name = "fuchsia_zircon_sys", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.3", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.futures-0.3.14.bazel b/rules/rust/remote/BUILD.futures-0.3.21.bazel similarity index 86% rename from rules/rust/remote/BUILD.futures-0.3.14.bazel rename to rules/rust/remote/BUILD.futures-0.3.21.bazel index ec78e96..6b0a670 100644 --- a/rules/rust/remote/BUILD.futures-0.3.14.bazel +++ b/rules/rust/remote/BUILD.futures-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -43,7 +44,6 @@ rust_library( "thread-pool", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -51,18 +51,19 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures", "manual", ], - version = "0.3.14", + version = "0.3.21", # buildifier: leave-alone deps = [ - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_executor__0_3_14//:futures_executor", - "@raze__futures_io__0_3_14//:futures_io", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__futures_task__0_3_14//:futures_task", - "@raze__futures_util__0_3_14//:futures_util", + "@raze__futures_channel__0_3_21//:futures_channel", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_executor__0_3_21//:futures_executor", + "@raze__futures_io__0_3_21//:futures_io", + "@raze__futures_sink__0_3_21//:futures_sink", + "@raze__futures_task__0_3_21//:futures_task", + "@raze__futures_util__0_3_21//:futures_util", ], ) @@ -106,6 +107,8 @@ rust_library( # Unsupported target "io_cursor" with type "test" omitted +# Unsupported target "io_line_writer" with type "test" omitted + # Unsupported target "io_lines" with type "test" omitted # Unsupported target "io_read" with type "test" omitted @@ -142,6 +145,8 @@ rust_library( # Unsupported target "stream" with type "test" omitted +# Unsupported target "stream_abortable" with type "test" omitted + # Unsupported target "stream_buffer_unordered" with type "test" omitted # Unsupported target "stream_catch_unwind" with type "test" omitted @@ -168,4 +173,6 @@ rust_library( # Unsupported target "task_atomic_waker" with type "test" omitted +# Unsupported target "test_macro" with type "test" omitted + # Unsupported target "try_join" with type "test" omitted diff --git a/rules/rust/remote/BUILD.futures-channel-0.3.14.bazel b/rules/rust/remote/BUILD.futures-channel-0.3.14.bazel deleted file mode 100644 index 3497ffc..0000000 --- a/rules/rust/remote/BUILD.futures-channel-0.3.14.bazel +++ /dev/null @@ -1,70 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "sync_mpsc" with type "bench" omitted - -rust_library( - name = "futures_channel", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "default", - "futures-sink", - "sink", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.14", - # buildifier: leave-alone - deps = [ - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_sink__0_3_14//:futures_sink", - ], -) - -# Unsupported target "channel" with type "test" omitted - -# Unsupported target "mpsc" with type "test" omitted - -# Unsupported target "mpsc-close" with type "test" omitted - -# Unsupported target "oneshot" with type "test" omitted diff --git a/rules/rust/remote/BUILD.lexical-core-0.7.5.bazel b/rules/rust/remote/BUILD.futures-channel-0.3.21.bazel similarity index 66% rename from rules/rust/remote/BUILD.lexical-core-0.7.5.bazel rename to rules/rust/remote/BUILD.futures-channel-0.3.21.bazel index c614397..0e99a03 100644 --- a/rules/rust/remote/BUILD.lexical-core-0.7.5.bazel +++ b/rules/rust/remote/BUILD.futures-channel-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,18 +38,16 @@ load( ) cargo_build_script( - name = "lexical_core_build_script", + name = "futures_channel_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ - "arrayvec", - "correct", + "alloc", "default", - "ryu", - "static_assertions", + "futures-sink", + "sink", "std", - "table", ], crate_root = "build.rs", data = glob(["**"]), @@ -60,26 +59,25 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.7.5", + version = "0.3.21", visibility = ["//visibility:private"], deps = [ ], ) +# Unsupported target "sync_mpsc" with type "bench" omitted + rust_library( - name = "lexical_core", + name = "futures_channel", srcs = glob(["**/*.rs"]), crate_features = [ - "arrayvec", - "correct", + "alloc", "default", - "ryu", - "static_assertions", + "futures-sink", + "sink", "std", - "table", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -87,16 +85,22 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-channel", "manual", ], - version = "0.7.5", + version = "0.3.21", # buildifier: leave-alone deps = [ - ":lexical_core_build_script", - "@raze__arrayvec__0_5_2//:arrayvec", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__ryu__1_0_5//:ryu", - "@raze__static_assertions__1_1_0//:static_assertions", + ":futures_channel_build_script", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_sink__0_3_21//:futures_sink", ], ) + +# Unsupported target "channel" with type "test" omitted + +# Unsupported target "mpsc" with type "test" omitted + +# Unsupported target "mpsc-close" with type "test" omitted + +# Unsupported target "oneshot" with type "test" omitted diff --git a/rules/rust/remote/BUILD.futures-core-0.3.14.bazel b/rules/rust/remote/BUILD.futures-core-0.3.14.bazel deleted file mode 100644 index 436e4f0..0000000 --- a/rules/rust/remote/BUILD.futures-core-0.3.14.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "futures_core", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.14", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.cast-0.2.5.bazel b/rules/rust/remote/BUILD.futures-core-0.3.21.bazel similarity index 84% rename from rules/rust/remote/BUILD.cast-0.2.5.bazel rename to rules/rust/remote/BUILD.futures-core-0.3.21.bazel index 86106e8..f466473 100644 --- a/rules/rust/remote/BUILD.cast-0.2.5.bazel +++ b/rules/rust/remote/BUILD.futures-core-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,11 +38,12 @@ load( ) cargo_build_script( - name = "cast_build_script", + name = "futures_core_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ + "alloc", "default", "std", ], @@ -55,22 +57,21 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.5", + version = "0.3.21", visibility = ["//visibility:private"], deps = [ - "@raze__rustc_version__0_2_3//:rustc_version", ], ) rust_library( - name = "cast", + name = "futures_core", srcs = glob(["**/*.rs"]), crate_features = [ + "alloc", "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -78,11 +79,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-core", "manual", ], - version = "0.2.5", + version = "0.3.21", # buildifier: leave-alone deps = [ - ":cast_build_script", + ":futures_core_build_script", ], ) diff --git a/rules/rust/remote/BUILD.futures-executor-0.3.14.bazel b/rules/rust/remote/BUILD.futures-executor-0.3.21.bazel similarity index 76% rename from rules/rust/remote/BUILD.futures-executor-0.3.14.bazel rename to rules/rust/remote/BUILD.futures-executor-0.3.21.bazel index 365586d..659fd44 100644 --- a/rules/rust/remote/BUILD.futures-executor-0.3.14.bazel +++ b/rules/rust/remote/BUILD.futures-executor-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,12 +37,12 @@ rust_library( name = "futures_executor", srcs = glob(["**/*.rs"]), crate_features = [ + "default", "num_cpus", "std", "thread-pool", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -49,15 +50,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-executor", "manual", ], - version = "0.3.14", + version = "0.3.21", # buildifier: leave-alone deps = [ - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_task__0_3_14//:futures_task", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__num_cpus__1_13_0//:num_cpus", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_task__0_3_21//:futures_task", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__num_cpus__1_13_1//:num_cpus", ], ) diff --git a/rules/rust/remote/BUILD.futures-io-0.3.14.bazel b/rules/rust/remote/BUILD.futures-io-0.3.21.bazel similarity index 89% rename from rules/rust/remote/BUILD.futures-io-0.3.14.bazel rename to rules/rust/remote/BUILD.futures-io-0.3.21.bazel index a913c8f..d6b9f9d 100644 --- a/rules/rust/remote/BUILD.futures-io-0.3.14.bazel +++ b/rules/rust/remote/BUILD.futures-io-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,11 +35,9 @@ rust_library( name = "futures_io", srcs = glob(["**/*.rs"]), crate_features = [ - "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +45,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-io", "manual", ], - version = "0.3.14", + version = "0.3.21", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.futures-macro-0.3.14.bazel b/rules/rust/remote/BUILD.futures-macro-0.3.14.bazel deleted file mode 100644 index 97ef124..0000000 --- a/rules/rust/remote/BUILD.futures-macro-0.3.14.bazel +++ /dev/null @@ -1,59 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "futures_macro", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__proc_macro_hack__0_5_19//:proc_macro_hack", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.14", - # buildifier: leave-alone - deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.block-buffer-0.9.0.bazel b/rules/rust/remote/BUILD.futures-macro-0.3.21.bazel similarity index 75% rename from rules/rust/remote/BUILD.block-buffer-0.9.0.bazel rename to rules/rust/remote/BUILD.futures-macro-0.3.21.bazel index 1bfbbbc..d505242 100644 --- a/rules/rust/remote/BUILD.block-buffer-0.9.0.bazel +++ b/rules/rust/remote/BUILD.futures-macro-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,13 +31,12 @@ licenses([ # Generated Targets -rust_library( - name = "block_buffer", +rust_proc_macro( + name = "futures_macro", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,11 +44,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-macro", "manual", ], - version = "0.9.0", + version = "0.3.21", # buildifier: leave-alone deps = [ - "@raze__generic_array__0_14_4//:generic_array", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.futures-sink-0.3.14.bazel b/rules/rust/remote/BUILD.futures-sink-0.3.21.bazel similarity index 89% rename from rules/rust/remote/BUILD.futures-sink-0.3.14.bazel rename to rules/rust/remote/BUILD.futures-sink-0.3.21.bazel index a3ade69..2633225 100644 --- a/rules/rust/remote/BUILD.futures-sink-0.3.14.bazel +++ b/rules/rust/remote/BUILD.futures-sink-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -39,7 +40,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -47,9 +47,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-sink", "manual", ], - version = "0.3.14", + version = "0.3.21", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.futures-task-0.3.14.bazel b/rules/rust/remote/BUILD.futures-task-0.3.14.bazel deleted file mode 100644 index 34797bd..0000000 --- a/rules/rust/remote/BUILD.futures-task-0.3.14.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "futures_task", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.14", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.standback-0.2.17.bazel b/rules/rust/remote/BUILD.futures-task-0.3.21.bazel similarity index 84% rename from rules/rust/remote/BUILD.standback-0.2.17.bazel rename to rules/rust/remote/BUILD.futures-task-0.3.21.bazel index b349642..bb1d1c0 100644 --- a/rules/rust/remote/BUILD.standback-0.2.17.bazel +++ b/rules/rust/remote/BUILD.futures-task-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,11 +38,12 @@ load( ) cargo_build_script( - name = "standback_build_script", + name = "futures_task_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ + "alloc", "std", ], crate_root = "build.rs", @@ -54,21 +56,20 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.17", + version = "0.3.21", visibility = ["//visibility:private"], deps = [ - "@raze__version_check__0_9_3//:version_check", ], ) rust_library( - name = "standback", + name = "futures_task", srcs = glob(["**/*.rs"]), crate_features = [ + "alloc", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -76,11 +77,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=futures-task", "manual", ], - version = "0.2.17", + version = "0.3.21", # buildifier: leave-alone deps = [ - ":standback_build_script", + ":futures_task_build_script", ], ) diff --git a/rules/rust/remote/BUILD.futures-util-0.3.14.bazel b/rules/rust/remote/BUILD.futures-util-0.3.14.bazel deleted file mode 100644 index 6d4058e..0000000 --- a/rules/rust/remote/BUILD.futures-util-0.3.14.bazel +++ /dev/null @@ -1,85 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "futures_unordered" with type "bench" omitted - -rust_library( - name = "futures_util", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "async-await", - "async-await-macro", - "channel", - "default", - "futures-channel", - "futures-io", - "futures-macro", - "futures-sink", - "io", - "memchr", - "proc-macro-hack", - "proc-macro-nested", - "sink", - "slab", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__futures_macro__0_3_14//:futures_macro", - "@raze__proc_macro_hack__0_5_19//:proc_macro_hack", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.14", - # buildifier: leave-alone - deps = [ - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_io__0_3_14//:futures_io", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__futures_task__0_3_14//:futures_task", - "@raze__memchr__2_3_4//:memchr", - "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__pin_utils__0_1_0//:pin_utils", - "@raze__proc_macro_nested__0_1_7//:proc_macro_nested", - "@raze__slab__0_4_2//:slab", - ], -) diff --git a/rules/rust/remote/BUILD.time-0.2.26.bazel b/rules/rust/remote/BUILD.futures-util-0.3.21.bazel similarity index 52% rename from rules/rust/remote/BUILD.time-0.2.26.bazel rename to rules/rust/remote/BUILD.futures-util-0.3.21.bazel index 2664ec2..cea43d7 100644 --- a/rules/rust/remote/BUILD.time-0.2.26.bazel +++ b/rules/rust/remote/BUILD.futures-util-0.3.21.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,17 +38,25 @@ load( ) cargo_build_script( - name = "time_build_script", + name = "futures_util_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ + "alloc", + "async-await", + "async-await-macro", + "channel", "default", - "deprecated", - "libc", + "futures-channel", + "futures-io", + "futures-macro", + "futures-sink", + "io", + "memchr", + "sink", + "slab", "std", - "stdweb", - "winapi", ], crate_root = "build.rs", data = glob(["**"]), @@ -59,63 +68,61 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.26", + version = "0.3.21", visibility = ["//visibility:private"], deps = [ - "@raze__version_check__0_9_3//:version_check", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), + ], ) +# Unsupported target "flatten_unordered" with type "bench" omitted + +# Unsupported target "futures_unordered" with type "bench" omitted + rust_library( - name = "time", + name = "futures_util", srcs = glob(["**/*.rs"]), - aliases = { - }, crate_features = [ + "alloc", + "async-await", + "async-await-macro", + "channel", "default", - "deprecated", - "libc", + "futures-channel", + "futures-io", + "futures-macro", + "futures-sink", + "io", + "memchr", + "sink", + "slab", "std", - "stdweb", - "winapi", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", proc_macro_deps = [ - "@raze__const_fn__0_4_7//:const_fn", + "@raze__futures_macro__0_3_21//:futures_macro", ], rustc_flags = [ "--cap-lints=allow", - "--cfg=std", ], tags = [ "cargo-raze", + "crate-name=futures-util", "manual", ], - version = "0.2.26", + version = "0.3.21", # buildifier: leave-alone deps = [ - ":time_build_script", - "@raze__standback__0_2_17//:standback", - "@raze__time_macros__0_1_1//:time_macros", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), + ":futures_util_build_script", + "@raze__futures_channel__0_3_21//:futures_channel", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_io__0_3_21//:futures_io", + "@raze__futures_sink__0_3_21//:futures_sink", + "@raze__futures_task__0_3_21//:futures_task", + "@raze__memchr__2_4_1//:memchr", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__pin_utils__0_1_0//:pin_utils", + "@raze__slab__0_4_5//:slab", + ], ) diff --git a/rules/rust/remote/BUILD.fxhash-0.2.1.bazel b/rules/rust/remote/BUILD.fxhash-0.2.1.bazel deleted file mode 100644 index ccba250..0000000 --- a/rules/rust/remote/BUILD.fxhash-0.2.1.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "fxhash" with type "bench" omitted - -rust_library( - name = "fxhash", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.1", - # buildifier: leave-alone - deps = [ - "@raze__byteorder__1_4_3//:byteorder", - ], -) diff --git a/rules/rust/remote/BUILD.subtle-2.4.0.bazel b/rules/rust/remote/BUILD.generic-array-0.12.4.bazel similarity index 64% rename from rules/rust/remote/BUILD.subtle-2.4.0.bazel rename to rules/rust/remote/BUILD.generic-array-0.12.4.bazel index 4573886..68a2e6a 100644 --- a/rules/rust/remote/BUILD.subtle-2.4.0.bazel +++ b/rules/rust/remote/BUILD.generic-array-0.12.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,18 +26,17 @@ package(default_visibility = [ ]) licenses([ - "notice", # BSD-3-Clause from expression "BSD-3-Clause" + "notice", # MIT from expression "MIT" ]) # Generated Targets rust_library( - name = "subtle", + name = "generic_array", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,12 +44,24 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=generic_array", "manual", ], - version = "2.4.0", + version = "0.12.4", # buildifier: leave-alone deps = [ + "@raze__typenum__1_15_0//:typenum", ], ) +# Unsupported target "arr" with type "test" omitted + +# Unsupported target "generics" with type "test" omitted + +# Unsupported target "hex" with type "test" omitted + +# Unsupported target "import_name" with type "test" omitted + +# Unsupported target "iter" with type "test" omitted + # Unsupported target "mod" with type "test" omitted diff --git a/rules/rust/remote/BUILD.generic-array-0.14.4.bazel b/rules/rust/remote/BUILD.generic-array-0.14.4.bazel deleted file mode 100644 index c599ab6..0000000 --- a/rules/rust/remote/BUILD.generic-array-0.14.4.bazel +++ /dev/null @@ -1,97 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "generic_array_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.14.4", - visibility = ["//visibility:private"], - deps = [ - "@raze__version_check__0_9_3//:version_check", - ], -) - -rust_library( - name = "generic_array", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.14.4", - # buildifier: leave-alone - deps = [ - ":generic_array_build_script", - "@raze__typenum__1_13_0//:typenum", - ], -) - -# Unsupported target "arr" with type "test" omitted - -# Unsupported target "generics" with type "test" omitted - -# Unsupported target "hex" with type "test" omitted - -# Unsupported target "import_name" with type "test" omitted - -# Unsupported target "iter" with type "test" omitted - -# Unsupported target "mod" with type "test" omitted diff --git a/rules/rust/remote/BUILD.filetime-0.2.14.bazel b/rules/rust/remote/BUILD.getrandom-0.2.5.bazel similarity index 74% rename from rules/rust/remote/BUILD.filetime-0.2.14.bazel rename to rules/rust/remote/BUILD.getrandom-0.2.5.bazel index 07304d7..7177e80 100644 --- a/rules/rust/remote/BUILD.filetime-0.2.14.bazel +++ b/rules/rust/remote/BUILD.getrandom-0.2.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,15 +31,17 @@ licenses([ # Generated Targets +# Unsupported target "mod" with type "bench" omitted + rust_library( - name = "filetime", + name = "getrandom", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +49,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=getrandom", "manual", ], - version = "0.2.14", + version = "0.2.5", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", @@ -58,8 +62,14 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), ) + +# Unsupported target "custom" with type "test" omitted + +# Unsupported target "normal" with type "test" omitted + +# Unsupported target "rdrand" with type "test" omitted diff --git a/rules/rust/remote/BUILD.grpc-0.8.3.bazel b/rules/rust/remote/BUILD.grpc-0.8.3.bazel deleted file mode 100644 index 50171cd..0000000 --- a/rules/rust/remote/BUILD.grpc-0.8.3.bazel +++ /dev/null @@ -1,68 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "grpc", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.3", - # buildifier: leave-alone - deps = [ - "@raze__base64__0_9_3//:base64", - "@raze__bytes__0_5_6//:bytes", - "@raze__futures__0_3_14//:futures", - "@raze__httpbis__0_9_1//:httpbis", - "@raze__log__0_4_14//:log", - "@raze__log_ndc__0_2_0//:log_ndc", - "@raze__tls_api__0_4_0//:tls_api", - "@raze__tls_api_stub__0_4_0//:tls_api_stub", - "@raze__tokio__0_2_25//:tokio", - ], -) - -# Unsupported target "client" with type "test" omitted - -# Unsupported target "server" with type "test" omitted - -# Unsupported target "simple" with type "test" omitted diff --git a/rules/rust/remote/BUILD.h2-0.2.7.bazel b/rules/rust/remote/BUILD.h2-0.3.12.bazel similarity index 65% rename from rules/rust/remote/BUILD.h2-0.2.7.bazel rename to rules/rust/remote/BUILD.h2-0.3.12.bazel index 70fced3..8cddc60 100644 --- a/rules/rust/remote/BUILD.h2-0.2.7.bazel +++ b/rules/rust/remote/BUILD.h2-0.3.12.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,7 +43,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -50,22 +50,22 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=h2", "manual", ], - version = "0.2.7", + version = "0.3.12", # buildifier: leave-alone deps = [ - "@raze__bytes__0_5_6//:bytes", + "@raze__bytes__1_1_0//:bytes", "@raze__fnv__1_0_7//:fnv", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__http__0_2_4//:http", - "@raze__indexmap__1_6_2//:indexmap", - "@raze__slab__0_4_2//:slab", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_util__0_3_1//:tokio_util", - "@raze__tracing__0_1_25//:tracing", - "@raze__tracing_futures__0_2_5//:tracing_futures", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_sink__0_3_21//:futures_sink", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__http__0_2_6//:http", + "@raze__indexmap__1_8_0//:indexmap", + "@raze__slab__0_4_5//:slab", + "@raze__tokio__1_17_0//:tokio", + "@raze__tokio_util__0_6_9//:tokio_util", + "@raze__tracing__0_1_32//:tracing", ], ) diff --git a/rules/rust/remote/BUILD.half-1.7.1.bazel b/rules/rust/remote/BUILD.half-1.7.1.bazel deleted file mode 100644 index ca95ed7..0000000 --- a/rules/rust/remote/BUILD.half-1.7.1.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "convert" with type "bench" omitted - -rust_library( - name = "half", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.7.1", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "version-numbers" with type "test" omitted diff --git a/rules/rust/remote/BUILD.gimli-0.23.0.bazel b/rules/rust/remote/BUILD.hashbrown-0.11.2.bazel similarity index 66% rename from rules/rust/remote/BUILD.gimli-0.23.0.bazel rename to rules/rust/remote/BUILD.hashbrown-0.11.2.bazel index 690216c..65c5be1 100644 --- a/rules/rust/remote/BUILD.gimli-0.23.0.bazel +++ b/rules/rust/remote/BUILD.hashbrown-0.11.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -32,22 +33,16 @@ licenses([ # Unsupported target "bench" with type "bench" omitted -# Unsupported target "dwarf-validate" with type "example" omitted - -# Unsupported target "dwarfdump" with type "example" omitted - -# Unsupported target "simple" with type "example" omitted - -# Unsupported target "simple_line" with type "example" omitted - rust_library( - name = "gimli", + name = "hashbrown", srcs = glob(["**/*.rs"]), crate_features = [ - "read", + "ahash", + "default", + "inline-more", + "raw", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -55,14 +50,20 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=hashbrown", "manual", ], - version = "0.23.0", + version = "0.11.2", # buildifier: leave-alone deps = [ + "@raze__ahash__0_7_6//:ahash", ], ) -# Unsupported target "convert_self" with type "test" omitted +# Unsupported target "hasher" with type "test" omitted -# Unsupported target "parse_self" with type "test" omitted +# Unsupported target "rayon" with type "test" omitted + +# Unsupported target "serde" with type "test" omitted + +# Unsupported target "set" with type "test" omitted diff --git a/rules/rust/remote/BUILD.hashbrown-0.9.1.bazel b/rules/rust/remote/BUILD.hashbrown-0.9.1.bazel index 5e859ca..2f8c886 100644 --- a/rules/rust/remote/BUILD.hashbrown-0.9.1.bazel +++ b/rules/rust/remote/BUILD.hashbrown-0.9.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -39,10 +40,8 @@ rust_library( "ahash", "default", "inline-more", - "raw", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -50,6 +49,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=hashbrown", "manual", ], version = "0.9.1", diff --git a/rules/rust/remote/BUILD.heck-0.3.2.bazel b/rules/rust/remote/BUILD.heck-0.3.3.bazel similarity index 84% rename from rules/rust/remote/BUILD.heck-0.3.2.bazel rename to rules/rust/remote/BUILD.heck-0.3.3.bazel index 549a1bc..93d3151 100644 --- a/rules/rust/remote/BUILD.heck-0.3.2.bazel +++ b/rules/rust/remote/BUILD.heck-0.3.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,11 +44,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=heck", "manual", ], - version = "0.3.2", + version = "0.3.3", # buildifier: leave-alone deps = [ - "@raze__unicode_segmentation__1_7_1//:unicode_segmentation", + "@raze__unicode_segmentation__1_9_0//:unicode_segmentation", ], ) diff --git a/rules/rust/remote/BUILD.hermit-abi-0.1.18.bazel b/rules/rust/remote/BUILD.hermit-abi-0.1.19.bazel similarity index 86% rename from rules/rust/remote/BUILD.hermit-abi-0.1.18.bazel rename to rules/rust/remote/BUILD.hermit-abi-0.1.19.bazel index e13cd45..53a9482 100644 --- a/rules/rust/remote/BUILD.hermit-abi-0.1.18.bazel +++ b/rules/rust/remote/BUILD.hermit-abi-0.1.19.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,6 @@ rust_library( "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,11 +45,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=hermit-abi", "manual", ], - version = "0.1.18", + version = "0.1.19", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], ) diff --git a/rules/rust/remote/BUILD.hmac-0.10.1.bazel b/rules/rust/remote/BUILD.hmac-0.10.1.bazel deleted file mode 100644 index 5bfe8be..0000000 --- a/rules/rust/remote/BUILD.hmac-0.10.1.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "hmac", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.10.1", - # buildifier: leave-alone - deps = [ - "@raze__crypto_mac__0_10_0//:crypto_mac", - "@raze__digest__0_9_0//:digest", - ], -) - -# Unsupported target "lib" with type "test" omitted diff --git a/rules/rust/remote/BUILD.hostname-0.3.1.bazel b/rules/rust/remote/BUILD.hostname-0.3.1.bazel deleted file mode 100644 index 4a62da3..0000000 --- a/rules/rust/remote/BUILD.hostname-0.3.1.bazel +++ /dev/null @@ -1,70 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "hostname" with type "example" omitted - -rust_library( - name = "hostname", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.1", - # buildifier: leave-alone - deps = [ - "@raze__match_cfg__0_1_0//:match_cfg", - ] + selects.with_or({ - # cfg(any(unix, target_os = "redox")) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "version" with type "test" omitted diff --git a/rules/rust/remote/BUILD.htmlescape-0.3.1.bazel b/rules/rust/remote/BUILD.htmlescape-0.3.1.bazel index b2545ae..28d2b15 100644 --- a/rules/rust/remote/BUILD.htmlescape-0.3.1.bazel +++ b/rules/rust/remote/BUILD.htmlescape-0.3.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=htmlescape", "manual", ], version = "0.3.1", diff --git a/rules/rust/remote/BUILD.http-0.2.4.bazel b/rules/rust/remote/BUILD.http-0.2.6.bazel similarity index 88% rename from rules/rust/remote/BUILD.http-0.2.4.bazel rename to rules/rust/remote/BUILD.http-0.2.6.bazel index b73b46b..4813086 100644 --- a/rules/rust/remote/BUILD.http-0.2.4.bazel +++ b/rules/rust/remote/BUILD.http-0.2.6.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -46,7 +47,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -54,14 +54,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=http", "manual", ], - version = "0.2.4", + version = "0.2.6", # buildifier: leave-alone deps = [ - "@raze__bytes__1_0_1//:bytes", + "@raze__bytes__1_1_0//:bytes", "@raze__fnv__1_0_7//:fnv", - "@raze__itoa__0_4_7//:itoa", + "@raze__itoa__1_0_1//:itoa", ], ) diff --git a/rules/rust/remote/BUILD.bb8-0.4.2.bazel b/rules/rust/remote/BUILD.http-body-0.4.4.bazel similarity index 73% rename from rules/rust/remote/BUILD.bb8-0.4.2.bazel rename to rules/rust/remote/BUILD.http-body-0.4.4.bazel index 2a41a8e..2096ab0 100644 --- a/rules/rust/remote/BUILD.bb8-0.4.2.bazel +++ b/rules/rust/remote/BUILD.http-body-0.4.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,30 +32,28 @@ licenses([ # Generated Targets rust_library( - name = "bb8", + name = "http_body", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=http-body", "manual", ], - version = "0.4.2", + version = "0.4.4", # buildifier: leave-alone deps = [ - "@raze__futures__0_3_14//:futures", - "@raze__tokio__0_2_25//:tokio", + "@raze__bytes__1_1_0//:bytes", + "@raze__http__0_2_6//:http", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", ], ) -# Unsupported target "test" with type "test" omitted +# Unsupported target "is_end_stream" with type "test" omitted diff --git a/rules/rust/remote/BUILD.plotters-svg-0.3.0.bazel b/rules/rust/remote/BUILD.http-range-header-0.3.0.bazel similarity index 83% rename from rules/rust/remote/BUILD.plotters-svg-0.3.0.bazel rename to rules/rust/remote/BUILD.http-range-header-0.3.0.bazel index d8480c0..96758af 100644 --- a/rules/rust/remote/BUILD.plotters-svg-0.3.0.bazel +++ b/rules/rust/remote/BUILD.http-range-header-0.3.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,13 +31,14 @@ licenses([ # Generated Targets +# Unsupported target "benchmark" with type "bench" omitted + rust_library( - name = "plotters_svg", + name = "http_range_header", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,11 +46,11 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=http-range-header", "manual", ], version = "0.3.0", # buildifier: leave-alone deps = [ - "@raze__plotters_backend__0_3_0//:plotters_backend", ], ) diff --git a/rules/rust/remote/BUILD.httparse-1.4.0.bazel b/rules/rust/remote/BUILD.httparse-1.6.0.bazel similarity index 92% rename from rules/rust/remote/BUILD.httparse-1.4.0.bazel rename to rules/rust/remote/BUILD.httparse-1.6.0.bazel index ee60405..81c1274 100644 --- a/rules/rust/remote/BUILD.httparse-1.4.0.bazel +++ b/rules/rust/remote/BUILD.httparse-1.6.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -55,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.4.0", + version = "1.6.0", visibility = ["//visibility:private"], deps = [ ], @@ -71,7 +72,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -79,9 +79,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=httparse", "manual", ], - version = "1.4.0", + version = "1.6.0", # buildifier: leave-alone deps = [ ":httparse_build_script", diff --git a/rules/rust/remote/BUILD.mio-named-pipes-0.1.7.bazel b/rules/rust/remote/BUILD.httpdate-1.0.2.bazel similarity index 82% rename from rules/rust/remote/BUILD.mio-named-pipes-0.1.7.bazel rename to rules/rust/remote/BUILD.httpdate-1.0.2.bazel index a158288..1df72d9 100644 --- a/rules/rust/remote/BUILD.mio-named-pipes-0.1.7.bazel +++ b/rules/rust/remote/BUILD.httpdate-1.0.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,13 +31,14 @@ licenses([ # Generated Targets +# Unsupported target "benchmarks" with type "bench" omitted + rust_library( - name = "mio_named_pipes", + name = "httpdate", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,12 +46,11 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=httpdate", "manual", ], - version = "0.1.7", + version = "1.0.2", # buildifier: leave-alone deps = [ ], ) - -# Unsupported target "smoke" with type "test" omitted diff --git a/rules/rust/remote/BUILD.hyper-0.14.17.bazel b/rules/rust/remote/BUILD.hyper-0.14.17.bazel new file mode 100644 index 0000000..72e9906 --- /dev/null +++ b/rules/rust/remote/BUILD.hyper-0.14.17.bazel @@ -0,0 +1,133 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "body" with type "bench" omitted + +# Unsupported target "connect" with type "bench" omitted + +# Unsupported target "end_to_end" with type "bench" omitted + +# Unsupported target "pipeline" with type "bench" omitted + +# Unsupported target "server" with type "bench" omitted + +# Unsupported target "hyper" with type "cdylib" omitted + +# Unsupported target "client" with type "example" omitted + +# Unsupported target "client_json" with type "example" omitted + +# Unsupported target "echo" with type "example" omitted + +# Unsupported target "gateway" with type "example" omitted + +# Unsupported target "hello" with type "example" omitted + +# Unsupported target "http_proxy" with type "example" omitted + +# Unsupported target "multi_server" with type "example" omitted + +# Unsupported target "params" with type "example" omitted + +# Unsupported target "send_file" with type "example" omitted + +# Unsupported target "service_struct_impl" with type "example" omitted + +# Unsupported target "single_threaded" with type "example" omitted + +# Unsupported target "state" with type "example" omitted + +# Unsupported target "tower_client" with type "example" omitted + +# Unsupported target "tower_server" with type "example" omitted + +# Unsupported target "upgrades" with type "example" omitted + +# Unsupported target "web_api" with type "example" omitted + +rust_library( + name = "hyper", + srcs = glob(["**/*.rs"]), + crate_features = [ + "client", + "default", + "full", + "h2", + "http1", + "http2", + "runtime", + "server", + "socket2", + "stream", + "tcp", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=hyper", + "manual", + ], + version = "0.14.17", + # buildifier: leave-alone + deps = [ + "@raze__bytes__1_1_0//:bytes", + "@raze__futures_channel__0_3_21//:futures_channel", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__h2__0_3_12//:h2", + "@raze__http__0_2_6//:http", + "@raze__http_body__0_4_4//:http_body", + "@raze__httparse__1_6_0//:httparse", + "@raze__httpdate__1_0_2//:httpdate", + "@raze__itoa__1_0_1//:itoa", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__socket2__0_4_4//:socket2", + "@raze__tokio__1_17_0//:tokio", + "@raze__tower_service__0_3_1//:tower_service", + "@raze__tracing__0_1_32//:tracing", + "@raze__want__0_3_0//:want", + ], +) + +# Unsupported target "hyper" with type "staticlib" omitted + +# Unsupported target "client" with type "test" omitted + +# Unsupported target "integration" with type "test" omitted + +# Unsupported target "server" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-web-codegen-0.4.0.bazel b/rules/rust/remote/BUILD.hyper-timeout-0.4.1.bazel similarity index 69% rename from rules/rust/remote/BUILD.actix-web-codegen-0.4.0.bazel rename to rules/rust/remote/BUILD.hyper-timeout-0.4.1.bazel index 5ed8198..d7976af 100644 --- a/rules/rust/remote/BUILD.actix-web-codegen-0.4.0.bazel +++ b/rules/rust/remote/BUILD.hyper-timeout-0.4.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,13 +31,14 @@ licenses([ # Generated Targets +# Unsupported target "client" with type "example" omitted + rust_library( - name = "actix_web_codegen", + name = "hyper_timeout", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -44,17 +46,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=hyper-timeout", "manual", ], - version = "0.4.0", + version = "0.4.1", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__hyper__0_14_17//:hyper", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tokio__1_17_0//:tokio", + "@raze__tokio_io_timeout__1_2_0//:tokio_io_timeout", ], ) - -# Unsupported target "test_macro" with type "test" omitted - -# Unsupported target "trybuild" with type "test" omitted diff --git a/rules/rust/remote/BUILD.idna-0.2.3.bazel b/rules/rust/remote/BUILD.idna-0.2.3.bazel deleted file mode 100644 index bbb09c9..0000000 --- a/rules/rust/remote/BUILD.idna-0.2.3.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "all" with type "bench" omitted - -rust_library( - name = "idna", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.3", - # buildifier: leave-alone - deps = [ - "@raze__matches__0_1_8//:matches", - "@raze__unicode_bidi__0_3_5//:unicode_bidi", - "@raze__unicode_normalization__0_1_17//:unicode_normalization", - ], -) - -# Unsupported target "tests" with type "test" omitted - -# Unsupported target "unit" with type "test" omitted diff --git a/rules/rust/remote/BUILD.indexmap-1.6.2.bazel b/rules/rust/remote/BUILD.indexmap-1.8.0.bazel similarity index 88% rename from rules/rust/remote/BUILD.indexmap-1.6.2.bazel rename to rules/rust/remote/BUILD.indexmap-1.8.0.bazel index ef3758a..0756c62 100644 --- a/rules/rust/remote/BUILD.indexmap-1.6.2.bazel +++ b/rules/rust/remote/BUILD.indexmap-1.8.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,6 +43,7 @@ cargo_build_script( build_script_env = { }, crate_features = [ + "std", ], crate_root = "build.rs", data = glob(["**"]), @@ -53,10 +55,10 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.6.2", + version = "1.8.0", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", + "@raze__autocfg__1_1_0//:autocfg", ], ) @@ -68,24 +70,24 @@ rust_library( name = "indexmap", srcs = glob(["**/*.rs"]), crate_features = [ + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", - "--cfg=has_std", ], tags = [ "cargo-raze", + "crate-name=indexmap", "manual", ], - version = "1.6.2", + version = "1.8.0", # buildifier: leave-alone deps = [ ":indexmap_build_script", - "@raze__hashbrown__0_9_1//:hashbrown", + "@raze__hashbrown__0_11_2//:hashbrown", ], ) diff --git a/rules/rust/remote/BUILD.instant-0.1.9.bazel b/rules/rust/remote/BUILD.instant-0.1.12.bazel similarity index 90% rename from rules/rust/remote/BUILD.instant-0.1.9.bazel rename to rules/rust/remote/BUILD.instant-0.1.12.bazel index 8534c40..4c94fe7 100644 --- a/rules/rust/remote/BUILD.instant-0.1.9.bazel +++ b/rules/rust/remote/BUILD.instant-0.1.12.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=instant", "manual", ], - version = "0.1.9", + version = "0.1.12", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", diff --git a/rules/rust/remote/BUILD.itertools-0.10.0.bazel b/rules/rust/remote/BUILD.itertools-0.10.3.bazel similarity index 92% rename from rules/rust/remote/BUILD.itertools-0.10.0.bazel rename to rules/rust/remote/BUILD.itertools-0.10.3.bazel index 1f420e5..1c61118 100644 --- a/rules/rust/remote/BUILD.itertools-0.10.0.bazel +++ b/rules/rust/remote/BUILD.itertools-0.10.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -57,7 +58,6 @@ rust_library( "use_std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -65,9 +65,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=itertools", "manual", ], - version = "0.10.0", + version = "0.10.3", # buildifier: leave-alone deps = [ "@raze__either__1_6_1//:either", @@ -76,7 +77,7 @@ rust_library( # Unsupported target "adaptors_no_collect" with type "test" omitted -# Unsupported target "fold_specialization" with type "test" omitted +# Unsupported target "flatten_ok" with type "test" omitted # Unsupported target "macros_hygiene" with type "test" omitted diff --git a/rules/rust/remote/BUILD.itertools-0.9.0.bazel b/rules/rust/remote/BUILD.itertools-0.9.0.bazel deleted file mode 100644 index 2c45fa5..0000000 --- a/rules/rust/remote/BUILD.itertools-0.9.0.bazel +++ /dev/null @@ -1,90 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "bench1" with type "bench" omitted - -# Unsupported target "combinations_with_replacement" with type "bench" omitted - -# Unsupported target "fold_specialization" with type "bench" omitted - -# Unsupported target "tree_fold1" with type "bench" omitted - -# Unsupported target "tuple_combinations" with type "bench" omitted - -# Unsupported target "tuples" with type "bench" omitted - -# Unsupported target "iris" with type "example" omitted - -rust_library( - name = "itertools", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "use_std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.0", - # buildifier: leave-alone - deps = [ - "@raze__either__1_6_1//:either", - ], -) - -# Unsupported target "adaptors_no_collect" with type "test" omitted - -# Unsupported target "fold_specialization" with type "test" omitted - -# Unsupported target "merge_join" with type "test" omitted - -# Unsupported target "peeking_take_while" with type "test" omitted - -# Unsupported target "quick" with type "test" omitted - -# Unsupported target "specializations" with type "test" omitted - -# Unsupported target "test_core" with type "test" omitted - -# Unsupported target "test_std" with type "test" omitted - -# Unsupported target "tuples" with type "test" omitted - -# Unsupported target "zip" with type "test" omitted diff --git a/rules/rust/remote/BUILD.itoa-0.4.7.bazel b/rules/rust/remote/BUILD.itoa-1.0.1.bazel similarity index 88% rename from rules/rust/remote/BUILD.itoa-0.4.7.bazel rename to rules/rust/remote/BUILD.itoa-1.0.1.bazel index 7c40d12..9957491 100644 --- a/rules/rust/remote/BUILD.itoa-0.4.7.bazel +++ b/rules/rust/remote/BUILD.itoa-1.0.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,21 +37,19 @@ rust_library( name = "itoa", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=itoa", "manual", ], - version = "0.4.7", + version = "1.0.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.js-sys-0.3.50.bazel b/rules/rust/remote/BUILD.js-sys-0.3.56.bazel similarity index 86% rename from rules/rust/remote/BUILD.js-sys-0.3.50.bazel rename to rules/rust/remote/BUILD.js-sys-0.3.56.bazel index a611510..4a1317e 100644 --- a/rules/rust/remote/BUILD.js-sys-0.3.50.bazel +++ b/rules/rust/remote/BUILD.js-sys-0.3.56.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,12 +44,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=js-sys", "manual", ], - version = "0.3.50", + version = "0.3.56", # buildifier: leave-alone deps = [ - "@raze__wasm_bindgen__0_2_73//:wasm_bindgen", + "@raze__wasm_bindgen__0_2_79//:wasm_bindgen", ], ) diff --git a/rules/rust/remote/BUILD.serde_cbor-0.11.1.bazel b/rules/rust/remote/BUILD.json5-0.4.1.bazel similarity index 56% rename from rules/rust/remote/BUILD.serde_cbor-0.11.1.bazel rename to rules/rust/remote/BUILD.json5-0.4.1.bazel index 60e6aa6..372892d 100644 --- a/rules/rust/remote/BUILD.serde_cbor-0.11.1.bazel +++ b/rules/rust/remote/BUILD.json5-0.4.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,53 +26,46 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # ISC from expression "ISC" ]) # Generated Targets -# Unsupported target "readme" with type "example" omitted - -# Unsupported target "tags" with type "example" omitted - rust_library( - name = "serde_cbor", + name = "json5", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", - data = [], + data = [] + glob(["**/*.pest"]), edition = "2018", + proc_macro_deps = [ + "@raze__pest_derive__2_1_0//:pest_derive", + ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=json5", "manual", ], - version = "0.11.1", + version = "0.4.1", # buildifier: leave-alone deps = [ - "@raze__half__1_7_1//:half", - "@raze__serde__1_0_125//:serde", + "@raze__pest__2_1_3//:pest", + "@raze__serde__1_0_136//:serde", ], ) -# Unsupported target "bennofs" with type "test" omitted +# Unsupported target "adapted_from_js_reference" with type "test" omitted -# Unsupported target "canonical" with type "test" omitted +# Unsupported target "common" with type "test" omitted # Unsupported target "de" with type "test" omitted -# Unsupported target "enum" with type "test" omitted +# Unsupported target "examples" with type "test" omitted + +# Unsupported target "json5_dot_org_example" with type "test" omitted # Unsupported target "ser" with type "test" omitted - -# Unsupported target "std_types" with type "test" omitted - -# Unsupported target "tags" with type "test" omitted - -# Unsupported target "value" with type "test" omitted diff --git a/rules/rust/remote/BUILD.kernel32-sys-0.2.2.bazel b/rules/rust/remote/BUILD.kernel32-sys-0.2.2.bazel deleted file mode 100644 index 17bffdd..0000000 --- a/rules/rust/remote/BUILD.kernel32-sys-0.2.2.bazel +++ /dev/null @@ -1,94 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "kernel32_sys_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.2", - visibility = ["//visibility:private"], - deps = [ - "@raze__winapi_build__0_1_1//:winapi_build", - ], -) - -alias( - name = "kernel32_sys", - actual = ":kernel32", - tags = [ - "cargo-raze", - "manual", - ], -) - -rust_library( - name = "kernel32", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.2", - # buildifier: leave-alone - deps = [ - ":kernel32_sys_build_script", - "@raze__winapi__0_2_8//:winapi", - ], -) diff --git a/rules/rust/remote/BUILD.lazy_static-1.4.0.bazel b/rules/rust/remote/BUILD.lazy_static-1.4.0.bazel index 105e362..eaada7f 100644 --- a/rules/rust/remote/BUILD.lazy_static-1.4.0.bazel +++ b/rules/rust/remote/BUILD.lazy_static-1.4.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=lazy_static", "manual", ], version = "1.4.0", diff --git a/rules/rust/remote/BUILD.oorandom-11.1.3.bazel b/rules/rust/remote/BUILD.levenshtein_automata-0.2.1.bazel similarity index 85% rename from rules/rust/remote/BUILD.oorandom-11.1.3.bazel rename to rules/rust/remote/BUILD.levenshtein_automata-0.2.1.bazel index f035c21..a79d33b 100644 --- a/rules/rust/remote/BUILD.oorandom-11.1.3.bazel +++ b/rules/rust/remote/BUILD.levenshtein_automata-0.2.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "oorandom", + name = "levenshtein_automata", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=levenshtein_automata", "manual", ], - version = "11.1.3", + version = "0.2.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.libc-0.2.93.bazel b/rules/rust/remote/BUILD.libc-0.2.121.bazel similarity index 83% rename from rules/rust/remote/BUILD.libc-0.2.93.bazel rename to rules/rust/remote/BUILD.libc-0.2.121.bazel index 694b478..e870a67 100644 --- a/rules/rust/remote/BUILD.libc-0.2.93.bazel +++ b/rules/rust/remote/BUILD.libc-0.2.121.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,7 +43,6 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "align", "default", "std", ], @@ -56,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.93", + version = "0.2.121", visibility = ["//visibility:private"], deps = [ ], @@ -66,28 +66,21 @@ rust_library( name = "libc", srcs = glob(["**/*.rs"]), crate_features = [ - "align", "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", - "--cfg=libc_priv_mod_use", - "--cfg=libc_union", - "--cfg=libc_const_size_of", - "--cfg=libc_core_cvoid", - "--cfg=libc_align", - "--cfg=libc_packedN", ], tags = [ "cargo-raze", + "crate-name=libc", "manual", ], - version = "0.2.93", + version = "0.2.121", # buildifier: leave-alone deps = [ ":libc_build_script", diff --git a/rules/rust/remote/BUILD.bitflags-1.2.1.bazel b/rules/rust/remote/BUILD.libz-sys-1.1.5.bazel similarity index 77% rename from rules/rust/remote/BUILD.bitflags-1.2.1.bazel rename to rules/rust/remote/BUILD.libz-sys-1.1.5.bazel index e336760..e04e8a1 100644 --- a/rules/rust/remote/BUILD.bitflags-1.2.1.bazel +++ b/rules/rust/remote/BUILD.libz-sys-1.1.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,16 +38,19 @@ load( ) cargo_build_script( - name = "bitflags_build_script", + name = "libz_sys_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ "default", + "libc", + "stock-zlib", ], crate_root = "build.rs", data = glob(["**"]), edition = "2015", + links = "z", rustc_flags = [ "--cap-lints=allow", ], @@ -54,20 +58,23 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.2.1", + version = "1.1.5", visibility = ["//visibility:private"], deps = [ + "@raze__cc__1_0_73//:cc", + "@raze__pkg_config__0_3_24//:pkg_config", ], ) rust_library( - name = "bitflags", + name = "libz_sys", srcs = glob(["**/*.rs"]), crate_features = [ "default", + "libc", + "stock-zlib", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -75,11 +82,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=libz-sys", "manual", ], - version = "1.2.1", + version = "1.1.5", # buildifier: leave-alone deps = [ - ":bitflags_build_script", + ":libz_sys_build_script", + "@raze__libc__0_2_121//:libc", ], ) diff --git a/rules/rust/remote/BUILD.linked-hash-map-0.5.4.bazel b/rules/rust/remote/BUILD.linked-hash-map-0.5.4.bazel index cf74f81..f529fd3 100644 --- a/rules/rust/remote/BUILD.linked-hash-map-0.5.4.bazel +++ b/rules/rust/remote/BUILD.linked-hash-map-0.5.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=linked-hash-map", "manual", ], version = "0.5.4", diff --git a/rules/rust/remote/BUILD.lock_api-0.4.3.bazel b/rules/rust/remote/BUILD.lock_api-0.4.6.bazel similarity index 90% rename from rules/rust/remote/BUILD.lock_api-0.4.3.bazel rename to rules/rust/remote/BUILD.lock_api-0.4.6.bazel index 7e6cd24..a43bd29 100644 --- a/rules/rust/remote/BUILD.lock_api-0.4.3.bazel +++ b/rules/rust/remote/BUILD.lock_api-0.4.6.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=lock_api", "manual", ], - version = "0.4.3", + version = "0.4.6", # buildifier: leave-alone deps = [ "@raze__scopeguard__1_1_0//:scopeguard", diff --git a/rules/rust/remote/BUILD.log-0.4.14.bazel b/rules/rust/remote/BUILD.log-0.4.14.bazel index 5ebfba3..9279fee 100644 --- a/rules/rust/remote/BUILD.log-0.4.14.bazel +++ b/rules/rust/remote/BUILD.log-0.4.14.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,7 +43,6 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "serde", "std", ], crate_root = "build.rs", @@ -67,19 +67,17 @@ rust_library( name = "log", srcs = glob(["**/*.rs"]), crate_features = [ - "serde", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", - "--cfg=atomic_cas", ], tags = [ "cargo-raze", + "crate-name=log", "manual", ], version = "0.4.14", @@ -87,7 +85,6 @@ rust_library( deps = [ ":log_build_script", "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__serde__1_0_125//:serde", ], ) diff --git a/rules/rust/remote/BUILD.log4rs-0.10.0.bazel b/rules/rust/remote/BUILD.log4rs-0.10.0.bazel deleted file mode 100644 index d8d1da4..0000000 --- a/rules/rust/remote/BUILD.log4rs-0.10.0.bazel +++ /dev/null @@ -1,117 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "json_logger" with type "example" omitted - -# Unsupported target "log_to_file" with type "example" omitted - -rust_library( - name = "log4rs", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "all_components", - "ansi_writer", - "antidote", - "chrono", - "compound_policy", - "console_appender", - "console_writer", - "default", - "delete_roller", - "file", - "file_appender", - "fixed_window_roller", - "flate2", - "gzip", - "humantime", - "json_encoder", - "libc", - "log-mdc", - "pattern_encoder", - "rolling_file_appender", - "serde", - "serde-value", - "serde_derive", - "serde_json", - "serde_yaml", - "simple_writer", - "size_trigger", - "thread-id", - "threshold_filter", - "typemap", - "winapi", - "yaml_format", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__serde_derive__1_0_125//:serde_derive", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.10.0", - # buildifier: leave-alone - deps = [ - "@raze__antidote__1_0_0//:antidote", - "@raze__arc_swap__0_4_8//:arc_swap", - "@raze__chrono__0_4_19//:chrono", - "@raze__flate2__1_0_20//:flate2", - "@raze__fnv__1_0_7//:fnv", - "@raze__humantime__1_3_0//:humantime", - "@raze__log__0_4_14//:log", - "@raze__log_mdc__0_1_0//:log_mdc", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__serde_value__0_6_0//:serde_value", - "@raze__serde_yaml__0_8_17//:serde_yaml", - "@raze__thread_id__3_3_0//:thread_id", - "@raze__typemap__0_3_3//:typemap", - ] + selects.with_or({ - # cfg(not(windows)) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.lru-0.6.5.bazel b/rules/rust/remote/BUILD.lru-0.7.3.bazel similarity index 86% rename from rules/rust/remote/BUILD.lru-0.6.5.bazel rename to rules/rust/remote/BUILD.lru-0.7.3.bazel index 818a33d..df97a37 100644 --- a/rules/rust/remote/BUILD.lru-0.6.5.bazel +++ b/rules/rust/remote/BUILD.lru-0.7.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "hashbrown", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,11 +46,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=lru", "manual", ], - version = "0.6.5", + version = "0.7.3", # buildifier: leave-alone deps = [ - "@raze__hashbrown__0_9_1//:hashbrown", + "@raze__hashbrown__0_11_2//:hashbrown", ], ) diff --git a/rules/rust/remote/BUILD.lru-cache-0.1.2.bazel b/rules/rust/remote/BUILD.lru-cache-0.1.2.bazel deleted file mode 100644 index 15e500e..0000000 --- a/rules/rust/remote/BUILD.lru-cache-0.1.2.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "lru_cache", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.2", - # buildifier: leave-alone - deps = [ - "@raze__linked_hash_map__0_5_4//:linked_hash_map", - ], -) diff --git a/rules/rust/remote/BUILD.lz4-sys-1.9.2.bazel b/rules/rust/remote/BUILD.lz4-sys-1.9.2.bazel deleted file mode 100644 index 03382a2..0000000 --- a/rules/rust/remote/BUILD.lz4-sys-1.9.2.bazel +++ /dev/null @@ -1,85 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "lz4_sys_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.9.2", - visibility = ["//visibility:private"], - deps = [ - "@raze__cc__1_0_67//:cc", - ], -) - -rust_library( - name = "lz4_sys", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.9.2", - # buildifier: leave-alone - deps = [ - ":lz4_sys_build_script", - "@raze__libc__0_2_93//:libc", - ], -) diff --git a/rules/rust/remote/BUILD.lz4_flex-0.9.2.bazel b/rules/rust/remote/BUILD.lz4_flex-0.9.2.bazel new file mode 100644 index 0000000..f4881ff --- /dev/null +++ b/rules/rust/remote/BUILD.lz4_flex-0.9.2.bazel @@ -0,0 +1,58 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "crit_bench" with type "bench" omitted + +rust_library( + name = "lz4_flex", + srcs = glob(["**/*.rs"]), + crate_features = [ + "checked-decode", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=lz4_flex", + "manual", + ], + version = "0.9.2", + # buildifier: leave-alone + deps = [ + "@raze__twox_hash__1_6_2//:twox_hash", + ], +) diff --git a/rules/rust/remote/BUILD.maplit-1.0.2.bazel b/rules/rust/remote/BUILD.maplit-1.0.2.bazel index f576fda..23e39c7 100644 --- a/rules/rust/remote/BUILD.maplit-1.0.2.bazel +++ b/rules/rust/remote/BUILD.maplit-1.0.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=maplit", "manual", ], version = "1.0.2", diff --git a/rules/rust/remote/BUILD.match_cfg-0.1.0.bazel b/rules/rust/remote/BUILD.match_cfg-0.1.0.bazel deleted file mode 100644 index e3fe66c..0000000 --- a/rules/rust/remote/BUILD.match_cfg-0.1.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "match_cfg", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "use_core", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.0", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.phf-0.8.0.bazel b/rules/rust/remote/BUILD.matchers-0.1.0.bazel similarity index 82% rename from rules/rust/remote/BUILD.phf-0.8.0.bazel rename to rules/rust/remote/BUILD.matchers-0.1.0.bazel index 9deb32d..87ee8cf 100644 --- a/rules/rust/remote/BUILD.phf-0.8.0.bazel +++ b/rules/rust/remote/BUILD.matchers-0.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "phf", + name = "matchers", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,11 +44,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=matchers", "manual", ], - version = "0.8.0", + version = "0.1.0", # buildifier: leave-alone deps = [ - "@raze__phf_shared__0_8_0//:phf_shared", + "@raze__regex_automata__0_1_10//:regex_automata", ], ) diff --git a/rules/rust/remote/BUILD.matches-0.1.8.bazel b/rules/rust/remote/BUILD.matches-0.1.8.bazel deleted file mode 100644 index 592ef49..0000000 --- a/rules/rust/remote/BUILD.matches-0.1.8.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "matches", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.8", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "macro_use_one" with type "test" omitted diff --git a/rules/rust/remote/BUILD.maybe-uninit-2.0.0.bazel b/rules/rust/remote/BUILD.maybe-uninit-2.0.0.bazel deleted file mode 100644 index be9d157..0000000 --- a/rules/rust/remote/BUILD.maybe-uninit-2.0.0.bazel +++ /dev/null @@ -1,85 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "maybe_uninit_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.0.0", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "maybe_uninit", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.0.0", - # buildifier: leave-alone - deps = [ - ":maybe_uninit_build_script", - ], -) - -# Unsupported target "doesnt_drop" with type "test" omitted diff --git a/rules/rust/remote/BUILD.log-ndc-0.2.0.bazel b/rules/rust/remote/BUILD.measure_time-0.8.0.bazel similarity index 79% rename from rules/rust/remote/BUILD.log-ndc-0.2.0.bazel rename to rules/rust/remote/BUILD.measure_time-0.8.0.bazel index 3f8c792..4912e22 100644 --- a/rules/rust/remote/BUILD.log-ndc-0.2.0.bazel +++ b/rules/rust/remote/BUILD.measure_time-0.8.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,28 +26,28 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "unencumbered", # Unlicense from expression "Unlicense" ]) # Generated Targets rust_library( - name = "log_ndc", + name = "measure_time", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=measure_time", "manual", ], - version = "0.2.0", + version = "0.8.0", # buildifier: leave-alone deps = [ "@raze__log__0_4_14//:log", diff --git a/rules/rust/remote/BUILD.memchr-2.3.4.bazel b/rules/rust/remote/BUILD.memchr-2.4.1.bazel similarity index 89% rename from rules/rust/remote/BUILD.memchr-2.3.4.bazel rename to rules/rust/remote/BUILD.memchr-2.4.1.bazel index 39355e9..477e3e6 100644 --- a/rules/rust/remote/BUILD.memchr-2.3.4.bazel +++ b/rules/rust/remote/BUILD.memchr-2.4.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -44,11 +45,10 @@ cargo_build_script( crate_features = [ "default", "std", - "use_std", ], crate_root = "build.rs", data = glob(["**"]), - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], @@ -56,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "2.3.4", + version = "2.4.1", visibility = ["//visibility:private"], deps = [ ], @@ -68,20 +68,19 @@ rust_library( crate_features = [ "default", "std", - "use_std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=memchr", "manual", ], - version = "2.3.4", + version = "2.4.1", # buildifier: leave-alone deps = [ ":memchr_build_script", diff --git a/rules/rust/remote/BUILD.memmap-0.7.0.bazel b/rules/rust/remote/BUILD.memmap2-0.5.3.bazel similarity index 86% rename from rules/rust/remote/BUILD.memmap-0.7.0.bazel rename to rules/rust/remote/BUILD.memmap2-0.5.3.bazel index a94ff6f..421955a 100644 --- a/rules/rust/remote/BUILD.memmap-0.7.0.bazel +++ b/rules/rust/remote/BUILD.memmap2-0.5.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -33,24 +34,24 @@ licenses([ # Unsupported target "cat" with type "example" omitted rust_library( - name = "memmap", + name = "memmap2", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=memmap2", "manual", ], - version = "0.7.0", + version = "0.5.3", # buildifier: leave-alone deps = [ ] + selects.with_or({ @@ -59,7 +60,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.memoffset-0.6.3.bazel b/rules/rust/remote/BUILD.memoffset-0.6.3.bazel deleted file mode 100644 index 747e5f2..0000000 --- a/rules/rust/remote/BUILD.memoffset-0.6.3.bazel +++ /dev/null @@ -1,86 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "memoffset_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "default", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.3", - visibility = ["//visibility:private"], - deps = [ - "@raze__autocfg__1_0_1//:autocfg", - ], -) - -rust_library( - name = "memoffset", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.3", - # buildifier: leave-alone - deps = [ - ":memoffset_build_script", - ], -) diff --git a/rules/rust/remote/BUILD.memoffset-0.5.6.bazel b/rules/rust/remote/BUILD.memoffset-0.6.5.bazel similarity index 89% rename from rules/rust/remote/BUILD.memoffset-0.5.6.bazel rename to rules/rust/remote/BUILD.memoffset-0.6.5.bazel index df671ba..17ad3dc 100644 --- a/rules/rust/remote/BUILD.memoffset-0.5.6.bazel +++ b/rules/rust/remote/BUILD.memoffset-0.6.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -54,10 +55,10 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.5.6", + version = "0.6.5", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", + "@raze__autocfg__1_1_0//:autocfg", ], ) @@ -68,7 +69,6 @@ rust_library( "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -76,9 +76,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=memoffset", "manual", ], - version = "0.5.6", + version = "0.6.5", # buildifier: leave-alone deps = [ ":memoffset_build_script", diff --git a/rules/rust/remote/BUILD.actix-rt-1.1.1.bazel b/rules/rust/remote/BUILD.minimal-lexical-0.2.1.bazel similarity index 54% rename from rules/rust/remote/BUILD.actix-rt-1.1.1.bazel rename to rules/rust/remote/BUILD.minimal-lexical-0.2.1.bazel index 42cbbc4..efe7cf2 100644 --- a/rules/rust/remote/BUILD.actix-rt-1.1.1.bazel +++ b/rules/rust/remote/BUILD.minimal-lexical-0.2.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,34 +32,48 @@ licenses([ # Generated Targets rust_library( - name = "actix_rt", + name = "minimal_lexical", srcs = glob(["**/*.rs"]), crate_features = [ + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", - proc_macro_deps = [ - "@raze__actix_macros__0_1_3//:actix_macros", - ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=minimal-lexical", "manual", ], - version = "1.1.1", + version = "0.2.1", # buildifier: leave-alone deps = [ - "@raze__actix_threadpool__0_3_3//:actix_threadpool", - "@raze__copyless__0_1_5//:copyless", - "@raze__futures_channel__0_3_14//:futures_channel", - "@raze__futures_util__0_3_14//:futures_util", - "@raze__smallvec__1_6_1//:smallvec", - "@raze__tokio__0_2_25//:tokio", ], ) +# Unsupported target "bellerophon" with type "test" omitted + +# Unsupported target "bellerophon_tests" with type "test" omitted + # Unsupported target "integration_tests" with type "test" omitted + +# Unsupported target "lemire_tests" with type "test" omitted + +# Unsupported target "libm_tests" with type "test" omitted + +# Unsupported target "mask_tests" with type "test" omitted + +# Unsupported target "number_tests" with type "test" omitted + +# Unsupported target "parse_tests" with type "test" omitted + +# Unsupported target "rounding_tests" with type "test" omitted + +# Unsupported target "slow_tests" with type "test" omitted + +# Unsupported target "stackvec" with type "test" omitted + +# Unsupported target "vec_tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.miniz_oxide-0.4.4.bazel b/rules/rust/remote/BUILD.miniz_oxide-0.4.4.bazel deleted file mode 100644 index ae1b8d6..0000000 --- a/rules/rust/remote/BUILD.miniz_oxide-0.4.4.bazel +++ /dev/null @@ -1,85 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR (Zlib OR Apache-2.0)" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "miniz_oxide_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.4", - visibility = ["//visibility:private"], - deps = [ - "@raze__autocfg__1_0_1//:autocfg", - ], -) - -rust_library( - name = "miniz_oxide", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.4", - # buildifier: leave-alone - deps = [ - ":miniz_oxide_build_script", - "@raze__adler__1_0_2//:adler", - ], -) diff --git a/rules/rust/remote/BUILD.mio-0.6.23.bazel b/rules/rust/remote/BUILD.mio-0.6.23.bazel deleted file mode 100644 index 7cc331e..0000000 --- a/rules/rust/remote/BUILD.mio-0.6.23.bazel +++ /dev/null @@ -1,73 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "mio", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - "with-deprecated", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.23", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__iovec__0_1_4//:iovec", - "@raze__log__0_4_14//:log", - "@raze__net2__0_2_37//:net2", - "@raze__slab__0_4_2//:slab", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.mio-0.7.11.bazel b/rules/rust/remote/BUILD.mio-0.8.2.bazel similarity index 86% rename from rules/rust/remote/BUILD.mio-0.7.11.bazel rename to rules/rust/remote/BUILD.mio-0.8.2.bazel index 63f8629..f206d89 100644 --- a/rules/rust/remote/BUILD.mio-0.7.11.bazel +++ b/rules/rust/remote/BUILD.mio-0.8.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,6 +31,8 @@ licenses([ # Generated Targets +# Unsupported target "tcp_listenfd_server" with type "example" omitted + # Unsupported target "tcp_server" with type "example" omitted # Unsupported target "udp_server" with type "example" omitted @@ -44,13 +47,8 @@ rust_library( "net", "os-ext", "os-poll", - "os-util", - "tcp", - "udp", - "uds", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -58,9 +56,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=mio", "manual", ], - version = "0.7.11", + version = "0.8.2", # buildifier: leave-alone deps = [ "@raze__log__0_4_14//:log", @@ -70,7 +69,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.mio-uds-0.6.8.bazel b/rules/rust/remote/BUILD.mio-uds-0.6.8.bazel deleted file mode 100644 index e171e0f..0000000 --- a/rules/rust/remote/BUILD.mio-uds-0.6.8.bazel +++ /dev/null @@ -1,66 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "mio_uds", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.8", - # buildifier: leave-alone - deps = [ - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__iovec__0_1_4//:iovec", - "@raze__libc__0_2_93//:libc", - "@raze__mio__0_6_23//:mio", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.miow-0.2.2.bazel b/rules/rust/remote/BUILD.miow-0.2.2.bazel deleted file mode 100644 index d10503b..0000000 --- a/rules/rust/remote/BUILD.miow-0.2.2.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "miow", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.2", - # buildifier: leave-alone - deps = [ - "@raze__kernel32_sys__0_2_2//:kernel32_sys", - "@raze__net2__0_2_37//:net2", - "@raze__winapi__0_2_8//:winapi", - "@raze__ws2_32_sys__0_2_1//:ws2_32_sys", - ], -) diff --git a/rules/rust/remote/BUILD.miow-0.3.7.bazel b/rules/rust/remote/BUILD.miow-0.3.7.bazel index 732a095..944e013 100644 --- a/rules/rust/remote/BUILD.miow-0.3.7.bazel +++ b/rules/rust/remote/BUILD.miow-0.3.7.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=miow", "manual", ], version = "0.3.7", diff --git a/rules/rust/remote/BUILD.semver-parser-0.7.0.bazel b/rules/rust/remote/BUILD.multimap-0.8.3.bazel similarity index 87% rename from rules/rust/remote/BUILD.semver-parser-0.7.0.bazel rename to rules/rust/remote/BUILD.multimap-0.8.3.bazel index 4aa6173..a954a6d 100644 --- a/rules/rust/remote/BUILD.semver-parser-0.7.0.bazel +++ b/rules/rust/remote/BUILD.multimap-0.8.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "semver_parser", + name = "multimap", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=multimap", "manual", ], - version = "0.7.0", + version = "0.8.3", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.murmurhash32-0.2.0.bazel b/rules/rust/remote/BUILD.murmurhash32-0.2.0.bazel index f82183c..2292873 100644 --- a/rules/rust/remote/BUILD.murmurhash32-0.2.0.bazel +++ b/rules/rust/remote/BUILD.murmurhash32-0.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=murmurhash32", "manual", ], version = "0.2.0", diff --git a/rules/rust/remote/BUILD.net2-0.2.37.bazel b/rules/rust/remote/BUILD.net2-0.2.37.bazel deleted file mode 100644 index 501b7ab..0000000 --- a/rules/rust/remote/BUILD.net2-0.2.37.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "net2", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - "duration", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.37", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__0_1_10//:cfg_if", - ] + selects.with_or({ - # cfg(any(target_os = "redox", unix, target_os = "wasi")) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.nix-0.14.1.bazel b/rules/rust/remote/BUILD.nix-0.14.1.bazel deleted file mode 100644 index 5bf9698..0000000 --- a/rules/rust/remote/BUILD.nix-0.14.1.bazel +++ /dev/null @@ -1,113 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "nix_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.14.1", - visibility = ["//visibility:private"], - deps = [ - ] + selects.with_or({ - # cfg(any(target_os = "android", target_os = "linux")) - ( - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), -) - -rust_library( - name = "nix", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.14.1", - # buildifier: leave-alone - deps = [ - ":nix_build_script", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__libc__0_2_93//:libc", - "@raze__void__1_0_2//:void", - ] + selects.with_or({ - # cfg(any(target_os = "android", target_os = "linux")) - ( - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), -) - -# Unsupported target "test" with type "test" omitted - -# Unsupported target "test-aio-drop" with type "test" omitted - -# Unsupported target "test-lio-listio-resubmit" with type "test" omitted - -# Unsupported target "test-mount" with type "test" omitted - -# Unsupported target "test-ptymaster-drop" with type "test" omitted diff --git a/rules/rust/remote/BUILD.nom-5.1.2.bazel b/rules/rust/remote/BUILD.nom-7.1.1.bazel similarity index 55% rename from rules/rust/remote/BUILD.nom-5.1.2.bazel rename to rules/rust/remote/BUILD.nom-7.1.1.bazel index 8612bbb..6c3aa8e 100644 --- a/rules/rust/remote/BUILD.nom-5.1.2.bazel +++ b/rules/rust/remote/BUILD.nom-7.1.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -29,53 +30,8 @@ licenses([ ]) # Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) -cargo_build_script( - name = "nom_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "alloc", - "default", - "lexical", - "lexical-core", - "std", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "5.1.2", - visibility = ["//visibility:private"], - deps = [ - "@raze__version_check__0_9_3//:version_check", - ], -) - -# Unsupported target "arithmetic" with type "bench" omitted - -# Unsupported target "http" with type "bench" omitted - -# Unsupported target "ini" with type "bench" omitted - -# Unsupported target "ini_complete" with type "bench" omitted - -# Unsupported target "ini_str" with type "bench" omitted - -# Unsupported target "json" with type "bench" omitted +# Unsupported target "iterator" with type "example" omitted # Unsupported target "json" with type "example" omitted @@ -89,12 +45,9 @@ rust_library( crate_features = [ "alloc", "default", - "lexical", - "lexical-core", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -102,14 +55,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=nom", "manual", ], - version = "5.1.2", + version = "7.1.1", # buildifier: leave-alone deps = [ - ":nom_build_script", - "@raze__lexical_core__0_7_5//:lexical_core", - "@raze__memchr__2_3_4//:memchr", + "@raze__memchr__2_4_1//:memchr", + "@raze__minimal_lexical__0_2_1//:minimal_lexical", ], ) @@ -117,8 +70,6 @@ rust_library( # Unsupported target "arithmetic_ast" with type "test" omitted -# Unsupported target "blockbuf-arithmetic" with type "test" omitted - # Unsupported target "css" with type "test" omitted # Unsupported target "custom_errors" with type "test" omitted @@ -127,7 +78,7 @@ rust_library( # Unsupported target "float" with type "test" omitted -# Unsupported target "inference" with type "test" omitted +# Unsupported target "fnmut" with type "test" omitted # Unsupported target "ini" with type "test" omitted @@ -141,10 +92,6 @@ rust_library( # Unsupported target "multiline" with type "test" omitted -# Unsupported target "named_args" with type "test" omitted - # Unsupported target "overflow" with type "test" omitted # Unsupported target "reborrow_fold" with type "test" omitted - -# Unsupported target "test1" with type "test" omitted diff --git a/rules/rust/remote/BUILD.ntapi-0.3.6.bazel b/rules/rust/remote/BUILD.ntapi-0.3.7.bazel similarity index 92% rename from rules/rust/remote/BUILD.ntapi-0.3.6.bazel rename to rules/rust/remote/BUILD.ntapi-0.3.7.bazel index 685bbbd..7e836f2 100644 --- a/rules/rust/remote/BUILD.ntapi-0.3.6.bazel +++ b/rules/rust/remote/BUILD.ntapi-0.3.7.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -55,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.3.6", + version = "0.3.7", visibility = ["//visibility:private"], deps = [ ], @@ -69,7 +70,6 @@ rust_library( "user", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -77,9 +77,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ntapi", "manual", ], - version = "0.3.6", + version = "0.3.7", # buildifier: leave-alone deps = [ ":ntapi_build_script", diff --git a/rules/rust/remote/BUILD.num-integer-0.1.44.bazel b/rules/rust/remote/BUILD.num-integer-0.1.44.bazel index 191d76d..c01b9c5 100644 --- a/rules/rust/remote/BUILD.num-integer-0.1.44.bazel +++ b/rules/rust/remote/BUILD.num-integer-0.1.44.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,8 +43,6 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "i128", - "std", ], crate_root = "build.rs", data = glob(["**"]), @@ -58,7 +57,7 @@ cargo_build_script( version = "0.1.44", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", + "@raze__autocfg__1_1_0//:autocfg", ], ) @@ -72,11 +71,8 @@ rust_library( name = "num_integer", srcs = glob(["**/*.rs"]), crate_features = [ - "i128", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -84,6 +80,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=num-integer", "manual", ], version = "0.1.44", diff --git a/rules/rust/remote/BUILD.num-traits-0.1.43.bazel b/rules/rust/remote/BUILD.num-traits-0.1.43.bazel deleted file mode 100644 index 9b3c0f9..0000000 --- a/rules/rust/remote/BUILD.num-traits-0.1.43.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "num_traits", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.43", - # buildifier: leave-alone - deps = [ - "@raze__num_traits__0_2_14//:num_traits", - ], -) diff --git a/rules/rust/remote/BUILD.num-traits-0.2.14.bazel b/rules/rust/remote/BUILD.num-traits-0.2.14.bazel index 399f2a8..a2a1885 100644 --- a/rules/rust/remote/BUILD.num-traits-0.2.14.bazel +++ b/rules/rust/remote/BUILD.num-traits-0.2.14.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,9 +43,6 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "default", - "i128", - "std", ], crate_root = "build.rs", data = glob(["**"]), @@ -59,7 +57,7 @@ cargo_build_script( version = "0.2.14", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", + "@raze__autocfg__1_1_0//:autocfg", ], ) @@ -67,12 +65,8 @@ rust_library( name = "num_traits", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "i128", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -80,6 +74,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=num-traits", "manual", ], version = "0.2.14", diff --git a/rules/rust/remote/BUILD.num_cpus-1.13.0.bazel b/rules/rust/remote/BUILD.num_cpus-1.13.0.bazel deleted file mode 100644 index 75cf0c1..0000000 --- a/rules/rust/remote/BUILD.num_cpus-1.13.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "values" with type "example" omitted - -rust_library( - name = "num_cpus", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.13.0", - # buildifier: leave-alone - deps = [ - "@raze__libc__0_2_93//:libc", - ], -) diff --git a/rules/rust/remote/BUILD.iovec-0.1.4.bazel b/rules/rust/remote/BUILD.num_cpus-1.13.1.bazel similarity index 81% rename from rules/rust/remote/BUILD.iovec-0.1.4.bazel rename to rules/rust/remote/BUILD.num_cpus-1.13.1.bazel index ce03f5d..8072c09 100644 --- a/rules/rust/remote/BUILD.iovec-0.1.4.bazel +++ b/rules/rust/remote/BUILD.num_cpus-1.13.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,15 +31,16 @@ licenses([ # Generated Targets +# Unsupported target "values" with type "example" omitted + rust_library( - name = "iovec", + name = "num_cpus", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,18 +48,19 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=num_cpus", "manual", ], - version = "0.1.4", + version = "1.13.1", # buildifier: leave-alone deps = [ ] + selects.with_or({ - # cfg(unix) + # cfg(not(windows)) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.signal-hook-0.2.3.bazel b/rules/rust/remote/BUILD.num_enum-0.5.7.bazel similarity index 55% rename from rules/rust/remote/BUILD.signal-hook-0.2.3.bazel rename to rules/rust/remote/BUILD.num_enum-0.5.7.bazel index 51eb3aa..43c718e 100644 --- a/rules/rust/remote/BUILD.signal-hook-0.2.3.bazel +++ b/rules/rust/remote/BUILD.num_enum-0.5.7.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,39 +26,48 @@ package(default_visibility = [ ]) licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" + "notice", # BSD-3-Clause from expression "BSD-3-Clause OR (MIT OR Apache-2.0)" ]) # Generated Targets rust_library( - name = "signal_hook", + name = "num_enum", srcs = glob(["**/*.rs"]), crate_features = [ + "default", + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", + proc_macro_deps = [ + "@raze__num_enum_derive__0_5_7//:num_enum_derive", + ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=num_enum", "manual", ], - version = "0.2.3", + version = "0.5.7", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_93//:libc", - "@raze__signal_hook_registry__1_3_0//:signal_hook_registry", ], ) -# Unsupported target "cleanup" with type "test" omitted - -# Unsupported target "cleanup_indirect" with type "test" omitted - # Unsupported target "default" with type "test" omitted -# Unsupported target "iterator" with type "test" omitted +# Unsupported target "from_primitive" with type "test" omitted + +# Unsupported target "into_primitive" with type "test" omitted + +# Unsupported target "renamed_num_enum" with type "test" omitted + +# Unsupported target "try_build" with type "test" omitted + +# Unsupported target "try_from_primitive" with type "test" omitted + +# Unsupported target "unsafe_from_primitive" with type "test" omitted diff --git a/rules/rust/remote/BUILD.num_enum_derive-0.5.7.bazel b/rules/rust/remote/BUILD.num_enum_derive-0.5.7.bazel new file mode 100644 index 0000000..ec38bc0 --- /dev/null +++ b/rules/rust/remote/BUILD.num_enum_derive-0.5.7.bazel @@ -0,0 +1,60 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # BSD-3-Clause from expression "BSD-3-Clause OR (MIT OR Apache-2.0)" +]) + +# Generated Targets + +rust_proc_macro( + name = "num_enum_derive", + srcs = glob(["**/*.rs"]), + crate_features = [ + "proc-macro-crate", + "std", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=num_enum_derive", + "manual", + ], + version = "0.5.7", + # buildifier: leave-alone + deps = [ + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__proc_macro_crate__1_1_3//:proc_macro_crate", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", + ], +) diff --git a/rules/rust/remote/BUILD.thread-id-3.3.0.bazel b/rules/rust/remote/BUILD.num_threads-0.1.5.bazel similarity index 80% rename from rules/rust/remote/BUILD.thread-id-3.3.0.bazel rename to rules/rust/remote/BUILD.num_threads-0.1.5.bazel index 04b4590..88bdbbe 100644 --- a/rules/rust/remote/BUILD.thread-id-3.3.0.bazel +++ b/rules/rust/remote/BUILD.num_threads-0.1.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,13 @@ licenses([ # Generated Targets rust_library( - name = "thread_id", + name = "num_threads", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,18 +46,18 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=num_threads", "manual", ], - version = "3.3.0", + version = "0.1.5", # buildifier: leave-alone deps = [ ] + selects.with_or({ - # cfg(unix) + # cfg(any(target_os = "macos", target_os = "ios", target_os = "freebsd")) ( "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.object-0.23.0.bazel b/rules/rust/remote/BUILD.object-0.23.0.bazel deleted file mode 100644 index 7f77d80..0000000 --- a/rules/rust/remote/BUILD.object-0.23.0.bazel +++ /dev/null @@ -1,76 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "ar" with type "example" omitted - -# Unsupported target "nm" with type "example" omitted - -# Unsupported target "objcopy" with type "example" omitted - -# Unsupported target "objdump" with type "example" omitted - -# Unsupported target "objectmap" with type "example" omitted - -# Unsupported target "readobj" with type "example" omitted - -rust_library( - name = "object", - srcs = glob(["**/*.rs"]), - crate_features = [ - "archive", - "coff", - "elf", - "macho", - "pe", - "read_core", - "unaligned", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.23.0", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "integration" with type "test" omitted - -# Unsupported target "parse_self" with type "test" omitted diff --git a/rules/rust/remote/BUILD.once_cell-1.7.2.bazel b/rules/rust/remote/BUILD.once_cell-1.10.0.bazel similarity index 93% rename from rules/rust/remote/BUILD.once_cell-1.7.2.bazel rename to rules/rust/remote/BUILD.once_cell-1.10.0.bazel index c0873e5..1c93fe9 100644 --- a/rules/rust/remote/BUILD.once_cell-1.7.2.bazel +++ b/rules/rust/remote/BUILD.once_cell-1.10.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -54,7 +55,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -62,9 +62,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=once_cell", "manual", ], - version = "1.7.2", + version = "1.10.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.rustc_version-0.2.3.bazel b/rules/rust/remote/BUILD.opaque-debug-0.2.3.bazel similarity index 88% rename from rules/rust/remote/BUILD.rustc_version-0.2.3.bazel rename to rules/rust/remote/BUILD.opaque-debug-0.2.3.bazel index 1103d1c..d33f701 100644 --- a/rules/rust/remote/BUILD.rustc_version-0.2.3.bazel +++ b/rules/rust/remote/BUILD.opaque-debug-0.2.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "rustc_version", + name = "opaque_debug", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,11 +44,11 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=opaque-debug", "manual", ], version = "0.2.3", # buildifier: leave-alone deps = [ - "@raze__semver__0_9_0//:semver", ], ) diff --git a/rules/rust/remote/BUILD.opaque-debug-0.3.0.bazel b/rules/rust/remote/BUILD.opaque-debug-0.3.0.bazel deleted file mode 100644 index ac5c493..0000000 --- a/rules/rust/remote/BUILD.opaque-debug-0.3.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "opaque_debug", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.0", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "mod" with type "test" omitted diff --git a/rules/rust/remote/BUILD.opentelemetry-0.17.0.bazel b/rules/rust/remote/BUILD.opentelemetry-0.17.0.bazel new file mode 100644 index 0000000..28bdcd8 --- /dev/null +++ b/rules/rust/remote/BUILD.opentelemetry-0.17.0.bazel @@ -0,0 +1,86 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "batch_span_processor" with type "bench" omitted + +# Unsupported target "ddsketch" with type "bench" omitted + +# Unsupported target "metric" with type "bench" omitted + +# Unsupported target "trace" with type "bench" omitted + +rust_library( + name = "opentelemetry", + srcs = glob(["**/*.rs"]), + crate_features = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "default", + "fnv", + "metrics", + "percent-encoding", + "pin-project", + "rand", + "trace", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + proc_macro_deps = [ + "@raze__async_trait__0_1_52//:async_trait", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=opentelemetry", + "manual", + ], + version = "0.17.0", + # buildifier: leave-alone + deps = [ + "@raze__crossbeam_channel__0_5_4//:crossbeam_channel", + "@raze__dashmap__4_0_2//:dashmap", + "@raze__fnv__1_0_7//:fnv", + "@raze__futures_channel__0_3_21//:futures_channel", + "@raze__futures_executor__0_3_21//:futures_executor", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__percent_encoding__2_1_0//:percent_encoding", + "@raze__pin_project__1_0_10//:pin_project", + "@raze__rand__0_8_5//:rand", + "@raze__thiserror__1_0_30//:thiserror", + ], +) diff --git a/rules/rust/remote/BUILD.crypto-mac-0.10.0.bazel b/rules/rust/remote/BUILD.opentelemetry-prometheus-0.10.0.bazel similarity index 67% rename from rules/rust/remote/BUILD.crypto-mac-0.10.0.bazel rename to rules/rust/remote/BUILD.opentelemetry-prometheus-0.10.0.bazel index 3549dff..37ba38f 100644 --- a/rules/rust/remote/BUILD.crypto-mac-0.10.0.bazel +++ b/rules/rust/remote/BUILD.opentelemetry-prometheus-0.10.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,18 +26,17 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # Apache-2.0 from expression "Apache-2.0" ]) # Generated Targets rust_library( - name = "crypto_mac", + name = "opentelemetry_prometheus", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,12 +44,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=opentelemetry-prometheus", "manual", ], version = "0.10.0", # buildifier: leave-alone deps = [ - "@raze__generic_array__0_14_4//:generic_array", - "@raze__subtle__2_4_0//:subtle", + "@raze__opentelemetry__0_17_0//:opentelemetry", + "@raze__prometheus__0_13_0//:prometheus", + "@raze__protobuf__2_27_1//:protobuf", ], ) + +# Unsupported target "integration_test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.ordered-float-1.1.1.bazel b/rules/rust/remote/BUILD.ordered-float-1.1.1.bazel deleted file mode 100644 index c524dea..0000000 --- a/rules/rust/remote/BUILD.ordered-float-1.1.1.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "ordered_float", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.1.1", - # buildifier: leave-alone - deps = [ - "@raze__num_traits__0_2_14//:num_traits", - ], -) - -# Unsupported target "test" with type "test" omitted - -# Unsupported target "test_deprecated_names" with type "test" omitted diff --git a/rules/rust/remote/BUILD.ordered-multimap-0.3.1.bazel b/rules/rust/remote/BUILD.ordered-multimap-0.3.1.bazel new file mode 100644 index 0000000..b13d54f --- /dev/null +++ b/rules/rust/remote/BUILD.ordered-multimap-0.3.1.bazel @@ -0,0 +1,56 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "ordered_multimap", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=ordered-multimap", + "manual", + ], + version = "0.3.1", + # buildifier: leave-alone + deps = [ + "@raze__dlv_list__0_2_3//:dlv_list", + "@raze__hashbrown__0_9_1//:hashbrown", + ], +) diff --git a/rules/rust/remote/BUILD.erased-serde-0.3.13.bazel b/rules/rust/remote/BUILD.os_str_bytes-6.0.0.bazel similarity index 80% rename from rules/rust/remote/BUILD.erased-serde-0.3.13.bazel rename to rules/rust/remote/BUILD.os_str_bytes-6.0.0.bazel index d28369c..6c1f7fa 100644 --- a/rules/rust/remote/BUILD.erased-serde-0.3.13.bazel +++ b/rules/rust/remote/BUILD.os_str_bytes-6.0.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,14 @@ licenses([ # Generated Targets rust_library( - name = "erased_serde", + name = "os_str_bytes", srcs = glob(["**/*.rs"]), crate_features = [ "default", - "std", + "memchr", + "raw_os_str", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,13 +47,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=os_str_bytes", "manual", ], - version = "0.3.13", + version = "6.0.0", # buildifier: leave-alone deps = [ - "@raze__serde__1_0_125//:serde", + "@raze__memchr__2_4_1//:memchr", ], ) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.output_vt100-0.1.3.bazel b/rules/rust/remote/BUILD.output_vt100-0.1.3.bazel new file mode 100644 index 0000000..9a94658 --- /dev/null +++ b/rules/rust/remote/BUILD.output_vt100-0.1.3.bazel @@ -0,0 +1,57 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "red-hello" with type "example" omitted + +rust_library( + name = "output_vt100", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=output_vt100", + "manual", + ], + version = "0.1.3", + # buildifier: leave-alone + deps = [ + "@raze__winapi__0_3_9//:winapi", + ], +) diff --git a/rules/rust/remote/BUILD.owned-read-0.4.1.bazel b/rules/rust/remote/BUILD.ownedbytes-0.2.0.bazel similarity index 87% rename from rules/rust/remote/BUILD.owned-read-0.4.1.bazel rename to rules/rust/remote/BUILD.ownedbytes-0.2.0.bazel index db21311..c74f449 100644 --- a/rules/rust/remote/BUILD.owned-read-0.4.1.bazel +++ b/rules/rust/remote/BUILD.ownedbytes-0.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "owned_read", + name = "ownedbytes", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ownedbytes", "manual", ], - version = "0.4.1", + version = "0.2.0", # buildifier: leave-alone deps = [ "@raze__stable_deref_trait__1_2_0//:stable_deref_trait", diff --git a/rules/rust/remote/BUILD.owning_ref-0.4.1.bazel b/rules/rust/remote/BUILD.owning_ref-0.4.1.bazel deleted file mode 100644 index e0bdebd..0000000 --- a/rules/rust/remote/BUILD.owning_ref-0.4.1.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "owning_ref", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.1", - # buildifier: leave-alone - deps = [ - "@raze__stable_deref_trait__1_2_0//:stable_deref_trait", - ], -) diff --git a/rules/rust/remote/BUILD.pin-project-lite-0.1.12.bazel b/rules/rust/remote/BUILD.parking_lot-0.11.2.bazel similarity index 71% rename from rules/rust/remote/BUILD.pin-project-lite-0.1.12.bazel rename to rules/rust/remote/BUILD.parking_lot-0.11.2.bazel index 60c9f89..2265168 100644 --- a/rules/rust/remote/BUILD.pin-project-lite-0.1.12.bazel +++ b/rules/rust/remote/BUILD.parking_lot-0.11.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,12 @@ licenses([ # Generated Targets rust_library( - name = "pin_project_lite", + name = "parking_lot", srcs = glob(["**/*.rs"]), crate_features = [ + "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,18 +45,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=parking_lot", "manual", ], - version = "0.1.12", + version = "0.11.2", # buildifier: leave-alone deps = [ + "@raze__instant__0_1_12//:instant", + "@raze__lock_api__0_4_6//:lock_api", + "@raze__parking_lot_core__0_8_5//:parking_lot_core", ], ) -# Unsupported target "compiletest" with type "test" omitted - -# Unsupported target "lint" with type "test" omitted - -# Unsupported target "proper_unpin" with type "test" omitted - -# Unsupported target "test" with type "test" omitted +# Unsupported target "issue_203" with type "test" omitted diff --git a/rules/rust/remote/BUILD.parking_lot-0.11.1.bazel b/rules/rust/remote/BUILD.parking_lot-0.12.0.bazel similarity index 80% rename from rules/rust/remote/BUILD.parking_lot-0.11.1.bazel rename to rules/rust/remote/BUILD.parking_lot-0.12.0.bazel index a20c23d..543d42c 100644 --- a/rules/rust/remote/BUILD.parking_lot-0.11.1.bazel +++ b/rules/rust/remote/BUILD.parking_lot-0.12.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -35,9 +36,9 @@ rust_library( srcs = glob(["**/*.rs"]), crate_features = [ "default", + "send_guard", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,14 +46,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=parking_lot", "manual", ], - version = "0.11.1", + version = "0.12.0", # buildifier: leave-alone deps = [ - "@raze__instant__0_1_9//:instant", - "@raze__lock_api__0_4_3//:lock_api", - "@raze__parking_lot_core__0_8_3//:parking_lot_core", + "@raze__lock_api__0_4_6//:lock_api", + "@raze__parking_lot_core__0_9_1//:parking_lot_core", ], ) diff --git a/rules/rust/remote/BUILD.parking_lot_core-0.8.3.bazel b/rules/rust/remote/BUILD.parking_lot_core-0.8.3.bazel deleted file mode 100644 index b4f306b..0000000 --- a/rules/rust/remote/BUILD.parking_lot_core-0.8.3.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -rust_library( - name = "parking_lot_core", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.3", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__instant__0_1_9//:instant", - "@raze__smallvec__1_6_1//:smallvec", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.getrandom-0.2.2.bazel b/rules/rust/remote/BUILD.parking_lot_core-0.8.5.bazel similarity index 77% rename from rules/rust/remote/BUILD.getrandom-0.2.2.bazel rename to rules/rust/remote/BUILD.parking_lot_core-0.8.5.bazel index e4b449b..62cf039 100644 --- a/rules/rust/remote/BUILD.getrandom-0.2.2.bazel +++ b/rules/rust/remote/BUILD.parking_lot_core-0.8.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,7 +26,7 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" ]) # Generated Targets @@ -37,12 +38,11 @@ load( ) cargo_build_script( - name = "getrandom_build_script", + name = "parking_lot_core_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ - "std", ], crate_root = "build.rs", data = glob(["**"]), @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.2", + version = "0.8.5", visibility = ["//visibility:private"], deps = [ ] + selects.with_or({ @@ -68,18 +68,14 @@ cargo_build_script( }), ) -# Unsupported target "mod" with type "bench" omitted - rust_library( - name = "getrandom", + name = "parking_lot_core", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -87,27 +83,24 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=parking_lot_core", "manual", ], - version = "0.2.2", + version = "0.8.5", # buildifier: leave-alone deps = [ - ":getrandom_build_script", + ":parking_lot_core_build_script", "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__instant__0_1_12//:instant", + "@raze__smallvec__1_8_0//:smallvec", ] + selects.with_or({ # cfg(unix) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), ) - -# Unsupported target "custom" with type "test" omitted - -# Unsupported target "normal" with type "test" omitted - -# Unsupported target "rdrand" with type "test" omitted diff --git a/rules/rust/remote/BUILD.getrandom-0.1.16.bazel b/rules/rust/remote/BUILD.parking_lot_core-0.9.1.bazel similarity index 81% rename from rules/rust/remote/BUILD.getrandom-0.1.16.bazel rename to rules/rust/remote/BUILD.parking_lot_core-0.9.1.bazel index a6900c9..c3b1a1d 100644 --- a/rules/rust/remote/BUILD.getrandom-0.1.16.bazel +++ b/rules/rust/remote/BUILD.parking_lot_core-0.9.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,7 +26,7 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" ]) # Generated Targets @@ -37,12 +38,11 @@ load( ) cargo_build_script( - name = "getrandom_build_script", + name = "parking_lot_core_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ - "std", ], crate_root = "build.rs", data = glob(["**"]), @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.1.16", + version = "0.9.1", visibility = ["//visibility:private"], deps = [ ] + selects.with_or({ @@ -68,18 +68,14 @@ cargo_build_script( }), ) -# Unsupported target "mod" with type "bench" omitted - rust_library( - name = "getrandom", + name = "parking_lot_core", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -87,23 +83,23 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=parking_lot_core", "manual", ], - version = "0.1.16", + version = "0.9.1", # buildifier: leave-alone deps = [ - ":getrandom_build_script", + ":parking_lot_core_build_script", "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__smallvec__1_8_0//:smallvec", ] + selects.with_or({ # cfg(unix) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), ) - -# Unsupported target "common" with type "test" omitted diff --git a/rules/rust/remote/BUILD.cpuid-bool-0.1.2.bazel b/rules/rust/remote/BUILD.pathdiff-0.2.1.bazel similarity index 87% rename from rules/rust/remote/BUILD.cpuid-bool-0.1.2.bazel rename to rules/rust/remote/BUILD.pathdiff-0.2.1.bazel index d5b5e7b..f50adbe 100644 --- a/rules/rust/remote/BUILD.cpuid-bool-0.1.2.bazel +++ b/rules/rust/remote/BUILD.pathdiff-0.2.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "cpuid_bool", + name = "pathdiff", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pathdiff", "manual", ], - version = "0.1.2", + version = "0.2.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.percent-encoding-2.1.0.bazel b/rules/rust/remote/BUILD.percent-encoding-2.1.0.bazel index ac4ea27..3a343f2 100644 --- a/rules/rust/remote/BUILD.percent-encoding-2.1.0.bazel +++ b/rules/rust/remote/BUILD.percent-encoding-2.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=percent-encoding", "manual", ], version = "2.1.0", diff --git a/rules/rust/remote/BUILD.mime-0.3.16.bazel b/rules/rust/remote/BUILD.pest-2.1.3.bazel similarity index 73% rename from rules/rust/remote/BUILD.mime-0.3.16.bazel rename to rules/rust/remote/BUILD.pest-2.1.3.bazel index 22c9cb1..a12e962 100644 --- a/rules/rust/remote/BUILD.mime-0.3.16.bazel +++ b/rules/rust/remote/BUILD.pest-2.1.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,19 +31,14 @@ licenses([ # Generated Targets -# Unsupported target "cmp" with type "bench" omitted - -# Unsupported target "fmt" with type "bench" omitted - -# Unsupported target "parse" with type "bench" omitted +# Unsupported target "parens" with type "example" omitted rust_library( - name = "mime", + name = "pest", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -50,10 +46,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pest", "manual", ], - version = "0.3.16", + version = "2.1.3", # buildifier: leave-alone deps = [ + "@raze__ucd_trie__0_1_3//:ucd_trie", ], ) + +# Unsupported target "calculator" with type "test" omitted + +# Unsupported target "json" with type "test" omitted diff --git a/rules/rust/remote/BUILD.humantime-2.1.0.bazel b/rules/rust/remote/BUILD.pest_derive-2.1.0.bazel similarity index 65% rename from rules/rust/remote/BUILD.humantime-2.1.0.bazel rename to rules/rust/remote/BUILD.pest_derive-2.1.0.bazel index 51de9fe..192aebb 100644 --- a/rules/rust/remote/BUILD.humantime-2.1.0.bazel +++ b/rules/rust/remote/BUILD.pest_derive-2.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,28 +31,34 @@ licenses([ # Generated Targets -# Unsupported target "datetime_format" with type "bench" omitted - -# Unsupported target "datetime_parse" with type "bench" omitted - -rust_library( - name = "humantime", +rust_proc_macro( + name = "pest_derive", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=pest_derive", "manual", ], version = "2.1.0", # buildifier: leave-alone deps = [ + "@raze__pest__2_1_3//:pest", + "@raze__pest_generator__2_1_3//:pest_generator", ], ) + +# Unsupported target "grammar" with type "test" omitted + +# Unsupported target "grammar_inline" with type "test" omitted + +# Unsupported target "lists" with type "test" omitted + +# Unsupported target "reporting" with type "test" omitted diff --git a/rules/rust/remote/BUILD.pest_generator-2.1.3.bazel b/rules/rust/remote/BUILD.pest_generator-2.1.3.bazel new file mode 100644 index 0000000..f629267 --- /dev/null +++ b/rules/rust/remote/BUILD.pest_generator-2.1.3.bazel @@ -0,0 +1,59 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "pest_generator", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=pest_generator", + "manual", + ], + version = "2.1.3", + # buildifier: leave-alone + deps = [ + "@raze__pest__2_1_3//:pest", + "@raze__pest_meta__2_1_3//:pest_meta", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", + ], +) diff --git a/rules/rust/remote/BUILD.antidote-1.0.0.bazel b/rules/rust/remote/BUILD.pest_meta-2.1.3.bazel similarity index 81% rename from rules/rust/remote/BUILD.antidote-1.0.0.bazel rename to rules/rust/remote/BUILD.pest_meta-2.1.3.bazel index 8c57776..d6d5bde 100644 --- a/rules/rust/remote/BUILD.antidote-1.0.0.bazel +++ b/rules/rust/remote/BUILD.pest_meta-2.1.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "antidote", + name = "pest_meta", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,10 +44,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pest_meta", "manual", ], - version = "1.0.0", + version = "2.1.3", # buildifier: leave-alone deps = [ + "@raze__maplit__1_0_2//:maplit", + "@raze__pest__2_1_3//:pest", ], ) diff --git a/rules/rust/remote/BUILD.petgraph-0.6.0.bazel b/rules/rust/remote/BUILD.petgraph-0.6.0.bazel new file mode 100644 index 0000000..11fbf2e --- /dev/null +++ b/rules/rust/remote/BUILD.petgraph-0.6.0.bazel @@ -0,0 +1,102 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "bellman_ford" with type "bench" omitted + +# Unsupported target "dijkstra" with type "bench" omitted + +# Unsupported target "feedback_arc_set" with type "bench" omitted + +# Unsupported target "floyd_warshall" with type "bench" omitted + +# Unsupported target "iso" with type "bench" omitted + +# Unsupported target "k_shortest_path" with type "bench" omitted + +# Unsupported target "matching" with type "bench" omitted + +# Unsupported target "matrix_graph" with type "bench" omitted + +# Unsupported target "ograph" with type "bench" omitted + +# Unsupported target "serialize" with type "bench" omitted + +# Unsupported target "stable_graph" with type "bench" omitted + +# Unsupported target "unionfind" with type "bench" omitted + +rust_library( + name = "petgraph", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=petgraph", + "manual", + ], + version = "0.6.0", + # buildifier: leave-alone + deps = [ + "@raze__fixedbitset__0_4_1//:fixedbitset", + "@raze__indexmap__1_8_0//:indexmap", + ], +) + +# Unsupported target "floyd_warshall" with type "test" omitted + +# Unsupported target "graph" with type "test" omitted + +# Unsupported target "graphmap" with type "test" omitted + +# Unsupported target "iso" with type "test" omitted + +# Unsupported target "k_shortest_path" with type "test" omitted + +# Unsupported target "list" with type "test" omitted + +# Unsupported target "matching" with type "test" omitted + +# Unsupported target "operator" with type "test" omitted + +# Unsupported target "quickcheck" with type "test" omitted + +# Unsupported target "stable_graph" with type "test" omitted + +# Unsupported target "unionfind" with type "test" omitted diff --git a/rules/rust/remote/BUILD.pin-project-0.4.28.bazel b/rules/rust/remote/BUILD.pin-project-0.4.28.bazel deleted file mode 100644 index 36fb7db..0000000 --- a/rules/rust/remote/BUILD.pin-project-0.4.28.bazel +++ /dev/null @@ -1,104 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "enum-default" with type "example" omitted - -# Unsupported target "enum-default-expanded" with type "example" omitted - -# Unsupported target "not_unpin" with type "example" omitted - -# Unsupported target "not_unpin-expanded" with type "example" omitted - -# Unsupported target "pinned_drop" with type "example" omitted - -# Unsupported target "pinned_drop-expanded" with type "example" omitted - -# Unsupported target "project_replace" with type "example" omitted - -# Unsupported target "project_replace-expanded" with type "example" omitted - -# Unsupported target "struct-default" with type "example" omitted - -# Unsupported target "struct-default-expanded" with type "example" omitted - -# Unsupported target "unsafe_unpin" with type "example" omitted - -# Unsupported target "unsafe_unpin-expanded" with type "example" omitted - -rust_library( - name = "pin_project", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__pin_project_internal__0_4_28//:pin_project_internal", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.28", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "cfg" with type "test" omitted - -# Unsupported target "compiletest" with type "test" omitted - -# Unsupported target "drop_order" with type "test" omitted - -# Unsupported target "lint" with type "test" omitted - -# Unsupported target "pin_project" with type "test" omitted - -# Unsupported target "pinned_drop" with type "test" omitted - -# Unsupported target "project" with type "test" omitted - -# Unsupported target "project_ref" with type "test" omitted - -# Unsupported target "project_replace" with type "test" omitted - -# Unsupported target "repr_packed" with type "test" omitted - -# Unsupported target "sized" with type "test" omitted - -# Unsupported target "unsafe_unpin" with type "test" omitted diff --git a/rules/rust/remote/BUILD.pin-project-1.0.7.bazel b/rules/rust/remote/BUILD.pin-project-1.0.10.bazel similarity index 92% rename from rules/rust/remote/BUILD.pin-project-1.0.7.bazel rename to rules/rust/remote/BUILD.pin-project-1.0.10.bazel index fc18fe3..d1c772b 100644 --- a/rules/rust/remote/BUILD.pin-project-1.0.7.bazel +++ b/rules/rust/remote/BUILD.pin-project-1.0.10.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -60,20 +61,20 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", proc_macro_deps = [ - "@raze__pin_project_internal__1_0_7//:pin_project_internal", + "@raze__pin_project_internal__1_0_10//:pin_project_internal", ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=pin-project", "manual", ], - version = "1.0.7", + version = "1.0.10", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.pin-project-internal-0.4.28.bazel b/rules/rust/remote/BUILD.pin-project-internal-0.4.28.bazel deleted file mode 100644 index abaca42..0000000 --- a/rules/rust/remote/BUILD.pin-project-internal-0.4.28.bazel +++ /dev/null @@ -1,86 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "pin_project_internal_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.28", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "pin_project_internal", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.28", - # buildifier: leave-alone - deps = [ - ":pin_project_internal_build_script", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.pin-project-internal-1.0.10.bazel b/rules/rust/remote/BUILD.pin-project-internal-1.0.10.bazel new file mode 100644 index 0000000..e679b79 --- /dev/null +++ b/rules/rust/remote/BUILD.pin-project-internal-1.0.10.bazel @@ -0,0 +1,57 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" +]) + +# Generated Targets + +rust_proc_macro( + name = "pin_project_internal", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=pin-project-internal", + "manual", + ], + version = "1.0.10", + # buildifier: leave-alone + deps = [ + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", + ], +) diff --git a/rules/rust/remote/BUILD.pin-project-lite-0.2.6.bazel b/rules/rust/remote/BUILD.pin-project-lite-0.2.8.bazel similarity index 91% rename from rules/rust/remote/BUILD.pin-project-lite-0.2.6.bazel rename to rules/rust/remote/BUILD.pin-project-lite-0.2.8.bazel index 654fa59..3b4f072 100644 --- a/rules/rust/remote/BUILD.pin-project-lite-0.2.6.bazel +++ b/rules/rust/remote/BUILD.pin-project-lite-0.2.8.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pin-project-lite", "manual", ], - version = "0.2.6", + version = "0.2.8", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.pin-utils-0.1.0.bazel b/rules/rust/remote/BUILD.pin-utils-0.1.0.bazel index a14e503..d543483 100644 --- a/rules/rust/remote/BUILD.pin-utils-0.1.0.bazel +++ b/rules/rust/remote/BUILD.pin-utils-0.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pin-utils", "manual", ], version = "0.1.0", diff --git a/rules/rust/remote/BUILD.dtoa-0.4.8.bazel b/rules/rust/remote/BUILD.pkg-config-0.3.24.bazel similarity index 86% rename from rules/rust/remote/BUILD.dtoa-0.4.8.bazel rename to rules/rust/remote/BUILD.pkg-config-0.3.24.bazel index 6f4b8fb..90e175c 100644 --- a/rules/rust/remote/BUILD.dtoa-0.4.8.bazel +++ b/rules/rust/remote/BUILD.pkg-config-0.3.24.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,15 +31,12 @@ licenses([ # Generated Targets -# Unsupported target "bench" with type "bench" omitted - rust_library( - name = "dtoa", + name = "pkg_config", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pkg-config", "manual", ], - version = "0.4.8", + version = "0.3.24", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.plotters-0.3.0.bazel b/rules/rust/remote/BUILD.plotters-0.3.0.bazel deleted file mode 100644 index 73033be..0000000 --- a/rules/rust/remote/BUILD.plotters-0.3.0.bazel +++ /dev/null @@ -1,112 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "benchmark" with type "bench" omitted - -# Unsupported target "3d-plot" with type "example" omitted - -# Unsupported target "animation" with type "example" omitted - -# Unsupported target "area-chart" with type "example" omitted - -# Unsupported target "blit-bitmap" with type "example" omitted - -# Unsupported target "boxplot" with type "example" omitted - -# Unsupported target "chart" with type "example" omitted - -# Unsupported target "console" with type "example" omitted - -# Unsupported target "errorbar" with type "example" omitted - -# Unsupported target "histogram" with type "example" omitted - -# Unsupported target "mandelbrot" with type "example" omitted - -# Unsupported target "matshow" with type "example" omitted - -# Unsupported target "nested_coord" with type "example" omitted - -# Unsupported target "normal-dist" with type "example" omitted - -# Unsupported target "normal-dist2" with type "example" omitted - -# Unsupported target "relative_size" with type "example" omitted - -# Unsupported target "sierpinski" with type "example" omitted - -# Unsupported target "slc-temp" with type "example" omitted - -# Unsupported target "snowflake" with type "example" omitted - -# Unsupported target "stock" with type "example" omitted - -# Unsupported target "two-scales" with type "example" omitted - -rust_library( - name = "plotters", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "area_series", - "line_series", - "plotters-svg", - "svg_backend", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.0", - # buildifier: leave-alone - deps = [ - "@raze__num_traits__0_2_14//:num_traits", - "@raze__plotters_backend__0_3_0//:plotters_backend", - "@raze__plotters_svg__0_3_0//:plotters_svg", - ] + selects.with_or({ - # cfg(not(target_arch = "wasm32")) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.postgres-0.17.5.bazel b/rules/rust/remote/BUILD.postgres-0.17.5.bazel deleted file mode 100644 index e2871bb..0000000 --- a/rules/rust/remote/BUILD.postgres-0.17.5.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -rust_library( - name = "postgres", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.17.5", - # buildifier: leave-alone - deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_postgres__0_5_5//:tokio_postgres", - ], -) diff --git a/rules/rust/remote/BUILD.postgres-derive-0.4.0.bazel b/rules/rust/remote/BUILD.postgres-derive-0.4.0.bazel deleted file mode 100644 index 35829c9..0000000 --- a/rules/rust/remote/BUILD.postgres-derive-0.4.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "postgres_derive", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.0", - # buildifier: leave-alone - deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.postgres-protocol-0.5.3.bazel b/rules/rust/remote/BUILD.postgres-protocol-0.5.3.bazel deleted file mode 100644 index 428845b..0000000 --- a/rules/rust/remote/BUILD.postgres-protocol-0.5.3.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "postgres_protocol", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.3", - # buildifier: leave-alone - deps = [ - "@raze__base64__0_13_0//:base64", - "@raze__byteorder__1_4_3//:byteorder", - "@raze__bytes__0_5_6//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__hmac__0_9_0//:hmac", - "@raze__md5__0_7_0//:md5", - "@raze__memchr__2_3_4//:memchr", - "@raze__rand__0_7_3//:rand", - "@raze__sha2__0_9_3//:sha2", - "@raze__stringprep__0_1_2//:stringprep", - ], -) diff --git a/rules/rust/remote/BUILD.postgres-protocol-0.6.1.bazel b/rules/rust/remote/BUILD.postgres-protocol-0.6.1.bazel deleted file mode 100644 index c832bdc..0000000 --- a/rules/rust/remote/BUILD.postgres-protocol-0.6.1.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "postgres_protocol", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.1", - # buildifier: leave-alone - deps = [ - "@raze__base64__0_13_0//:base64", - "@raze__byteorder__1_4_3//:byteorder", - "@raze__bytes__1_0_1//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__hmac__0_10_1//:hmac", - "@raze__md_5__0_9_1//:md_5", - "@raze__memchr__2_3_4//:memchr", - "@raze__rand__0_8_3//:rand", - "@raze__sha2__0_9_3//:sha2", - "@raze__stringprep__0_1_2//:stringprep", - ], -) diff --git a/rules/rust/remote/BUILD.postgres-types-0.1.3.bazel b/rules/rust/remote/BUILD.postgres-types-0.1.3.bazel deleted file mode 100644 index 9e02b07..0000000 --- a/rules/rust/remote/BUILD.postgres-types-0.1.3.bazel +++ /dev/null @@ -1,70 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "postgres_types", - srcs = glob(["**/*.rs"]), - aliases = { - "@raze__serde__1_0_125//:serde": "serde_1", - "@raze__serde_json__1_0_64//:serde_json": "serde_json_1", - }, - crate_features = [ - "derive", - "postgres-derive", - "serde-1", - "serde_json-1", - "with-serde_json-1", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__postgres_derive__0_4_0//:postgres_derive", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.3", - # buildifier: leave-alone - deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__postgres_protocol__0_5_3//:postgres_protocol", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - ], -) diff --git a/rules/rust/remote/BUILD.postgres-types-0.2.1.bazel b/rules/rust/remote/BUILD.postgres-types-0.2.1.bazel deleted file mode 100644 index a28a155..0000000 --- a/rules/rust/remote/BUILD.postgres-types-0.2.1.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "postgres_types", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.1", - # buildifier: leave-alone - deps = [ - "@raze__bytes__1_0_1//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__postgres_protocol__0_6_1//:postgres_protocol", - ], -) diff --git a/rules/rust/remote/BUILD.ppv-lite86-0.2.10.bazel b/rules/rust/remote/BUILD.ppv-lite86-0.2.16.bazel similarity index 89% rename from rules/rust/remote/BUILD.ppv-lite86-0.2.10.bazel rename to rules/rust/remote/BUILD.ppv-lite86-0.2.16.bazel index ce5ed8e..705d523 100644 --- a/rules/rust/remote/BUILD.ppv-lite86-0.2.10.bazel +++ b/rules/rust/remote/BUILD.ppv-lite86-0.2.16.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +46,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ppv-lite86", "manual", ], - version = "0.2.10", + version = "0.2.16", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.arrayvec-0.5.2.bazel b/rules/rust/remote/BUILD.pretty_assertions-1.2.0.bazel similarity index 68% rename from rules/rust/remote/BUILD.arrayvec-0.5.2.bazel rename to rules/rust/remote/BUILD.pretty_assertions-1.2.0.bazel index 291d311..ab5e1b9 100644 --- a/rules/rust/remote/BUILD.arrayvec-0.5.2.bazel +++ b/rules/rust/remote/BUILD.pretty_assertions-1.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,20 +31,18 @@ licenses([ # Generated Targets -# Unsupported target "arraystring" with type "bench" omitted +# Unsupported target "pretty_assertion" with type "example" omitted -# Unsupported target "extend" with type "bench" omitted +# Unsupported target "standard_assertion" with type "example" omitted rust_library( - name = "arrayvec", + name = "pretty_assertions", srcs = glob(["**/*.rs"]), crate_features = [ - "array-sizes-33-128", "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -51,14 +50,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=pretty_assertions", "manual", ], - version = "0.5.2", + version = "1.2.0", # buildifier: leave-alone deps = [ + "@raze__ansi_term__0_12_1//:ansi_term", + "@raze__diff__0_1_12//:diff", ], ) -# Unsupported target "serde" with type "test" omitted - -# Unsupported target "tests" with type "test" omitted +# Unsupported target "macros" with type "test" omitted diff --git a/rules/rust/remote/BUILD.pin-project-internal-1.0.7.bazel b/rules/rust/remote/BUILD.proc-macro-crate-1.1.3.bazel similarity index 78% rename from rules/rust/remote/BUILD.pin-project-internal-1.0.7.bazel rename to rules/rust/remote/BUILD.proc-macro-crate-1.1.3.bazel index d646751..235bf36 100644 --- a/rules/rust/remote/BUILD.pin-project-internal-1.0.7.bazel +++ b/rules/rust/remote/BUILD.proc-macro-crate-1.1.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "pin_project_internal", + name = "proc_macro_crate", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -44,13 +44,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=proc-macro-crate", "manual", ], - version = "1.0.7", + version = "1.1.3", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__thiserror__1_0_30//:thiserror", + "@raze__toml__0_5_8//:toml", ], ) diff --git a/rules/rust/remote/BUILD.proc-macro-nested-0.1.7.bazel b/rules/rust/remote/BUILD.proc-macro-nested-0.1.7.bazel deleted file mode 100644 index 5182440..0000000 --- a/rules/rust/remote/BUILD.proc-macro-nested-0.1.7.bazel +++ /dev/null @@ -1,83 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "proc_macro_nested_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.7", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "proc_macro_nested", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.7", - # buildifier: leave-alone - deps = [ - ":proc_macro_nested_build_script", - ], -) diff --git a/rules/rust/remote/BUILD.proc-macro2-1.0.26.bazel b/rules/rust/remote/BUILD.proc-macro2-1.0.36.bazel similarity index 89% rename from rules/rust/remote/BUILD.proc-macro2-1.0.26.bazel rename to rules/rust/remote/BUILD.proc-macro2-1.0.36.bazel index f7a9260..49beab7 100644 --- a/rules/rust/remote/BUILD.proc-macro2-1.0.26.bazel +++ b/rules/rust/remote/BUILD.proc-macro2-1.0.36.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -55,7 +56,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.26", + version = "1.0.36", visibility = ["//visibility:private"], deps = [ ], @@ -69,23 +70,21 @@ rust_library( "proc-macro", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ "--cap-lints=allow", - "--cfg=use_proc_macro", - "--cfg=wrap_proc_macro", ], tags = [ "cargo-raze", + "crate-name=proc-macro2", "manual", ], - version = "1.0.26", + version = "1.0.36", # buildifier: leave-alone deps = [ ":proc_macro2_build_script", - "@raze__unicode_xid__0_2_1//:unicode_xid", + "@raze__unicode_xid__0_2_2//:unicode_xid", ], ) diff --git a/rules/rust/remote/BUILD.prometheus-0.13.0.bazel b/rules/rust/remote/BUILD.prometheus-0.13.0.bazel new file mode 100644 index 0000000..679f670 --- /dev/null +++ b/rules/rust/remote/BUILD.prometheus-0.13.0.bazel @@ -0,0 +1,121 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "prometheus_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + "default", + "protobuf", + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.13.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +# Unsupported target "atomic" with type "bench" omitted + +# Unsupported target "counter" with type "bench" omitted + +# Unsupported target "desc" with type "bench" omitted + +# Unsupported target "gauge" with type "bench" omitted + +# Unsupported target "histogram" with type "bench" omitted + +# Unsupported target "text_encoder" with type "bench" omitted + +# Unsupported target "example_custom_registry" with type "example" omitted + +# Unsupported target "example_edition_2018" with type "example" omitted + +# Unsupported target "example_embed" with type "example" omitted + +# Unsupported target "example_hyper" with type "example" omitted + +# Unsupported target "example_int_metrics" with type "example" omitted + +# Unsupported target "example_process_collector" with type "example" omitted + +# Unsupported target "example_push" with type "example" omitted + +rust_library( + name = "prometheus", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "protobuf", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=prometheus", + "manual", + ], + version = "0.13.0", + # buildifier: leave-alone + deps = [ + ":prometheus_build_script", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__fnv__1_0_7//:fnv", + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__memchr__2_4_1//:memchr", + "@raze__parking_lot__0_11_2//:parking_lot", + "@raze__protobuf__2_27_1//:protobuf", + "@raze__thiserror__1_0_30//:thiserror", + ], +) diff --git a/rules/rust/remote/BUILD.proptest-0.10.1.bazel b/rules/rust/remote/BUILD.proptest-0.10.1.bazel deleted file mode 100644 index 8062b0d..0000000 --- a/rules/rust/remote/BUILD.proptest-0.10.1.bazel +++ /dev/null @@ -1,88 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "config-defaults" with type "example" omitted - -# Unsupported target "dateparser_v1" with type "example" omitted - -# Unsupported target "dateparser_v2" with type "example" omitted - -# Unsupported target "fib" with type "example" omitted - -# Unsupported target "tutorial-simplify-play" with type "example" omitted - -# Unsupported target "tutorial-strategy-play" with type "example" omitted - -rust_library( - name = "proptest", - srcs = glob(["**/*.rs"]), - crate_features = [ - "bit-set", - "break-dead-code", - "default", - "fork", - "lazy_static", - "quick-error", - "regex-syntax", - "rusty-fork", - "std", - "tempfile", - "timeout", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.10.1", - # buildifier: leave-alone - deps = [ - "@raze__bit_set__0_5_2//:bit_set", - "@raze__bitflags__1_2_1//:bitflags", - "@raze__byteorder__1_4_3//:byteorder", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__num_traits__0_2_14//:num_traits", - "@raze__quick_error__1_2_3//:quick_error", - "@raze__rand__0_7_3//:rand", - "@raze__rand_chacha__0_2_2//:rand_chacha", - "@raze__rand_xorshift__0_2_0//:rand_xorshift", - "@raze__regex_syntax__0_6_23//:regex_syntax", - "@raze__rusty_fork__0_3_0//:rusty_fork", - "@raze__tempfile__3_2_0//:tempfile", - ], -) diff --git a/rules/rust/remote/BUILD.prost-0.9.0.bazel b/rules/rust/remote/BUILD.prost-0.9.0.bazel new file mode 100644 index 0000000..b9ed0d9 --- /dev/null +++ b/rules/rust/remote/BUILD.prost-0.9.0.bazel @@ -0,0 +1,63 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "varint" with type "bench" omitted + +rust_library( + name = "prost", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "prost-derive", + "std", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + proc_macro_deps = [ + "@raze__prost_derive__0_9_0//:prost_derive", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=prost", + "manual", + ], + version = "0.9.0", + # buildifier: leave-alone + deps = [ + "@raze__bytes__1_1_0//:bytes", + ], +) diff --git a/rules/rust/remote/BUILD.cookie-0.14.4.bazel b/rules/rust/remote/BUILD.prost-build-0.9.0.bazel similarity index 63% rename from rules/rust/remote/BUILD.cookie-0.14.4.bazel rename to rules/rust/remote/BUILD.prost-build-0.9.0.bazel index aff5499..1e78546 100644 --- a/rules/rust/remote/BUILD.cookie-0.14.4.bazel +++ b/rules/rust/remote/BUILD.prost-build-0.9.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,7 +26,7 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # Apache-2.0 from expression "Apache-2.0" ]) # Generated Targets @@ -37,13 +38,11 @@ load( ) cargo_build_script( - name = "cookie_build_script", + name = "prost_build_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, crate_features = [ - "percent-encode", - "percent-encoding", ], crate_root = "build.rs", data = glob(["**"]), @@ -55,22 +54,19 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.14.4", + version = "0.9.0", visibility = ["//visibility:private"], deps = [ - "@raze__version_check__0_9_3//:version_check", + "@raze__which__4_2_5//:which", ], ) rust_library( - name = "cookie", + name = "prost_build", srcs = glob(["**/*.rs"]), crate_features = [ - "percent-encode", - "percent-encoding", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -78,13 +74,23 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=prost-build", "manual", ], - version = "0.14.4", + version = "0.9.0", # buildifier: leave-alone deps = [ - ":cookie_build_script", - "@raze__percent_encoding__2_1_0//:percent_encoding", - "@raze__time__0_2_26//:time", + ":prost_build_build_script", + "@raze__bytes__1_1_0//:bytes", + "@raze__heck__0_3_3//:heck", + "@raze__itertools__0_10_3//:itertools", + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__log__0_4_14//:log", + "@raze__multimap__0_8_3//:multimap", + "@raze__petgraph__0_6_0//:petgraph", + "@raze__prost__0_9_0//:prost", + "@raze__prost_types__0_9_0//:prost_types", + "@raze__regex__1_5_5//:regex", + "@raze__tempfile__3_3_0//:tempfile", ], ) diff --git a/rules/rust/remote/BUILD.hmac-0.9.0.bazel b/rules/rust/remote/BUILD.prost-derive-0.9.0.bazel similarity index 67% rename from rules/rust/remote/BUILD.hmac-0.9.0.bazel rename to rules/rust/remote/BUILD.prost-derive-0.9.0.bazel index 71d245e..e7acf26 100644 --- a/rules/rust/remote/BUILD.hmac-0.9.0.bazel +++ b/rules/rust/remote/BUILD.prost-derive-0.9.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,18 +26,17 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # Apache-2.0 from expression "Apache-2.0" ]) # Generated Targets -rust_library( - name = "hmac", +rust_proc_macro( + name = "prost_derive", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,14 +44,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=prost-derive", "manual", ], version = "0.9.0", # buildifier: leave-alone deps = [ - "@raze__crypto_mac__0_9_1//:crypto_mac", - "@raze__digest__0_9_0//:digest", + "@raze__anyhow__1_0_56//:anyhow", + "@raze__itertools__0_10_3//:itertools", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) - -# Unsupported target "lib" with type "test" omitted diff --git a/rules/rust/remote/BUILD.digest-0.9.0.bazel b/rules/rust/remote/BUILD.prost-types-0.9.0.bazel similarity index 76% rename from rules/rust/remote/BUILD.digest-0.9.0.bazel rename to rules/rust/remote/BUILD.prost-types-0.9.0.bazel index 24fe611..8e6f572 100644 --- a/rules/rust/remote/BUILD.digest-0.9.0.bazel +++ b/rules/rust/remote/BUILD.prost-types-0.9.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,20 +26,19 @@ package(default_visibility = [ ]) licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" + "notice", # Apache-2.0 from expression "Apache-2.0" ]) # Generated Targets rust_library( - name = "digest", + name = "prost_types", srcs = glob(["**/*.rs"]), crate_features = [ - "alloc", + "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,11 +46,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=prost-types", "manual", ], version = "0.9.0", # buildifier: leave-alone deps = [ - "@raze__generic_array__0_14_4//:generic_array", + "@raze__bytes__1_1_0//:bytes", + "@raze__prost__0_9_0//:prost", ], ) diff --git a/rules/rust/remote/BUILD.protobuf-2.18.2.bazel b/rules/rust/remote/BUILD.protobuf-2.27.1.bazel similarity index 88% rename from rules/rust/remote/BUILD.protobuf-2.18.2.bazel rename to rules/rust/remote/BUILD.protobuf-2.27.1.bazel index 0ba569f..9e14645 100644 --- a/rules/rust/remote/BUILD.protobuf-2.18.2.bazel +++ b/rules/rust/remote/BUILD.protobuf-2.27.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,8 +43,6 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "bytes", - "with-bytes", ], crate_root = "build.rs", data = glob(["**"]), @@ -55,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "2.18.2", + version = "2.27.1", visibility = ["//visibility:private"], deps = [ ], @@ -69,11 +68,8 @@ rust_library( name = "protobuf", srcs = glob(["**/*.rs"]), crate_features = [ - "bytes", - "with-bytes", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -81,12 +77,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=protobuf", "manual", ], - version = "2.18.2", + version = "2.27.1", # buildifier: leave-alone deps = [ ":protobuf_build_script", - "@raze__bytes__0_5_6//:bytes", ], ) diff --git a/rules/rust/remote/BUILD.protobuf-codegen-2.18.2.bazel b/rules/rust/remote/BUILD.protobuf-codegen-2.18.2.bazel deleted file mode 100644 index e57e42f..0000000 --- a/rules/rust/remote/BUILD.protobuf-codegen-2.18.2.bazel +++ /dev/null @@ -1,104 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_protobuf_bin_gen_rust_do_not_use", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/bin/protobuf-bin-gen-rust-do-not-use.rs", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.18.2", - # buildifier: leave-alone - deps = [ - ":protobuf_codegen", - "@raze__protobuf__2_18_2//:protobuf", - ], -) - -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_protoc_gen_rust", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/bin/protoc-gen-rust.rs", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.18.2", - # buildifier: leave-alone - deps = [ - ":protobuf_codegen", - "@raze__protobuf__2_18_2//:protobuf", - ], -) - -rust_library( - name = "protobuf_codegen", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.18.2", - # buildifier: leave-alone - deps = [ - "@raze__protobuf__2_18_2//:protobuf", - ], -) diff --git a/rules/rust/remote/BUILD.quote-1.0.9.bazel b/rules/rust/remote/BUILD.quote-1.0.16.bazel similarity index 87% rename from rules/rust/remote/BUILD.quote-1.0.9.bazel rename to rules/rust/remote/BUILD.quote-1.0.16.bazel index be56d17..87fedfd 100644 --- a/rules/rust/remote/BUILD.quote-1.0.9.bazel +++ b/rules/rust/remote/BUILD.quote-1.0.16.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "proc-macro", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,12 +46,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=quote", "manual", ], - version = "1.0.9", + version = "1.0.16", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", + "@raze__proc_macro2__1_0_36//:proc_macro2", ], ) diff --git a/rules/rust/remote/BUILD.r2d2-0.8.9.bazel b/rules/rust/remote/BUILD.r2d2-0.8.9.bazel deleted file mode 100644 index 69d6fde..0000000 --- a/rules/rust/remote/BUILD.r2d2-0.8.9.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "r2d2", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.9", - # buildifier: leave-alone - deps = [ - "@raze__log__0_4_14//:log", - "@raze__parking_lot__0_11_1//:parking_lot", - "@raze__scheduled_thread_pool__0_2_5//:scheduled_thread_pool", - ], -) diff --git a/rules/rust/remote/BUILD.r2d2_postgres-0.16.0.bazel b/rules/rust/remote/BUILD.r2d2_postgres-0.16.0.bazel deleted file mode 100644 index 4856360..0000000 --- a/rules/rust/remote/BUILD.r2d2_postgres-0.16.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "r2d2_postgres", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.16.0", - # buildifier: leave-alone - deps = [ - "@raze__postgres__0_17_5//:postgres", - "@raze__r2d2__0_8_9//:r2d2", - ], -) diff --git a/rules/rust/remote/BUILD.rand-0.4.6.bazel b/rules/rust/remote/BUILD.rand-0.4.6.bazel deleted file mode 100644 index 45a1b95..0000000 --- a/rules/rust/remote/BUILD.rand-0.4.6.bazel +++ /dev/null @@ -1,73 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -# Unsupported target "generators" with type "bench" omitted - -# Unsupported target "misc" with type "bench" omitted - -rust_library( - name = "rand", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - "libc", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.6", - # buildifier: leave-alone - deps = [ - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.rand-0.5.6.bazel b/rules/rust/remote/BUILD.rand-0.5.6.bazel deleted file mode 100644 index bfbae83..0000000 --- a/rules/rust/remote/BUILD.rand-0.5.6.bazel +++ /dev/null @@ -1,84 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "distributions" with type "bench" omitted - -# Unsupported target "generators" with type "bench" omitted - -# Unsupported target "misc" with type "bench" omitted - -# Unsupported target "monte-carlo" with type "example" omitted - -# Unsupported target "monty-hall" with type "example" omitted - -rust_library( - name = "rand", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "alloc", - "cloudabi", - "default", - "fuchsia-cprng", - "libc", - "std", - "winapi", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.6", - # buildifier: leave-alone - deps = [ - "@raze__rand_core__0_3_1//:rand_core", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "bool" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rand-0.7.3.bazel b/rules/rust/remote/BUILD.rand-0.7.3.bazel deleted file mode 100644 index 4fcf6ee..0000000 --- a/rules/rust/remote/BUILD.rand-0.7.3.bazel +++ /dev/null @@ -1,86 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "generators" with type "bench" omitted - -# Unsupported target "misc" with type "bench" omitted - -# Unsupported target "seq" with type "bench" omitted - -# Unsupported target "weighted" with type "bench" omitted - -# Unsupported target "monte-carlo" with type "example" omitted - -# Unsupported target "monty-hall" with type "example" omitted - -rust_library( - name = "rand", - srcs = glob(["**/*.rs"]), - aliases = { - "@raze__getrandom__0_1_16//:getrandom": "getrandom_package", - }, - crate_features = [ - "alloc", - "default", - "getrandom", - "getrandom_package", - "libc", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.3", - # buildifier: leave-alone - deps = [ - "@raze__getrandom__0_1_16//:getrandom", - "@raze__rand_chacha__0_2_2//:rand_chacha", - "@raze__rand_core__0_5_1//:rand_core", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) diff --git a/rules/rust/remote/BUILD.rand-0.8.3.bazel b/rules/rust/remote/BUILD.rand-0.8.5.bazel similarity index 83% rename from rules/rust/remote/BUILD.rand-0.8.3.bazel rename to rules/rust/remote/BUILD.rand-0.8.5.bazel index a29bc51..d5d8f67 100644 --- a/rules/rust/remote/BUILD.rand-0.8.3.bazel +++ b/rules/rust/remote/BUILD.rand-0.8.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -41,12 +42,11 @@ rust_library( "getrandom", "libc", "rand_chacha", - "rand_hc", + "small_rng", "std", "std_rng", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -54,20 +54,21 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=rand", "manual", ], - version = "0.8.3", + version = "0.8.5", # buildifier: leave-alone deps = [ - "@raze__rand_chacha__0_3_0//:rand_chacha", - "@raze__rand_core__0_6_2//:rand_core", + "@raze__rand_chacha__0_3_1//:rand_chacha", + "@raze__rand_core__0_6_3//:rand_core", ] + selects.with_or({ # cfg(unix) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.rand_chacha-0.3.0.bazel b/rules/rust/remote/BUILD.rand_chacha-0.3.0.bazel deleted file mode 100644 index 893ae3a..0000000 --- a/rules/rust/remote/BUILD.rand_chacha-0.3.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rand_chacha", - srcs = glob(["**/*.rs"]), - crate_features = [ - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.0", - # buildifier: leave-alone - deps = [ - "@raze__ppv_lite86__0_2_10//:ppv_lite86", - "@raze__rand_core__0_6_2//:rand_core", - ], -) diff --git a/rules/rust/remote/BUILD.rand_chacha-0.2.2.bazel b/rules/rust/remote/BUILD.rand_chacha-0.3.1.bazel similarity index 82% rename from rules/rust/remote/BUILD.rand_chacha-0.2.2.bazel rename to rules/rust/remote/BUILD.rand_chacha-0.3.1.bazel index 9fa1052..0b9a9de 100644 --- a/rules/rust/remote/BUILD.rand_chacha-0.2.2.bazel +++ b/rules/rust/remote/BUILD.rand_chacha-0.3.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,12 +45,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=rand_chacha", "manual", ], - version = "0.2.2", + version = "0.3.1", # buildifier: leave-alone deps = [ - "@raze__ppv_lite86__0_2_10//:ppv_lite86", - "@raze__rand_core__0_5_1//:rand_core", + "@raze__ppv_lite86__0_2_16//:ppv_lite86", + "@raze__rand_core__0_6_3//:rand_core", ], ) diff --git a/rules/rust/remote/BUILD.rand_core-0.3.1.bazel b/rules/rust/remote/BUILD.rand_core-0.3.1.bazel deleted file mode 100644 index 171dd85..0000000 --- a/rules/rust/remote/BUILD.rand_core-0.3.1.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rand_core", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.1", - # buildifier: leave-alone - deps = [ - "@raze__rand_core__0_4_2//:rand_core", - ], -) diff --git a/rules/rust/remote/BUILD.rand_core-0.6.2.bazel b/rules/rust/remote/BUILD.rand_core-0.6.2.bazel deleted file mode 100644 index e825266..0000000 --- a/rules/rust/remote/BUILD.rand_core-0.6.2.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rand_core", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "getrandom", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.2", - # buildifier: leave-alone - deps = [ - "@raze__getrandom__0_2_2//:getrandom", - ], -) diff --git a/rules/rust/remote/BUILD.rand_core-0.5.1.bazel b/rules/rust/remote/BUILD.rand_core-0.6.3.bazel similarity index 86% rename from rules/rust/remote/BUILD.rand_core-0.5.1.bazel rename to rules/rust/remote/BUILD.rand_core-0.6.3.bazel index f22a819..5c39a6a 100644 --- a/rules/rust/remote/BUILD.rand_core-0.5.1.bazel +++ b/rules/rust/remote/BUILD.rand_core-0.6.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -39,7 +40,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -47,11 +47,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=rand_core", "manual", ], - version = "0.5.1", + version = "0.6.3", # buildifier: leave-alone deps = [ - "@raze__getrandom__0_1_16//:getrandom", + "@raze__getrandom__0_2_5//:getrandom", ], ) diff --git a/rules/rust/remote/BUILD.rand_hc-0.2.0.bazel b/rules/rust/remote/BUILD.rand_hc-0.2.0.bazel deleted file mode 100644 index 81c25f6..0000000 --- a/rules/rust/remote/BUILD.rand_hc-0.2.0.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rand_hc", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - "@raze__rand_core__0_5_1//:rand_core", - ], -) diff --git a/rules/rust/remote/BUILD.rand_hc-0.3.0.bazel b/rules/rust/remote/BUILD.rand_hc-0.3.0.bazel deleted file mode 100644 index 99de0eb..0000000 --- a/rules/rust/remote/BUILD.rand_hc-0.3.0.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rand_hc", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.0", - # buildifier: leave-alone - deps = [ - "@raze__rand_core__0_6_2//:rand_core", - ], -) diff --git a/rules/rust/remote/BUILD.rand_xorshift-0.2.0.bazel b/rules/rust/remote/BUILD.rand_xorshift-0.2.0.bazel deleted file mode 100644 index 829505b..0000000 --- a/rules/rust/remote/BUILD.rand_xorshift-0.2.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rand_xorshift", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - "@raze__rand_core__0_5_1//:rand_core", - ], -) - -# Unsupported target "mod" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rayon-1.5.0.bazel b/rules/rust/remote/BUILD.rayon-1.5.1.bazel similarity index 89% rename from rules/rust/remote/BUILD.rayon-1.5.0.bazel rename to rules/rust/remote/BUILD.rayon-1.5.1.bazel index 94275e6..af5294c 100644 --- a/rules/rust/remote/BUILD.rayon-1.5.0.bazel +++ b/rules/rust/remote/BUILD.rayon-1.5.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -53,10 +54,10 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.5.0", + version = "1.5.1", visibility = ["//visibility:private"], deps = [ - "@raze__autocfg__1_0_1//:autocfg", + "@raze__autocfg__1_1_0//:autocfg", ], ) @@ -68,7 +69,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -76,15 +76,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=rayon", "manual", ], - version = "1.5.0", + version = "1.5.1", # buildifier: leave-alone deps = [ ":rayon_build_script", - "@raze__crossbeam_deque__0_8_0//:crossbeam_deque", + "@raze__crossbeam_deque__0_8_1//:crossbeam_deque", "@raze__either__1_6_1//:either", - "@raze__rayon_core__1_9_0//:rayon_core", + "@raze__rayon_core__1_9_1//:rayon_core", ], ) diff --git a/rules/rust/remote/BUILD.rayon-core-1.9.0.bazel b/rules/rust/remote/BUILD.rayon-core-1.9.1.bazel similarity index 69% rename from rules/rust/remote/BUILD.rayon-core-1.9.0.bazel rename to rules/rust/remote/BUILD.rayon-core-1.9.1.bazel index 74decf5..3540c1f 100644 --- a/rules/rust/remote/BUILD.rayon-core-1.9.0.bazel +++ b/rules/rust/remote/BUILD.rayon-core-1.9.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -46,6 +47,7 @@ cargo_build_script( crate_root = "build.rs", data = glob(["**"]), edition = "2018", + links = "rayon-core", rustc_flags = [ "--cap-lints=allow", ], @@ -53,29 +55,18 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.9.0", + version = "1.9.1", visibility = ["//visibility:private"], deps = [ - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), + ], ) rust_library( name = "rayon_core", srcs = glob(["**/*.rs"]), - aliases = { - }, crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -83,26 +74,19 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=rayon-core", "manual", ], - version = "1.9.0", + version = "1.9.1", # buildifier: leave-alone deps = [ ":rayon_core_build_script", - "@raze__crossbeam_channel__0_5_1//:crossbeam_channel", - "@raze__crossbeam_deque__0_8_0//:crossbeam_deque", - "@raze__crossbeam_utils__0_8_3//:crossbeam_utils", + "@raze__crossbeam_channel__0_5_4//:crossbeam_channel", + "@raze__crossbeam_deque__0_8_1//:crossbeam_deque", + "@raze__crossbeam_utils__0_8_8//:crossbeam_utils", "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__num_cpus__1_13_0//:num_cpus", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), + "@raze__num_cpus__1_13_1//:num_cpus", + ], ) # Unsupported target "double_init_fail" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rdkafka-0.28.0.bazel b/rules/rust/remote/BUILD.rdkafka-0.28.0.bazel new file mode 100644 index 0000000..ef3e1ff --- /dev/null +++ b/rules/rust/remote/BUILD.rdkafka-0.28.0.bazel @@ -0,0 +1,102 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "asynchronous_processing" with type "example" omitted + +# Unsupported target "at_least_once" with type "example" omitted + +# Unsupported target "example_utils" with type "example" omitted + +# Unsupported target "metadata" with type "example" omitted + +# Unsupported target "roundtrip" with type "example" omitted + +# Unsupported target "runtime_async_std" with type "example" omitted + +# Unsupported target "runtime_smol" with type "example" omitted + +# Unsupported target "simple_consumer" with type "example" omitted + +# Unsupported target "simple_producer" with type "example" omitted + +rust_library( + name = "rdkafka", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "libz", + "tokio", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + proc_macro_deps = [ + "@raze__serde_derive__1_0_136//:serde_derive", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=rdkafka", + "manual", + ], + version = "0.28.0", + # buildifier: leave-alone + deps = [ + "@raze__futures__0_3_21//:futures", + "@raze__libc__0_2_121//:libc", + "@raze__log__0_4_14//:log", + "@raze__rdkafka_sys__4_2_0_1_8_2//:rdkafka_sys", + "@raze__serde__1_0_136//:serde", + "@raze__serde_json__1_0_79//:serde_json", + "@raze__slab__0_4_5//:slab", + "@raze__tokio__1_17_0//:tokio", + ], +) + +# Unsupported target "test_admin" with type "test" omitted + +# Unsupported target "test_high_consumers" with type "test" omitted + +# Unsupported target "test_high_producers" with type "test" omitted + +# Unsupported target "test_low_consumers" with type "test" omitted + +# Unsupported target "test_low_producers" with type "test" omitted + +# Unsupported target "test_metadata" with type "test" omitted + +# Unsupported target "test_transactions" with type "test" omitted + +# Unsupported target "utils" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rdkafka-sys-4.2.0+1.8.2.bazel b/rules/rust/remote/BUILD.rdkafka-sys-4.2.0+1.8.2.bazel new file mode 100644 index 0000000..125039c --- /dev/null +++ b/rules/rust/remote/BUILD.rdkafka-sys-4.2.0+1.8.2.bazel @@ -0,0 +1,97 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "rdkafka_sys_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + "CARGO_MAKEFLAGS": "", + }, + crate_features = [ + "libz", + "libz-sys", + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + links = "rdkafka", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "4.2.0+1.8.2", + visibility = ["//visibility:private"], + deps = [ + "@raze__libz_sys__1_1_5//:libz_sys", + "@raze__pkg_config__0_3_24//:pkg_config", + ], +) + +rust_library( + name = "rdkafka_sys", + srcs = glob(["**/*.rs"]), + crate_features = [ + "libz", + "libz-sys", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=rdkafka_sys", + "manual", + ], + version = "4.2.0+1.8.2", + # buildifier: leave-alone + deps = [ + ":rdkafka_sys_build_script", + "@raze__libc__0_2_121//:libc", + "@raze__libz_sys__1_1_5//:libz_sys", + "@raze__num_enum__0_5_7//:num_enum", + ], +) + +# Unsupported target "version_check" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rdrand-0.4.0.bazel b/rules/rust/remote/BUILD.rdrand-0.4.0.bazel deleted file mode 100644 index c814c4d..0000000 --- a/rules/rust/remote/BUILD.rdrand-0.4.0.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # ISC from expression "ISC" -]) - -# Generated Targets - -# Unsupported target "rdrand" with type "bench" omitted - -# Unsupported target "rdseed" with type "bench" omitted - -# Unsupported target "std" with type "bench" omitted - -rust_library( - name = "rdrand", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.0", - # buildifier: leave-alone - deps = [ - "@raze__rand_core__0_3_1//:rand_core", - ], -) diff --git a/rules/rust/remote/BUILD.redox_syscall-0.1.57.bazel b/rules/rust/remote/BUILD.redox_syscall-0.1.57.bazel deleted file mode 100644 index facb591..0000000 --- a/rules/rust/remote/BUILD.redox_syscall-0.1.57.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -alias( - name = "redox_syscall", - actual = ":syscall", - tags = [ - "cargo-raze", - "manual", - ], -) - -rust_library( - name = "syscall", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.57", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.redox_syscall-0.2.6.bazel b/rules/rust/remote/BUILD.redox_syscall-0.2.11.bazel similarity index 87% rename from rules/rust/remote/BUILD.redox_syscall-0.2.6.bazel rename to rules/rust/remote/BUILD.redox_syscall-0.2.11.bazel index 612f721..33ec48b 100644 --- a/rules/rust/remote/BUILD.redox_syscall-0.2.6.bazel +++ b/rules/rust/remote/BUILD.redox_syscall-0.2.11.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -45,7 +46,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -53,11 +53,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=syscall", "manual", ], - version = "0.2.6", + version = "0.2.11", # buildifier: leave-alone deps = [ - "@raze__bitflags__1_2_1//:bitflags", + "@raze__bitflags__1_3_2//:bitflags", ], ) diff --git a/rules/rust/remote/BUILD.redox_users-0.4.0.bazel b/rules/rust/remote/BUILD.redox_users-0.4.0.bazel deleted file mode 100644 index 329afa6..0000000 --- a/rules/rust/remote/BUILD.redox_users-0.4.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "redox_users", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.0", - # buildifier: leave-alone - deps = [ - "@raze__getrandom__0_2_2//:getrandom", - "@raze__redox_syscall__0_2_6//:redox_syscall", - ], -) diff --git a/rules/rust/remote/BUILD.regex-1.4.5.bazel b/rules/rust/remote/BUILD.regex-1.5.5.bazel similarity index 89% rename from rules/rust/remote/BUILD.regex-1.4.5.bazel rename to rules/rust/remote/BUILD.regex-1.5.5.bazel index 946577f..ad06752 100644 --- a/rules/rust/remote/BUILD.regex-1.4.5.bazel +++ b/rules/rust/remote/BUILD.regex-1.5.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -65,22 +66,22 @@ rust_library( "unicode-segment", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=regex", "manual", ], - version = "1.4.5", + version = "1.5.5", # buildifier: leave-alone deps = [ - "@raze__aho_corasick__0_7_15//:aho_corasick", - "@raze__memchr__2_3_4//:memchr", - "@raze__regex_syntax__0_6_23//:regex_syntax", + "@raze__aho_corasick__0_7_18//:aho_corasick", + "@raze__memchr__2_4_1//:memchr", + "@raze__regex_syntax__0_6_25//:regex_syntax", ], ) diff --git a/rules/rust/remote/BUILD.regex-automata-0.1.9.bazel b/rules/rust/remote/BUILD.regex-automata-0.1.10.bazel similarity index 81% rename from rules/rust/remote/BUILD.regex-automata-0.1.9.bazel rename to rules/rust/remote/BUILD.regex-automata-0.1.10.bazel index c4773ca..b71f85a 100644 --- a/rules/rust/remote/BUILD.regex-automata-0.1.9.bazel +++ b/rules/rust/remote/BUILD.regex-automata-0.1.10.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,9 +35,11 @@ rust_library( name = "regex_automata", srcs = glob(["**/*.rs"]), crate_features = [ + "default", + "regex-syntax", + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,12 +47,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=regex-automata", "manual", ], - version = "0.1.9", + version = "0.1.10", # buildifier: leave-alone deps = [ - "@raze__byteorder__1_4_3//:byteorder", + "@raze__regex_syntax__0_6_25//:regex_syntax", ], ) diff --git a/rules/rust/remote/BUILD.regex-syntax-0.4.2.bazel b/rules/rust/remote/BUILD.regex-syntax-0.4.2.bazel index a090d0f..ef47c2c 100644 --- a/rules/rust/remote/BUILD.regex-syntax-0.4.2.bazel +++ b/rules/rust/remote/BUILD.regex-syntax-0.4.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=regex-syntax", "manual", ], version = "0.4.2", diff --git a/rules/rust/remote/BUILD.regex-syntax-0.6.23.bazel b/rules/rust/remote/BUILD.regex-syntax-0.6.25.bazel similarity index 89% rename from rules/rust/remote/BUILD.regex-syntax-0.6.23.bazel rename to rules/rust/remote/BUILD.regex-syntax-0.6.25.bazel index aa491e6..03d0277 100644 --- a/rules/rust/remote/BUILD.regex-syntax-0.6.23.bazel +++ b/rules/rust/remote/BUILD.regex-syntax-0.6.25.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -47,17 +48,17 @@ rust_library( "unicode-segment", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=regex-syntax", "manual", ], - version = "0.6.23", + version = "0.6.25", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.remove_dir_all-0.5.3.bazel b/rules/rust/remote/BUILD.remove_dir_all-0.5.3.bazel index 7924adb..33b036d 100644 --- a/rules/rust/remote/BUILD.remove_dir_all-0.5.3.bazel +++ b/rules/rust/remote/BUILD.remove_dir_all-0.5.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=remove_dir_all", "manual", ], version = "0.5.3", diff --git a/rules/rust/remote/BUILD.reopen-1.0.2.bazel b/rules/rust/remote/BUILD.reopen-1.0.2.bazel deleted file mode 100644 index 5bbf74a..0000000 --- a/rules/rust/remote/BUILD.reopen-1.0.2.bazel +++ /dev/null @@ -1,96 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "reopen_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "libc", - "signal-hook", - "signals", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.2", - visibility = ["//visibility:private"], - deps = [ - "@raze__autocfg__1_0_1//:autocfg", - ], -) - -# Unsupported target "reopen_log" with type "example" omitted - -rust_library( - name = "reopen", - srcs = glob(["**/*.rs"]), - crate_features = [ - "libc", - "signal-hook", - "signals", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.2", - # buildifier: leave-alone - deps = [ - ":reopen_build_script", - "@raze__libc__0_2_93//:libc", - "@raze__signal_hook__0_2_3//:signal_hook", - ], -) - -# Unsupported target "locking" with type "test" omitted diff --git a/rules/rust/remote/BUILD.resolv-conf-0.7.0.bazel b/rules/rust/remote/BUILD.resolv-conf-0.7.0.bazel deleted file mode 100644 index 34642ad..0000000 --- a/rules/rust/remote/BUILD.resolv-conf-0.7.0.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "parse" with type "example" omitted - -rust_library( - name = "resolv_conf", - srcs = glob(["**/*.rs"]), - crate_features = [ - "hostname", - "system", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.0", - # buildifier: leave-alone - deps = [ - "@raze__hostname__0_3_1//:hostname", - "@raze__quick_error__1_2_3//:quick_error", - ], -) - -# Unsupported target "lib" with type "test" omitted diff --git a/rules/rust/remote/BUILD.ron-0.7.0.bazel b/rules/rust/remote/BUILD.ron-0.7.0.bazel new file mode 100644 index 0000000..7bb6911 --- /dev/null +++ b/rules/rust/remote/BUILD.ron-0.7.0.bazel @@ -0,0 +1,109 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "decode" with type "example" omitted + +# Unsupported target "decode_file" with type "example" omitted + +# Unsupported target "encode" with type "example" omitted + +# Unsupported target "transcode" with type "example" omitted + +rust_library( + name = "ron", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=ron", + "manual", + ], + version = "0.7.0", + # buildifier: leave-alone + deps = [ + "@raze__base64__0_13_0//:base64", + "@raze__bitflags__1_3_2//:bitflags", + "@raze__serde__1_0_136//:serde", + ], +) + +# Unsupported target "117_untagged_tuple_variant" with type "test" omitted + +# Unsupported target "123_enum_representation" with type "test" omitted + +# Unsupported target "129_indexmap" with type "test" omitted + +# Unsupported target "147_empty_sets_serialisation" with type "test" omitted + +# Unsupported target "240_array_pretty" with type "test" omitted + +# Unsupported target "250_variant_newtypes" with type "test" omitted + +# Unsupported target "322_escape_idents" with type "test" omitted + +# Unsupported target "big_struct" with type "test" omitted + +# Unsupported target "borrowed_str" with type "test" omitted + +# Unsupported target "comments" with type "test" omitted + +# Unsupported target "depth_limit" with type "test" omitted + +# Unsupported target "escape" with type "test" omitted + +# Unsupported target "extensions" with type "test" omitted + +# Unsupported target "floats" with type "test" omitted + +# Unsupported target "large_number" with type "test" omitted + +# Unsupported target "min_max" with type "test" omitted + +# Unsupported target "numbers" with type "test" omitted + +# Unsupported target "preserve_sequence" with type "test" omitted + +# Unsupported target "roundtrip" with type "test" omitted + +# Unsupported target "struct_integers" with type "test" omitted + +# Unsupported target "unicode" with type "test" omitted + +# Unsupported target "value" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rust-ini-0.13.0.bazel b/rules/rust/remote/BUILD.rust-ini-0.17.0.bazel similarity index 81% rename from rules/rust/remote/BUILD.rust-ini-0.13.0.bazel rename to rules/rust/remote/BUILD.rust-ini-0.17.0.bazel index bbdd26f..15cbea8 100644 --- a/rules/rust/remote/BUILD.rust-ini-0.13.0.bazel +++ b/rules/rust/remote/BUILD.rust-ini-0.17.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -45,20 +46,23 @@ rust_library( name = "ini", srcs = glob(["**/*.rs"]), crate_features = [ + "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=ini", "manual", ], - version = "0.13.0", + version = "0.17.0", # buildifier: leave-alone deps = [ + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__ordered_multimap__0_3_1//:ordered_multimap", ], ) diff --git a/rules/rust/remote/BUILD.rust-stemmers-1.2.0.bazel b/rules/rust/remote/BUILD.rust-stemmers-1.2.0.bazel index 9815a1e..105b967 100644 --- a/rules/rust/remote/BUILD.rust-stemmers-1.2.0.bazel +++ b/rules/rust/remote/BUILD.rust-stemmers-1.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,22 +39,22 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", proc_macro_deps = [ - "@raze__serde_derive__1_0_125//:serde_derive", + "@raze__serde_derive__1_0_136//:serde_derive", ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=rust-stemmers", "manual", ], version = "1.2.0", # buildifier: leave-alone deps = [ - "@raze__serde__1_0_125//:serde", + "@raze__serde__1_0_136//:serde", ], ) diff --git a/rules/rust/remote/BUILD.rustc-serialize-0.3.24.bazel b/rules/rust/remote/BUILD.rustc-serialize-0.3.24.bazel deleted file mode 100644 index 837ef23..0000000 --- a/rules/rust/remote/BUILD.rustc-serialize-0.3.24.bazel +++ /dev/null @@ -1,59 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "base64" with type "bench" omitted - -# Unsupported target "hex" with type "bench" omitted - -# Unsupported target "json" with type "bench" omitted - -rust_library( - name = "rustc_serialize", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.24", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.rustversion-1.0.4.bazel b/rules/rust/remote/BUILD.rustversion-1.0.4.bazel deleted file mode 100644 index 1bd7989..0000000 --- a/rules/rust/remote/BUILD.rustversion-1.0.4.bazel +++ /dev/null @@ -1,91 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "rustversion_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build/build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.4", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "rustversion", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.4", - # buildifier: leave-alone - deps = [ - ":rustversion_build_script", - ], -) - -# Unsupported target "compiletest" with type "test" omitted - -# Unsupported target "test_const" with type "test" omitted - -# Unsupported target "test_eval" with type "test" omitted - -# Unsupported target "test_parse" with type "test" omitted diff --git a/rules/rust/remote/BUILD.rusty-fork-0.3.0.bazel b/rules/rust/remote/BUILD.rusty-fork-0.3.0.bazel deleted file mode 100644 index 1635c2d..0000000 --- a/rules/rust/remote/BUILD.rusty-fork-0.3.0.bazel +++ /dev/null @@ -1,59 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "rusty_fork", - srcs = glob(["**/*.rs"]), - crate_features = [ - "timeout", - "wait-timeout", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.0", - # buildifier: leave-alone - deps = [ - "@raze__fnv__1_0_7//:fnv", - "@raze__quick_error__1_2_3//:quick_error", - "@raze__tempfile__3_2_0//:tempfile", - "@raze__wait_timeout__0_2_0//:wait_timeout", - ], -) diff --git a/rules/rust/remote/BUILD.ryu-1.0.5.bazel b/rules/rust/remote/BUILD.ryu-1.0.9.bazel similarity index 68% rename from rules/rust/remote/BUILD.ryu-1.0.5.bazel rename to rules/rust/remote/BUILD.ryu-1.0.9.bazel index d3c3991..ac1a2f2 100644 --- a/rules/rust/remote/BUILD.ryu-1.0.5.bazel +++ b/rules/rust/remote/BUILD.ryu-1.0.9.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -29,35 +30,6 @@ licenses([ ]) # Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "ryu_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.5", - visibility = ["//visibility:private"], - deps = [ - ], -) # Unsupported target "bench" with type "bench" omitted @@ -69,7 +41,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -77,12 +48,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ryu", "manual", ], - version = "1.0.5", + version = "1.0.9", # buildifier: leave-alone deps = [ - ":ryu_build_script", ], ) diff --git a/rules/rust/remote/BUILD.safemem-0.3.3.bazel b/rules/rust/remote/BUILD.safemem-0.3.3.bazel deleted file mode 100644 index d220fec..0000000 --- a/rules/rust/remote/BUILD.safemem-0.3.3.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "safemem", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.3", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.same-file-1.0.6.bazel b/rules/rust/remote/BUILD.same-file-1.0.6.bazel deleted file mode 100644 index 1e53267..0000000 --- a/rules/rust/remote/BUILD.same-file-1.0.6.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "unencumbered", # Unlicense from expression "Unlicense OR MIT" -]) - -# Generated Targets - -# Unsupported target "is_same_file" with type "example" omitted - -# Unsupported target "is_stderr" with type "example" omitted - -rust_library( - name = "same_file", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.6", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.scheduled-thread-pool-0.2.5.bazel b/rules/rust/remote/BUILD.scheduled-thread-pool-0.2.5.bazel deleted file mode 100644 index 5bd684c..0000000 --- a/rules/rust/remote/BUILD.scheduled-thread-pool-0.2.5.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "scheduled_thread_pool", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.5", - # buildifier: leave-alone - deps = [ - "@raze__parking_lot__0_11_1//:parking_lot", - ], -) diff --git a/rules/rust/remote/BUILD.scopeguard-1.1.0.bazel b/rules/rust/remote/BUILD.scopeguard-1.1.0.bazel index 1583149..7b6fb6f 100644 --- a/rules/rust/remote/BUILD.scopeguard-1.1.0.bazel +++ b/rules/rust/remote/BUILD.scopeguard-1.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=scopeguard", "manual", ], version = "1.1.0", diff --git a/rules/rust/remote/BUILD.semver-0.9.0.bazel b/rules/rust/remote/BUILD.semver-0.9.0.bazel deleted file mode 100644 index bab86e2..0000000 --- a/rules/rust/remote/BUILD.semver-0.9.0.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "semver", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.0", - # buildifier: leave-alone - deps = [ - "@raze__semver_parser__0_7_0//:semver_parser", - ], -) - -# Unsupported target "deprecation" with type "test" omitted - -# Unsupported target "regression" with type "test" omitted - -# Unsupported target "serde" with type "test" omitted diff --git a/rules/rust/remote/BUILD.serde-0.8.23.bazel b/rules/rust/remote/BUILD.serde-0.8.23.bazel deleted file mode 100644 index 4959f79..0000000 --- a/rules/rust/remote/BUILD.serde-0.8.23.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "serde", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - "--cfg=integer128", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.23", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.serde-1.0.125.bazel b/rules/rust/remote/BUILD.serde-1.0.136.bazel similarity index 89% rename from rules/rust/remote/BUILD.serde-1.0.125.bazel rename to rules/rust/remote/BUILD.serde-1.0.136.bazel index 62d8350..25988f4 100644 --- a/rules/rust/remote/BUILD.serde-1.0.125.bazel +++ b/rules/rust/remote/BUILD.serde-1.0.136.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -57,7 +58,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.125", + version = "1.0.136", visibility = ["//visibility:private"], deps = [ ], @@ -73,21 +74,20 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", proc_macro_deps = [ - "@raze__serde_derive__1_0_125//:serde_derive", + "@raze__serde_derive__1_0_136//:serde_derive", ], rustc_flags = [ "--cap-lints=allow", - "--cfg=integer128", ], tags = [ "cargo-raze", + "crate-name=serde", "manual", ], - version = "1.0.125", + version = "1.0.136", # buildifier: leave-alone deps = [ ":serde_build_script", diff --git a/rules/rust/remote/BUILD.serde-value-0.6.0.bazel b/rules/rust/remote/BUILD.serde-value-0.6.0.bazel deleted file mode 100644 index c0d506d..0000000 --- a/rules/rust/remote/BUILD.serde-value-0.6.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "serde_value", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.0", - # buildifier: leave-alone - deps = [ - "@raze__ordered_float__1_1_1//:ordered_float", - "@raze__serde__1_0_125//:serde", - ], -) diff --git a/rules/rust/remote/BUILD.serde_derive-1.0.125.bazel b/rules/rust/remote/BUILD.serde_derive-1.0.136.bazel similarity index 84% rename from rules/rust/remote/BUILD.serde_derive-1.0.125.bazel rename to rules/rust/remote/BUILD.serde_derive-1.0.136.bazel index 9e641db..7d43aa6 100644 --- a/rules/rust/remote/BUILD.serde_derive-1.0.125.bazel +++ b/rules/rust/remote/BUILD.serde_derive-1.0.136.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -54,20 +55,19 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.125", + version = "1.0.136", visibility = ["//visibility:private"], deps = [ ], ) -rust_library( +rust_proc_macro( name = "serde_derive", srcs = glob(["**/*.rs"]), crate_features = [ "default", ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2015", rustc_flags = [ @@ -75,14 +75,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=serde_derive", "manual", ], - version = "1.0.125", + version = "1.0.136", # buildifier: leave-alone deps = [ ":serde_derive_build_script", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.serde_json-1.0.79.bazel b/rules/rust/remote/BUILD.serde_json-1.0.79.bazel new file mode 100644 index 0000000..00fde93 --- /dev/null +++ b/rules/rust/remote/BUILD.serde_json-1.0.79.bazel @@ -0,0 +1,105 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "serde_json_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + "default", + "std", + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "1.0.79", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "serde_json", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "std", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=serde_json", + "manual", + ], + version = "1.0.79", + # buildifier: leave-alone + deps = [ + ":serde_json_build_script", + "@raze__itoa__1_0_1//:itoa", + "@raze__ryu__1_0_9//:ryu", + "@raze__serde__1_0_136//:serde", + ], +) + +# Unsupported target "compiletest" with type "test" omitted + +# Unsupported target "debug" with type "test" omitted + +# Unsupported target "lexical" with type "test" omitted + +# Unsupported target "map" with type "test" omitted + +# Unsupported target "regression" with type "test" omitted + +# Unsupported target "stream" with type "test" omitted + +# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.serde_qs-0.8.3.bazel b/rules/rust/remote/BUILD.serde_qs-0.8.3.bazel deleted file mode 100644 index 629d4f9..0000000 --- a/rules/rust/remote/BUILD.serde_qs-0.8.3.bazel +++ /dev/null @@ -1,71 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "csv_vectors" with type "example" omitted - -# Unsupported target "introduction" with type "example" omitted - -rust_library( - name = "serde_qs", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.3", - # buildifier: leave-alone - deps = [ - "@raze__percent_encoding__2_1_0//:percent_encoding", - "@raze__serde__1_0_125//:serde", - "@raze__thiserror__1_0_24//:thiserror", - ], -) - -# Unsupported target "test_actix" with type "test" omitted - -# Unsupported target "test_deserialize" with type "test" omitted - -# Unsupported target "test_regression" with type "test" omitted - -# Unsupported target "test_serialize" with type "test" omitted - -# Unsupported target "test_warp" with type "test" omitted diff --git a/rules/rust/remote/BUILD.serde_urlencoded-0.7.0.bazel b/rules/rust/remote/BUILD.serde_urlencoded-0.7.0.bazel deleted file mode 100644 index 342e87f..0000000 --- a/rules/rust/remote/BUILD.serde_urlencoded-0.7.0.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "serde_urlencoded", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.0", - # buildifier: leave-alone - deps = [ - "@raze__form_urlencoded__1_0_1//:form_urlencoded", - "@raze__itoa__0_4_7//:itoa", - "@raze__ryu__1_0_5//:ryu", - "@raze__serde__1_0_125//:serde", - ], -) - -# Unsupported target "test_deserialize" with type "test" omitted - -# Unsupported target "test_serialize" with type "test" omitted diff --git a/rules/rust/remote/BUILD.serde_yaml-0.8.17.bazel b/rules/rust/remote/BUILD.serde_yaml-0.8.23.bazel similarity index 81% rename from rules/rust/remote/BUILD.serde_yaml-0.8.17.bazel rename to rules/rust/remote/BUILD.serde_yaml-0.8.23.bazel index a7492b2..a5734c7 100644 --- a/rules/rust/remote/BUILD.serde_yaml-0.8.17.bazel +++ b/rules/rust/remote/BUILD.serde_yaml-0.8.23.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,14 +44,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=serde_yaml", "manual", ], - version = "0.8.17", + version = "0.8.23", # buildifier: leave-alone deps = [ - "@raze__dtoa__0_4_8//:dtoa", - "@raze__linked_hash_map__0_5_4//:linked_hash_map", - "@raze__serde__1_0_125//:serde", + "@raze__indexmap__1_8_0//:indexmap", + "@raze__ryu__1_0_9//:ryu", + "@raze__serde__1_0_136//:serde", "@raze__yaml_rust__0_4_5//:yaml_rust", ], ) @@ -63,5 +64,3 @@ rust_library( # Unsupported target "test_serde" with type "test" omitted # Unsupported target "test_value" with type "test" omitted - -# Unsupported target "test_visitor" with type "test" omitted diff --git a/rules/rust/remote/BUILD.md-5-0.9.1.bazel b/rules/rust/remote/BUILD.sha-1-0.8.2.bazel similarity index 70% rename from rules/rust/remote/BUILD.md-5-0.9.1.bazel rename to rules/rust/remote/BUILD.sha-1-0.8.2.bazel index 629954e..274388f 100644 --- a/rules/rust/remote/BUILD.md-5-0.9.1.bazel +++ b/rules/rust/remote/BUILD.sha-1-0.8.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -32,11 +33,11 @@ licenses([ # Unsupported target "lib" with type "bench" omitted -# Unsupported target "md5sum" with type "example" omitted +# Unsupported target "sha1sum" with type "example" omitted alias( - name = "md_5", - actual = ":md5", + name = "sha_1", + actual = ":sha1", tags = [ "cargo-raze", "manual", @@ -44,29 +45,28 @@ alias( ) rust_library( - name = "md5", + name = "sha1", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=sha1", "manual", ], - version = "0.9.1", + version = "0.8.2", # buildifier: leave-alone deps = [ - "@raze__block_buffer__0_9_0//:block_buffer", - "@raze__digest__0_9_0//:digest", - "@raze__opaque_debug__0_3_0//:opaque_debug", + "@raze__block_buffer__0_7_3//:block_buffer", + "@raze__digest__0_8_1//:digest", + "@raze__fake_simd__0_1_2//:fake_simd", + "@raze__opaque_debug__0_2_3//:opaque_debug", ], ) diff --git a/rules/rust/remote/BUILD.sha-1-0.9.4.bazel b/rules/rust/remote/BUILD.sha-1-0.9.4.bazel deleted file mode 100644 index 71b9910..0000000 --- a/rules/rust/remote/BUILD.sha-1-0.9.4.bazel +++ /dev/null @@ -1,85 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "lib" with type "bench" omitted - -# Unsupported target "sha1sum" with type "example" omitted - -alias( - name = "sha_1", - actual = ":sha1", - tags = [ - "cargo-raze", - "manual", - ], -) - -rust_library( - name = "sha1", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.4", - # buildifier: leave-alone - deps = [ - "@raze__block_buffer__0_9_0//:block_buffer", - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__digest__0_9_0//:digest", - "@raze__opaque_debug__0_3_0//:opaque_debug", - ] + selects.with_or({ - # cfg(any(target_arch = "x86", target_arch = "x86_64")) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__cpuid_bool__0_1_2//:cpuid_bool", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "lib" with type "test" omitted diff --git a/rules/rust/remote/BUILD.sha1-0.6.0.bazel b/rules/rust/remote/BUILD.sha1-0.6.0.bazel deleted file mode 100644 index c0ab1e6..0000000 --- a/rules/rust/remote/BUILD.sha1-0.6.0.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # BSD-3-Clause from expression "BSD-3-Clause" -]) - -# Generated Targets - -rust_library( - name = "sha1", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.0", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.sha2-0.9.3.bazel b/rules/rust/remote/BUILD.sha2-0.9.3.bazel deleted file mode 100644 index b3fcc46..0000000 --- a/rules/rust/remote/BUILD.sha2-0.9.3.bazel +++ /dev/null @@ -1,80 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "sha256" with type "bench" omitted - -# Unsupported target "sha512" with type "bench" omitted - -# Unsupported target "sha256sum" with type "example" omitted - -# Unsupported target "sha512sum" with type "example" omitted - -rust_library( - name = "sha2", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.9.3", - # buildifier: leave-alone - deps = [ - "@raze__block_buffer__0_9_0//:block_buffer", - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__digest__0_9_0//:digest", - "@raze__opaque_debug__0_3_0//:opaque_debug", - ] + selects.with_or({ - # cfg(any(target_arch = "x86", target_arch = "x86_64")) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__cpuid_bool__0_1_2//:cpuid_bool", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "lib" with type "test" omitted diff --git a/rules/rust/remote/BUILD.csv-core-0.1.10.bazel b/rules/rust/remote/BUILD.sharded-slab-0.1.4.bazel similarity index 79% rename from rules/rust/remote/BUILD.csv-core-0.1.10.bazel rename to rules/rust/remote/BUILD.sharded-slab-0.1.4.bazel index da5a2d8..cf98516 100644 --- a/rules/rust/remote/BUILD.csv-core-0.1.10.bazel +++ b/rules/rust/remote/BUILD.sharded-slab-0.1.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,7 +26,7 @@ package(default_visibility = [ ]) licenses([ - "unencumbered", # Unlicense from expression "Unlicense OR MIT" + "notice", # MIT from expression "MIT" ]) # Generated Targets @@ -33,13 +34,11 @@ licenses([ # Unsupported target "bench" with type "bench" omitted rust_library( - name = "csv_core", + name = "sharded_slab", srcs = glob(["**/*.rs"]), crate_features = [ - "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -47,11 +46,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=sharded-slab", "manual", ], - version = "0.1.10", + version = "0.1.4", # buildifier: leave-alone deps = [ - "@raze__memchr__2_3_4//:memchr", + "@raze__lazy_static__1_4_0//:lazy_static", ], ) diff --git a/rules/rust/remote/BUILD.signal-hook-0.3.8.bazel b/rules/rust/remote/BUILD.signal-hook-0.3.13.bazel similarity index 88% rename from rules/rust/remote/BUILD.signal-hook-0.3.8.bazel rename to rules/rust/remote/BUILD.signal-hook-0.3.13.bazel index 684cb42..6bedb83 100644 --- a/rules/rust/remote/BUILD.signal-hook-0.3.8.bazel +++ b/rules/rust/remote/BUILD.signal-hook-0.3.13.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -56,7 +57,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.3.8", + version = "0.3.13", visibility = ["//visibility:private"], deps = [ ], @@ -73,7 +74,6 @@ rust_library( "iterator", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -81,14 +81,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=signal-hook", "manual", ], - version = "0.3.8", + version = "0.3.13", # buildifier: leave-alone deps = [ ":signal_hook_build_script", - "@raze__libc__0_2_93//:libc", - "@raze__signal_hook_registry__1_3_0//:signal_hook_registry", + "@raze__libc__0_2_121//:libc", + "@raze__signal_hook_registry__1_4_0//:signal_hook_registry", ], ) diff --git a/rules/rust/remote/BUILD.signal-hook-registry-1.3.0.bazel b/rules/rust/remote/BUILD.signal-hook-registry-1.4.0.bazel similarity index 86% rename from rules/rust/remote/BUILD.signal-hook-registry-1.3.0.bazel rename to rules/rust/remote/BUILD.signal-hook-registry-1.4.0.bazel index d247e73..6b02cc6 100644 --- a/rules/rust/remote/BUILD.signal-hook-registry-1.3.0.bazel +++ b/rules/rust/remote/BUILD.signal-hook-registry-1.4.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,12 +44,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=signal-hook-registry", "manual", ], - version = "1.3.0", + version = "1.4.0", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], ) diff --git a/rules/rust/remote/BUILD.siphasher-0.3.5.bazel b/rules/rust/remote/BUILD.siphasher-0.3.5.bazel deleted file mode 100644 index b5a81c7..0000000 --- a/rules/rust/remote/BUILD.siphasher-0.3.5.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "siphasher", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.5", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.slab-0.4.2.bazel b/rules/rust/remote/BUILD.slab-0.4.5.bazel similarity index 81% rename from rules/rust/remote/BUILD.slab-0.4.2.bazel rename to rules/rust/remote/BUILD.slab-0.4.5.bazel index 33e45b4..ef48f21 100644 --- a/rules/rust/remote/BUILD.slab-0.4.2.bazel +++ b/rules/rust/remote/BUILD.slab-0.4.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,22 +35,26 @@ rust_library( name = "slab", srcs = glob(["**/*.rs"]), crate_features = [ + "default", + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=slab", "manual", ], - version = "0.4.2", + version = "0.4.5", # buildifier: leave-alone deps = [ ], ) +# Unsupported target "serde" with type "test" omitted + # Unsupported target "slab" with type "test" omitted diff --git a/rules/rust/remote/BUILD.slog-2.7.0.bazel b/rules/rust/remote/BUILD.slog-2.7.0.bazel deleted file mode 100644 index b2502f0..0000000 --- a/rules/rust/remote/BUILD.slog-2.7.0.bazel +++ /dev/null @@ -1,98 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "slog_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "default", - "erased-serde", - "nested-values", - "std", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.7.0", - visibility = ["//visibility:private"], - deps = [ - ], -) - -# Unsupported target "named" with type "example" omitted - -# Unsupported target "singlethread" with type "example" omitted - -# Unsupported target "struct-log-self" with type "example" omitted - -rust_library( - name = "slog", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "erased-serde", - "nested-values", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.7.0", - # buildifier: leave-alone - deps = [ - ":slog_build_script", - "@raze__erased_serde__0_3_13//:erased_serde", - ], -) diff --git a/rules/rust/remote/BUILD.slog-async-2.6.0.bazel b/rules/rust/remote/BUILD.slog-async-2.6.0.bazel deleted file mode 100644 index ae1b4d4..0000000 --- a/rules/rust/remote/BUILD.slog-async-2.6.0.bazel +++ /dev/null @@ -1,58 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)" -]) - -# Generated Targets - -rust_library( - name = "slog_async", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.6.0", - # buildifier: leave-alone - deps = [ - "@raze__crossbeam_channel__0_5_1//:crossbeam_channel", - "@raze__slog__2_7_0//:slog", - "@raze__take_mut__0_2_2//:take_mut", - "@raze__thread_local__1_1_3//:thread_local", - ], -) diff --git a/rules/rust/remote/BUILD.slog-json-2.3.0.bazel b/rules/rust/remote/BUILD.slog-json-2.3.0.bazel deleted file mode 100644 index 3784111..0000000 --- a/rules/rust/remote/BUILD.slog-json-2.3.0.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "reciprocal", # MPL-2.0 from expression "MPL-2.0" -]) - -# Generated Targets - -# Unsupported target "pretty" with type "example" omitted - -rust_library( - name = "slog_json", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.3.0", - # buildifier: leave-alone - deps = [ - "@raze__chrono__0_4_19//:chrono", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__slog__2_7_0//:slog", - ], -) diff --git a/rules/rust/remote/BUILD.slog-scope-4.4.0.bazel b/rules/rust/remote/BUILD.slog-scope-4.4.0.bazel deleted file mode 100644 index 19a289d..0000000 --- a/rules/rust/remote/BUILD.slog-scope-4.4.0.bazel +++ /dev/null @@ -1,58 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)" -]) - -# Generated Targets - -# Unsupported target "compact-color" with type "example" omitted - -rust_library( - name = "slog_scope", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "4.4.0", - # buildifier: leave-alone - deps = [ - "@raze__arc_swap__1_2_0//:arc_swap", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__slog__2_7_0//:slog", - ], -) diff --git a/rules/rust/remote/BUILD.slog-stdlog-4.1.0.bazel b/rules/rust/remote/BUILD.slog-stdlog-4.1.0.bazel deleted file mode 100644 index 6946850..0000000 --- a/rules/rust/remote/BUILD.slog-stdlog-4.1.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)" -]) - -# Generated Targets - -rust_library( - name = "slog_stdlog", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "4.1.0", - # buildifier: leave-alone - deps = [ - "@raze__log__0_4_14//:log", - "@raze__slog__2_7_0//:slog", - "@raze__slog_scope__4_4_0//:slog_scope", - ], -) diff --git a/rules/rust/remote/BUILD.slog-term-2.8.0.bazel b/rules/rust/remote/BUILD.slog-term-2.8.0.bazel deleted file mode 100644 index fb561cd..0000000 --- a/rules/rust/remote/BUILD.slog-term-2.8.0.bazel +++ /dev/null @@ -1,72 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MPL-2.0 OR (MIT OR Apache-2.0)" -]) - -# Generated Targets - -# Unsupported target "compact" with type "example" omitted - -# Unsupported target "compact-color" with type "example" omitted - -# Unsupported target "full" with type "example" omitted - -# Unsupported target "full-color" with type "example" omitted - -# Unsupported target "full-color-oorder" with type "example" omitted - -# Unsupported target "to-file" with type "example" omitted - -rust_library( - name = "slog_term", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.8.0", - # buildifier: leave-alone - deps = [ - "@raze__atty__0_2_14//:atty", - "@raze__chrono__0_4_19//:chrono", - "@raze__slog__2_7_0//:slog", - "@raze__term__0_7_0//:term", - "@raze__thread_local__1_1_3//:thread_local", - ], -) - -# Unsupported target "term" with type "test" omitted diff --git a/rules/rust/remote/BUILD.slog_derive-0.2.0.bazel b/rules/rust/remote/BUILD.slog_derive-0.2.0.bazel deleted file mode 100644 index ba584f5..0000000 --- a/rules/rust/remote/BUILD.slog_derive-0.2.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "slog_derive", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.smallvec-1.6.1.bazel b/rules/rust/remote/BUILD.smallvec-1.8.0.bazel similarity index 90% rename from rules/rust/remote/BUILD.smallvec-1.6.1.bazel rename to rules/rust/remote/BUILD.smallvec-1.8.0.bazel index 0b2498e..28ad0b8 100644 --- a/rules/rust/remote/BUILD.smallvec-1.6.1.bazel +++ b/rules/rust/remote/BUILD.smallvec-1.8.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +46,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=smallvec", "manual", ], - version = "1.6.1", + version = "1.8.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.smawk-0.3.1.bazel b/rules/rust/remote/BUILD.smawk-0.3.1.bazel index ab243be..c687a8c 100644 --- a/rules/rust/remote/BUILD.smawk-0.3.1.bazel +++ b/rules/rust/remote/BUILD.smawk-0.3.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=smawk", "manual", ], version = "0.3.1", diff --git a/rules/rust/remote/BUILD.snap-1.0.4.bazel b/rules/rust/remote/BUILD.snap-1.0.4.bazel deleted file mode 100644 index d60cd91..0000000 --- a/rules/rust/remote/BUILD.snap-1.0.4.bazel +++ /dev/null @@ -1,89 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # BSD-3-Clause from expression "BSD-3-Clause" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "snap_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.4", - visibility = ["//visibility:private"], - deps = [ - ], -) - -# Unsupported target "compress" with type "example" omitted - -# Unsupported target "compress-escaped" with type "example" omitted - -# Unsupported target "decompress" with type "example" omitted - -rust_library( - name = "snap", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.0.4", - # buildifier: leave-alone - deps = [ - ":snap_build_script", - ], -) diff --git a/rules/rust/remote/BUILD.socket2-0.4.0.bazel b/rules/rust/remote/BUILD.socket2-0.4.4.bazel similarity index 87% rename from rules/rust/remote/BUILD.socket2-0.4.0.bazel rename to rules/rust/remote/BUILD.socket2-0.4.4.bazel index 314f7e6..4aaa933 100644 --- a/rules/rust/remote/BUILD.socket2-0.4.0.bazel +++ b/rules/rust/remote/BUILD.socket2-0.4.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,9 +37,9 @@ rust_library( aliases = { }, crate_features = [ + "all", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +47,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=socket2", "manual", ], - version = "0.4.0", + version = "0.4.4", # buildifier: leave-alone deps = [ ] + selects.with_or({ @@ -57,7 +59,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.stable_deref_trait-1.2.0.bazel b/rules/rust/remote/BUILD.stable_deref_trait-1.2.0.bazel index 4d3ded6..012d4a3 100644 --- a/rules/rust/remote/BUILD.stable_deref_trait-1.2.0.bazel +++ b/rules/rust/remote/BUILD.stable_deref_trait-1.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -39,7 +40,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -47,6 +47,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=stable_deref_trait", "manual", ], version = "1.2.0", diff --git a/rules/rust/remote/BUILD.static_assertions-1.1.0.bazel b/rules/rust/remote/BUILD.static_assertions-1.1.0.bazel index 68f245a..75598c2 100644 --- a/rules/rust/remote/BUILD.static_assertions-1.1.0.bazel +++ b/rules/rust/remote/BUILD.static_assertions-1.1.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=static_assertions", "manual", ], version = "1.1.0", diff --git a/rules/rust/remote/BUILD.stdweb-0.4.20.bazel b/rules/rust/remote/BUILD.stdweb-0.4.20.bazel deleted file mode 100644 index b8b61c2..0000000 --- a/rules/rust/remote/BUILD.stdweb-0.4.20.bazel +++ /dev/null @@ -1,90 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "stdweb_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.20", - visibility = ["//visibility:private"], - deps = [ - "@raze__rustc_version__0_2_3//:rustc_version", - ], -) - -rust_library( - name = "stdweb", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - proc_macro_deps = [ - "@raze__stdweb_derive__0_5_3//:stdweb_derive", - "@raze__stdweb_internal_macros__0_2_9//:stdweb_internal_macros", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.20", - # buildifier: leave-alone - deps = [ - ":stdweb_build_script", - "@raze__discard__1_0_4//:discard", - "@raze__stdweb_internal_runtime__0_1_5//:stdweb_internal_runtime", - ], -) diff --git a/rules/rust/remote/BUILD.stdweb-derive-0.5.3.bazel b/rules/rust/remote/BUILD.stdweb-derive-0.5.3.bazel deleted file mode 100644 index d0469a5..0000000 --- a/rules/rust/remote/BUILD.stdweb-derive-0.5.3.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "stdweb_derive", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2015", - proc_macro_deps = [ - "@raze__serde_derive__1_0_125//:serde_derive", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.3", - # buildifier: leave-alone - deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__serde__1_0_125//:serde", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.stdweb-internal-macros-0.2.9.bazel b/rules/rust/remote/BUILD.stdweb-internal-macros-0.2.9.bazel deleted file mode 100644 index 201c38f..0000000 --- a/rules/rust/remote/BUILD.stdweb-internal-macros-0.2.9.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "stdweb_internal_macros", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2015", - proc_macro_deps = [ - "@raze__serde_derive__1_0_125//:serde_derive", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.9", - # buildifier: leave-alone - deps = [ - "@raze__base_x__0_2_8//:base_x", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - "@raze__sha1__0_6_0//:sha1", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.stdweb-internal-runtime-0.1.5.bazel b/rules/rust/remote/BUILD.stdweb-internal-runtime-0.1.5.bazel deleted file mode 100644 index 76928a8..0000000 --- a/rules/rust/remote/BUILD.stdweb-internal-runtime-0.1.5.bazel +++ /dev/null @@ -1,85 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "stdweb_internal_runtime_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "default", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.5", - visibility = ["//visibility:private"], - deps = [ - ], -) - -rust_library( - name = "stdweb_internal_runtime", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.5", - # buildifier: leave-alone - deps = [ - ":stdweb_internal_runtime_build_script", - ], -) diff --git a/rules/rust/remote/BUILD.stringprep-0.1.2.bazel b/rules/rust/remote/BUILD.stringprep-0.1.2.bazel deleted file mode 100644 index d1c6f75..0000000 --- a/rules/rust/remote/BUILD.stringprep-0.1.2.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "stringprep", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.2", - # buildifier: leave-alone - deps = [ - "@raze__unicode_bidi__0_3_5//:unicode_bidi", - "@raze__unicode_normalization__0_1_17//:unicode_normalization", - ], -) - -# Unsupported target "nameprep_tests" with type "test" omitted - -# Unsupported target "nodeprep_tests" with type "test" omitted - -# Unsupported target "saslprep_tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.strsim-0.8.0.bazel b/rules/rust/remote/BUILD.strsim-0.10.0.bazel similarity index 90% rename from rules/rust/remote/BUILD.strsim-0.8.0.bazel rename to rules/rust/remote/BUILD.strsim-0.10.0.bazel index d68f266..858b016 100644 --- a/rules/rust/remote/BUILD.strsim-0.8.0.bazel +++ b/rules/rust/remote/BUILD.strsim-0.10.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,9 +46,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=strsim", "manual", ], - version = "0.8.0", + version = "0.10.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.strum_macros-0.20.1.bazel b/rules/rust/remote/BUILD.strum_macros-0.20.1.bazel deleted file mode 100644 index 2d2c10f..0000000 --- a/rules/rust/remote/BUILD.strum_macros-0.20.1.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "strum_macros", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.20.1", - # buildifier: leave-alone - deps = [ - "@raze__heck__0_3_2//:heck", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.syn-1.0.69.bazel b/rules/rust/remote/BUILD.syn-1.0.89.bazel similarity index 91% rename from rules/rust/remote/BUILD.syn-1.0.69.bazel rename to rules/rust/remote/BUILD.syn-1.0.89.bazel index 87f913c..16cc40f 100644 --- a/rules/rust/remote/BUILD.syn-1.0.69.bazel +++ b/rules/rust/remote/BUILD.syn-1.0.89.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -64,7 +65,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.69", + version = "1.0.89", visibility = ["//visibility:private"], deps = [ ], @@ -91,7 +92,6 @@ rust_library( "visit-mut", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -99,18 +99,21 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=syn", "manual", ], - version = "1.0.69", + version = "1.0.89", # buildifier: leave-alone deps = [ ":syn_build_script", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__unicode_xid__0_2_1//:unicode_xid", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__unicode_xid__0_2_2//:unicode_xid", ], ) +# Unsupported target "regression" with type "test" omitted + # Unsupported target "test_asyncness" with type "test" omitted # Unsupported target "test_attribute" with type "test" omitted diff --git a/rules/rust/remote/BUILD.take_mut-0.2.2.bazel b/rules/rust/remote/BUILD.take_mut-0.2.2.bazel deleted file mode 100644 index 6ce50de..0000000 --- a/rules/rust/remote/BUILD.take_mut-0.2.2.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "take_mut", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.2", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.tantivy-0.17.0.bazel b/rules/rust/remote/BUILD.tantivy-0.17.0.bazel new file mode 100644 index 0000000..39ef90a --- /dev/null +++ b/rules/rust/remote/BUILD.tantivy-0.17.0.bazel @@ -0,0 +1,151 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "analyzer" with type "bench" omitted + +# Unsupported target "index-bench" with type "bench" omitted + +# Unsupported target "aggregation" with type "example" omitted + +# Unsupported target "basic_search" with type "example" omitted + +# Unsupported target "custom_collector" with type "example" omitted + +# Unsupported target "custom_tokenizer" with type "example" omitted + +# Unsupported target "deleting_updating_documents" with type "example" omitted + +# Unsupported target "faceted_search" with type "example" omitted + +# Unsupported target "faceted_search_with_tweaked_score" with type "example" omitted + +# Unsupported target "integer_range_search" with type "example" omitted + +# Unsupported target "iterating_docs_and_positions" with type "example" omitted + +# Unsupported target "json_field" with type "example" omitted + +# Unsupported target "multiple_producer" with type "example" omitted + +# Unsupported target "pre_tokenized_text" with type "example" omitted + +# Unsupported target "snippet" with type "example" omitted + +# Unsupported target "stop_words" with type "example" omitted + +# Unsupported target "warmer" with type "example" omitted + +# Unsupported target "working_with_json" with type "example" omitted + +rust_library( + name = "tantivy", + srcs = glob(["**/*.rs"]), + aliases = { + "@raze__tantivy_common__0_2_0//:tantivy_common": "common", + }, + crate_features = [ + "brotli", + "brotli-compression", + "default", + "fs2", + "lz4-compression", + "lz4_flex", + "memmap2", + "mmap", + "tempfile", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + proc_macro_deps = [ + "@raze__async_trait__0_1_52//:async_trait", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tantivy", + "manual", + ], + version = "0.17.0", + # buildifier: leave-alone + deps = [ + "@raze__base64__0_13_0//:base64", + "@raze__bitpacking__0_8_4//:bitpacking", + "@raze__brotli__3_3_3//:brotli", + "@raze__byteorder__1_4_3//:byteorder", + "@raze__census__0_4_0//:census", + "@raze__chrono__0_4_19//:chrono", + "@raze__crc32fast__1_3_2//:crc32fast", + "@raze__crossbeam__0_8_1//:crossbeam", + "@raze__downcast_rs__1_2_0//:downcast_rs", + "@raze__fail__0_5_0//:fail", + "@raze__fastdivide__0_4_0//:fastdivide", + "@raze__fastfield_codecs__0_1_0//:fastfield_codecs", + "@raze__fnv__1_0_7//:fnv", + "@raze__fs2__0_4_3//:fs2", + "@raze__futures__0_3_21//:futures", + "@raze__htmlescape__0_3_1//:htmlescape", + "@raze__itertools__0_10_3//:itertools", + "@raze__levenshtein_automata__0_2_1//:levenshtein_automata", + "@raze__log__0_4_14//:log", + "@raze__lru__0_7_3//:lru", + "@raze__lz4_flex__0_9_2//:lz4_flex", + "@raze__measure_time__0_8_0//:measure_time", + "@raze__memmap2__0_5_3//:memmap2", + "@raze__murmurhash32__0_2_0//:murmurhash32", + "@raze__num_cpus__1_13_1//:num_cpus", + "@raze__once_cell__1_10_0//:once_cell", + "@raze__ownedbytes__0_2_0//:ownedbytes", + "@raze__pretty_assertions__1_2_0//:pretty_assertions", + "@raze__rayon__1_5_1//:rayon", + "@raze__regex__1_5_5//:regex", + "@raze__rust_stemmers__1_2_0//:rust_stemmers", + "@raze__serde__1_0_136//:serde", + "@raze__serde_json__1_0_79//:serde_json", + "@raze__smallvec__1_8_0//:smallvec", + "@raze__stable_deref_trait__1_2_0//:stable_deref_trait", + "@raze__tantivy_bitpacker__0_1_1//:tantivy_bitpacker", + "@raze__tantivy_common__0_2_0//:tantivy_common", + "@raze__tantivy_fst__0_3_0//:tantivy_fst", + "@raze__tantivy_query_grammar__0_15_0//:tantivy_query_grammar", + "@raze__tempfile__3_3_0//:tempfile", + "@raze__thiserror__1_0_30//:thiserror", + "@raze__uuid__0_8_2//:uuid", + ], +) + +# Unsupported target "failpoints" with type "test" omitted + +# Unsupported target "mod" with type "test" omitted diff --git a/rules/rust/remote/BUILD.levenshtein_automata-0.1.1.bazel b/rules/rust/remote/BUILD.tantivy-bitpacker-0.1.1.bazel similarity index 81% rename from rules/rust/remote/BUILD.levenshtein_automata-0.1.1.bazel rename to rules/rust/remote/BUILD.tantivy-bitpacker-0.1.1.bazel index 657d16b..ac362c9 100644 --- a/rules/rust/remote/BUILD.levenshtein_automata-0.1.1.bazel +++ b/rules/rust/remote/BUILD.tantivy-bitpacker-0.1.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,27 +31,26 @@ licenses([ # Generated Targets +# Unsupported target "bench" with type "bench" omitted + rust_library( - name = "levenshtein_automata", + name = "tantivy_bitpacker", srcs = glob(["**/*.rs"]), crate_features = [ - "fst", - "fst_automaton", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=tantivy-bitpacker", "manual", ], version = "0.1.1", # buildifier: leave-alone deps = [ - "@raze__fst__0_3_5//:fst", ], ) diff --git a/rules/rust/remote/BUILD.tantivy-common-0.1.0.bazel b/rules/rust/remote/BUILD.tantivy-common-0.1.0.bazel new file mode 100644 index 0000000..c54b685 --- /dev/null +++ b/rules/rust/remote/BUILD.tantivy-common-0.1.0.bazel @@ -0,0 +1,55 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "tantivy_common", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tantivy-common", + "manual", + ], + version = "0.1.0", + # buildifier: leave-alone + deps = [ + "@raze__byteorder__1_4_3//:byteorder", + ], +) diff --git a/rules/rust/remote/BUILD.tantivy-common-0.2.0.bazel b/rules/rust/remote/BUILD.tantivy-common-0.2.0.bazel new file mode 100644 index 0000000..a780097 --- /dev/null +++ b/rules/rust/remote/BUILD.tantivy-common-0.2.0.bazel @@ -0,0 +1,56 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "tantivy_common", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tantivy-common", + "manual", + ], + version = "0.2.0", + # buildifier: leave-alone + deps = [ + "@raze__byteorder__1_4_3//:byteorder", + "@raze__ownedbytes__0_2_0//:ownedbytes", + ], +) diff --git a/rules/rust/remote/BUILD.tantivy-fst-0.3.0.bazel b/rules/rust/remote/BUILD.tantivy-fst-0.3.0.bazel index 4332d58..f43c192 100644 --- a/rules/rust/remote/BUILD.tantivy-fst-0.3.0.bazel +++ b/rules/rust/remote/BUILD.tantivy-fst-0.3.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -40,7 +41,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -48,6 +48,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tantivy-fst", "manual", ], version = "0.3.0", diff --git a/rules/rust/remote/BUILD.tantivy-query-grammar-0.15.0.bazel b/rules/rust/remote/BUILD.tantivy-query-grammar-0.15.0.bazel new file mode 100644 index 0000000..48add78 --- /dev/null +++ b/rules/rust/remote/BUILD.tantivy-query-grammar-0.15.0.bazel @@ -0,0 +1,55 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "tantivy_query_grammar", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tantivy-query-grammar", + "manual", + ], + version = "0.15.0", + # buildifier: leave-alone + deps = [ + "@raze__combine__4_6_3//:combine", + ], +) diff --git a/rules/rust/remote/BUILD.tar-0.4.33.bazel b/rules/rust/remote/BUILD.tar-0.4.33.bazel deleted file mode 100644 index a944bfc..0000000 --- a/rules/rust/remote/BUILD.tar-0.4.33.bazel +++ /dev/null @@ -1,80 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "extract_file" with type "example" omitted - -# Unsupported target "list" with type "example" omitted - -# Unsupported target "raw_list" with type "example" omitted - -# Unsupported target "write" with type "example" omitted - -rust_library( - name = "tar", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "default", - "xattr", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.33", - # buildifier: leave-alone - deps = [ - "@raze__filetime__0_2_14//:filetime", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - "@raze__xattr__0_2_2//:xattr", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "all" with type "test" omitted - -# Unsupported target "entry" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tempdir-0.3.7.bazel b/rules/rust/remote/BUILD.tempdir-0.3.7.bazel deleted file mode 100644 index b4a44ed..0000000 --- a/rules/rust/remote/BUILD.tempdir-0.3.7.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "tempdir", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.7", - # buildifier: leave-alone - deps = [ - "@raze__rand__0_4_6//:rand", - "@raze__remove_dir_all__0_5_3//:remove_dir_all", - ], -) - -# Unsupported target "smoke" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tempfile-3.2.0.bazel b/rules/rust/remote/BUILD.tempfile-3.3.0.bazel similarity index 86% rename from rules/rust/remote/BUILD.tempfile-3.2.0.bazel rename to rules/rust/remote/BUILD.tempfile-3.3.0.bazel index 61f3c43..0fcb477 100644 --- a/rules/rust/remote/BUILD.tempfile-3.2.0.bazel +++ b/rules/rust/remote/BUILD.tempfile-3.3.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,21 +46,22 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tempfile", "manual", ], - version = "3.2.0", + version = "3.3.0", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__rand__0_8_3//:rand", + "@raze__fastrand__1_7_0//:fastrand", "@raze__remove_dir_all__0_5_3//:remove_dir_all", ] + selects.with_or({ - # cfg(unix) + # cfg(any(unix, target_os = "wasi")) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.termcolor-1.1.2.bazel b/rules/rust/remote/BUILD.termcolor-1.1.3.bazel similarity index 89% rename from rules/rust/remote/BUILD.termcolor-1.1.2.bazel rename to rules/rust/remote/BUILD.termcolor-1.1.3.bazel index 791e447..e826410 100644 --- a/rules/rust/remote/BUILD.termcolor-1.1.2.bazel +++ b/rules/rust/remote/BUILD.termcolor-1.1.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=termcolor", "manual", ], - version = "1.1.2", + version = "1.1.3", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.textwrap-0.11.0.bazel b/rules/rust/remote/BUILD.textwrap-0.11.0.bazel deleted file mode 100644 index e3b8837..0000000 --- a/rules/rust/remote/BUILD.textwrap-0.11.0.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "linear" with type "bench" omitted - -# Unsupported target "layout" with type "example" omitted - -# Unsupported target "termwidth" with type "example" omitted - -rust_library( - name = "textwrap", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.11.0", - # buildifier: leave-alone - deps = [ - "@raze__unicode_width__0_1_8//:unicode_width", - ], -) - -# Unsupported target "version-numbers" with type "test" omitted diff --git a/rules/rust/remote/BUILD.textwrap-0.13.4.bazel b/rules/rust/remote/BUILD.textwrap-0.15.0.bazel similarity index 72% rename from rules/rust/remote/BUILD.textwrap-0.13.4.bazel rename to rules/rust/remote/BUILD.textwrap-0.15.0.bazel index 46b7f1c..8a9907e 100644 --- a/rules/rust/remote/BUILD.textwrap-0.13.4.bazel +++ b/rules/rust/remote/BUILD.textwrap-0.15.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,20 +31,24 @@ licenses([ # Generated Targets +# Unsupported target "indent" with type "bench" omitted + # Unsupported target "linear" with type "bench" omitted +# Unsupported target "hyphenation" with type "example" omitted + +# Unsupported target "termwidth" with type "example" omitted + rust_library( name = "textwrap", srcs = glob(["**/*.rs"]), - aliases = { - }, crate_features = [ "default", "smawk", + "unicode-linebreak", "unicode-width", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -51,22 +56,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=textwrap", "manual", ], - version = "0.13.4", + version = "0.15.0", # buildifier: leave-alone deps = [ "@raze__smawk__0_3_1//:smawk", - "@raze__unicode_width__0_1_8//:unicode_width", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), + "@raze__unicode_linebreak__0_1_2//:unicode_linebreak", + "@raze__unicode_width__0_1_9//:unicode_width", + ], ) # Unsupported target "indent" with type "test" omitted diff --git a/rules/rust/remote/BUILD.thiserror-1.0.24.bazel b/rules/rust/remote/BUILD.thiserror-1.0.30.bazel similarity index 87% rename from rules/rust/remote/BUILD.thiserror-1.0.24.bazel rename to rules/rust/remote/BUILD.thiserror-1.0.30.bazel index 7dc1095..5de2dba 100644 --- a/rules/rust/remote/BUILD.thiserror-1.0.24.bazel +++ b/rules/rust/remote/BUILD.thiserror-1.0.30.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,20 +37,20 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", proc_macro_deps = [ - "@raze__thiserror_impl__1_0_24//:thiserror_impl", + "@raze__thiserror_impl__1_0_30//:thiserror_impl", ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=thiserror", "manual", ], - version = "1.0.24", + version = "1.0.30", # buildifier: leave-alone deps = [ ], @@ -59,8 +60,6 @@ rust_library( # Unsupported target "test_backtrace" with type "test" omitted -# Unsupported target "test_deprecated" with type "test" omitted - # Unsupported target "test_display" with type "test" omitted # Unsupported target "test_error" with type "test" omitted @@ -69,6 +68,8 @@ rust_library( # Unsupported target "test_from" with type "test" omitted +# Unsupported target "test_generics" with type "test" omitted + # Unsupported target "test_lints" with type "test" omitted # Unsupported target "test_option" with type "test" omitted diff --git a/rules/rust/remote/BUILD.thiserror-impl-1.0.24.bazel b/rules/rust/remote/BUILD.thiserror-impl-1.0.30.bazel similarity index 78% rename from rules/rust/remote/BUILD.thiserror-impl-1.0.24.bazel rename to rules/rust/remote/BUILD.thiserror-impl-1.0.30.bazel index efadeca..f732df8 100644 --- a/rules/rust/remote/BUILD.thiserror-impl-1.0.24.bazel +++ b/rules/rust/remote/BUILD.thiserror-impl-1.0.30.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,13 +31,12 @@ licenses([ # Generated Targets -rust_library( +rust_proc_macro( name = "thiserror_impl", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -44,13 +44,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=thiserror-impl", "manual", ], - version = "1.0.24", + version = "1.0.30", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.thread_local-1.1.3.bazel b/rules/rust/remote/BUILD.thread_local-1.1.4.bazel similarity index 86% rename from rules/rust/remote/BUILD.thread_local-1.1.3.bazel rename to rules/rust/remote/BUILD.thread_local-1.1.4.bazel index 36491cc..e18c0ed 100644 --- a/rules/rust/remote/BUILD.thread_local-1.1.3.bazel +++ b/rules/rust/remote/BUILD.thread_local-1.1.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,11 +46,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=thread_local", "manual", ], - version = "1.1.3", + version = "1.1.4", # buildifier: leave-alone deps = [ - "@raze__once_cell__1_7_2//:once_cell", + "@raze__once_cell__1_10_0//:once_cell", ], ) diff --git a/rules/rust/remote/BUILD.threadpool-1.8.1.bazel b/rules/rust/remote/BUILD.threadpool-1.8.1.bazel deleted file mode 100644 index fb0c732..0000000 --- a/rules/rust/remote/BUILD.threadpool-1.8.1.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "threadpool", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.8.1", - # buildifier: leave-alone - deps = [ - "@raze__num_cpus__1_13_0//:num_cpus", - ], -) diff --git a/rules/rust/remote/BUILD.time-0.1.43.bazel b/rules/rust/remote/BUILD.time-0.1.44.bazel similarity index 86% rename from rules/rust/remote/BUILD.time-0.1.43.bazel rename to rules/rust/remote/BUILD.time-0.1.44.bazel index eed6473..ee4d416 100644 --- a/rules/rust/remote/BUILD.time-0.1.43.bazel +++ b/rules/rust/remote/BUILD.time-0.1.44.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,20 +37,19 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ "--cap-lints=allow", - "--cfg=std", ], tags = [ "cargo-raze", + "crate-name=time", "manual", ], - version = "0.1.43", + version = "0.1.44", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", ], ) diff --git a/rules/rust/remote/BUILD.socket2-0.3.19.bazel b/rules/rust/remote/BUILD.time-0.3.7.bazel similarity index 73% rename from rules/rust/remote/BUILD.socket2-0.3.19.bazel rename to rules/rust/remote/BUILD.time-0.3.7.bazel index 614aafc..25fd43c 100644 --- a/rules/rust/remote/BUILD.socket2-0.3.19.bazel +++ b/rules/rust/remote/BUILD.time-0.3.7.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,15 +31,20 @@ licenses([ # Generated Targets +# Unsupported target "benchmarks" with type "bench" omitted + rust_library( - name = "socket2", + name = "time", srcs = glob(["**/*.rs"]), aliases = { }, crate_features = [ + "alloc", + "formatting", + "itoa", + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,19 +52,21 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=time", "manual", ], - version = "0.3.19", + version = "0.3.7", # buildifier: leave-alone deps = [ + "@raze__itoa__1_0_1//:itoa", ] + selects.with_or({ - # cfg(unix) + # cfg(target_family = "unix") ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", + "@raze__num_threads__0_1_5//:num_threads", ], "//conditions:default": [], }), diff --git a/rules/rust/remote/BUILD.time-macros-0.1.1.bazel b/rules/rust/remote/BUILD.time-macros-0.1.1.bazel deleted file mode 100644 index 9492926..0000000 --- a/rules/rust/remote/BUILD.time-macros-0.1.1.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "time_macros", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__proc_macro_hack__0_5_19//:proc_macro_hack", - "@raze__time_macros_impl__0_1_1//:time_macros_impl", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.1", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.time-macros-impl-0.1.1.bazel b/rules/rust/remote/BUILD.time-macros-impl-0.1.1.bazel deleted file mode 100644 index dadad9e..0000000 --- a/rules/rust/remote/BUILD.time-macros-impl-0.1.1.bazel +++ /dev/null @@ -1,60 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "time_macros_impl", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__proc_macro_hack__0_5_19//:proc_macro_hack", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.1", - # buildifier: leave-alone - deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__standback__0_2_17//:standback", - "@raze__syn__1_0_69//:syn", - ], -) diff --git a/rules/rust/remote/BUILD.tinytemplate-1.2.1.bazel b/rules/rust/remote/BUILD.tinytemplate-1.2.1.bazel deleted file mode 100644 index c67d5ff..0000000 --- a/rules/rust/remote/BUILD.tinytemplate-1.2.1.bazel +++ /dev/null @@ -1,57 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" -]) - -# Generated Targets - -# Unsupported target "benchmarks" with type "bench" omitted - -rust_library( - name = "tinytemplate", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.2.1", - # buildifier: leave-alone - deps = [ - "@raze__serde__1_0_125//:serde", - "@raze__serde_json__1_0_64//:serde_json", - ], -) diff --git a/rules/rust/remote/BUILD.tinyvec-1.2.0.bazel b/rules/rust/remote/BUILD.tinyvec-1.2.0.bazel deleted file mode 100644 index d1c221f..0000000 --- a/rules/rust/remote/BUILD.tinyvec-1.2.0.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # Zlib from expression "Zlib OR (Apache-2.0 OR MIT)" -]) - -# Generated Targets - -# Unsupported target "macros" with type "bench" omitted - -rust_library( - name = "tinyvec", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "default", - "tinyvec_macros", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.2.0", - # buildifier: leave-alone - deps = [ - "@raze__tinyvec_macros__0_1_0//:tinyvec_macros", - ], -) - -# Unsupported target "arrayvec" with type "test" omitted - -# Unsupported target "tinyvec" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tinyvec_macros-0.1.0.bazel b/rules/rust/remote/BUILD.tinyvec_macros-0.1.0.bazel deleted file mode 100644 index a6238a3..0000000 --- a/rules/rust/remote/BUILD.tinyvec_macros-0.1.0.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR (Apache-2.0 OR Zlib)" -]) - -# Generated Targets - -rust_library( - name = "tinyvec_macros", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.0", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.tls-api-0.4.0.bazel b/rules/rust/remote/BUILD.tls-api-0.4.0.bazel deleted file mode 100644 index a1dbd97..0000000 --- a/rules/rust/remote/BUILD.tls-api-0.4.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "tls_api", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.0", - # buildifier: leave-alone - deps = [ - "@raze__log__0_4_14//:log", - "@raze__tokio__0_2_25//:tokio", - ], -) diff --git a/rules/rust/remote/BUILD.tls-api-stub-0.4.0.bazel b/rules/rust/remote/BUILD.tls-api-stub-0.4.0.bazel deleted file mode 100644 index e9cf840..0000000 --- a/rules/rust/remote/BUILD.tls-api-stub-0.4.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "tls_api_stub", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.0", - # buildifier: leave-alone - deps = [ - "@raze__tls_api__0_4_0//:tls_api", - "@raze__tokio__0_2_25//:tokio", - "@raze__void__1_0_2//:void", - ], -) diff --git a/rules/rust/remote/BUILD.tokio-0.2.25.bazel b/rules/rust/remote/BUILD.tokio-0.2.25.bazel deleted file mode 100644 index e744f0c..0000000 --- a/rules/rust/remote/BUILD.tokio-0.2.25.bazel +++ /dev/null @@ -1,310 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "tokio", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - "blocking", - "default", - "dns", - "fnv", - "fs", - "full", - "futures-core", - "io-driver", - "io-std", - "io-util", - "iovec", - "lazy_static", - "libc", - "macros", - "memchr", - "mio", - "mio-named-pipes", - "mio-uds", - "net", - "num_cpus", - "process", - "rt-core", - "rt-threaded", - "rt-util", - "signal", - "signal-hook-registry", - "slab", - "stream", - "sync", - "tcp", - "time", - "tokio-macros", - "udp", - "uds", - "winapi", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__tokio_macros__0_2_6//:tokio_macros", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.25", - # buildifier: leave-alone - deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__fnv__1_0_7//:fnv", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__iovec__0_1_4//:iovec", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__memchr__2_3_4//:memchr", - "@raze__mio__0_6_23//:mio", - "@raze__num_cpus__1_13_0//:num_cpus", - "@raze__pin_project_lite__0_1_12//:pin_project_lite", - "@raze__slab__0_4_2//:slab", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - "@raze__mio_uds__0_6_8//:mio_uds", - "@raze__signal_hook_registry__1_3_0//:signal_hook_registry", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "_require_full" with type "test" omitted - -# Unsupported target "async_send_sync" with type "test" omitted - -# Unsupported target "buffered" with type "test" omitted - -# Unsupported target "fs" with type "test" omitted - -# Unsupported target "fs_copy" with type "test" omitted - -# Unsupported target "fs_dir" with type "test" omitted - -# Unsupported target "fs_file" with type "test" omitted - -# Unsupported target "fs_file_mocked" with type "test" omitted - -# Unsupported target "fs_link" with type "test" omitted - -# Unsupported target "io_async_read" with type "test" omitted - -# Unsupported target "io_chain" with type "test" omitted - -# Unsupported target "io_copy" with type "test" omitted - -# Unsupported target "io_driver" with type "test" omitted - -# Unsupported target "io_driver_drop" with type "test" omitted - -# Unsupported target "io_lines" with type "test" omitted - -# Unsupported target "io_mem_stream" with type "test" omitted - -# Unsupported target "io_read" with type "test" omitted - -# Unsupported target "io_read_exact" with type "test" omitted - -# Unsupported target "io_read_line" with type "test" omitted - -# Unsupported target "io_read_to_end" with type "test" omitted - -# Unsupported target "io_read_to_string" with type "test" omitted - -# Unsupported target "io_read_until" with type "test" omitted - -# Unsupported target "io_reader_stream" with type "test" omitted - -# Unsupported target "io_split" with type "test" omitted - -# Unsupported target "io_take" with type "test" omitted - -# Unsupported target "io_write" with type "test" omitted - -# Unsupported target "io_write_all" with type "test" omitted - -# Unsupported target "io_write_int" with type "test" omitted - -# Unsupported target "macros_join" with type "test" omitted - -# Unsupported target "macros_pin" with type "test" omitted - -# Unsupported target "macros_select" with type "test" omitted - -# Unsupported target "macros_test" with type "test" omitted - -# Unsupported target "macros_try_join" with type "test" omitted - -# Unsupported target "net_bind_resource" with type "test" omitted - -# Unsupported target "net_lookup_host" with type "test" omitted - -# Unsupported target "no_rt" with type "test" omitted - -# Unsupported target "process_issue_2174" with type "test" omitted - -# Unsupported target "process_issue_42" with type "test" omitted - -# Unsupported target "process_kill_on_drop" with type "test" omitted - -# Unsupported target "process_smoke" with type "test" omitted - -# Unsupported target "rt_basic" with type "test" omitted - -# Unsupported target "rt_common" with type "test" omitted - -# Unsupported target "rt_threaded" with type "test" omitted - -# Unsupported target "signal_ctrl_c" with type "test" omitted - -# Unsupported target "signal_drop_recv" with type "test" omitted - -# Unsupported target "signal_drop_rt" with type "test" omitted - -# Unsupported target "signal_drop_signal" with type "test" omitted - -# Unsupported target "signal_multi_rt" with type "test" omitted - -# Unsupported target "signal_no_rt" with type "test" omitted - -# Unsupported target "signal_notify_both" with type "test" omitted - -# Unsupported target "signal_twice" with type "test" omitted - -# Unsupported target "signal_usr1" with type "test" omitted - -# Unsupported target "stream_chain" with type "test" omitted - -# Unsupported target "stream_collect" with type "test" omitted - -# Unsupported target "stream_empty" with type "test" omitted - -# Unsupported target "stream_fuse" with type "test" omitted - -# Unsupported target "stream_iter" with type "test" omitted - -# Unsupported target "stream_merge" with type "test" omitted - -# Unsupported target "stream_once" with type "test" omitted - -# Unsupported target "stream_pending" with type "test" omitted - -# Unsupported target "stream_reader" with type "test" omitted - -# Unsupported target "stream_stream_map" with type "test" omitted - -# Unsupported target "stream_timeout" with type "test" omitted - -# Unsupported target "sync_barrier" with type "test" omitted - -# Unsupported target "sync_broadcast" with type "test" omitted - -# Unsupported target "sync_cancellation_token" with type "test" omitted - -# Unsupported target "sync_errors" with type "test" omitted - -# Unsupported target "sync_mpsc" with type "test" omitted - -# Unsupported target "sync_mutex" with type "test" omitted - -# Unsupported target "sync_mutex_owned" with type "test" omitted - -# Unsupported target "sync_notify" with type "test" omitted - -# Unsupported target "sync_oneshot" with type "test" omitted - -# Unsupported target "sync_rwlock" with type "test" omitted - -# Unsupported target "sync_semaphore" with type "test" omitted - -# Unsupported target "sync_semaphore_owned" with type "test" omitted - -# Unsupported target "sync_watch" with type "test" omitted - -# Unsupported target "task_blocking" with type "test" omitted - -# Unsupported target "task_local" with type "test" omitted - -# Unsupported target "task_local_set" with type "test" omitted - -# Unsupported target "tcp_accept" with type "test" omitted - -# Unsupported target "tcp_connect" with type "test" omitted - -# Unsupported target "tcp_echo" with type "test" omitted - -# Unsupported target "tcp_into_split" with type "test" omitted - -# Unsupported target "tcp_peek" with type "test" omitted - -# Unsupported target "tcp_shutdown" with type "test" omitted - -# Unsupported target "tcp_split" with type "test" omitted - -# Unsupported target "test_clock" with type "test" omitted - -# Unsupported target "time_delay" with type "test" omitted - -# Unsupported target "time_delay_queue" with type "test" omitted - -# Unsupported target "time_interval" with type "test" omitted - -# Unsupported target "time_rt" with type "test" omitted - -# Unsupported target "time_throttle" with type "test" omitted - -# Unsupported target "time_timeout" with type "test" omitted - -# Unsupported target "udp" with type "test" omitted - -# Unsupported target "uds_cred" with type "test" omitted - -# Unsupported target "uds_datagram" with type "test" omitted - -# Unsupported target "uds_split" with type "test" omitted - -# Unsupported target "uds_stream" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-1.5.0.bazel b/rules/rust/remote/BUILD.tokio-1.17.0.bazel similarity index 79% rename from rules/rust/remote/BUILD.tokio-1.5.0.bazel rename to rules/rust/remote/BUILD.tokio-1.17.0.bazel index 628b134..81276a6 100644 --- a/rules/rust/remote/BUILD.tokio-1.5.0.bazel +++ b/rules/rust/remote/BUILD.tokio-1.17.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -29,53 +30,6 @@ licenses([ ]) # Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "tokio_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - "bytes", - "default", - "io-util", - "libc", - "memchr", - "mio", - "net", - "sync", - "time", - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "1.5.0", - visibility = ["//visibility:private"], - deps = [ - "@raze__autocfg__1_0_1//:autocfg", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - ], - "//conditions:default": [], - }), -) rust_library( name = "tokio", @@ -85,40 +39,62 @@ rust_library( crate_features = [ "bytes", "default", + "fs", + "full", + "io-std", "io-util", "libc", + "macros", "memchr", "mio", "net", + "num_cpus", + "once_cell", + "parking_lot", + "process", + "rt", + "rt-multi-thread", + "signal", + "signal-hook-registry", + "socket2", "sync", "time", + "tokio-macros", + "winapi", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", + proc_macro_deps = [ + "@raze__tokio_macros__1_7_0//:tokio_macros", + ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=tokio", "manual", ], - version = "1.5.0", + version = "1.17.0", # buildifier: leave-alone deps = [ - ":tokio_build_script", - "@raze__bytes__1_0_1//:bytes", - "@raze__memchr__2_3_4//:memchr", - "@raze__mio__0_7_11//:mio", - "@raze__pin_project_lite__0_2_6//:pin_project_lite", + "@raze__bytes__1_1_0//:bytes", + "@raze__memchr__2_4_1//:memchr", + "@raze__mio__0_8_2//:mio", + "@raze__num_cpus__1_13_1//:num_cpus", + "@raze__once_cell__1_10_0//:once_cell", + "@raze__parking_lot__0_12_0//:parking_lot", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__socket2__0_4_4//:socket2", ] + selects.with_or({ # cfg(unix) ( "@rules_rust//rust/platform:x86_64-apple-darwin", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__libc__0_2_93//:libc", + "@raze__libc__0_2_121//:libc", + "@raze__signal_hook_registry__1_4_0//:signal_hook_registry", ], "//conditions:default": [], }), @@ -138,14 +114,16 @@ rust_library( # Unsupported target "fs_file" with type "test" omitted -# Unsupported target "fs_file_mocked" with type "test" omitted - # Unsupported target "fs_link" with type "test" omitted # Unsupported target "io_async_fd" with type "test" omitted # Unsupported target "io_async_read" with type "test" omitted +# Unsupported target "io_buf_reader" with type "test" omitted + +# Unsupported target "io_buf_writer" with type "test" omitted + # Unsupported target "io_chain" with type "test" omitted # Unsupported target "io_copy" with type "test" omitted @@ -156,10 +134,14 @@ rust_library( # Unsupported target "io_driver_drop" with type "test" omitted +# Unsupported target "io_fill_buf" with type "test" omitted + # Unsupported target "io_lines" with type "test" omitted # Unsupported target "io_mem_stream" with type "test" omitted +# Unsupported target "io_poll_aio" with type "test" omitted + # Unsupported target "io_read" with type "test" omitted # Unsupported target "io_read_buf" with type "test" omitted @@ -178,14 +160,20 @@ rust_library( # Unsupported target "io_take" with type "test" omitted +# Unsupported target "io_util_empty" with type "test" omitted + # Unsupported target "io_write" with type "test" omitted # Unsupported target "io_write_all" with type "test" omitted +# Unsupported target "io_write_all_buf" with type "test" omitted + # Unsupported target "io_write_buf" with type "test" omitted # Unsupported target "io_write_int" with type "test" omitted +# Unsupported target "join_handle_panic" with type "test" omitted + # Unsupported target "macros_join" with type "test" omitted # Unsupported target "macros_pin" with type "test" omitted @@ -196,18 +184,24 @@ rust_library( # Unsupported target "macros_try_join" with type "test" omitted +# Unsupported target "named_pipe" with type "test" omitted + # Unsupported target "net_bind_resource" with type "test" omitted # Unsupported target "net_lookup_host" with type "test" omitted # Unsupported target "no_rt" with type "test" omitted +# Unsupported target "process_arg0" with type "test" omitted + # Unsupported target "process_issue_2174" with type "test" omitted # Unsupported target "process_issue_42" with type "test" omitted # Unsupported target "process_kill_on_drop" with type "test" omitted +# Unsupported target "process_raw_handle" with type "test" omitted + # Unsupported target "process_smoke" with type "test" omitted # Unsupported target "rt_basic" with type "test" omitted @@ -216,6 +210,8 @@ rust_library( # Unsupported target "rt_handle_block_on" with type "test" omitted +# Unsupported target "rt_metrics" with type "test" omitted + # Unsupported target "rt_threaded" with type "test" omitted # Unsupported target "signal_ctrl_c" with type "test" omitted @@ -266,6 +262,10 @@ rust_library( # Unsupported target "task_blocking" with type "test" omitted +# Unsupported target "task_builder" with type "test" omitted + +# Unsupported target "task_join_set" with type "test" omitted + # Unsupported target "task_local" with type "test" omitted # Unsupported target "task_local_set" with type "test" omitted @@ -311,3 +311,5 @@ rust_library( # Unsupported target "uds_split" with type "test" omitted # Unsupported target "uds_stream" with type "test" omitted + +# Unsupported target "unwindsafe" with type "test" omitted diff --git a/rules/rust/remote/BUILD.actix-macros-0.1.3.bazel b/rules/rust/remote/BUILD.tokio-io-timeout-1.2.0.bazel similarity index 78% rename from rules/rust/remote/BUILD.actix-macros-0.1.3.bazel rename to rules/rust/remote/BUILD.tokio-io-timeout-1.2.0.bazel index 25638f6..c9a615e 100644 --- a/rules/rust/remote/BUILD.actix-macros-0.1.3.bazel +++ b/rules/rust/remote/BUILD.tokio-io-timeout-1.2.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "actix_macros", + name = "tokio_io_timeout", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -44,14 +44,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tokio-io-timeout", "manual", ], - version = "0.1.3", + version = "1.2.0", # buildifier: leave-alone deps = [ - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tokio__1_17_0//:tokio", ], ) - -# Unsupported target "trybuild" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-macros-0.2.6.bazel b/rules/rust/remote/BUILD.tokio-macros-1.7.0.bazel similarity index 77% rename from rules/rust/remote/BUILD.tokio-macros-0.2.6.bazel rename to rules/rust/remote/BUILD.tokio-macros-1.7.0.bazel index 3c7e2f5..1144fe3 100644 --- a/rules/rust/remote/BUILD.tokio-macros-0.2.6.bazel +++ b/rules/rust/remote/BUILD.tokio-macros-1.7.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,13 +31,12 @@ licenses([ # Generated Targets -rust_library( +rust_proc_macro( name = "tokio_macros", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -44,13 +44,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tokio-macros", "manual", ], - version = "0.2.6", + version = "1.7.0", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.tokio-pg-mapper-0.2.0.bazel b/rules/rust/remote/BUILD.tokio-pg-mapper-0.2.0.bazel deleted file mode 100644 index 64025bf..0000000 --- a/rules/rust/remote/BUILD.tokio-pg-mapper-0.2.0.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # ISC from expression "ISC" -]) - -# Generated Targets - -rust_library( - name = "tokio_pg_mapper", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - "@raze__tokio_postgres__0_7_1//:tokio_postgres", - ], -) diff --git a/rules/rust/remote/BUILD.tokio-pg-mapper-derive-0.2.0.bazel b/rules/rust/remote/BUILD.tokio-pg-mapper-derive-0.2.0.bazel deleted file mode 100644 index 7d2a489..0000000 --- a/rules/rust/remote/BUILD.tokio-pg-mapper-derive-0.2.0.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # ISC from expression "ISC" -]) - -# Generated Targets - -rust_library( - name = "tokio_pg_mapper_derive", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "proc-macro", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - "@raze__tokio_postgres__0_7_1//:tokio_postgres", - ], -) diff --git a/rules/rust/remote/BUILD.tokio-postgres-0.5.5.bazel b/rules/rust/remote/BUILD.tokio-postgres-0.5.5.bazel deleted file mode 100644 index 438efd5..0000000 --- a/rules/rust/remote/BUILD.tokio-postgres-0.5.5.bazel +++ /dev/null @@ -1,75 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -rust_library( - name = "tokio_postgres", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "runtime", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.5", - # buildifier: leave-alone - deps = [ - "@raze__byteorder__1_4_3//:byteorder", - "@raze__bytes__0_5_6//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__parking_lot__0_11_1//:parking_lot", - "@raze__percent_encoding__2_1_0//:percent_encoding", - "@raze__phf__0_8_0//:phf", - "@raze__pin_project_lite__0_1_12//:pin_project_lite", - "@raze__postgres_protocol__0_5_3//:postgres_protocol", - "@raze__postgres_types__0_1_3//:postgres_types", - "@raze__tokio__0_2_25//:tokio", - "@raze__tokio_util__0_3_1//:tokio_util", - ], -) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-postgres-0.7.1.bazel b/rules/rust/remote/BUILD.tokio-postgres-0.7.1.bazel deleted file mode 100644 index 97513a7..0000000 --- a/rules/rust/remote/BUILD.tokio-postgres-0.7.1.bazel +++ /dev/null @@ -1,76 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "bench" with type "bench" omitted - -rust_library( - name = "tokio_postgres", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "runtime", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.1", - # buildifier: leave-alone - deps = [ - "@raze__byteorder__1_4_3//:byteorder", - "@raze__bytes__1_0_1//:bytes", - "@raze__fallible_iterator__0_2_0//:fallible_iterator", - "@raze__futures__0_3_14//:futures", - "@raze__log__0_4_14//:log", - "@raze__parking_lot__0_11_1//:parking_lot", - "@raze__percent_encoding__2_1_0//:percent_encoding", - "@raze__phf__0_8_0//:phf", - "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__postgres_protocol__0_6_1//:postgres_protocol", - "@raze__postgres_types__0_2_1//:postgres_types", - "@raze__socket2__0_4_0//:socket2", - "@raze__tokio__1_5_0//:tokio", - "@raze__tokio_util__0_6_6//:tokio_util", - ], -) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-stream-0.1.8.bazel b/rules/rust/remote/BUILD.tokio-stream-0.1.8.bazel new file mode 100644 index 0000000..834d6a8 --- /dev/null +++ b/rules/rust/remote/BUILD.tokio-stream-0.1.8.bazel @@ -0,0 +1,85 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "tokio_stream", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "time", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tokio-stream", + "manual", + ], + version = "0.1.8", + # buildifier: leave-alone + deps = [ + "@raze__futures_core__0_3_21//:futures_core", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tokio__1_17_0//:tokio", + ], +) + +# Unsupported target "async_send_sync" with type "test" omitted + +# Unsupported target "stream_chain" with type "test" omitted + +# Unsupported target "stream_collect" with type "test" omitted + +# Unsupported target "stream_empty" with type "test" omitted + +# Unsupported target "stream_fuse" with type "test" omitted + +# Unsupported target "stream_iter" with type "test" omitted + +# Unsupported target "stream_merge" with type "test" omitted + +# Unsupported target "stream_once" with type "test" omitted + +# Unsupported target "stream_pending" with type "test" omitted + +# Unsupported target "stream_stream_map" with type "test" omitted + +# Unsupported target "stream_timeout" with type "test" omitted + +# Unsupported target "time_throttle" with type "test" omitted + +# Unsupported target "watch" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-util-0.6.6.bazel b/rules/rust/remote/BUILD.tokio-util-0.6.9.bazel similarity index 77% rename from rules/rust/remote/BUILD.tokio-util-0.6.6.bazel rename to rules/rust/remote/BUILD.tokio-util-0.6.9.bazel index bfbbe4b..96ee671 100644 --- a/rules/rust/remote/BUILD.tokio-util-0.6.6.bazel +++ b/rules/rust/remote/BUILD.tokio-util-0.6.9.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,20 +46,23 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tokio-util", "manual", ], - version = "0.6.6", + version = "0.6.9", # buildifier: leave-alone deps = [ - "@raze__bytes__1_0_1//:bytes", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_sink__0_3_14//:futures_sink", + "@raze__bytes__1_1_0//:bytes", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_sink__0_3_21//:futures_sink", "@raze__log__0_4_14//:log", - "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tokio__1_5_0//:tokio", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tokio__1_17_0//:tokio", ], ) +# Unsupported target "_require_full" with type "test" omitted + # Unsupported target "codecs" with type "test" omitted # Unsupported target "context" with type "test" omitted @@ -68,12 +71,16 @@ rust_library( # Unsupported target "framed_read" with type "test" omitted +# Unsupported target "framed_stream" with type "test" omitted + # Unsupported target "framed_write" with type "test" omitted # Unsupported target "io_reader_stream" with type "test" omitted # Unsupported target "io_stream_reader" with type "test" omitted +# Unsupported target "io_sync_bridge" with type "test" omitted + # Unsupported target "length_delimited" with type "test" omitted # Unsupported target "mpsc" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-util-0.3.1.bazel b/rules/rust/remote/BUILD.tokio-util-0.7.0.bazel similarity index 54% rename from rules/rust/remote/BUILD.tokio-util-0.3.1.bazel rename to rules/rust/remote/BUILD.tokio-util-0.7.0.bazel index 9f5613c..a36f869 100644 --- a/rules/rust/remote/BUILD.tokio-util-0.3.1.bazel +++ b/rules/rust/remote/BUILD.tokio-util-0.7.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,15 +35,8 @@ rust_library( name = "tokio_util", srcs = glob(["**/*.rs"]), crate_features = [ - "codec", - "compat", - "default", - "full", - "futures-io", - "udp", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -50,29 +44,53 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tokio-util", "manual", ], - version = "0.3.1", + version = "0.7.0", # buildifier: leave-alone deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_io__0_3_14//:futures_io", - "@raze__futures_sink__0_3_14//:futures_sink", + "@raze__bytes__1_1_0//:bytes", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_sink__0_3_21//:futures_sink", "@raze__log__0_4_14//:log", - "@raze__pin_project_lite__0_1_12//:pin_project_lite", - "@raze__tokio__0_2_25//:tokio", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tokio__1_17_0//:tokio", ], ) +# Unsupported target "_require_full" with type "test" omitted + # Unsupported target "codecs" with type "test" omitted +# Unsupported target "context" with type "test" omitted + # Unsupported target "framed" with type "test" omitted # Unsupported target "framed_read" with type "test" omitted +# Unsupported target "framed_stream" with type "test" omitted + # Unsupported target "framed_write" with type "test" omitted +# Unsupported target "io_reader_stream" with type "test" omitted + +# Unsupported target "io_stream_reader" with type "test" omitted + +# Unsupported target "io_sync_bridge" with type "test" omitted + # Unsupported target "length_delimited" with type "test" omitted +# Unsupported target "mpsc" with type "test" omitted + +# Unsupported target "poll_semaphore" with type "test" omitted + +# Unsupported target "reusable_box" with type "test" omitted + +# Unsupported target "spawn_pinned" with type "test" omitted + +# Unsupported target "sync_cancellation_token" with type "test" omitted + +# Unsupported target "time_delay_queue" with type "test" omitted + # Unsupported target "udp" with type "test" omitted diff --git a/rules/rust/remote/BUILD.toml-0.5.8.bazel b/rules/rust/remote/BUILD.toml-0.5.8.bazel index 478185e..0d8db55 100644 --- a/rules/rust/remote/BUILD.toml-0.5.8.bazel +++ b/rules/rust/remote/BUILD.toml-0.5.8.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -43,7 +44,6 @@ rust_library( "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -51,12 +51,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=toml", "manual", ], version = "0.5.8", # buildifier: leave-alone deps = [ - "@raze__serde__1_0_125//:serde", + "@raze__serde__1_0_136//:serde", ], ) diff --git a/rules/rust/remote/BUILD.tonic-0.6.2.bazel b/rules/rust/remote/BUILD.tonic-0.6.2.bazel new file mode 100644 index 0000000..ec0b576 --- /dev/null +++ b/rules/rust/remote/BUILD.tonic-0.6.2.bazel @@ -0,0 +1,97 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "decode" with type "bench" omitted + +rust_library( + name = "tonic", + srcs = glob(["**/*.rs"]), + aliases = { + "@raze__prost__0_9_0//:prost": "prost1", + }, + crate_features = [ + "async-trait", + "codegen", + "default", + "h2", + "hyper", + "hyper-timeout", + "prost", + "prost-derive", + "prost1", + "tokio", + "tower", + "tracing-futures", + "transport", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + proc_macro_deps = [ + "@raze__async_trait__0_1_52//:async_trait", + "@raze__prost_derive__0_9_0//:prost_derive", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tonic", + "manual", + ], + version = "0.6.2", + # buildifier: leave-alone + deps = [ + "@raze__async_stream__0_3_3//:async_stream", + "@raze__base64__0_13_0//:base64", + "@raze__bytes__1_1_0//:bytes", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__h2__0_3_12//:h2", + "@raze__http__0_2_6//:http", + "@raze__http_body__0_4_4//:http_body", + "@raze__hyper__0_14_17//:hyper", + "@raze__hyper_timeout__0_4_1//:hyper_timeout", + "@raze__percent_encoding__2_1_0//:percent_encoding", + "@raze__pin_project__1_0_10//:pin_project", + "@raze__prost__0_9_0//:prost", + "@raze__tokio__1_17_0//:tokio", + "@raze__tokio_stream__0_1_8//:tokio_stream", + "@raze__tokio_util__0_6_9//:tokio_util", + "@raze__tower__0_4_12//:tower", + "@raze__tower_layer__0_3_1//:tower_layer", + "@raze__tower_service__0_3_1//:tower_service", + "@raze__tracing__0_1_32//:tracing", + "@raze__tracing_futures__0_2_5//:tracing_futures", + ], +) diff --git a/rules/rust/remote/BUILD.integer-encoding-2.1.3.bazel b/rules/rust/remote/BUILD.tonic-build-0.6.2.bazel similarity index 70% rename from rules/rust/remote/BUILD.integer-encoding-2.1.3.bazel rename to rules/rust/remote/BUILD.tonic-build-0.6.2.bazel index b3a2765..7476058 100644 --- a/rules/rust/remote/BUILD.integer-encoding-2.1.3.bazel +++ b/rules/rust/remote/BUILD.tonic-build-0.6.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,19 +31,15 @@ licenses([ # Generated Targets -# Unsupported target "main" with type "bench" omitted - -# Unsupported target "encode_varint_from_stdin" with type "example" omitted - -# Unsupported target "read_write_file" with type "example" omitted - rust_library( - name = "integer_encoding", + name = "tonic_build", srcs = glob(["**/*.rs"]), crate_features = [ + "prost", + "prost-build", + "transport", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -50,10 +47,15 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tonic-build", "manual", ], - version = "2.1.3", + version = "0.6.2", # buildifier: leave-alone deps = [ + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__prost_build__0_9_0//:prost_build", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) diff --git a/rules/rust/remote/BUILD.tower-0.4.12.bazel b/rules/rust/remote/BUILD.tower-0.4.12.bazel new file mode 100644 index 0000000..3a916ea --- /dev/null +++ b/rules/rust/remote/BUILD.tower-0.4.12.bazel @@ -0,0 +1,114 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "tower-balance" with type "example" omitted + +rust_library( + name = "tower", + srcs = glob(["**/*.rs"]), + crate_features = [ + "__common", + "balance", + "buffer", + "default", + "discover", + "futures-core", + "futures-util", + "indexmap", + "limit", + "load", + "log", + "make", + "pin-project", + "pin-project-lite", + "rand", + "ready-cache", + "slab", + "timeout", + "tokio", + "tokio-util", + "tracing", + "util", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tower", + "manual", + ], + version = "0.4.12", + # buildifier: leave-alone + deps = [ + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__indexmap__1_8_0//:indexmap", + "@raze__pin_project__1_0_10//:pin_project", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__rand__0_8_5//:rand", + "@raze__slab__0_4_5//:slab", + "@raze__tokio__1_17_0//:tokio", + "@raze__tokio_util__0_7_0//:tokio_util", + "@raze__tower_layer__0_3_1//:tower_layer", + "@raze__tower_service__0_3_1//:tower_service", + "@raze__tracing__0_1_32//:tracing", + ], +) + +# Unsupported target "balance" with type "test" omitted + +# Unsupported target "buffer" with type "test" omitted + +# Unsupported target "builder" with type "test" omitted + +# Unsupported target "hedge" with type "test" omitted + +# Unsupported target "limit" with type "test" omitted + +# Unsupported target "load_shed" with type "test" omitted + +# Unsupported target "ready_cache" with type "test" omitted + +# Unsupported target "retry" with type "test" omitted + +# Unsupported target "spawn_ready" with type "test" omitted + +# Unsupported target "steer" with type "test" omitted + +# Unsupported target "support" with type "test" omitted + +# Unsupported target "util" with type "test" omitted diff --git a/rules/rust/remote/BUILD.synstructure-0.12.4.bazel b/rules/rust/remote/BUILD.tower-http-0.2.5.bazel similarity index 55% rename from rules/rust/remote/BUILD.synstructure-0.12.4.bazel rename to rules/rust/remote/BUILD.tower-http-0.2.5.bazel index b0e0d72..9cd25a6 100644 --- a/rules/rust/remote/BUILD.synstructure-0.12.4.bazel +++ b/rules/rust/remote/BUILD.tower-http-0.2.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,15 @@ licenses([ # Generated Targets rust_library( - name = "synstructure", + name = "tower_http", srcs = glob(["**/*.rs"]), crate_features = [ "default", - "proc-macro", + "set-header", + "trace", + "tracing", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,14 +48,22 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tower-http", "manual", ], - version = "0.12.4", + version = "0.2.5", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - "@raze__unicode_xid__0_2_1//:unicode_xid", + "@raze__bitflags__1_3_2//:bitflags", + "@raze__bytes__1_1_0//:bytes", + "@raze__futures_core__0_3_21//:futures_core", + "@raze__futures_util__0_3_21//:futures_util", + "@raze__http__0_2_6//:http", + "@raze__http_body__0_4_4//:http_body", + "@raze__http_range_header__0_3_0//:http_range_header", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tower_layer__0_3_1//:tower_layer", + "@raze__tower_service__0_3_1//:tower_service", + "@raze__tracing__0_1_32//:tracing", ], ) diff --git a/rules/rust/remote/BUILD.plotters-backend-0.3.0.bazel b/rules/rust/remote/BUILD.tower-layer-0.3.1.bazel similarity index 86% rename from rules/rust/remote/BUILD.plotters-backend-0.3.0.bazel rename to rules/rust/remote/BUILD.tower-layer-0.3.1.bazel index 3bbaae6..fde07d8 100644 --- a/rules/rust/remote/BUILD.plotters-backend-0.3.0.bazel +++ b/rules/rust/remote/BUILD.tower-layer-0.3.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "plotters_backend", + name = "tower_layer", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tower-layer", "manual", ], - version = "0.3.0", + version = "0.3.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.strum-0.20.0.bazel b/rules/rust/remote/BUILD.tower-service-0.3.1.bazel similarity index 86% rename from rules/rust/remote/BUILD.strum-0.20.0.bazel rename to rules/rust/remote/BUILD.tower-service-0.3.1.bazel index dc33baf..56b4558 100644 --- a/rules/rust/remote/BUILD.strum-0.20.0.bazel +++ b/rules/rust/remote/BUILD.tower-service-0.3.1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "strum", + name = "tower_service", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tower-service", "manual", ], - version = "0.20.0", + version = "0.3.1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.tracing-0.1.25.bazel b/rules/rust/remote/BUILD.tracing-0.1.32.bazel similarity index 74% rename from rules/rust/remote/BUILD.tracing-0.1.25.bazel rename to rules/rust/remote/BUILD.tracing-0.1.32.bazel index beed394..7e347b4 100644 --- a/rules/rust/remote/BUILD.tracing-0.1.25.bazel +++ b/rules/rust/remote/BUILD.tracing-0.1.32.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,6 +31,8 @@ licenses([ # Generated Targets +# Unsupported target "global_subscriber" with type "bench" omitted + # Unsupported target "no_subscriber" with type "bench" omitted # Unsupported target "subscriber" with type "bench" omitted @@ -38,30 +41,38 @@ rust_library( name = "tracing", srcs = glob(["**/*.rs"]), crate_features = [ + "attributes", + "default", "log", "std", + "tracing-attributes", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", + proc_macro_deps = [ + "@raze__tracing_attributes__0_1_20//:tracing_attributes", + ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=tracing", "manual", ], - version = "0.1.25", + version = "0.1.32", # buildifier: leave-alone deps = [ "@raze__cfg_if__1_0_0//:cfg_if", "@raze__log__0_4_14//:log", - "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tracing_core__0_1_17//:tracing_core", + "@raze__pin_project_lite__0_2_8//:pin_project_lite", + "@raze__tracing_core__0_1_23//:tracing_core", ], ) +# Unsupported target "enabled" with type "test" omitted + # Unsupported target "event" with type "test" omitted # Unsupported target "filter_caching_is_lexically_scoped" with type "test" omitted @@ -76,6 +87,10 @@ rust_library( # Unsupported target "macros" with type "test" omitted +# Unsupported target "macros_incompatible_concat" with type "test" omitted + +# Unsupported target "macros_redefined_core" with type "test" omitted + # Unsupported target "max_level_hint" with type "test" omitted # Unsupported target "multiple_max_level_hints" with type "test" omitted diff --git a/rules/rust/remote/BUILD.language-tags-0.2.2.bazel b/rules/rust/remote/BUILD.tracing-appender-0.2.2.bazel similarity index 74% rename from rules/rust/remote/BUILD.language-tags-0.2.2.bazel rename to rules/rust/remote/BUILD.tracing-appender-0.2.2.bazel index 5850209..c5fb95e 100644 --- a/rules/rust/remote/BUILD.language-tags-0.2.2.bazel +++ b/rules/rust/remote/BUILD.tracing-appender-0.2.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,25 +32,26 @@ licenses([ # Generated Targets rust_library( - name = "language_tags", + name = "tracing_appender", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=tracing-appender", "manual", ], version = "0.2.2", # buildifier: leave-alone deps = [ + "@raze__crossbeam_channel__0_5_4//:crossbeam_channel", + "@raze__time__0_3_7//:time", + "@raze__tracing_subscriber__0_3_9//:tracing_subscriber", ], ) - -# Unsupported target "tests" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tokio-util-0.2.0.bazel b/rules/rust/remote/BUILD.tracing-attributes-0.1.20.bazel similarity index 51% rename from rules/rust/remote/BUILD.tokio-util-0.2.0.bazel rename to rules/rust/remote/BUILD.tracing-attributes-0.1.20.bazel index 24f4af1..c711fb0 100644 --- a/rules/rust/remote/BUILD.tokio-util-0.2.0.bazel +++ b/rules/rust/remote/BUILD.tracing-attributes-0.1.20.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,14 +31,12 @@ licenses([ # Generated Targets -rust_library( - name = "tokio_util", +rust_proc_macro( + name = "tracing_attributes", srcs = glob(["**/*.rs"]), crate_features = [ - "codec", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,28 +44,34 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tracing-attributes", "manual", ], - version = "0.2.0", + version = "0.1.20", # buildifier: leave-alone deps = [ - "@raze__bytes__0_5_6//:bytes", - "@raze__futures_core__0_3_14//:futures_core", - "@raze__futures_sink__0_3_14//:futures_sink", - "@raze__log__0_4_14//:log", - "@raze__pin_project_lite__0_1_12//:pin_project_lite", - "@raze__tokio__0_2_25//:tokio", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", ], ) -# Unsupported target "codecs" with type "test" omitted +# Unsupported target "async_fn" with type "test" omitted -# Unsupported target "framed" with type "test" omitted +# Unsupported target "destructuring" with type "test" omitted -# Unsupported target "framed_read" with type "test" omitted +# Unsupported target "err" with type "test" omitted -# Unsupported target "framed_write" with type "test" omitted +# Unsupported target "fields" with type "test" omitted -# Unsupported target "length_delimited" with type "test" omitted +# Unsupported target "instrument" with type "test" omitted -# Unsupported target "udp" with type "test" omitted +# Unsupported target "levels" with type "test" omitted + +# Unsupported target "names" with type "test" omitted + +# Unsupported target "ret" with type "test" omitted + +# Unsupported target "support" with type "test" omitted + +# Unsupported target "targets" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tracing-core-0.1.17.bazel b/rules/rust/remote/BUILD.tracing-core-0.1.23.bazel similarity index 88% rename from rules/rust/remote/BUILD.tracing-core-0.1.17.bazel rename to rules/rust/remote/BUILD.tracing-core-0.1.23.bazel index b0a549a..0278eab 100644 --- a/rules/rust/remote/BUILD.tracing-core-0.1.17.bazel +++ b/rules/rust/remote/BUILD.tracing-core-0.1.23.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,11 +35,12 @@ rust_library( name = "tracing_core", srcs = glob(["**/*.rs"]), crate_features = [ + "default", "lazy_static", "std", + "valuable", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +48,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tracing-core", "manual", ], - version = "0.1.17", + version = "0.1.23", # buildifier: leave-alone deps = [ "@raze__lazy_static__1_4_0//:lazy_static", diff --git a/rules/rust/remote/BUILD.tracing-futures-0.2.5.bazel b/rules/rust/remote/BUILD.tracing-futures-0.2.5.bazel index 71b3f2c..c87d991 100644 --- a/rules/rust/remote/BUILD.tracing-futures-0.2.5.bazel +++ b/rules/rust/remote/BUILD.tracing-futures-0.2.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -34,11 +35,12 @@ rust_library( name = "tracing_futures", srcs = glob(["**/*.rs"]), crate_features = [ + "default", "pin-project", + "std", "std-future", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,13 +48,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=tracing-futures", "manual", ], version = "0.2.5", # buildifier: leave-alone deps = [ - "@raze__pin_project__1_0_7//:pin_project", - "@raze__tracing__0_1_25//:tracing", + "@raze__pin_project__1_0_10//:pin_project", + "@raze__tracing__0_1_32//:tracing", ], ) diff --git a/rules/rust/remote/BUILD.serde-hjson-0.9.1.bazel b/rules/rust/remote/BUILD.tracing-log-0.1.2.bazel similarity index 69% rename from rules/rust/remote/BUILD.serde-hjson-0.9.1.bazel rename to rules/rust/remote/BUILD.tracing-log-0.1.2.bazel index 5cbc965..a19a4f9 100644 --- a/rules/rust/remote/BUILD.serde-hjson-0.9.1.bazel +++ b/rules/rust/remote/BUILD.tracing-log-0.1.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,27 +32,32 @@ licenses([ # Generated Targets rust_library( - name = "serde_hjson", + name = "tracing_log", srcs = glob(["**/*.rs"]), crate_features = [ + "log-tracer", + "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=tracing-log", "manual", ], - version = "0.9.1", + version = "0.1.2", # buildifier: leave-alone deps = [ "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__num_traits__0_1_43//:num_traits", - "@raze__regex__1_4_5//:regex", - "@raze__serde__0_8_23//:serde", + "@raze__log__0_4_14//:log", + "@raze__tracing_core__0_1_23//:tracing_core", ], ) + +# Unsupported target "log_tracer" with type "test" omitted + +# Unsupported target "reexport_log_crate" with type "test" omitted diff --git a/rules/rust/remote/BUILD.tracing-serde-0.1.3.bazel b/rules/rust/remote/BUILD.tracing-serde-0.1.3.bazel new file mode 100644 index 0000000..a6b0cf2 --- /dev/null +++ b/rules/rust/remote/BUILD.tracing-serde-0.1.3.bazel @@ -0,0 +1,56 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "tracing_serde", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tracing-serde", + "manual", + ], + version = "0.1.3", + # buildifier: leave-alone + deps = [ + "@raze__serde__1_0_136//:serde", + "@raze__tracing_core__0_1_23//:tracing_core", + ], +) diff --git a/rules/rust/remote/BUILD.tracing-subscriber-0.3.9.bazel b/rules/rust/remote/BUILD.tracing-subscriber-0.3.9.bazel new file mode 100644 index 0000000..fbf6309 --- /dev/null +++ b/rules/rust/remote/BUILD.tracing-subscriber-0.3.9.bazel @@ -0,0 +1,129 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "enter" with type "bench" omitted + +# Unsupported target "filter" with type "bench" omitted + +# Unsupported target "filter_log" with type "bench" omitted + +# Unsupported target "fmt" with type "bench" omitted + +rust_library( + name = "tracing_subscriber", + srcs = glob(["**/*.rs"]), + crate_features = [ + "alloc", + "ansi", + "ansi_term", + "default", + "env-filter", + "fmt", + "json", + "lazy_static", + "matchers", + "regex", + "registry", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "std", + "thread_local", + "tracing", + "tracing-log", + "tracing-serde", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=tracing-subscriber", + "manual", + ], + version = "0.3.9", + # buildifier: leave-alone + deps = [ + "@raze__ansi_term__0_12_1//:ansi_term", + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__matchers__0_1_0//:matchers", + "@raze__regex__1_5_5//:regex", + "@raze__serde__1_0_136//:serde", + "@raze__serde_json__1_0_79//:serde_json", + "@raze__sharded_slab__0_1_4//:sharded_slab", + "@raze__smallvec__1_8_0//:smallvec", + "@raze__thread_local__1_1_4//:thread_local", + "@raze__tracing__0_1_32//:tracing", + "@raze__tracing_core__0_1_23//:tracing_core", + "@raze__tracing_log__0_1_2//:tracing_log", + "@raze__tracing_serde__0_1_3//:tracing_serde", + ], +) + +# Unsupported target "cached_layer_filters_dont_break_other_layers" with type "test" omitted + +# Unsupported target "duplicate_spans" with type "test" omitted + +# Unsupported target "field_filter" with type "test" omitted + +# Unsupported target "filter" with type "test" omitted + +# Unsupported target "filter_log" with type "test" omitted + +# Unsupported target "fmt_max_level_hint" with type "test" omitted + +# Unsupported target "hinted_layer_filters_dont_break_other_layers" with type "test" omitted + +# Unsupported target "layer_filter_interests_are_cached" with type "test" omitted + +# Unsupported target "layer_filters" with type "test" omitted + +# Unsupported target "multiple_layer_filter_interests_cached" with type "test" omitted + +# Unsupported target "registry_max_level_hint" with type "test" omitted + +# Unsupported target "registry_with_subscriber" with type "test" omitted + +# Unsupported target "reload" with type "test" omitted + +# Unsupported target "same_len_filters" with type "test" omitted + +# Unsupported target "support" with type "test" omitted + +# Unsupported target "unhinted_layer_filters_dont_break_other_layers" with type "test" omitted + +# Unsupported target "utils" with type "test" omitted diff --git a/rules/rust/remote/BUILD.traitobject-0.1.0.bazel b/rules/rust/remote/BUILD.traitobject-0.1.0.bazel deleted file mode 100644 index 0540b5d..0000000 --- a/rules/rust/remote/BUILD.traitobject-0.1.0.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "traitobject", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.0", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.trust-dns-proto-0.19.7.bazel b/rules/rust/remote/BUILD.trust-dns-proto-0.19.7.bazel deleted file mode 100644 index 674b6ae..0000000 --- a/rules/rust/remote/BUILD.trust-dns-proto-0.19.7.bazel +++ /dev/null @@ -1,73 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "lib" with type "bench" omitted - -# Unsupported target "name_benches" with type "bench" omitted - -rust_library( - name = "trust_dns_proto", - srcs = glob(["**/*.rs"]), - crate_features = [ - "tokio", - "tokio-runtime", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - proc_macro_deps = [ - "@raze__async_trait__0_1_50//:async_trait", - "@raze__enum_as_inner__0_3_3//:enum_as_inner", - ], - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.19.7", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__1_0_0//:cfg_if", - "@raze__futures__0_3_14//:futures", - "@raze__idna__0_2_3//:idna", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__log__0_4_14//:log", - "@raze__rand__0_7_3//:rand", - "@raze__smallvec__1_6_1//:smallvec", - "@raze__thiserror__1_0_24//:thiserror", - "@raze__tokio__0_2_25//:tokio", - "@raze__url__2_2_1//:url", - ], -) diff --git a/rules/rust/remote/BUILD.trust-dns-resolver-0.19.7.bazel b/rules/rust/remote/BUILD.trust-dns-resolver-0.19.7.bazel deleted file mode 100644 index 7ab67f9..0000000 --- a/rules/rust/remote/BUILD.trust-dns-resolver-0.19.7.bazel +++ /dev/null @@ -1,72 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "global_resolver" with type "example" omitted - -# Unsupported target "multithreaded_runtime" with type "example" omitted - -rust_library( - name = "trust_dns_resolver", - srcs = glob(["**/*.rs"]), - crate_features = [ - "ipconfig", - "resolv-conf", - "system-config", - "tokio", - "tokio-runtime", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.19.7", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__futures__0_3_14//:futures", - "@raze__lazy_static__1_4_0//:lazy_static", - "@raze__log__0_4_14//:log", - "@raze__lru_cache__0_1_2//:lru_cache", - "@raze__resolv_conf__0_7_0//:resolv_conf", - "@raze__smallvec__1_6_1//:smallvec", - "@raze__thiserror__1_0_24//:thiserror", - "@raze__tokio__0_2_25//:tokio", - "@raze__trust_dns_proto__0_19_7//:trust_dns_proto", - ], -) diff --git a/rules/rust/remote/BUILD.void-1.0.2.bazel b/rules/rust/remote/BUILD.try-lock-0.2.3.bazel similarity index 87% rename from rules/rust/remote/BUILD.void-1.0.2.bazel rename to rules/rust/remote/BUILD.try-lock-0.2.3.bazel index 84b0050..feb2041 100644 --- a/rules/rust/remote/BUILD.void-1.0.2.bazel +++ b/rules/rust/remote/BUILD.try-lock-0.2.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,14 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "void", + name = "try_lock", srcs = glob(["**/*.rs"]), crate_features = [ - "default", - "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=try-lock", "manual", ], - version = "1.0.2", + version = "0.2.3", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.lz4-1.23.2.bazel b/rules/rust/remote/BUILD.twox-hash-1.6.2.bazel similarity index 72% rename from rules/rust/remote/BUILD.lz4-1.23.2.bazel rename to rules/rust/remote/BUILD.twox-hash-1.6.2.bazel index 86e2a12..d7017d3 100644 --- a/rules/rust/remote/BUILD.lz4-1.23.2.bazel +++ b/rules/rust/remote/BUILD.twox-hash-1.6.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -33,11 +34,11 @@ licenses([ rust_binary( # Prefix bin name to disambiguate from (probable) collision with lib name # N.B.: The exact form of this is subject to change. - name = "cargo_bin_lz4", + name = "cargo_bin_hash_file", srcs = glob(["**/*.rs"]), crate_features = [ ], - crate_root = "src/bin/lz4.rs", + crate_root = "src/bin/hash_file.rs", data = [], edition = "2018", rustc_flags = [ @@ -45,24 +46,24 @@ rust_binary( ], tags = [ "cargo-raze", + "crate-name=hash_file", "manual", ], - version = "1.23.2", + version = "1.6.2", # buildifier: leave-alone deps = [ - ":lz4", - "@raze__libc__0_2_93//:libc", - "@raze__lz4_sys__1_9_2//:lz4_sys", + ":twox_hash", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__static_assertions__1_1_0//:static_assertions", ], ) rust_library( - name = "lz4", + name = "twox_hash", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -70,14 +71,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=twox-hash", "manual", ], - version = "1.23.2", + version = "1.6.2", # buildifier: leave-alone deps = [ - "@raze__libc__0_2_93//:libc", - "@raze__lz4_sys__1_9_2//:lz4_sys", + "@raze__cfg_if__1_0_0//:cfg_if", + "@raze__static_assertions__1_1_0//:static_assertions", ], ) - -# Unsupported target "docmatic" with type "test" omitted diff --git a/rules/rust/remote/BUILD.typenum-1.13.0.bazel b/rules/rust/remote/BUILD.typenum-1.15.0.bazel similarity index 89% rename from rules/rust/remote/BUILD.typenum-1.13.0.bazel rename to rules/rust/remote/BUILD.typenum-1.15.0.bazel index 271a263..52a71b1 100644 --- a/rules/rust/remote/BUILD.typenum-1.13.0.bazel +++ b/rules/rust/remote/BUILD.typenum-1.15.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,7 +43,6 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "force_unix_path_separator", ], crate_root = "build/main.rs", data = glob(["**"]), @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.13.0", + version = "1.15.0", visibility = ["//visibility:private"], deps = [ ], @@ -64,10 +64,8 @@ rust_library( name = "typenum", srcs = glob(["**/*.rs"]), crate_features = [ - "force_unix_path_separator", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -75,9 +73,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=typenum", "manual", ], - version = "1.13.0", + version = "1.15.0", # buildifier: leave-alone deps = [ ":typenum_build_script", diff --git a/rules/rust/remote/BUILD.unicode-normalization-0.1.17.bazel b/rules/rust/remote/BUILD.ucd-trie-0.1.3.bazel similarity index 86% rename from rules/rust/remote/BUILD.unicode-normalization-0.1.17.bazel rename to rules/rust/remote/BUILD.ucd-trie-0.1.3.bazel index f650c06..0444ec2 100644 --- a/rules/rust/remote/BUILD.unicode-normalization-0.1.17.bazel +++ b/rules/rust/remote/BUILD.ucd-trie-0.1.3.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -33,14 +34,13 @@ licenses([ # Unsupported target "bench" with type "bench" omitted rust_library( - name = "unicode_normalization", + name = "ucd_trie", srcs = glob(["**/*.rs"]), crate_features = [ "default", "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -48,11 +48,11 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=ucd-trie", "manual", ], - version = "0.1.17", + version = "0.1.3", # buildifier: leave-alone deps = [ - "@raze__tinyvec__1_2_0//:tinyvec", ], ) diff --git a/rules/rust/remote/BUILD.unicode-bidi-0.3.5.bazel b/rules/rust/remote/BUILD.unicode-bidi-0.3.5.bazel deleted file mode 100644 index aa3737b..0000000 --- a/rules/rust/remote/BUILD.unicode-bidi-0.3.5.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "unicode_bidi", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.5", - # buildifier: leave-alone - deps = [ - "@raze__matches__0_1_8//:matches", - ], -) diff --git a/rules/rust/remote/BUILD.const_fn-0.4.7.bazel b/rules/rust/remote/BUILD.unicode-linebreak-0.1.2.bazel similarity index 79% rename from rules/rust/remote/BUILD.const_fn-0.4.7.bazel rename to rules/rust/remote/BUILD.unicode-linebreak-0.1.2.bazel index 33da55f..2fff714 100644 --- a/rules/rust/remote/BUILD.const_fn-0.4.7.bazel +++ b/rules/rust/remote/BUILD.unicode-linebreak-0.1.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -25,7 +26,7 @@ package(default_visibility = [ ]) licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR MIT" + "notice", # Apache-2.0 from expression "Apache-2.0" ]) # Generated Targets @@ -37,7 +38,7 @@ load( ) cargo_build_script( - name = "const_fn_build_script", + name = "unicode_linebreak_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, @@ -53,19 +54,19 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.4.7", + version = "0.1.2", visibility = ["//visibility:private"], deps = [ + "@raze__regex__1_5_5//:regex", ], ) rust_library( - name = "const_fn", + name = "unicode_linebreak", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -73,11 +74,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=unicode-linebreak", "manual", ], - version = "0.4.7", + version = "0.1.2", # buildifier: leave-alone deps = [ - ":const_fn_build_script", + ":unicode_linebreak_build_script", ], ) diff --git a/rules/rust/remote/BUILD.unicode-segmentation-1.7.1.bazel b/rules/rust/remote/BUILD.unicode-segmentation-1.9.0.bazel similarity index 78% rename from rules/rust/remote/BUILD.unicode-segmentation-1.7.1.bazel rename to rules/rust/remote/BUILD.unicode-segmentation-1.9.0.bazel index 58f05f3..bdfd9fa 100644 --- a/rules/rust/remote/BUILD.unicode-segmentation-1.7.1.bazel +++ b/rules/rust/remote/BUILD.unicode-segmentation-1.9.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -32,23 +33,27 @@ licenses([ # Unsupported target "graphemes" with type "bench" omitted +# Unsupported target "unicode_words" with type "bench" omitted + +# Unsupported target "word_bounds" with type "bench" omitted + rust_library( name = "unicode_segmentation", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], - edition = "2015", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=unicode-segmentation", "manual", ], - version = "1.7.1", + version = "1.9.0", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.unicode-width-0.1.8.bazel b/rules/rust/remote/BUILD.unicode-width-0.1.9.bazel similarity index 89% rename from rules/rust/remote/BUILD.unicode-width-0.1.8.bazel rename to rules/rust/remote/BUILD.unicode-width-0.1.9.bazel index 2d9b56e..e9a387c 100644 --- a/rules/rust/remote/BUILD.unicode-width-0.1.8.bazel +++ b/rules/rust/remote/BUILD.unicode-width-0.1.9.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,6 @@ rust_library( "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -45,9 +45,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=unicode-width", "manual", ], - version = "0.1.8", + version = "0.1.9", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.unicode-xid-0.2.1.bazel b/rules/rust/remote/BUILD.unicode-xid-0.2.2.bazel similarity index 86% rename from rules/rust/remote/BUILD.unicode-xid-0.2.1.bazel rename to rules/rust/remote/BUILD.unicode-xid-0.2.2.bazel index 25407a5..b27458b 100644 --- a/rules/rust/remote/BUILD.unicode-xid-0.2.1.bazel +++ b/rules/rust/remote/BUILD.unicode-xid-0.2.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,6 +31,8 @@ licenses([ # Generated Targets +# Unsupported target "xid" with type "bench" omitted + rust_library( name = "unicode_xid", srcs = glob(["**/*.rs"]), @@ -37,7 +40,6 @@ rust_library( "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -45,9 +47,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=unicode-xid", "manual", ], - version = "0.2.1", + version = "0.2.2", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.unix_socket-0.5.0.bazel b/rules/rust/remote/BUILD.unix_socket-0.5.0.bazel deleted file mode 100644 index dc2eb1c..0000000 --- a/rules/rust/remote/BUILD.unix_socket-0.5.0.bazel +++ /dev/null @@ -1,55 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "unix_socket", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.5.0", - # buildifier: leave-alone - deps = [ - "@raze__cfg_if__0_1_10//:cfg_if", - "@raze__libc__0_2_93//:libc", - ], -) diff --git a/rules/rust/remote/BUILD.unsafe-any-0.4.2.bazel b/rules/rust/remote/BUILD.unsafe-any-0.4.2.bazel deleted file mode 100644 index 4d0df3e..0000000 --- a/rules/rust/remote/BUILD.unsafe-any-0.4.2.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "unsafe_any", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.2", - # buildifier: leave-alone - deps = [ - "@raze__traitobject__0_1_0//:traitobject", - ], -) diff --git a/rules/rust/remote/BUILD.url-2.2.1.bazel b/rules/rust/remote/BUILD.url-2.2.1.bazel deleted file mode 100644 index d9da4c8..0000000 --- a/rules/rust/remote/BUILD.url-2.2.1.bazel +++ /dev/null @@ -1,63 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -# Unsupported target "parse_url" with type "bench" omitted - -rust_library( - name = "url", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.2.1", - # buildifier: leave-alone - deps = [ - "@raze__form_urlencoded__1_0_1//:form_urlencoded", - "@raze__idna__0_2_3//:idna", - "@raze__matches__0_1_8//:matches", - "@raze__percent_encoding__2_1_0//:percent_encoding", - ], -) - -# Unsupported target "data" with type "test" omitted - -# Unsupported target "unit" with type "test" omitted diff --git a/rules/rust/remote/BUILD.urlparse-0.7.3.bazel b/rules/rust/remote/BUILD.urlparse-0.7.3.bazel deleted file mode 100644 index eb5cccc..0000000 --- a/rules/rust/remote/BUILD.urlparse-0.7.3.bazel +++ /dev/null @@ -1,61 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "lib" with type "bench" omitted - -rust_library( - name = "urlparse", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.7.3", - # buildifier: leave-alone - deps = [ - ], -) - -# Unsupported target "test_query" with type "test" omitted - -# Unsupported target "test_quote" with type "test" omitted - -# Unsupported target "test_urlparse" with type "test" omitted diff --git a/rules/rust/remote/BUILD.utf8-ranges-1.0.4.bazel b/rules/rust/remote/BUILD.utf8-ranges-1.0.4.bazel index f4277a7..70e27f4 100644 --- a/rules/rust/remote/BUILD.utf8-ranges-1.0.4.bazel +++ b/rules/rust/remote/BUILD.utf8-ranges-1.0.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=utf8-ranges", "manual", ], version = "1.0.4", diff --git a/rules/rust/remote/BUILD.uuid-0.8.2.bazel b/rules/rust/remote/BUILD.uuid-0.8.2.bazel index 09229b2..9f91119 100644 --- a/rules/rust/remote/BUILD.uuid-0.8.2.bazel +++ b/rules/rust/remote/BUILD.uuid-0.8.2.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -51,7 +52,6 @@ rust_library( "v4", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -59,12 +59,13 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=uuid", "manual", ], version = "0.8.2", # buildifier: leave-alone deps = [ - "@raze__getrandom__0_2_2//:getrandom", - "@raze__serde__1_0_125//:serde", + "@raze__getrandom__0_2_5//:getrandom", + "@raze__serde__1_0_136//:serde", ], ) diff --git a/rules/rust/remote/BUILD.valuable-0.1.0.bazel b/rules/rust/remote/BUILD.valuable-0.1.0.bazel new file mode 100644 index 0000000..c9f2129 --- /dev/null +++ b/rules/rust/remote/BUILD.valuable-0.1.0.bazel @@ -0,0 +1,96 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "valuable_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + "alloc", + "std", + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.1.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +# Unsupported target "structable" with type "bench" omitted + +# Unsupported target "derive" with type "example" omitted + +# Unsupported target "hello_world" with type "example" omitted + +# Unsupported target "print" with type "example" omitted + +rust_library( + name = "valuable", + srcs = glob(["**/*.rs"]), + crate_features = [ + "alloc", + "std", + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=valuable", + "manual", + ], + version = "0.1.0", + # buildifier: leave-alone + deps = [ + ":valuable_build_script", + ], +) diff --git a/rules/rust/remote/BUILD.rustc-demangle-0.1.18.bazel b/rules/rust/remote/BUILD.vcpkg-0.2.15.bazel similarity index 87% rename from rules/rust/remote/BUILD.rustc-demangle-0.1.18.bazel rename to rules/rust/remote/BUILD.vcpkg-0.2.15.bazel index 52b545d..796c0ab 100644 --- a/rules/rust/remote/BUILD.rustc-demangle-0.1.18.bazel +++ b/rules/rust/remote/BUILD.vcpkg-0.2.15.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,12 +32,11 @@ licenses([ # Generated Targets rust_library( - name = "rustc_demangle", + name = "vcpkg", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=vcpkg", "manual", ], - version = "0.1.18", + version = "0.2.15", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.vec_map-0.8.2.bazel b/rules/rust/remote/BUILD.vec_map-0.8.2.bazel deleted file mode 100644 index 79c80af..0000000 --- a/rules/rust/remote/BUILD.vec_map-0.8.2.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "vec_map", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.8.2", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.version_check-0.9.3.bazel b/rules/rust/remote/BUILD.version_check-0.9.4.bazel similarity index 89% rename from rules/rust/remote/BUILD.version_check-0.9.3.bazel rename to rules/rust/remote/BUILD.version_check-0.9.4.bazel index fa87a46..155a7ce 100644 --- a/rules/rust/remote/BUILD.version_check-0.9.3.bazel +++ b/rules/rust/remote/BUILD.version_check-0.9.4.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -44,9 +44,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=version_check", "manual", ], - version = "0.9.3", + version = "0.9.4", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.wait-timeout-0.2.0.bazel b/rules/rust/remote/BUILD.wait-timeout-0.2.0.bazel deleted file mode 100644 index d423b7d..0000000 --- a/rules/rust/remote/BUILD.wait-timeout-0.2.0.bazel +++ /dev/null @@ -1,171 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_exit", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/bin/exit.rs", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - ":wait_timeout", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_reader", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/bin/reader.rs", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - ":wait_timeout", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_sleep", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/bin/sleep.rs", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - ":wait_timeout", - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -rust_library( - name = "wait_timeout", - srcs = glob(["**/*.rs"]), - aliases = { - }, - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.0", - # buildifier: leave-alone - deps = [ - ] + selects.with_or({ - # cfg(unix) - ( - "@rules_rust//rust/platform:x86_64-apple-darwin", - "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", - ): [ - "@raze__libc__0_2_93//:libc", - ], - "//conditions:default": [], - }), -) - -# Unsupported target "smoke" with type "test" omitted diff --git a/rules/rust/remote/BUILD.walkdir-2.3.2.bazel b/rules/rust/remote/BUILD.walkdir-2.3.2.bazel deleted file mode 100644 index 21b16be..0000000 --- a/rules/rust/remote/BUILD.walkdir-2.3.2.bazel +++ /dev/null @@ -1,54 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "unencumbered", # Unlicense from expression "Unlicense OR MIT" -]) - -# Generated Targets - -rust_library( - name = "walkdir", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "2.3.2", - # buildifier: leave-alone - deps = [ - "@raze__same_file__1_0_6//:same_file", - ], -) diff --git a/rules/rust/remote/BUILD.want-0.3.0.bazel b/rules/rust/remote/BUILD.want-0.3.0.bazel new file mode 100644 index 0000000..e9da0c6 --- /dev/null +++ b/rules/rust/remote/BUILD.want-0.3.0.bazel @@ -0,0 +1,58 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "throughput" with type "bench" omitted + +rust_library( + name = "want", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=want", + "manual", + ], + version = "0.3.0", + # buildifier: leave-alone + deps = [ + "@raze__log__0_4_14//:log", + "@raze__try_lock__0_2_3//:try_lock", + ], +) diff --git a/rules/rust/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel b/rules/rust/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel similarity index 88% rename from rules/rust/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel rename to rules/rust/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel index f56e019..15e025e 100644 --- a/rules/rust/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel +++ b/rules/rust/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +46,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=wasi", "manual", ], - version = "0.10.2+wasi-snapshot-preview1", + version = "0.10.0+wasi-snapshot-preview1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel b/rules/rust/remote/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel similarity index 88% rename from rules/rust/remote/BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel rename to rules/rust/remote/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel index d0eb27d..22f769b 100644 --- a/rules/rust/remote/BUILD.wasi-0.9.0+wasi-snapshot-preview1.bazel +++ b/rules/rust/remote/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,9 +46,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=wasi", "manual", ], - version = "0.9.0+wasi-snapshot-preview1", + version = "0.11.0+wasi-snapshot-preview1", # buildifier: leave-alone deps = [ ], diff --git a/rules/rust/remote/BUILD.wasm-bindgen-0.2.73.bazel b/rules/rust/remote/BUILD.wasm-bindgen-0.2.79.bazel similarity index 91% rename from rules/rust/remote/BUILD.wasm-bindgen-0.2.73.bazel rename to rules/rust/remote/BUILD.wasm-bindgen-0.2.79.bazel index 129979f..392d7f2 100644 --- a/rules/rust/remote/BUILD.wasm-bindgen-0.2.73.bazel +++ b/rules/rust/remote/BUILD.wasm-bindgen-0.2.79.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -56,7 +57,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.73", + version = "0.2.79", visibility = ["//visibility:private"], deps = [ ], @@ -71,20 +72,20 @@ rust_library( "std", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", proc_macro_deps = [ - "@raze__wasm_bindgen_macro__0_2_73//:wasm_bindgen_macro", + "@raze__wasm_bindgen_macro__0_2_79//:wasm_bindgen_macro", ], rustc_flags = [ "--cap-lints=allow", ], tags = [ "cargo-raze", + "crate-name=wasm-bindgen", "manual", ], - version = "0.2.73", + version = "0.2.79", # buildifier: leave-alone deps = [ ":wasm_bindgen_build_script", diff --git a/rules/rust/remote/BUILD.wasm-bindgen-backend-0.2.73.bazel b/rules/rust/remote/BUILD.wasm-bindgen-backend-0.2.79.bazel similarity index 74% rename from rules/rust/remote/BUILD.wasm-bindgen-backend-0.2.73.bazel rename to rules/rust/remote/BUILD.wasm-bindgen-backend-0.2.79.bazel index f469d70..5695c37 100644 --- a/rules/rust/remote/BUILD.wasm-bindgen-backend-0.2.73.bazel +++ b/rules/rust/remote/BUILD.wasm-bindgen-backend-0.2.79.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,6 @@ rust_library( "spans", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,17 +45,18 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=wasm-bindgen-backend", "manual", ], - version = "0.2.73", + version = "0.2.79", # buildifier: leave-alone deps = [ - "@raze__bumpalo__3_6_1//:bumpalo", + "@raze__bumpalo__3_9_1//:bumpalo", "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_14//:log", - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - "@raze__wasm_bindgen_shared__0_2_73//:wasm_bindgen_shared", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", + "@raze__wasm_bindgen_shared__0_2_79//:wasm_bindgen_shared", ], ) diff --git a/rules/rust/remote/BUILD.wasm-bindgen-macro-0.2.73.bazel b/rules/rust/remote/BUILD.wasm-bindgen-macro-0.2.79.bazel similarity index 80% rename from rules/rust/remote/BUILD.wasm-bindgen-macro-0.2.73.bazel rename to rules/rust/remote/BUILD.wasm-bindgen-macro-0.2.79.bazel index 1c26b30..f558fc5 100644 --- a/rules/rust/remote/BUILD.wasm-bindgen-macro-0.2.73.bazel +++ b/rules/rust/remote/BUILD.wasm-bindgen-macro-0.2.79.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -30,14 +31,13 @@ licenses([ # Generated Targets -rust_library( +rust_proc_macro( name = "wasm_bindgen_macro", srcs = glob(["**/*.rs"]), crate_features = [ "spans", ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -45,13 +45,14 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=wasm-bindgen-macro", "manual", ], - version = "0.2.73", + version = "0.2.79", # buildifier: leave-alone deps = [ - "@raze__quote__1_0_9//:quote", - "@raze__wasm_bindgen_macro_support__0_2_73//:wasm_bindgen_macro_support", + "@raze__quote__1_0_16//:quote", + "@raze__wasm_bindgen_macro_support__0_2_79//:wasm_bindgen_macro_support", ], ) diff --git a/rules/rust/remote/BUILD.wasm-bindgen-macro-support-0.2.73.bazel b/rules/rust/remote/BUILD.wasm-bindgen-macro-support-0.2.79.bazel similarity index 71% rename from rules/rust/remote/BUILD.wasm-bindgen-macro-support-0.2.73.bazel rename to rules/rust/remote/BUILD.wasm-bindgen-macro-support-0.2.79.bazel index 4571058..57163f7 100644 --- a/rules/rust/remote/BUILD.wasm-bindgen-macro-support-0.2.73.bazel +++ b/rules/rust/remote/BUILD.wasm-bindgen-macro-support-0.2.79.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,6 @@ rust_library( "spans", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,15 +45,16 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=wasm-bindgen-macro-support", "manual", ], - version = "0.2.73", + version = "0.2.79", # buildifier: leave-alone deps = [ - "@raze__proc_macro2__1_0_26//:proc_macro2", - "@raze__quote__1_0_9//:quote", - "@raze__syn__1_0_69//:syn", - "@raze__wasm_bindgen_backend__0_2_73//:wasm_bindgen_backend", - "@raze__wasm_bindgen_shared__0_2_73//:wasm_bindgen_shared", + "@raze__proc_macro2__1_0_36//:proc_macro2", + "@raze__quote__1_0_16//:quote", + "@raze__syn__1_0_89//:syn", + "@raze__wasm_bindgen_backend__0_2_79//:wasm_bindgen_backend", + "@raze__wasm_bindgen_shared__0_2_79//:wasm_bindgen_shared", ], ) diff --git a/rules/rust/remote/BUILD.wasm-bindgen-shared-0.2.73.bazel b/rules/rust/remote/BUILD.wasm-bindgen-shared-0.2.79.bazel similarity index 89% rename from rules/rust/remote/BUILD.wasm-bindgen-shared-0.2.73.bazel rename to rules/rust/remote/BUILD.wasm-bindgen-shared-0.2.79.bazel index 8ea07b9..242c11b 100644 --- a/rules/rust/remote/BUILD.wasm-bindgen-shared-0.2.73.bazel +++ b/rules/rust/remote/BUILD.wasm-bindgen-shared-0.2.79.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -46,6 +47,7 @@ cargo_build_script( crate_root = "build.rs", data = glob(["**"]), edition = "2018", + links = "wasm_bindgen", rustc_flags = [ "--cap-lints=allow", ], @@ -53,7 +55,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.73", + version = "0.2.79", visibility = ["//visibility:private"], deps = [ ], @@ -65,7 +67,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -73,9 +74,10 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=wasm-bindgen-shared", "manual", ], - version = "0.2.73", + version = "0.2.79", # buildifier: leave-alone deps = [ ":wasm_bindgen_shared_build_script", diff --git a/rules/rust/remote/BUILD.web-sys-0.3.50.bazel b/rules/rust/remote/BUILD.web-sys-0.3.50.bazel deleted file mode 100644 index 16a029d..0000000 --- a/rules/rust/remote/BUILD.web-sys-0.3.50.bazel +++ /dev/null @@ -1,67 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "web_sys", - srcs = glob(["**/*.rs"]), - crate_features = [ - "CanvasRenderingContext2d", - "Document", - "DomRect", - "DomRectReadOnly", - "Element", - "EventTarget", - "HtmlCanvasElement", - "HtmlElement", - "Node", - "Window", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.3.50", - # buildifier: leave-alone - deps = [ - "@raze__js_sys__0_3_50//:js_sys", - "@raze__wasm_bindgen__0_2_73//:wasm_bindgen", - ], -) - -# Unsupported target "wasm" with type "test" omitted diff --git a/rules/rust/remote/BUILD.which-4.2.5.bazel b/rules/rust/remote/BUILD.which-4.2.5.bazel new file mode 100644 index 0000000..9feee76 --- /dev/null +++ b/rules/rust/remote/BUILD.which-4.2.5.bazel @@ -0,0 +1,58 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "which", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=which", + "manual", + ], + version = "4.2.5", + # buildifier: leave-alone + deps = [ + "@raze__either__1_6_1//:either", + "@raze__libc__0_2_121//:libc", + ], +) + +# Unsupported target "basic" with type "test" omitted diff --git a/rules/rust/remote/BUILD.widestring-0.4.3.bazel b/rules/rust/remote/BUILD.widestring-0.4.3.bazel deleted file mode 100644 index c62cf69..0000000 --- a/rules/rust/remote/BUILD.widestring-0.4.3.bazel +++ /dev/null @@ -1,56 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "widestring", - srcs = glob(["**/*.rs"]), - crate_features = [ - "alloc", - "default", - "std", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.4.3", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.winapi-0.2.8.bazel b/rules/rust/remote/BUILD.winapi-0.2.8.bazel deleted file mode 100644 index cd6d273..0000000 --- a/rules/rust/remote/BUILD.winapi-0.2.8.bazel +++ /dev/null @@ -1,53 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -rust_library( - name = "winapi", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.8", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.winapi-0.3.9.bazel b/rules/rust/remote/BUILD.winapi-0.3.9.bazel index 2da27c4..360f818 100644 --- a/rules/rust/remote/BUILD.winapi-0.3.9.bazel +++ b/rules/rust/remote/BUILD.winapi-0.3.9.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -42,33 +43,25 @@ cargo_build_script( build_script_env = { }, crate_features = [ - "basetsd", "cfg", "consoleapi", "errhandlingapi", "evntrace", "fileapi", "handleapi", - "impl-debug", - "impl-default", "in6addr", "inaddr", "ioapiset", - "knownfolders", - "memoryapi", "minwinbase", "minwindef", - "mstcpip", "mswsock", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", - "objbase", "processenv", "processthreadsapi", "profileapi", - "shlobj", "std", "synchapi", "sysinfoapi", @@ -80,8 +73,8 @@ cargo_build_script( "winerror", "winioctl", "winnt", - "winreg", "winsock2", + "winuser", "ws2def", "ws2ipdef", "ws2tcpip", @@ -106,33 +99,25 @@ rust_library( name = "winapi", srcs = glob(["**/*.rs"]), crate_features = [ - "basetsd", "cfg", "consoleapi", "errhandlingapi", "evntrace", "fileapi", "handleapi", - "impl-debug", - "impl-default", "in6addr", "inaddr", "ioapiset", - "knownfolders", - "memoryapi", "minwinbase", "minwindef", - "mstcpip", "mswsock", "namedpipeapi", "ntdef", "ntsecapi", "ntstatus", - "objbase", "processenv", "processthreadsapi", "profileapi", - "shlobj", "std", "synchapi", "sysinfoapi", @@ -144,14 +129,13 @@ rust_library( "winerror", "winioctl", "winnt", - "winreg", "winsock2", + "winuser", "ws2def", "ws2ipdef", "ws2tcpip", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -159,6 +143,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=winapi", "manual", ], version = "0.3.9", diff --git a/rules/rust/remote/BUILD.winapi-build-0.1.1.bazel b/rules/rust/remote/BUILD.winapi-build-0.1.1.bazel deleted file mode 100644 index f06a9ff..0000000 --- a/rules/rust/remote/BUILD.winapi-build-0.1.1.bazel +++ /dev/null @@ -1,62 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -alias( - name = "winapi_build", - actual = ":build", - tags = [ - "cargo-raze", - "manual", - ], -) - -rust_library( - name = "build", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.1.1", - # buildifier: leave-alone - deps = [ - ], -) diff --git a/rules/rust/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel b/rules/rust/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel index a95ed5c..c682e0e 100644 --- a/rules/rust/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel +++ b/rules/rust/remote/BUILD.winapi-i686-pc-windows-gnu-0.4.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -65,7 +66,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -73,6 +73,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=winapi-i686-pc-windows-gnu", "manual", ], version = "0.4.0", diff --git a/rules/rust/remote/BUILD.winapi-util-0.1.5.bazel b/rules/rust/remote/BUILD.winapi-util-0.1.5.bazel index 57c8100..b3f338a 100644 --- a/rules/rust/remote/BUILD.winapi-util-0.1.5.bazel +++ b/rules/rust/remote/BUILD.winapi-util-0.1.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -36,7 +37,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -44,6 +44,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=winapi-util", "manual", ], version = "0.1.5", diff --git a/rules/rust/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel b/rules/rust/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel index c8ff476..17a01b7 100644 --- a/rules/rust/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel +++ b/rules/rust/remote/BUILD.winapi-x86_64-pc-windows-gnu-0.4.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -65,7 +66,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2015", rustc_flags = [ @@ -73,6 +73,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=winapi-x86_64-pc-windows-gnu", "manual", ], version = "0.4.0", diff --git a/rules/rust/remote/BUILD.actix-tls-2.0.0.bazel b/rules/rust/remote/BUILD.windows-sys-0.32.0.bazel similarity index 74% rename from rules/rust/remote/BUILD.actix-tls-2.0.0.bazel rename to rules/rust/remote/BUILD.windows-sys-0.32.0.bazel index 7123afd..b42a6a5 100644 --- a/rules/rust/remote/BUILD.actix-tls-2.0.0.bazel +++ b/rules/rust/remote/BUILD.windows-sys-0.32.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -31,13 +32,18 @@ licenses([ # Generated Targets rust_library( - name = "actix_tls", + name = "windows_sys", srcs = glob(["**/*.rs"]), crate_features = [ + "Win32", + "Win32_Foundation", + "Win32_System", + "Win32_System_LibraryLoader", + "Win32_System_SystemServices", + "Win32_System_WindowsProgramming", "default", ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -45,14 +51,11 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=windows-sys", "manual", ], - version = "2.0.0", + version = "0.32.0", # buildifier: leave-alone deps = [ - "@raze__actix_codec__0_3_0//:actix_codec", - "@raze__actix_service__1_0_6//:actix_service", - "@raze__actix_utils__2_0_0//:actix_utils", - "@raze__futures_util__0_3_14//:futures_util", ], ) diff --git a/rules/rust/remote/BUILD.proc-macro-hack-0.5.19.bazel b/rules/rust/remote/BUILD.windows_aarch64_msvc-0.32.0.bazel similarity index 83% rename from rules/rust/remote/BUILD.proc-macro-hack-0.5.19.bazel rename to rules/rust/remote/BUILD.windows_aarch64_msvc-0.32.0.bazel index 6634073..dd5f203 100644 --- a/rules/rust/remote/BUILD.proc-macro-hack-0.5.19.bazel +++ b/rules/rust/remote/BUILD.windows_aarch64_msvc-0.32.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,7 @@ load( ) cargo_build_script( - name = "proc_macro_hack_build_script", + name = "windows_aarch64_msvc_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, @@ -53,19 +54,18 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.5.19", + version = "0.32.0", visibility = ["//visibility:private"], deps = [ ], ) rust_library( - name = "proc_macro_hack", + name = "windows_aarch64_msvc", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "proc-macro", data = [], edition = "2018", rustc_flags = [ @@ -73,13 +73,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=windows_aarch64_msvc", "manual", ], - version = "0.5.19", + version = "0.32.0", # buildifier: leave-alone deps = [ - ":proc_macro_hack_build_script", + ":windows_aarch64_msvc_build_script", ], ) - -# Unsupported target "compiletest" with type "test" omitted diff --git a/rules/rust/remote/BUILD.ipconfig-0.2.2.bazel b/rules/rust/remote/BUILD.windows_i686_gnu-0.32.0.bazel similarity index 84% rename from rules/rust/remote/BUILD.ipconfig-0.2.2.bazel rename to rules/rust/remote/BUILD.windows_i686_gnu-0.32.0.bazel index 3299fe1..c73c3e8 100644 --- a/rules/rust/remote/BUILD.ipconfig-0.2.2.bazel +++ b/rules/rust/remote/BUILD.windows_i686_gnu-0.32.0.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -37,7 +38,7 @@ load( ) cargo_build_script( - name = "ipconfig_build_script", + name = "windows_i686_gnu_build_script", srcs = glob(["**/*.rs"]), build_script_env = { }, @@ -53,19 +54,18 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.2", + version = "0.32.0", visibility = ["//visibility:private"], deps = [ ], ) rust_library( - name = "ipconfig", + name = "windows_i686_gnu", srcs = glob(["**/*.rs"]), crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -73,13 +73,12 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=windows_i686_gnu", "manual", ], - version = "0.2.2", + version = "0.32.0", # buildifier: leave-alone deps = [ - ":ipconfig_build_script", + ":windows_i686_gnu_build_script", ], ) - -# Unsupported target "test" with type "test" omitted diff --git a/rules/rust/remote/BUILD.windows_i686_msvc-0.32.0.bazel b/rules/rust/remote/BUILD.windows_i686_msvc-0.32.0.bazel new file mode 100644 index 0000000..0e92eaa --- /dev/null +++ b/rules/rust/remote/BUILD.windows_i686_msvc-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_i686_msvc_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_i686_msvc", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_i686_msvc", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_i686_msvc_build_script", + ], +) diff --git a/rules/rust/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel b/rules/rust/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel new file mode 100644 index 0000000..45013e5 --- /dev/null +++ b/rules/rust/remote/BUILD.windows_x86_64_gnu-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_x86_64_gnu_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_x86_64_gnu", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_x86_64_gnu", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_x86_64_gnu_build_script", + ], +) diff --git a/rules/rust/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel b/rules/rust/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel new file mode 100644 index 0000000..233b51a --- /dev/null +++ b/rules/rust/remote/BUILD.windows_x86_64_msvc-0.32.0.bazel @@ -0,0 +1,84 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:defs.bzl", + "rust_binary", + "rust_library", + "rust_proc_macro", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//rules/rust", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "windows_x86_64_msvc_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.32.0", + visibility = ["//visibility:private"], + deps = [ + ], +) + +rust_library( + name = "windows_x86_64_msvc", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "crate-name=windows_x86_64_msvc", + "manual", + ], + version = "0.32.0", + # buildifier: leave-alone + deps = [ + ":windows_x86_64_msvc_build_script", + ], +) diff --git a/rules/rust/remote/BUILD.winreg-0.6.2.bazel b/rules/rust/remote/BUILD.winreg-0.6.2.bazel deleted file mode 100644 index c94dfe0..0000000 --- a/rules/rust/remote/BUILD.winreg-0.6.2.bazel +++ /dev/null @@ -1,64 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets - -# Unsupported target "basic_usage" with type "example" omitted - -# Unsupported target "enum" with type "example" omitted - -# Unsupported target "installed_apps" with type "example" omitted - -# Unsupported target "serialization" with type "example" omitted - -# Unsupported target "transactions" with type "example" omitted - -rust_library( - name = "winreg", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.6.2", - # buildifier: leave-alone - deps = [ - "@raze__winapi__0_3_9//:winapi", - ], -) diff --git a/rules/rust/remote/BUILD.ws2_32-sys-0.2.1.bazel b/rules/rust/remote/BUILD.ws2_32-sys-0.2.1.bazel deleted file mode 100644 index a37ffc1..0000000 --- a/rules/rust/remote/BUILD.ws2_32-sys-0.2.1.bazel +++ /dev/null @@ -1,94 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT" -]) - -# Generated Targets -# buildifier: disable=out-of-order-load -# buildifier: disable=load-on-top -load( - "@rules_rust//cargo:cargo_build_script.bzl", - "cargo_build_script", -) - -cargo_build_script( - name = "ws2_32_sys_build_script", - srcs = glob(["**/*.rs"]), - build_script_env = { - }, - crate_features = [ - ], - crate_root = "build.rs", - data = glob(["**"]), - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.1", - visibility = ["//visibility:private"], - deps = [ - "@raze__winapi_build__0_1_1//:winapi_build", - ], -) - -alias( - name = "ws2_32_sys", - actual = ":ws2_32", - tags = [ - "cargo-raze", - "manual", - ], -) - -rust_library( - name = "ws2_32", - srcs = glob(["**/*.rs"]), - crate_features = [ - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.1", - # buildifier: leave-alone - deps = [ - ":ws2_32_sys_build_script", - "@raze__winapi__0_2_8//:winapi", - ], -) diff --git a/rules/rust/remote/BUILD.xattr-0.2.2.bazel b/rules/rust/remote/BUILD.xattr-0.2.2.bazel deleted file mode 100644 index 4f09b9d..0000000 --- a/rules/rust/remote/BUILD.xattr-0.2.2.bazel +++ /dev/null @@ -1,58 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -# buildifier: disable=load -load( - "@rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//rules/rust", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "notice", # MIT from expression "MIT OR Apache-2.0" -]) - -# Generated Targets - -rust_library( - name = "xattr", - srcs = glob(["**/*.rs"]), - crate_features = [ - "default", - "unsupported", - ], - crate_root = "src/lib.rs", - crate_type = "lib", - data = [], - edition = "2015", - rustc_flags = [ - "--cap-lints=allow", - ], - tags = [ - "cargo-raze", - "manual", - ], - version = "0.2.2", - # buildifier: leave-alone - deps = [ - "@raze__libc__0_2_93//:libc", - ], -) - -# Unsupported target "main" with type "test" omitted diff --git a/rules/rust/remote/BUILD.yaml-rust-0.4.5.bazel b/rules/rust/remote/BUILD.yaml-rust-0.4.5.bazel index 1e27257..a1734e5 100644 --- a/rules/rust/remote/BUILD.yaml-rust-0.4.5.bazel +++ b/rules/rust/remote/BUILD.yaml-rust-0.4.5.bazel @@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects") # buildifier: disable=load load( - "@rules_rust//rust:rust.bzl", + "@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", + "rust_proc_macro", "rust_test", ) @@ -38,7 +39,6 @@ rust_library( crate_features = [ ], crate_root = "src/lib.rs", - crate_type = "lib", data = [], edition = "2018", rustc_flags = [ @@ -46,6 +46,7 @@ rust_library( ], tags = [ "cargo-raze", + "crate-name=yaml-rust", "manual", ], version = "0.4.5", diff --git a/rules/rust/rustfmt.toml b/rules/rust/rustfmt.toml new file mode 100644 index 0000000..cd016f6 --- /dev/null +++ b/rules/rust/rustfmt.toml @@ -0,0 +1 @@ +max_width = 180