Skip to content

Restyle [pull] master from nodejs:master #333

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.

Sign up for GitHub

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

Open
restyled-io wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Restyle [pull] master from nodejs:master #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55735af
Restyled by prettier
restyled-commits Sep 18, 2019
0c29a5f
Restyled by prettier-markdown
restyled-commits Sep 18, 2019
e1434b1
Restyled by prettier-yaml
restyled-commits Sep 18, 2019
28a9135
Restyled by shfmt
restyled-commits Sep 18, 2019
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
6 changes: 3 additions & 3 deletions deps/npm/.travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ matrix:
env: DEPLOY_VERSION=testing COVERALLS_REPO_TOKEN="$COVERALLS_OPTIONAL_TOKEN"
script:
# run the sudo tests, with coverage enabled
- "sudo PATH=$PATH $(which node) . run tap -- \"test/tap/*.js\" --coverage --timeout 600"
- 'sudo PATH=$PATH $(which node) . run tap -- "test/tap/*.js" --coverage --timeout 600'

# also run standard and license checking
- node_js: "10"
Expand All @@ -44,10 +44,10 @@ matrix:
env: "DEPLOY_VERSION=testing"

notifications:
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8

install:
- "node . install"

script:
- "node . run tap -- \"test/tap/*.js\" -t600 -Rclassic -c"
- 'node . run tap -- "test/tap/*.js" -t600 -Rclassic -c'
2,760 changes: 1,238 additions & 1,522 deletions deps/npm/CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

6,000 changes: 2,758 additions & 3,242 deletions deps/npm/changelogs/CHANGELOG-3.md
View file
Open in desktop

Large diffs are not rendered by default.

467 changes: 223 additions & 244 deletions deps/npm/doc/misc/semver.md
View file
Open in desktop

Large diffs are not rendered by default.

47 changes: 25 additions & 22 deletions deps/npm/lib/ci.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,48 @@
'use strict'
"use strict";

const npm = require('./npm.js')
const Installer = require('libcipm')
const log = require('npmlog')
const path = require('path')
const npm = require("./npm.js");
const Installer = require("libcipm");
const log = require("npmlog");
const path = require("path");

ci.usage = 'npm ci'
ci.usage = "npm ci";

ci.completion = (cb) => cb(null, [])
ci.completion = cb => cb(null, []);

module.exports = ci
function ci (args, cb) {
module.exports = ci;
function ci(args, cb) {
const opts = {
// Add some non-npm-config opts by hand.
cache: path.join(npm.config.get('cache'), '_cacache'),
cache: path.join(npm.config.get("cache"), "_cacache"),
// NOTE: npm has some magic logic around color distinct from the config
// value, so we have to override it here
color: !!npm.color,
hashAlgorithm: 'sha1',
hashAlgorithm: "sha1",
includeDeprecated: false,
log,
'npm-session': npm.session,
'project-scope': npm.projectScope,
"npm-session": npm.session,
"project-scope": npm.projectScope,
refer: npm.referer,
dmode: npm.modes.exec,
fmode: npm.modes.file,
umask: npm.modes.umask,
npmVersion: npm.version,
tmp: npm.tmp
}
};

for (const key in npm.config.list[0]) {
if (key !== 'log') {
opts[key] = npm.config.list[0][key]
if (key !== "log") {
opts[key] = npm.config.list[0][key];
}
}

return new Installer(opts).run().then(details => {
log.disableProgress()
console.log(`added ${details.pkgCount} packages in ${
details.runTime / 1000
}s`)
}).then(() => cb(), cb)
return new Installer(opts)
.run()
.then(details => {
log.disableProgress();
console.log(
`added ${details.pkgCount} packages in ${details.runTime / 1000}s`
);
})
.then(() => cb(), cb);
}
Loading