From f4d3ce954a62aeb54ea89f534827abd58031e699 Mon Sep 17 00:00:00 2001 From: calebboyd Date: Wed, 21 Mar 2018 21:37:22 -0500 Subject: [PATCH] chore: ensure capital drive letter in file manifest --- package-lock.json | 77 ++++++++++++++++++++++++++++---------------- package.json | 2 +- src/steps/shim-fs.ts | 16 ++++----- 3 files changed, 59 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1948c31..da81327 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nexe", - "version": "2.0.0-next.6", + "version": "2.0.0-next.7", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -428,9 +428,9 @@ "dev": true }, "cherow": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/cherow/-/cherow-1.3.0.tgz", - "integrity": "sha512-CPVcpzhEn51flYwXsAbhTKSjjIHbUeXR6NrQSJpeFLXRRmumkCJj97Z2yGnlqsiWKEwTfBBZpUvst5/+ybzKFg==" + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/cherow/-/cherow-1.3.8.tgz", + "integrity": "sha512-V6eo7CG0i1UJUNqfoIT2eTYhVgilVOiv8BU4j92X4voBlDwlaMPi0qGylvhfOlcPgeJpnxMM1dZpePFFTlNYbw==" }, "class-utils": { "version": "0.3.6", @@ -803,6 +803,24 @@ "once": "1.4.0" } }, + "enhanced-resolve": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz", + "integrity": "sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==", + "requires": { + "graceful-fs": "4.1.11", + "memory-fs": "0.4.1", + "tapable": "1.0.0" + } + }, + "errno": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", + "requires": { + "prr": "1.0.1" + } + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -1580,6 +1598,15 @@ "object-visit": "1.0.1" } }, + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "requires": { + "errno": "0.1.7", + "readable-stream": "2.3.3" + } + }, "merge2": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.1.tgz", @@ -1977,7 +2004,8 @@ "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true }, "path-type": { "version": "3.0.0", @@ -2042,6 +2070,11 @@ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" }, + "prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" + }, "query-string": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.0.1.tgz", @@ -2089,35 +2122,20 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, "requires": { "path-parse": "1.0.5" } }, "resolve-dependencies": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-1.1.0.tgz", - "integrity": "sha512-hKSiQoH3ybkWv2Gk3/txD7401S2eTiN00F6p1Yq1j2Pj6+Un9uceoc6/Jy8RKLPnx+98rgaTfgdvrz+tXOR8+w==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-1.1.4.tgz", + "integrity": "sha512-XWID2SxWgSqtdC8JWbGvfJL+NHNYRoDdGZ0mbwm8kGGzmTslB0cTCalOPR5LKw5O9v4f8AoWqeGdhna2Mda/LQ==", "requires": { "@calebboyd/semaphore": "1.2.0", - "cherow": "1.3.0", - "globby": "8.0.1", - "resolve": "1.5.0" - }, - "dependencies": { - "globby": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz", - "integrity": "sha512-oMrYrJERnKBLXNLVTqhm3vPEdJ/b2ZE28xN4YARiix1NOIOBPEpOUnm844K1iu/BkphCaf2WNFwMszv8Soi1pw==", - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "fast-glob": "2.2.0", - "glob": "7.1.2", - "ignore": "3.3.7", - "pify": "3.0.0", - "slash": "1.0.0" - } - } + "cherow": "1.3.8", + "enhanced-resolve": "4.0.0", + "globby": "8.0.1" } }, "resolve-url": { @@ -2548,6 +2566,11 @@ } } }, + "tapable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz", + "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==" + }, "tar-stream": { "version": "1.5.5", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz", diff --git a/package.json b/package.json index 3fc485f..1e4cefd 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "mkdirp": "^0.5.1", "ora": "^2.0.0", "pify": "^3.0.0", - "resolve-dependencies": "^1.1.0", + "resolve-dependencies": "^1.1.4", "rimraf": "^2.6.2" }, "devDependencies": { diff --git a/src/steps/shim-fs.ts b/src/steps/shim-fs.ts index aafb208..dcee252 100644 --- a/src/steps/shim-fs.ts +++ b/src/steps/shim-fs.ts @@ -25,6 +25,14 @@ const manifest = binary.resources, originalRealpathSync = fs.realpathSync, resourceStart = binary.layout.resourceStart +let log = (text: string) => { + if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) { + process.stderr.write('[nexe] - ' + text + '\n') + } else { + log = noop + } +} + const getKey = process.platform.startsWith('win') ? function getKey(filepath: string): string { let key = path.resolve(filepath) @@ -35,14 +43,6 @@ const getKey = process.platform.startsWith('win') } : path.resolve -let log = (text: string) => { - if ((process.env.DEBUG || '').toLowerCase().includes('nexe:require')) { - process.stderr.write('[nexe] - ' + text + '\n') - } else { - log = noop - } -} - const statTime = function() { const stat = binary.layout.stat return {