From e135c2bb360dcf00ecee34a95985afec21ba3655 Mon Sep 17 00:00:00 2001 From: Lars Willighagen Date: Tue, 2 Oct 2018 20:23:34 +0200 Subject: [PATCH] update: re-enable updating local packages PR #11584 removed the possibility of updating local packages (linked with symlinks) with `npm update`. Reason was that this functionality didn't work in v3.6.0. However, the system behind local dependencies has since changed, and I can't reproduce the original error anymore. Reverts 59e5056a2129cb2951f4ff3b657ada20657f01a7 Fixes: https://npm.community/t/1725?u=larsgw PR-URL: https://github.com/npm/cli/pull/73 Credit: @larsgw Reviewed-By: @iarna Reviewed-By: @zkat --- lib/outdated.js | 2 +- lib/update.js | 2 +- test/tap/outdated-symlink.js | 133 +++++++++++++++++++++++++++++++++++ test/tap/update-symlink.js | 109 ++++++++++++++++++++++++++++ 4 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 test/tap/outdated-symlink.js create mode 100644 test/tap/update-symlink.js diff --git a/lib/outdated.js b/lib/outdated.js index ebd67fb6b37d5..baeb5e7179df4 100644 --- a/lib/outdated.js +++ b/lib/outdated.js @@ -157,7 +157,7 @@ function makePretty (p, opts) { } if (opts.color) { - columns[0] = color[has === want || want === 'linked' ? 'yellow' : 'red'](columns[0]) // dep + columns[0] = color[has === want ? 'yellow' : 'red'](columns[0]) // dep columns[2] = color.green(columns[2]) // want columns[3] = color.magenta(columns[3]) // latest } diff --git a/lib/update.js b/lib/update.js index 9b1345f9dfbfb..fdb934fac6730 100644 --- a/lib/update.js +++ b/lib/update.js @@ -46,7 +46,7 @@ function update_ (args) { "because it's currently at the maximum version that matches its specified semver range" ) } - return ww.current !== ww.wanted && ww.latest !== 'linked' + return ww.current !== ww.wanted }) if (wanted.length === 0) return diff --git a/test/tap/outdated-symlink.js b/test/tap/outdated-symlink.js new file mode 100644 index 0000000000000..96d6f660e2100 --- /dev/null +++ b/test/tap/outdated-symlink.js @@ -0,0 +1,133 @@ +'use strict' +const path = require('path') +const test = require('tap').test +const mr = require('npm-registry-mock') +const Tacks = require('tacks') +const File = Tacks.File +const Symlink = Tacks.Symlink +const Dir = Tacks.Dir +const common = require('../common-tap.js') + +const basedir = path.join(__dirname, path.basename(__filename, '.js')) +const testdir = path.join(basedir, 'testdir') +const cachedir = path.join(basedir, 'cache') +const globaldir = path.join(basedir, 'global') +const tmpdir = path.join(basedir, 'tmp') + +const conf = { + cwd: path.join(testdir, 'main'), + env: Object.assign({}, process.env, { + npm_config_cache: cachedir, + npm_config_tmp: tmpdir, + npm_config_prefix: globaldir, + npm_config_registry: common.registry, + npm_config_loglevel: 'warn' + }) +} + +let server +const fixture = new Tacks(Dir({ + cache: Dir(), + global: Dir(), + tmp: Dir(), + testdir: Dir({ + broken: Dir({ + 'package.json': File({ + name: 'broken', + version: '1.0.0' + }) + }), + main: Dir({ + node_modules: Dir({ + unbroken: Symlink('/testdir/unbroken') + }), + 'package-lock.json': File({ + name: 'main', + version: '1.0.0', + lockfileVersion: 1, + requires: true, + dependencies: { + broken: { + version: 'file:../broken' + }, + unbroken: { + version: 'file:../unbroken' + } + } + }), + 'package.json': File({ + name: 'main', + version: '1.0.0', + dependencies: { + broken: 'file:../broken', + unbroken: 'file:../unbroken' + } + }) + }), + unbroken: Dir({ + 'package.json': File({ + name: 'unbroken', + version: '1.0.0' + }) + }) + }) +})) + +function setup () { + cleanup() + fixture.create(basedir) +} + +function cleanup () { + fixture.remove(basedir) +} + +test('setup', function (t) { + setup() + mr({port: common.port, throwOnUnmatched: true}, function (err, s) { + if (err) throw err + server = s + t.done() + }) +}) + +test('outdated sees broken links', function (t) { + common.npm(['outdated', '--json'], conf, function (err, code, stdout, stderr) { + if (err) throw err + t.is(code, 1, 'command ran not ok') + t.comment(stderr.trim()) + t.comment(stdout.trim()) + t.same(JSON.parse(stdout), { + broken: { + wanted: 'linked', + latest: 'linked', + location: '' + } + }) + t.done() + }) +}) + +test('outdated with long output sees broken links', function (t) { + common.npm(['outdated', '--long', '--json'], conf, function (err, code, stdout, stderr) { + if (err) throw err + t.is(code, 1, 'command ran not ok') + t.comment(stderr.trim()) + t.comment(stdout.trim()) + t.same(JSON.parse(stdout), { + broken: { + wanted: 'linked', + latest: 'linked', + type: 'dependencies', + location: '' + } + }) + t.done() + }) +}) + +test('cleanup', function (t) { + server.close() + cleanup() + t.done() +}) diff --git a/test/tap/update-symlink.js b/test/tap/update-symlink.js new file mode 100644 index 0000000000000..79139d306f5fd --- /dev/null +++ b/test/tap/update-symlink.js @@ -0,0 +1,109 @@ +'use strict' +const path = require('path') +const test = require('tap').test +const mr = require('npm-registry-mock') +const Tacks = require('tacks') +const File = Tacks.File +const Symlink = Tacks.Symlink +const Dir = Tacks.Dir +const common = require('../common-tap.js') + +const basedir = path.join(__dirname, path.basename(__filename, '.js')) +const testdir = path.join(basedir, 'testdir') +const cachedir = path.join(basedir, 'cache') +const globaldir = path.join(basedir, 'global') +const tmpdir = path.join(basedir, 'tmp') + +const conf = { + cwd: path.join(testdir, 'main'), + env: Object.assign({}, process.env, { + npm_config_cache: cachedir, + npm_config_tmp: tmpdir, + npm_config_prefix: globaldir, + npm_config_registry: common.registry, + npm_config_loglevel: 'warn' + }) +} + +let server +const fixture = new Tacks(Dir({ + cache: Dir(), + global: Dir(), + tmp: Dir(), + testdir: Dir({ + broken: Dir({ + 'package.json': File({ + name: 'broken', + version: '1.0.0' + }) + }), + main: Dir({ + node_modules: Dir({ + unbroken: Symlink('/testdir/unbroken') + }), + 'package-lock.json': File({ + name: 'main', + version: '1.0.0', + lockfileVersion: 1, + requires: true, + dependencies: { + broken: { + version: 'file:../broken' + }, + unbroken: { + version: 'file:../unbroken' + } + } + }), + 'package.json': File({ + name: 'main', + version: '1.0.0', + dependencies: { + broken: 'file:../broken', + unbroken: 'file:../unbroken' + } + }) + }), + unbroken: Dir({ + 'package.json': File({ + name: 'unbroken', + version: '1.0.0' + }) + }) + }) +})) + +function setup () { + cleanup() + fixture.create(basedir) +} + +function cleanup () { + fixture.remove(basedir) +} + +test('setup', function (t) { + setup() + mr({port: common.port, throwOnUnmatched: true}, function (err, s) { + if (err) throw err + server = s + t.done() + }) +}) + +test('update fixes broken links', function (t) { + common.npm(['update'], conf, function (err, code, stdout, stderr) { + if (err) throw err + t.is(code, 0, 'command ran ok') + t.comment(stdout.trim()) + t.comment(stderr.trim()) + t.match(stdout, '+ broken@1.0.0') + t.done() + }) +}) + +test('cleanup', function (t) { + server.close() + cleanup() + t.done() +})