Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/shrinkwrap.js8
-rw-r--r--test/tap/shrinkwrap-empty-deps.js2
-rw-r--r--test/tap/shrinkwrap-extra-metadata.js7
3 files changed, 9 insertions, 8 deletions
diff --git a/lib/shrinkwrap.js b/lib/shrinkwrap.js
index 85e0b81db..75fe0dd95 100644
--- a/lib/shrinkwrap.js
+++ b/lib/shrinkwrap.js
@@ -204,9 +204,9 @@ function updateLockfileMetadata (pkginfo, pkgJson) {
const newPkg = {}
let metainfoWritten = false
const metainfo = new Set([
- 'createdWith',
'lockfileVersion',
- 'packageIntegrity'
+ 'packageIntegrity',
+ 'preserveSymlinks'
])
Object.keys(pkginfo).forEach((k) => {
if (k === 'dependencies') {
@@ -225,7 +225,9 @@ function updateLockfileMetadata (pkginfo, pkgJson) {
function writeMetainfo (pkginfo) {
pkginfo.lockfileVersion = PKGLOCK_VERSION
pkginfo.packageIntegrity = pkgJson && pkgSri.hash(pkgJson)
- pkginfo.preserveSymlinks = process.env.NODE_PRESERVE_SYMLINKS
+ if (process.env.NODE_PRESERVE_SYMLINKS) {
+ pkginfo.preserveSymlinks = process.env.NODE_PRESERVE_SYMLINKS
+ }
metainfoWritten = true
}
return newPkg
diff --git a/test/tap/shrinkwrap-empty-deps.js b/test/tap/shrinkwrap-empty-deps.js
index 734bd1738..eeb5e656e 100644
--- a/test/tap/shrinkwrap-empty-deps.js
+++ b/test/tap/shrinkwrap-empty-deps.js
@@ -4,10 +4,8 @@ const common = require('../common-tap.js')
const fs = require('fs')
const mkdirp = require('mkdirp')
const mr = require('npm-registry-mock')
-const npm = require('../../lib/npm.js')
const osenv = require('osenv')
const path = require('path')
-const pkgSri = require('../../lib/utils/package-integrity.js')
const rimraf = require('rimraf')
const test = require('tap').test
diff --git a/test/tap/shrinkwrap-extra-metadata.js b/test/tap/shrinkwrap-extra-metadata.js
index b68b20356..c5f60e4c2 100644
--- a/test/tap/shrinkwrap-extra-metadata.js
+++ b/test/tap/shrinkwrap-extra-metadata.js
@@ -13,7 +13,8 @@ const test = require('tap').test
const pkg = path.join(__dirname, path.basename(__filename, '.js'))
-const EXEC_OPTS = { cwd: pkg }
+const EXEC_OPTS = {
+ cwd: pkg }
const json = {
author: 'Rockbert',
@@ -41,7 +42,7 @@ test('adds additional metadata fields from the pkglock spec', function (t) {
'--loglevel', 'silent',
'shrinkwrap'
],
- EXEC_OPTS,
+ { cwd: pkg, env: { NODE_PRESERVE_SYMLINKS: 'foo' } },
function (err, code, stdout, stderr) {
t.ifError(err, 'shrinkwrap ran without issue')
t.notOk(code, 'shrinkwrap ran without raising error code')
@@ -54,7 +55,7 @@ test('adds additional metadata fields from the pkglock spec', function (t) {
'version': '0.0.0',
'lockfileVersion': npm.lockfileVersion,
'packageIntegrity': pkgSri.hash(json),
- 'preserveSymlinks': process.env.NODE_PRESERVE_SYMLINKS
+ 'preserveSymlinks': 'foo'
},
JSON.parse(desired),
'shrinkwrap wrote the expected metadata fields'