Skip to content

Commit 7bf0db3

Browse files
authored
Merge branch 'main' into deps-version
2 parents 47770e9 + 300f68e commit 7bf0db3

File tree

746 files changed

+57171
-58326
lines changed

Some content is hidden

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

746 files changed

+57171
-58326
lines changed

deps/ada/ada.cpp

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on 2023-05-16 13:48:47 -0400. Do not edit! */
1+
/* auto-generated on 2023-05-19 00:02:33 -0400. Do not edit! */
22
/* begin file src/ada.cpp */
33
#include "ada.h"
44
/* begin file src/checkers.cpp */
@@ -10001,8 +10001,9 @@ static_assert(sizeof(is_forbidden_domain_code_point_table_or_upper) == 256);
1000110001
static_assert(is_forbidden_domain_code_point_table_or_upper[uint8_t('A')] == 2);
1000210002
static_assert(is_forbidden_domain_code_point_table_or_upper[uint8_t('Z')] == 2);
1000310003

10004-
ada_really_inline constexpr bool contains_forbidden_domain_code_point_or_upper(
10005-
const char* input, size_t length) noexcept {
10004+
ada_really_inline constexpr uint8_t
10005+
contains_forbidden_domain_code_point_or_upper(const char* input,
10006+
size_t length) noexcept {
1000610007
size_t i = 0;
1000710008
uint8_t accumulator{};
1000810009
for (; i + 4 <= length; i += 4) {
@@ -10677,7 +10678,7 @@ ada_really_inline size_t find_next_host_delimiter_special(
1067710678
has_zero_byte(xor3) | has_zero_byte(xor4) |
1067810679
has_zero_byte(xor5);
1067910680
if (is_match) {
10680-
return i + index_of_first_set_byte(is_match);
10681+
return size_t(i + index_of_first_set_byte(is_match));
1068110682
}
1068210683
}
1068310684
if (i < view.size()) {
@@ -10695,7 +10696,7 @@ ada_really_inline size_t find_next_host_delimiter_special(
1069510696
has_zero_byte(xor3) | has_zero_byte(xor4) |
1069610697
has_zero_byte(xor5);
1069710698
if (is_match) {
10698-
return i + index_of_first_set_byte(is_match);
10699+
return size_t(i + index_of_first_set_byte(is_match));
1069910700
}
1070010701
}
1070110702
return view.size();
@@ -10739,7 +10740,7 @@ ada_really_inline size_t find_next_host_delimiter(std::string_view view,
1073910740
uint64_t is_match = has_zero_byte(xor1) | has_zero_byte(xor2) |
1074010741
has_zero_byte(xor4) | has_zero_byte(xor5);
1074110742
if (is_match) {
10742-
return i + index_of_first_set_byte(is_match);
10743+
return size_t(i + index_of_first_set_byte(is_match));
1074310744
}
1074410745
}
1074510746
if (i < view.size()) {
@@ -10757,7 +10758,7 @@ ada_really_inline size_t find_next_host_delimiter(std::string_view view,
1075710758
uint64_t is_match = has_zero_byte(xor1) | has_zero_byte(xor2) |
1075810759
has_zero_byte(xor4) | has_zero_byte(xor5);
1075910760
if (is_match) {
10760-
return i + index_of_first_set_byte(is_match);
10761+
return size_t(i + index_of_first_set_byte(is_match));
1076110762
}
1076210763
}
1076310764
return view.size();
@@ -11064,7 +11065,7 @@ find_authority_delimiter_special(std::string_view view) noexcept {
1106411065
uint64_t is_match = has_zero_byte(xor1) | has_zero_byte(xor2) |
1106511066
has_zero_byte(xor3) | has_zero_byte(xor4);
1106611067
if (is_match) {
11067-
return i + index_of_first_set_byte(is_match);
11068+
return size_t(i + index_of_first_set_byte(is_match));
1106811069
}
1106911070
}
1107011071

@@ -11079,7 +11080,7 @@ find_authority_delimiter_special(std::string_view view) noexcept {
1107911080
uint64_t is_match = has_zero_byte(xor1) | has_zero_byte(xor2) |
1108011081
has_zero_byte(xor3) | has_zero_byte(xor4);
1108111082
if (is_match) {
11082-
return i + index_of_first_set_byte(is_match);
11083+
return size_t(i + index_of_first_set_byte(is_match));
1108311084
}
1108411085
}
1108511086

@@ -11112,7 +11113,7 @@ find_authority_delimiter(std::string_view view) noexcept {
1111211113
uint64_t is_match =
1111311114
has_zero_byte(xor1) | has_zero_byte(xor2) | has_zero_byte(xor3);
1111411115
if (is_match) {
11115-
return i + index_of_first_set_byte(is_match);
11116+
return size_t(i + index_of_first_set_byte(is_match));
1111611117
}
1111711118
}
1111811119

@@ -11126,7 +11127,7 @@ find_authority_delimiter(std::string_view view) noexcept {
1112611127
uint64_t is_match =
1112711128
has_zero_byte(xor1) | has_zero_byte(xor2) | has_zero_byte(xor3);
1112811129
if (is_match) {
11129-
return i + index_of_first_set_byte(is_match);
11130+
return size_t(i + index_of_first_set_byte(is_match));
1113011131
}
1113111132
}
1113211133

@@ -12088,8 +12089,7 @@ result_type parse_url(std::string_view user_input,
1208812089

1208912090
// We refuse to parse URL strings that exceed 4GB. Such strings are almost
1209012091
// surely the result of a bug or are otherwise a security concern.
12091-
if (user_input.size() >=
12092-
std::string_view::size_type(std::numeric_limits<uint32_t>::max)) {
12092+
if (user_input.size() > std::numeric_limits<uint32_t>::max()) {
1209312093
url.is_valid = false;
1209412094
}
1209512095
// Going forward, user_input.size() is in [0,
@@ -13565,22 +13565,6 @@ ada_really_inline bool url_aggregator::parse_host(std::string_view input) {
1356513565
}
1356613566
ada_log("parse_host fast path ", get_hostname());
1356713567
return true;
13568-
} else if (is_forbidden_or_upper == 2) {
13569-
// We have encountered at least one upper case ASCII letter, let us
13570-
// try to convert it to lower case. If there is no 'xn-' in the result,
13571-
// we can then use a secondary fast path.
13572-
std::string _buffer = std::string(input);
13573-
unicode::to_lower_ascii(_buffer.data(), _buffer.size());
13574-
if (input.find("xn-") == std::string_view::npos) {
13575-
// secondary fast path when input is not all lower case
13576-
update_base_hostname(input);
13577-
if (checkers::is_ipv4(get_hostname())) {
13578-
ada_log("parse_host fast path ipv4");
13579-
return parse_ipv4(get_hostname());
13580-
}
13581-
ada_log("parse_host fast path ", get_hostname());
13582-
return true;
13583-
}
1358413568
}
1358513569
// We have encountered at least one forbidden code point or the input contains
1358613570
// 'xn-' (case insensitive), so we need to call 'to_ascii' to perform the full

deps/ada/ada.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* auto-generated on 2023-05-16 13:48:47 -0400. Do not edit! */
1+
/* auto-generated on 2023-05-19 00:02:33 -0400. Do not edit! */
22
/* begin file include/ada.h */
33
/**
44
* @file ada.h
@@ -4354,8 +4354,9 @@ ada_really_inline constexpr bool contains_forbidden_domain_code_point(
43544354
* then the second bit is set to 1.
43554355
* @see https://url.spec.whatwg.org/#forbidden-domain-code-point
43564356
*/
4357-
ada_really_inline constexpr bool contains_forbidden_domain_code_point_or_upper(
4358-
const char* input, size_t length) noexcept;
4357+
ada_really_inline constexpr uint8_t
4358+
contains_forbidden_domain_code_point_or_upper(const char* input,
4359+
size_t length) noexcept;
43594360

43604361
/**
43614362
* Checks if the input is a forbidden doamin code point.
@@ -6484,14 +6485,14 @@ inline std::ostream &operator<<(std::ostream &out,
64846485
#ifndef ADA_ADA_VERSION_H
64856486
#define ADA_ADA_VERSION_H
64866487

6487-
#define ADA_VERSION "2.4.1"
6488+
#define ADA_VERSION "2.4.2"
64886489

64896490
namespace ada {
64906491

64916492
enum {
64926493
ADA_VERSION_MAJOR = 2,
64936494
ADA_VERSION_MINOR = 4,
6494-
ADA_VERSION_REVISION = 1,
6495+
ADA_VERSION_REVISION = 2,
64956496
};
64966497

64976498
} // namespace ada

deps/corepack/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# Changelog
22

3+
## [0.18.0](https://github.com/nodejs/corepack/compare/v0.17.2...v0.18.0) (2023-05-19)
4+
5+
6+
### ⚠ BREAKING CHANGES
7+
8+
* remove support for Node.js 14.x
9+
10+
### Features
11+
12+
* update package manager versions ([#256](https://github.com/nodejs/corepack/issues/256)) ([7b61ff6](https://github.com/nodejs/corepack/commit/7b61ff6bc797ec4ed50c2ba1e1f1689264cbf4fc))
13+
14+
15+
### Bug Fixes
16+
17+
* **doc:** add a note about troubleshooting network errors ([#259](https://github.com/nodejs/corepack/issues/259)) ([aa3cbdb](https://github.com/nodejs/corepack/commit/aa3cbdb54fb21b8e0adde96dc781cdf750932843))
18+
19+
20+
### Miscellaneous Chores
21+
22+
* update supported Node.js versions ([#258](https://github.com/nodejs/corepack/issues/258)) ([74f679d](https://github.com/nodejs/corepack/commit/74f679d8a72cc10a3720fc679b95e9bd086d95be))
23+
324
## [0.17.2](https://github.com/nodejs/corepack/compare/v0.17.1...v0.17.2) (2023-04-07)
425

526

deps/corepack/README.md

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,20 @@
22

33
Corepack is a zero-runtime-dependency Node.js script that acts as a bridge
44
between Node.js projects and the package managers they are intended to be used
5-
with during development. In practical terms, **Corepack will let you use Yarn
6-
and pnpm without having to install them** - just like what currently happens
7-
with npm, which is shipped by Node.js by default.
8-
9-
**Important:** At the moment, Corepack only covers Yarn and pnpm. Given that we
10-
have little control on the npm project, we prefer to focus on the Yarn and pnpm
11-
use cases. As a result, Corepack doesn't have any effect at all on the way you
12-
use npm.
5+
with during development. In practical terms, **Corepack lets you use Yarn, npm,
6+
and pnpm without having to install them**.
137

148
## How to Install
159

1610
### Default Installs
1711

18-
Corepack is distributed by default with Node.js 14.19.0 and 16.9.0, but is
19-
opt-in for the time being. Run `corepack enable` to install the required shims.
12+
Corepack is [distributed by default with all recent Node.js versions](https://nodejs.org/api/corepack.html).
13+
Run `corepack enable` to install the required Yarn and pnpm binaries on your path.
2014

2115
### Manual Installs
2216

2317
<details>
24-
<summary>Click here to see how to install Corepack using npm</summary>
18+
<summary>Install Corepack using npm</summary>
2519

2620
First uninstall your global Yarn and pnpm binaries (just leave npm). In general,
2721
you'd do this by running the following command:
@@ -45,6 +39,12 @@ is distributed along with Node.js itself.
4539

4640
</details>
4741

42+
<details><summary>Install Corepack from source</summary>
43+
44+
See [`CONTRIBUTING.md`](./CONTRIBUTING.md).
45+
46+
</details>
47+
4848
## Usage
4949

5050
### When Building Packages
@@ -131,12 +131,37 @@ on a project where the `packageManager` field references `pnpm`).
131131
| --------------------- | --------------------------------------- |
132132
| `--install-directory` | Add the shims to the specified location |
133133

134-
This command will detect where Node.js is installed and will create shims next
134+
This command will detect where Corepack is installed and will create shims next
135135
to it for each of the specified package managers (or all of them if the command
136136
is called without parameters). Note that the npm shims will not be installed
137137
unless explicitly requested, as npm is currently distributed with Node.js
138138
through other means.
139139

140+
If the file system where the `corepack` binary is located is read-only, this
141+
command will fail. A workaround is to add the binaries as alias in your
142+
shell configuration file (e.g. in `~/.bash_aliases`):
143+
144+
```sh
145+
alias yarn="corepack yarn"
146+
alias yarnpkg="corepack yarnpkg"
147+
alias pnpm="corepack pnpm"
148+
alias pnpx="corepack pnpx"
149+
alias npm="corepack npm"
150+
alias npx="corepack npx"
151+
```
152+
153+
On Windows PowerShell, you can add functions using the `$PROFILE` automatic
154+
variable:
155+
156+
```powershell
157+
echo "function yarn { corepack yarn `$args }" >> $PROFILE
158+
echo "function yarnpkg { corepack yarnpkg `$args }" >> $PROFILE
159+
echo "function pnpm { corepack pnpm `$args }" >> $PROFILE
160+
echo "function pnpx { corepack pnpx `$args }" >> $PROFILE
161+
echo "function npm { corepack npm `$args }" >> $PROFILE
162+
echo "function npx { corepack npx `$args }" >> $PROFILE
163+
```
164+
140165
### `corepack disable [... name]`
141166

142167
| Option | Description |
@@ -217,6 +242,16 @@ network interaction.
217242
- `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` are supported through
218243
[`node-proxy-agent`](https://github.com/TooTallNate/node-proxy-agent).
219244

245+
## Troubleshooting
246+
247+
### Networking
248+
249+
There are a wide variety of networking issues that can occur while running `corepack` commands. Things to check:
250+
251+
- Make sure your network connection is active.
252+
- Make sure the host for your request can be resolved by your DNS; try using `curl [URL]` from your shell.
253+
- Check your proxy settings (see [Environment Variables](#environment-variables)).
254+
220255
## Contributing
221256

222257
See [`CONTRIBUTING.md`](./CONTRIBUTING.md).

0 commit comments

Comments
 (0)