diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index acffa4fbbd53b..fdb499b29b7c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- node-version: [6.x, 8.x, 10.x, 12.x]
+ node-version: [6.x, 8.x, 10.x, 12.x, 14.x]
os: [ubuntu-latest, windows-latest, macOS-latest]
runs-on: ${{ matrix.os }}
diff --git a/.travis.yml b/.travis.yml
index 9fb0d51133692..16165cd643da8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ os:
- windows
node_js:
+ - 14
- 12
- 10
- 8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee1f7410f2b86..fc2934d6abd5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 6.14.13 (2021-04-08)
+
+### DEPENDENCIES
+
+* [`285ab3f65`](https://github.com/npm/cli/commit/285ab3f654882860246f729eb52e2c8c6a6d6e01)
+ `hosted-git-info@2.8.9`
+* [`63b5c56c5`](https://github.com/npm/cli/commit/63b5c56c5203c8965c8ddeff28f2a65010b40b7c)
+ `ssri@6.0.2`
+
## 6.14.12 (2021-03-25)
### DEPENDENCIES
diff --git a/node_modules/hosted-git-info/CHANGELOG.md b/node_modules/hosted-git-info/CHANGELOG.md
index 4f86601e029e9..6987fb4aebb57 100644
--- a/node_modules/hosted-git-info/CHANGELOG.md
+++ b/node_modules/hosted-git-info/CHANGELOG.md
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## [2.8.9](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) (2021-04-07)
+
+
+### Bug Fixes
+
+* backport regex fix from [#76](https://github.com/npm/hosted-git-info/issues/76) ([29adfe5](https://github.com/npm/hosted-git-info/commit/29adfe5)), closes [#84](https://github.com/npm/hosted-git-info/issues/84)
+
+
+
## [2.8.8](https://github.com/npm/hosted-git-info/compare/v2.8.7...v2.8.8) (2020-02-29)
diff --git a/node_modules/hosted-git-info/index.js b/node_modules/hosted-git-info/index.js
index 21e53fe3724be..0885772256362 100644
--- a/node_modules/hosted-git-info/index.js
+++ b/node_modules/hosted-git-info/index.js
@@ -41,7 +41,7 @@ function fromUrl (giturl, opts) {
isGitHubShorthand(giturl) ? 'github:' + giturl : giturl
)
var parsed = parseGitUrl(url)
- var shortcutMatch = url.match(new RegExp('^([^:]+):(?:(?:[^@:]+(?:[^@]+)?@)?([^/]*))[/](.+?)(?:[.]git)?($|#)'))
+ var shortcutMatch = url.match(/^([^:]+):(?:[^@]+@)?(?:([^/]*)\/)?([^#]+)/)
var matches = Object.keys(gitHosts).map(function (gitHostName) {
try {
var gitHostInfo = gitHosts[gitHostName]
@@ -55,7 +55,7 @@ function fromUrl (giturl, opts) {
var defaultRepresentation = null
if (shortcutMatch && shortcutMatch[1] === gitHostName) {
user = shortcutMatch[2] && decodeURIComponent(shortcutMatch[2])
- project = decodeURIComponent(shortcutMatch[3])
+ project = decodeURIComponent(shortcutMatch[3].replace(/\.git$/, ''))
defaultRepresentation = 'shortcut'
} else {
if (parsed.host && parsed.host !== gitHostInfo.domain && parsed.host.replace(/^www[.]/, '') !== gitHostInfo.domain) return
diff --git a/node_modules/hosted-git-info/package.json b/node_modules/hosted-git-info/package.json
index 8d9c2b2046c74..d85189b536cec 100644
--- a/node_modules/hosted-git-info/package.json
+++ b/node_modules/hosted-git-info/package.json
@@ -1,19 +1,19 @@
{
- "_from": "hosted-git-info@2.8.8",
- "_id": "hosted-git-info@2.8.8",
+ "_from": "hosted-git-info@2.8.9",
+ "_id": "hosted-git-info@2.8.9",
"_inBundle": false,
- "_integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+ "_integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
"_location": "/hosted-git-info",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
- "raw": "hosted-git-info@2.8.8",
+ "raw": "hosted-git-info@2.8.9",
"name": "hosted-git-info",
"escapedName": "hosted-git-info",
- "rawSpec": "2.8.8",
+ "rawSpec": "2.8.9",
"saveSpec": null,
- "fetchSpec": "2.8.8"
+ "fetchSpec": "2.8.9"
},
"_requiredBy": [
"#USER",
@@ -21,10 +21,10 @@
"/normalize-package-data",
"/npm-package-arg"
],
- "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
- "_shasum": "7539bd4bc1e0e0a895815a2e0262420b12858488",
- "_spec": "hosted-git-info@2.8.8",
- "_where": "/Users/darcyclarke/Documents/Repos/npm/cli",
+ "_resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "_shasum": "dffc0bf9a21c02209090f2aa69429e1414daf3f9",
+ "_spec": "hosted-git-info@2.8.9",
+ "_where": "/Users/ruyadorno/Documents/workspace/cli/legacy",
"author": {
"name": "Rebecca Turner",
"email": "me@re-becca.org",
@@ -68,5 +68,5 @@
"test": "tap -J --coverage=90 --no-esm test/*.js",
"test:coverage": "tap --coverage-report=html -J --coverage=90 --no-esm test/*.js"
},
- "version": "2.8.8"
+ "version": "2.8.9"
}
diff --git a/node_modules/ssri/CHANGELOG.md b/node_modules/ssri/CHANGELOG.md
index d4c5897902d12..15c930b844d02 100644
--- a/node_modules/ssri/CHANGELOG.md
+++ b/node_modules/ssri/CHANGELOG.md
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+## [6.0.2](https://github.com/zkat/ssri/compare/v6.0.1...v6.0.2) (2021-04-07)
+
+
+### Bug Fixes
+
+* backport regex change from 8.0.1 ([b30dfdb](https://github.com/zkat/ssri/commit/b30dfdb)), closes [#19](https://github.com/zkat/ssri/issues/19)
+
+
+
## [6.0.1](https://github.com/zkat/ssri/compare/v6.0.0...v6.0.1) (2018-08-27)
diff --git a/node_modules/ssri/index.js b/node_modules/ssri/index.js
index e102892b0bcd0..673ed2ad249ce 100644
--- a/node_modules/ssri/index.js
+++ b/node_modules/ssri/index.js
@@ -8,7 +8,7 @@ const SPEC_ALGORITHMS = ['sha256', 'sha384', 'sha512']
const BASE64_REGEX = /^[a-z0-9+/]+(?:=?=?)$/i
const SRI_REGEX = /^([^-]+)-([^?]+)([?\S*]*)$/
-const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)*$/
+const STRICT_SRI_REGEX = /^([^-]+)-([A-Za-z0-9+/=]{44,88})(\?[\x21-\x7E]*)?$/
const VCHAR_REGEX = /^[\x21-\x7E]+$/
const SsriOpts = figgyPudding({
diff --git a/node_modules/ssri/package.json b/node_modules/ssri/package.json
index 5dd740daa2782..c181f2b40f25f 100644
--- a/node_modules/ssri/package.json
+++ b/node_modules/ssri/package.json
@@ -1,31 +1,32 @@
{
- "_from": "ssri@latest",
- "_id": "ssri@6.0.1",
+ "_from": "ssri@6.0.2",
+ "_id": "ssri@6.0.2",
"_inBundle": false,
- "_integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+ "_integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
"_location": "/ssri",
"_phantomChildren": {},
"_requested": {
- "type": "tag",
+ "type": "version",
"registry": true,
- "raw": "ssri@latest",
+ "raw": "ssri@6.0.2",
"name": "ssri",
"escapedName": "ssri",
- "rawSpec": "latest",
+ "rawSpec": "6.0.2",
"saveSpec": null,
- "fetchSpec": "latest"
+ "fetchSpec": "6.0.2"
},
"_requiredBy": [
"#USER",
"/",
"/cacache",
+ "/libnpmpublish",
"/make-fetch-happen",
"/pacote"
],
- "_resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
- "_shasum": "2a3c41b28dd45b62b63676ecb74001265ae9edd8",
- "_spec": "ssri@latest",
- "_where": "/Users/zkat/Documents/code/work/npm",
+ "_resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+ "_shasum": "157939134f20464e7301ddba3e90ffa8f7728ac5",
+ "_spec": "ssri@6.0.2",
+ "_where": "/Users/ruyadorno/Documents/workspace/cli/legacy",
"author": {
"name": "Kat Marchán",
"email": "kzm@sykosomatic.org"
@@ -89,5 +90,5 @@
"update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
"update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
},
- "version": "6.0.1"
+ "version": "6.0.2"
}
diff --git a/package-lock.json b/package-lock.json
index 6bc8ff8c30840..5d005d4be7f80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "npm",
- "version": "6.14.12",
+ "version": "6.14.13",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -2311,9 +2311,9 @@
}
},
"hosted-git-info": {
- "version": "2.8.8",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
- "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
},
"html-escaper": {
"version": "2.0.2",
@@ -5091,9 +5091,9 @@
}
},
"ssri": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
- "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz",
+ "integrity": "sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==",
"requires": {
"figgy-pudding": "^3.5.1"
}
diff --git a/package.json b/package.json
index ace575f874cb1..138dce95204f8 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "version": "6.14.12",
+ "version": "6.14.13",
"name": "npm",
"description": "a package manager for JavaScript",
"keywords": [
@@ -63,7 +63,7 @@
"glob": "^7.1.6",
"graceful-fs": "^4.2.4",
"has-unicode": "~2.0.1",
- "hosted-git-info": "^2.8.8",
+ "hosted-git-info": "^2.8.9",
"iferr": "^1.0.2",
"infer-owner": "^1.0.4",
"inflight": "~1.0.6",
@@ -132,7 +132,7 @@
"slide": "~1.1.6",
"sorted-object": "~2.0.1",
"sorted-union-stream": "~2.1.3",
- "ssri": "^6.0.1",
+ "ssri": "^6.0.2",
"stringify-package": "^1.0.1",
"tar": "^4.4.13",
"text-table": "~0.2.0",
diff --git a/test/tap/git-npmignore.js b/test/tap/git-npmignore.js
index c01f7aa50acc1..ba022b69892d6 100644
--- a/test/tap/git-npmignore.js
+++ b/test/tap/git-npmignore.js
@@ -7,6 +7,7 @@ var rimraf = require('rimraf')
var test = require('tap').test
var which = require('which')
+var GITHUB_ACTIONS = process.env.GITHUB_ACTIONS
var common = require('../common-tap.js')
var escapeArg = require('../../lib/utils/escape-arg.js')
var Tacks = require('tacks')
@@ -151,8 +152,9 @@ function setup (cb) {
if (er) return cb(er)
var git = escapeArg(gitPath)
+ var extraOpts = GITHUB_ACTIONS ? ' --initial-branch=main' : ''
- exec(git + ' init --initial-branch=main', {cwd: dep}, init)
+ exec(git + ' init' + extraOpts, {cwd: dep}, init)
function init (er, _, stderr) {
if (er) return cb(er)