Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deps updates #6416

Merged
merged 20 commits into from
May 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
RELEASE_COMMENT_ID: ${{ needs.release.outputs.comment-id }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
node . exec --offline -- template-oss-release-manager --lockfile=true
node . exec --offline -- template-oss-release-manager --lockfile=true --publish=false
node . run rp-pull-request --ignore-scripts -ws -iwr --if-present
- name: Commit
id: commit
Expand Down
20 changes: 20 additions & 0 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,14 @@ graph LR;
color-convert-->color-name;
columnify-->strip-ansi;
columnify-->wcwidth;
cross-spawn-->path-key;
cross-spawn-->shebang-command;
cross-spawn-->which;
debug-->ms;
defaults-->clone;
encoding-->iconv-lite;
foreground-child-->cross-spawn;
foreground-child-->signal-exit;
fs-minipass-->minipass;
gauge-->aproba;
gauge-->color-support;
Expand All @@ -306,9 +311,11 @@ graph LR;
gauge-->string-width;
gauge-->strip-ansi;
gauge-->wide-align;
glob-->foreground-child;
glob-->fs.realpath;
glob-->inflight;
glob-->inherits;
glob-->jackspeak;
glob-->minimatch;
glob-->minipass;
glob-->once;
Expand All @@ -335,6 +342,14 @@ graph LR;
init-package-json-->validate-npm-package-name;
is-cidr-->cidr-regex;
is-core-module-->has;
isaacs-cliui-->string-width-cjs;
isaacs-cliui-->string-width;
isaacs-cliui-->strip-ansi-cjs;
isaacs-cliui-->strip-ansi;
isaacs-cliui-->wrap-ansi-cjs;
isaacs-cliui-->wrap-ansi;
jackspeak-->isaacs-cliui["@isaacs/cliui"];
jackspeak-->pkgjs-parseargs["@pkgjs/parseargs"];
libnpmaccess-->nock;
libnpmaccess-->npm-package-arg;
libnpmaccess-->npm-registry-fetch;
Expand Down Expand Up @@ -742,6 +757,7 @@ graph LR;
readable-stream-->util-deprecate;
rimraf-->glob;
semver-->lru-cache;
shebang-command-->shebang-regex;
sigstore-->make-fetch-happen;
sigstore-->sigstore-protobuf-specs["@sigstore/protobuf-specs"];
sigstore-->tuf-js;
Expand All @@ -755,6 +771,7 @@ graph LR;
spdx-expression-parse-->spdx-exceptions;
spdx-expression-parse-->spdx-license-ids;
ssri-->minipass;
string-width-->eastasianwidth;
string-width-->emoji-regex;
string-width-->is-fullwidth-code-point;
string-width-->strip-ansi;
Expand All @@ -779,6 +796,9 @@ graph LR;
wcwidth-->defaults;
which-->isexe;
wide-align-->string-width;
wrap-ansi-->ansi-styles;
wrap-ansi-->string-width;
wrap-ansi-->strip-ansi;
write-file-atomic-->imurmurhash;
write-file-atomic-->signal-exit;
```
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"devDependencies": {
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.12.1",
"@npmcli/template-oss": "4.14.1",
"front-matter": "^4.0.2",
"ignore-walk": "^6.0.1",
"jsdom": "^21.1.0",
Expand Down Expand Up @@ -56,7 +56,7 @@
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"ciVersions": "latest",
"engines": "^14.17.0 || ^16.13.0 || >=18.0.0",
"version": "4.12.1",
"version": "4.14.1",
"content": "../scripts/template-oss/index.js",
"workspaceRepo": {
"add": {
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/help-search.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { readFile } = require('fs/promises')
const path = require('path')
const glob = require('glob')
const { glob } = require('glob')
const BaseCommand = require('../base-command.js')

const globify = pattern => pattern.split('\\').join('/')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/help.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const spawn = require('@npmcli/promise-spawn')
const path = require('path')
const openUrl = require('../utils/open-url.js')
const glob = require('glob')
const { glob } = require('glob')
const localeCompare = require('@isaacs/string-locale-compare')('en')

const globify = pattern => pattern.split('\\').join('/')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/search.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Minipass = require('minipass')
const { Minipass } = require('minipass')
const Pipeline = require('minipass-pipeline')
const libSearch = require('libnpmsearch')
const log = require('../utils/log-shim.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/format-search-stream.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Minipass = require('minipass')
const { Minipass } = require('minipass')
const columnify = require('columnify')

// This module consumes package data in the following format:
Expand Down
8 changes: 4 additions & 4 deletions lib/utils/log-file.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const os = require('os')
const { join, dirname, basename } = require('path')
const { format } = require('util')
const glob = require('glob')
const MiniPass = require('minipass')
const { glob } = require('glob')
const { Minipass } = require('minipass')
const fsMiniPass = require('fs-minipass')
const fs = require('fs/promises')
const log = require('./log-shim')
Expand Down Expand Up @@ -56,7 +56,7 @@ class LogFiles {
}

on () {
this.#logStream = new MiniPass()
this.#logStream = new Minipass()
process.on('log', this.#logHandler)
}

Expand Down Expand Up @@ -103,7 +103,7 @@ class LogFiles {
}

get #isBuffered () {
return this.#logStream instanceof MiniPass
return this.#logStream instanceof Minipass
}

#endStream (output) {
Expand Down
2 changes: 1 addition & 1 deletion lib/workspaces/get-workspaces.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { resolve, relative } = require('path')
const mapWorkspaces = require('@npmcli/map-workspaces')
const minimatch = require('minimatch')
const { minimatch } = require('minimatch')
const rpj = require('read-package-json-fast')

// minimatch wants forward slashes only for glob patterns
Expand Down
4 changes: 2 additions & 2 deletions mock-registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.12.1"
"version": "4.14.1"
},
"tap": {
"no-coverage": true,
Expand All @@ -46,7 +46,7 @@
"devDependencies": {
"@npmcli/arborist": "^6.1.1",
"@npmcli/eslint-config": "^4.0.1",
"@npmcli/template-oss": "4.12.1",
"@npmcli/template-oss": "4.14.1",
"nock": "^13.3.0",
"npm-package-arg": "^10.1.0",
"pacote": "^15.0.8",
Expand Down
38 changes: 38 additions & 0 deletions node_modules/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@
!/@gar/promisify
!/@isaacs/
/@isaacs/*
!/@isaacs/cliui
!/@isaacs/cliui/node_modules/
/@isaacs/cliui/node_modules/*
!/@isaacs/cliui/node_modules/ansi-regex
!/@isaacs/cliui/node_modules/emoji-regex
!/@isaacs/cliui/node_modules/string-width
!/@isaacs/cliui/node_modules/strip-ansi
!/@isaacs/string-locale-compare
!/@npmcli/
/@npmcli/*
Expand All @@ -29,6 +36,9 @@
!/@npmcli/promise-spawn
!/@npmcli/query
!/@npmcli/run-script
!/@pkgjs/
/@pkgjs/*
!/@pkgjs/parseargs
!/@sigstore/
/@sigstore/*
!/@sigstore/protobuf-specs
Expand All @@ -39,6 +49,9 @@
/@tufjs/*
!/@tufjs/canonical-json
!/@tufjs/models
!/@tufjs/models/node_modules/
/@tufjs/models/node_modules/*
!/@tufjs/models/node_modules/minimatch
!/abbrev
!/abort-controller
!/agent-base
Expand Down Expand Up @@ -73,6 +86,10 @@
!/common-ancestor-path
!/concat-map
!/console-control-strings
!/cross-spawn
!/cross-spawn/node_modules/
/cross-spawn/node_modules/*
!/cross-spawn/node_modules/which
!/cssesc
!/debug
!/debug/node_modules/
Expand All @@ -82,13 +99,15 @@
!/delegates
!/depd
!/diff
!/eastasianwidth
!/emoji-regex
!/encoding
!/env-paths
!/err-code
!/event-target-shim
!/events
!/fastest-levenshtein
!/foreground-child
!/fs-minipass
!/fs.realpath
!/function-bind
Expand Down Expand Up @@ -120,6 +139,7 @@
!/is-fullwidth-code-point
!/is-lambda
!/isexe
!/jackspeak
!/json-parse-even-better-errors
!/json-stringify-nice
!/jsonparse
Expand Down Expand Up @@ -194,6 +214,7 @@
!/node-gyp/node_modules/nopt
!/node-gyp/node_modules/npmlog
!/node-gyp/node_modules/readable-stream
!/node-gyp/node_modules/signal-exit
!/node-gyp/node_modules/ssri
!/node-gyp/node_modules/unique-filename
!/node-gyp/node_modules/unique-slug
Expand All @@ -216,7 +237,11 @@
!/pacote
!/parse-conflict-json
!/path-is-absolute
!/path-key
!/path-scurry
!/path-scurry/node_modules/
/path-scurry/node_modules/*
!/path-scurry/node_modules/lru-cache
!/postcss-selector-parser
!/proc-log
!/process
Expand Down Expand Up @@ -245,6 +270,8 @@
/semver/node_modules/*
!/semver/node_modules/lru-cache
!/set-blocking
!/shebang-command
!/shebang-regex
!/signal-exit
!/sigstore
!/smart-buffer
Expand All @@ -256,7 +283,9 @@
!/spdx-license-ids
!/ssri
!/string_decoder
!/string-width-cjs
!/string-width
!/strip-ansi-cjs
!/strip-ansi
!/supports-color
!/tar
Expand All @@ -279,6 +308,15 @@
!/wcwidth
!/which
!/wide-align
!/wrap-ansi-cjs
!/wrap-ansi
!/wrap-ansi/node_modules/
/wrap-ansi/node_modules/*
!/wrap-ansi/node_modules/ansi-regex
!/wrap-ansi/node_modules/ansi-styles
!/wrap-ansi/node_modules/emoji-regex
!/wrap-ansi/node_modules/string-width
!/wrap-ansi/node_modules/strip-ansi
!/wrappy
!/write-file-atomic
!/yallist
Expand Down
14 changes: 14 additions & 0 deletions node_modules/@isaacs/cliui/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Copyright (c) 2015, Contributors

Permission to use, copy, modify, and/or distribute this software
for any purpose with or without fee is hereby granted, provided
that the above copyright notice and this permission notice
appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE
LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Loading