@pnpm/config
Advanced tools
Comparing version 3.0.0-1 to 3.0.0-2
@@ -5,3 +5,3 @@ "use strict"; | ||
const npmTypes = require("@zkochan/npm-conf/lib/types"); | ||
const camelcase = require("camelcase"); | ||
const camelcase_1 = require("camelcase"); | ||
const findUp = require("find-up"); | ||
@@ -114,3 +114,3 @@ const path = require("path"); | ||
.reduce((acc, configKey) => { | ||
acc[camelcase(configKey)] = typeof cliArgs[configKey] !== 'undefined' | ||
acc[camelcase_1.default(configKey)] = typeof cliArgs[configKey] !== 'undefined' | ||
? cliArgs[configKey] | ||
@@ -130,18 +130,18 @@ : npmConfig.get(configKey); | ||
pnpmConfig.globalPrefix = path.join(npmGlobalPrefix, 'pnpm-global'); | ||
pnpmConfig.shrinkwrapDirectory = typeof pnpmConfig['lockfileDirectory'] === 'undefined' | ||
pnpmConfig.lockfileDirectory = typeof pnpmConfig['lockfileDirectory'] === 'undefined' | ||
? pnpmConfig.shrinkwrapDirectory | ||
: pnpmConfig['lockfileDirectory']; | ||
pnpmConfig.shrinkwrap = typeof pnpmConfig['lockfile'] === 'undefined' | ||
pnpmConfig.lockfile = typeof pnpmConfig['lockfile'] === 'undefined' | ||
? pnpmConfig.shrinkwrap | ||
: pnpmConfig['lockfile']; | ||
pnpmConfig.shrinkwrapOnly = typeof pnpmConfig['lockfileOnly'] === 'undefined' | ||
pnpmConfig.lockfileOnly = typeof pnpmConfig['lockfileOnly'] === 'undefined' | ||
? pnpmConfig.shrinkwrapOnly | ||
: pnpmConfig['lockfileOnly']; | ||
pnpmConfig.frozenShrinkwrap = typeof pnpmConfig['frozenLockfile'] === 'undefined' | ||
pnpmConfig.frozenLockfile = typeof pnpmConfig['frozenLockfile'] === 'undefined' | ||
? pnpmConfig.frozenShrinkwrap | ||
: pnpmConfig['frozenLockfile']; | ||
pnpmConfig.preferFrozenShrinkwrap = typeof pnpmConfig['preferFrozenLockfile'] === 'undefined' | ||
pnpmConfig.preferFrozenLockfile = typeof pnpmConfig['preferFrozenLockfile'] === 'undefined' | ||
? pnpmConfig.preferFrozenShrinkwrap | ||
: pnpmConfig['preferFrozenLockfile']; | ||
pnpmConfig.sharedWorkspaceShrinkwrap = typeof pnpmConfig['sharedWorkspaceLockfile'] === 'undefined' | ||
pnpmConfig.sharedWorkspaceLockfile = typeof pnpmConfig['sharedWorkspaceLockfile'] === 'undefined' | ||
? pnpmConfig.sharedWorkspaceShrinkwrap | ||
@@ -152,3 +152,3 @@ : pnpmConfig['sharedWorkspaceLockfile']; | ||
const shamefullyFlattenSuffix = pnpmConfig.shamefullyFlatten ? '_shamefully_flatten' : ''; | ||
const subfolder = '1' + independentLeavesSuffix + shamefullyFlattenSuffix; | ||
const subfolder = '2' + independentLeavesSuffix + shamefullyFlattenSuffix; | ||
pnpmConfig.prefix = path.join(pnpmConfig.globalPrefix, subfolder); | ||
@@ -169,3 +169,3 @@ pnpmConfig.bin = pnpmConfig.globalBin; | ||
} | ||
if (pnpmConfig.sharedWorkspaceShrinkwrap) { | ||
if (pnpmConfig.sharedWorkspaceLockfile) { | ||
if (opts.cliArgs['shared-workspace-lockfile'] || opts.cliArgs['shared-workspace-shrinkwrap']) { | ||
@@ -176,5 +176,5 @@ const err = new Error('Configuration conflict. "shared-workspace-lockfile" may not be used with "global"'); | ||
} | ||
pnpmConfig.sharedWorkspaceShrinkwrap = false; | ||
pnpmConfig.sharedWorkspaceLockfile = false; | ||
} | ||
if (pnpmConfig.shrinkwrapDirectory) { | ||
if (pnpmConfig.lockfileDirectory) { | ||
if (opts.cliArgs['lockfile-directory'] || opts.cliArgs['shrinkwrap-directory']) { | ||
@@ -185,3 +185,3 @@ const err = new Error('Configuration conflict. "lockfile-directory" may not be used with "global"'); | ||
} | ||
delete pnpmConfig.shrinkwrapDirectory; | ||
delete pnpmConfig.lockfileDirectory; | ||
} | ||
@@ -193,4 +193,4 @@ } | ||
} | ||
if (pnpmConfig.sharedWorkspaceShrinkwrap && !pnpmConfig.shrinkwrapDirectory) { | ||
pnpmConfig.shrinkwrapDirectory = pnpmConfig.workspacePrefix || undefined; | ||
if (pnpmConfig.sharedWorkspaceLockfile && !pnpmConfig.lockfileDirectory) { | ||
pnpmConfig.lockfileDirectory = pnpmConfig.workspacePrefix || undefined; | ||
} | ||
@@ -211,4 +211,4 @@ pnpmConfig.packageManager = packageManager; | ||
} | ||
if (!pnpmConfig.packageLock && pnpmConfig.shrinkwrap) { | ||
pnpmConfig.shrinkwrap = false; | ||
if (!pnpmConfig.packageLock && pnpmConfig.lockfile) { | ||
pnpmConfig.lockfile = false; | ||
} | ||
@@ -215,0 +215,0 @@ if (typeof pnpmConfig.filter === 'string') { |
@@ -51,2 +51,3 @@ import { Registries } from '@pnpm/types'; | ||
lock: boolean; | ||
lockfileOnly?: boolean; | ||
childConcurrency?: number; | ||
@@ -59,3 +60,2 @@ repeatInstallDepth?: number; | ||
shamefullyFlatten?: boolean; | ||
shrinkwrapOnly?: boolean; | ||
useStoreServer?: boolean; | ||
@@ -69,5 +69,5 @@ workspaceConcurrency: number; | ||
pending: boolean; | ||
shrinkwrapDirectory?: string; | ||
sharedWorkspaceShrinkwrap: boolean; | ||
lockfileDirectory?: string; | ||
sharedWorkspaceLockfile: boolean; | ||
registries: Registries; | ||
} |
{ | ||
"name": "@pnpm/config", | ||
"version": "3.0.0-1", | ||
"version": "3.0.0-2", | ||
"description": "Gets configs for pnpm", | ||
@@ -33,8 +33,7 @@ "main": "lib/index.js", | ||
"dependencies": { | ||
"@pnpm/types": "2.0.0", | ||
"@types/camelcase": "4.1.0", | ||
"@pnpm/types": "3.0.0", | ||
"@types/node": "11.9.5", | ||
"@types/which": "1.3.1", | ||
"@zkochan/npm-conf": "1.2.2", | ||
"camelcase": "5.0.0", | ||
"@zkochan/npm-conf": "1.2.4", | ||
"camelcase": "5.2.0", | ||
"find-up": "3.0.0", | ||
@@ -55,3 +54,3 @@ "which": "1.3.1" | ||
"tempy": "0.2.1", | ||
"ts-node": "6.2.0", | ||
"ts-node": "8.0.3", | ||
"tslint": "5.13.1", | ||
@@ -58,0 +57,0 @@ "typescript": "3.3.3333" |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
7
24456
30
+ Added@pnpm/types@3.0.0(transitive)
+ Added@zkochan/npm-conf@1.2.4(transitive)
+ Addedcamelcase@5.2.0(transitive)
- Removed@types/camelcase@4.1.0
- Removed@pnpm/types@2.0.0(transitive)
- Removed@types/camelcase@4.1.0(transitive)
- Removed@zkochan/npm-conf@1.2.2(transitive)
- Removedcamelcase@5.0.0(transitive)
- Removedpify@3.0.0(transitive)
Updated@pnpm/types@3.0.0
Updated@zkochan/npm-conf@1.2.4
Updatedcamelcase@5.2.0