Skip to content

Commit b59097f

Browse files
committed
1 parent 8b29435 commit b59097f

Some content is hidden

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

95 files changed

+5581
-458
lines changed

DEPENDENCIES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ graph LR;
287287
cross-spawn-->which;
288288
debug-->ms;
289289
encoding-->iconv-lite;
290+
fdir-->picomatch;
290291
foreground-child-->cross-spawn;
291292
foreground-child-->signal-exit;
292293
fs-minipass-->minipass;
@@ -443,13 +444,13 @@ graph LR;
443444
minizlib-->rimraf;
444445
node-gyp-->env-paths;
445446
node-gyp-->exponential-backoff;
446-
node-gyp-->glob;
447447
node-gyp-->graceful-fs;
448448
node-gyp-->make-fetch-happen;
449449
node-gyp-->nopt;
450450
node-gyp-->proc-log;
451451
node-gyp-->semver;
452452
node-gyp-->tar;
453+
node-gyp-->tinyglobby;
453454
node-gyp-->which;
454455
nopt-->abbrev;
455456
normalize-package-data-->hosted-git-info;
@@ -767,6 +768,8 @@ graph LR;
767768
tar-->minizlib;
768769
tar-->mkdirp;
769770
tar-->yallist;
771+
tinyglobby-->fdir;
772+
tinyglobby-->picomatch;
770773
tuf-js-->debug;
771774
tuf-js-->make-fetch-happen;
772775
tuf-js-->tufjs-models["@tufjs/models"];

node_modules/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,11 @@
229229
!/tar/node_modules/minipass
230230
!/text-table
231231
!/tiny-relative-date
232+
!/tinyglobby
233+
!/tinyglobby/node_modules/
234+
/tinyglobby/node_modules/*
235+
!/tinyglobby/node_modules/fdir
236+
!/tinyglobby/node_modules/picomatch
232237
!/treeverse
233238
!/tuf-js
234239
!/tuf-js/node_modules/
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "11.0.0"
2+
".": "11.2.0"
33
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "0.18.1"
2+
".": "0.20.0"
33
}

node_modules/node-gyp/gyp/docs/Hacking.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ to make sure your changes aren't breaking anything important.
2424
You run the test driver with e.g.
2525

2626
``` sh
27-
$ python -m pip install --upgrade pip setuptools
27+
$ python -m pip install --upgrade pip
2828
$ pip install --editable ".[dev]"
2929
$ python -m pytest
3030
```
@@ -34,7 +34,7 @@ See [Testing](Testing.md) for more details on the test framework.
3434
Note that it can be handy to look at the project files output by the tests
3535
to diagnose problems. The easiest way to do that is by kindly asking the
3636
test driver to leave the temporary directories it creates in-place.
37-
This is done by setting the enviroment variable "PRESERVE", e.g.
37+
This is done by setting the environment variable "PRESERVE", e.g.
3838

3939
```
4040
set PRESERVE=all # On Windows

node_modules/node-gyp/gyp/docs/InputFormatReference.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ lists associated with the following keys, are treated as pathnames:
194194
* include\_dirs
195195
* inputs
196196
* libraries
197+
* library\_dirs
197198
* outputs
198199
* sources
199200
* mac\_bundle\_resources
@@ -231,7 +232,8 @@ Source dictionary from `../build/common.gypi`:
231232
```
232233
{
233234
'include_dirs': ['include'], # Treated as relative to ../build
234-
'libraries': ['-lz'], # Not treated as a pathname, begins with a dash
235+
'library_dirs': ['lib'], # Treated as relative to ../build
236+
'libraries': ['-lz'], # Not treated as a pathname, begins with a dash
235237
'defines': ['NDEBUG'], # defines does not contain pathnames
236238
}
237239
```
@@ -250,6 +252,7 @@ Merged dictionary:
250252
{
251253
'sources': ['string_util.cc'],
252254
'include_dirs': ['../build/include'],
255+
'library_dirs': ['../build/lib'],
253256
'libraries': ['-lz'],
254257
'defines': ['NDEBUG'],
255258
}

node_modules/node-gyp/gyp/docs/LanguageSpecification.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ have structural meaning for target definitions:
157157
| `all_dependent_settings` | A dictionary of settings to be applied to all dependents of the target, transitively. This includes direct dependents and the entire set of their dependents, and so on. This section may contain anything found within a `target` dictionary, except `configurations`, `target_name`, and `type` sections. Compare `direct_dependent_settings` and `link_settings`. |
158158
| `configurations` | A list of dictionaries defining build configurations for the target. See the "Configurations" section below. |
159159
| `copies` | A list of copy actions to perform. See the "Copies" section below. |
160-
| `defines` | A list of preprocesor definitions to be passed on the command line to the C/C++ compiler (via `-D` or `/D` options). |
160+
| `defines` | A list of preprocessor definitions to be passed on the command line to the C/C++ compiler (via `-D` or `/D` options). |
161161
| `dependencies` | A list of targets on which this target depends. Targets in other `.gyp` files are specified as `../path/to/other.gyp:target_we_want`. |
162162
| `direct_dependent_settings` | A dictionary of settings to be applied to other targets that depend on this target. These settings will only be applied to direct dependents. This section may contain anything found within a `target` dictionary, except `configurations`, `target_name`, and `type` sections. Compare with `all_dependent_settings` and `link_settings`. |
163163
| `include_dirs` | A list of include directories to be passed on the command line to the C/C++ compiler (via `-I` or `/I` options). |
@@ -208,8 +208,8 @@ Configuration dictionaries may also contain these elements:
208208

209209
Conditionals may appear within any dictionary in a `.gyp` file. There
210210
are two tpes of conditionals, which differ only in the timing of their
211-
processing. `conditons` sections are processed shortly after loading
212-
`.gyp` files, and `target_conditons` sections are processed after all
211+
processing. `conditions` sections are processed shortly after loading
212+
`.gyp` files, and `target_conditions` sections are processed after all
213213
dependencies have been computed.
214214

215215
A conditional section is introduced with a `conditions` or

node_modules/node-gyp/gyp/docs/Testing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,15 @@ fails the test if it does.
392392

393393
Verifies that the output string contains all of the "lines" in the specified
394394
list of lines. In practice, the lines can be any substring and need not be
395-
`\n`-terminaed lines per se. If any line is missing, the test fails.
395+
`\n`-terminated lines per se. If any line is missing, the test fails.
396396

397397
```
398398
test.must_not_contain_any_lines(output, lines)
399399
```
400400

401401
Verifies that the output string does _not_ contain any of the "lines" in the
402402
specified list of lines. In practice, the lines can be any substring and need
403-
not be `\n`-terminaed lines per se. If any line exists in the output string,
403+
not be `\n`-terminated lines per se. If any line exists in the output string,
404404
the test fails.
405405

406406
```
@@ -409,7 +409,7 @@ the test fails.
409409

410410
Verifies that the output string contains at least one of the "lines" in the
411411
specified list of lines. In practice, the lines can be any substring and need
412-
not be `\n`-terminaed lines per se. If none of the specified lines is present,
412+
not be `\n`-terminated lines per se. If none of the specified lines is present,
413413
the test fails.
414414

415415
### Reading file contents

node_modules/node-gyp/gyp/docs/UserDocumentation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describing all the information necessary to build the target.
104104

105105
`'conditions'`: A list of condition specifications that can modify the
106106
contents of the items in the global dictionary defined by this `.gyp`
107-
file based on the values of different variablwes. As implied by the
107+
file based on the values of different variables. As implied by the
108108
above example, the most common use of a `conditions` section in the
109109
top-level dictionary is to add platform-specific targets to the
110110
`targets` list.
@@ -375,7 +375,7 @@ If your platform-specific file does not contain a
375375
already in the `conditions` for the target), and you can't change the
376376
file name, there are two patterns that can be used.
377377

378-
**Prefererred**: Add the file to the `sources` list of the appropriate
378+
**Preferred**: Add the file to the `sources` list of the appropriate
379379
dictionary within the `targets` list. Add an appropriate `conditions`
380380
section to exclude the specific files name:
381381

@@ -807,7 +807,7 @@ directory:
807807
```
808808

809809
Adding a library often involves updating multiple `.gyp` files, adding
810-
the target to the approprate `.gyp` file (possibly a newly-added `.gyp`
810+
the target to the appropriate `.gyp` file (possibly a newly-added `.gyp`
811811
file), and updating targets in the other `.gyp` files that depend on
812812
(link with) the new library.
813813

@@ -858,7 +858,7 @@ because of those settings' being listed in the
858858
`direct_dependent_settings` block.
859859

860860
Note that these settings will likely need to be replicated in the
861-
settings for the library target itsef, so that the library will build
861+
settings for the library target itself, so that the library will build
862862
with the same options. This does not prevent the target from defining
863863
additional options for its "internal" use when compiling its own source
864864
files. (In the above example, these are the `LOCAL_DEFINE_FOR_LIBBAR`

node_modules/node-gyp/gyp/gyp_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# found in the LICENSE file.
66

77
import os
8-
import sys
98
import subprocess
9+
import sys
1010

1111

1212
def IsCygwin():

node_modules/node-gyp/gyp/pylib/gyp/MSVSProject.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
"""Visual Studio project reader/writer."""
66

7-
import gyp.easy_xml as easy_xml
7+
from gyp import easy_xml
88

99
# ------------------------------------------------------------------------------
1010

node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def ValidateMSBuild(self, value):
171171
int(value, self._msbuild_base)
172172

173173
def ConvertToMSBuild(self, value):
174-
msbuild_format = (self._msbuild_base == 10) and "%d" or "0x%04x"
174+
msbuild_format = ((self._msbuild_base == 10) and "%d") or "0x%04x"
175175
return msbuild_format % int(value)
176176

177177

node_modules/node-gyp/gyp/pylib/gyp/MSVSSettings_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"""Unit tests for the MSVSSettings.py file."""
88

99
import unittest
10-
import gyp.MSVSSettings as MSVSSettings
11-
1210
from io import StringIO
1311

12+
from gyp import MSVSSettings
13+
1414

1515
class TestSequenceFunctions(unittest.TestCase):
1616
def setUp(self):

node_modules/node-gyp/gyp/pylib/gyp/MSVSToolFile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
"""Visual Studio project reader/writer."""
66

7-
import gyp.easy_xml as easy_xml
7+
from gyp import easy_xml
88

99

1010
class Writer:

node_modules/node-gyp/gyp/pylib/gyp/MSVSUserFile.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import re
99
import socket # for gethostname
1010

11-
import gyp.easy_xml as easy_xml
12-
11+
from gyp import easy_xml
1312

1413
# ------------------------------------------------------------------------------
1514

node_modules/node-gyp/gyp/pylib/gyp/MSVSUtil.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import copy
88
import os
99

10-
1110
# A dictionary mapping supported target types to extensions.
1211
TARGET_TYPE_EXT = {
1312
"executable": "exe",

node_modules/node-gyp/gyp/pylib/gyp/MSVSVersion.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
"""Handle version information related to Visual Stuio."""
66

77
import errno
8+
import glob
89
import os
910
import re
1011
import subprocess
1112
import sys
12-
import glob
1313

1414

1515
def JoinPath(*args):
@@ -69,7 +69,7 @@ def UsesVcxproj(self):
6969

7070
def ProjectExtension(self):
7171
"""Returns the file extension for the project."""
72-
return self.uses_vcxproj and ".vcxproj" or ".vcproj"
72+
return (self.uses_vcxproj and ".vcxproj") or ".vcproj"
7373

7474
def Path(self):
7575
"""Returns the path to Visual Studio installation."""

0 commit comments

Comments
 (0)