Skip to content

Commit 31a777a

Browse files
Merge branch 'WhyNotHugo-python3' into next-beta
2 parents c0cc878 + 207c533 commit 31a777a

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@
253253
"jsdoc": "3.6.2",
254254
"mocha": "4.1.0",
255255
"mocha-testcheck": "1.0.0-rc.0",
256-
"node-gyp": "5.0.3",
256+
"node-gyp": "^6.1.0",
257257
"node-sass": "4.14.1",
258258
"node-sass-import-once": "1.2.0",
259259
"npm-run-all": "4.1.5",

ts/util/lint/exceptions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10543,7 +10543,7 @@
1054310543
"rule": "jQuery-$(",
1054410544
"path": "node_modules/node-gyp/lib/configure.js",
1054510545
"line": " !gyp.opts.nodedir ? '<(target_arch)' : '$(Configuration)',",
10546-
"lineNumber": 299,
10546+
"lineNumber": 300,
1054710547
"reasonCategory": "falseMatch",
1054810548
"updated": "2019-07-19T17:16:02.404Z"
1054910549
},

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11693,7 +11693,7 @@ minipass@^2.2.1, minipass@^2.3.3:
1169311693
safe-buffer "^5.1.2"
1169411694
yallist "^3.0.0"
1169511695

11696-
minipass@^2.3.4, minipass@^2.3.5:
11696+
minipass@^2.3.4:
1169711697
version "2.3.5"
1169811698
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
1169911699
integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
@@ -12117,23 +12117,6 @@ node-gyp-build@^4.2.1:
1211712117
resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
1211812118
integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==
1211912119

12120-
12121-
version "5.0.3"
12122-
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.0.3.tgz#80d64c23790244991b6d44532f0a351bedd3dd45"
12123-
integrity sha512-z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ==
12124-
dependencies:
12125-
env-paths "^1.0.0"
12126-
glob "^7.0.3"
12127-
graceful-fs "^4.1.2"
12128-
mkdirp "^0.5.0"
12129-
nopt "2 || 3"
12130-
npmlog "0 || 1 || 2 || 3 || 4"
12131-
request "^2.87.0"
12132-
rimraf "2"
12133-
semver "~5.3.0"
12134-
tar "^4.4.8"
12135-
which "1"
12136-
1213712120
node-gyp@^3.8.0:
1213812121
version "3.8.0"
1213912122
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -12152,6 +12135,23 @@ node-gyp@^3.8.0:
1215212135
tar "^2.0.0"
1215312136
which "1"
1215412137

12138+
node-gyp@^6.1.0:
12139+
version "6.1.0"
12140+
resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-6.1.0.tgz#64e31c61a4695ad304c1d5b82cf6b7c79cc79f3f"
12141+
integrity sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==
12142+
dependencies:
12143+
env-paths "^2.2.0"
12144+
glob "^7.1.4"
12145+
graceful-fs "^4.2.2"
12146+
mkdirp "^0.5.1"
12147+
nopt "^4.0.1"
12148+
npmlog "^4.1.2"
12149+
request "^2.88.0"
12150+
rimraf "^2.6.3"
12151+
semver "^5.7.1"
12152+
tar "^4.4.12"
12153+
which "^1.3.1"
12154+
1215512155
node-libs-browser@^2.2.1:
1215612156
version "2.2.1"
1215712157
resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -15400,7 +15400,7 @@ semver@^5.0.1:
1540015400
version "5.5.0"
1540115401
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
1540215402

15403-
semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
15403+
semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
1540415404
version "5.7.1"
1540515405
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
1540615406
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

0 commit comments

Comments
 (0)