@lerna-lite/core 1.1.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/command.d.ts +2 -2
- package/dist/command.js +7 -7
- package/dist/command.js.map +1 -1
- package/dist/conventional-commits/recommend-version.d.ts +3 -2
- package/dist/conventional-commits/recommend-version.js.map +1 -1
- package/dist/models/index.d.ts +38 -0
- package/dist/otplease.d.ts +2 -1
- package/dist/otplease.js +1 -5
- package/dist/otplease.js.map +1 -1
- package/dist/package-graph/package-graph.d.ts +2 -2
- package/dist/package-graph/package-graph.js +33 -5
- package/dist/package-graph/package-graph.js.map +1 -1
- package/dist/package.d.ts +9 -21
- package/dist/package.js +11 -15
- package/dist/package.js.map +1 -1
- package/dist/project/lib/apply-extends.d.ts +5 -1
- package/dist/project/lib/apply-extends.js.map +1 -1
- package/dist/project/lib/shallow-extend.d.ts +7 -1
- package/dist/project/lib/shallow-extend.js.map +1 -1
- package/dist/project/project.d.ts +6 -12
- package/dist/project/project.js +6 -5
- package/dist/project/project.js.map +1 -1
- package/dist/utils/collect-uncommitted.d.ts +7 -8
- package/dist/utils/collect-uncommitted.js +0 -5
- package/dist/utils/collect-uncommitted.js.map +1 -1
- package/dist/utils/query-graph.d.ts +1 -1
- package/dist/utils/query-graph.js +2 -2
- package/dist/utils/query-graph.js.map +1 -1
- package/package.json +4 -4
package/dist/command.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Logger } from 'npmlog';
|
|
2
2
|
import { Project } from './project/project';
|
|
3
|
-
import { ExecOpts } from './models';
|
|
3
|
+
import { CommandType, ExecOpts } from './models';
|
|
4
4
|
import { PackageGraph } from './package-graph/package-graph';
|
|
5
5
|
export declare class Command {
|
|
6
6
|
argv: any;
|
|
@@ -9,7 +9,7 @@ export declare class Command {
|
|
|
9
9
|
sort: any;
|
|
10
10
|
toposort?: number;
|
|
11
11
|
execOpts: ExecOpts;
|
|
12
|
-
|
|
12
|
+
commandName: CommandType;
|
|
13
13
|
composed: any;
|
|
14
14
|
logger: Logger;
|
|
15
15
|
options: any;
|
package/dist/command.js
CHANGED
|
@@ -21,15 +21,15 @@ const child_process_1 = require("./child-process");
|
|
|
21
21
|
const DEFAULT_CONCURRENCY = os_1.default.cpus().length;
|
|
22
22
|
class Command {
|
|
23
23
|
constructor(_argv) {
|
|
24
|
-
this.
|
|
24
|
+
this.commandName = '';
|
|
25
25
|
npmlog_1.default.pause();
|
|
26
26
|
npmlog_1.default.heading = 'lerna-lite';
|
|
27
27
|
const argv = (0, clone_deep_1.default)(_argv);
|
|
28
28
|
npmlog_1.default.silly('argv', argv);
|
|
29
29
|
// 'FooCommand' => 'foo'
|
|
30
|
-
this.
|
|
30
|
+
this.commandName = (this.constructor.name.replace(/Command$/, '').toLowerCase());
|
|
31
31
|
// composed commands are called from other commands, like publish -> version
|
|
32
|
-
this.composed = typeof argv.composed === 'string' && argv.composed !== this.
|
|
32
|
+
this.composed = typeof argv.composed === 'string' && argv.composed !== this.commandName;
|
|
33
33
|
if (!this.composed) {
|
|
34
34
|
// composed commands have already logged the lerna version
|
|
35
35
|
npmlog_1.default.notice('cli', `v${argv.lernaVersion}`);
|
|
@@ -139,7 +139,7 @@ class Command {
|
|
|
139
139
|
// Command config object normalized to 'command' namespace
|
|
140
140
|
const commandConfig = this.project.config.command || {};
|
|
141
141
|
// The current command always overrides otherCommandConfigs
|
|
142
|
-
const overrides = [this.
|
|
142
|
+
const overrides = [this.commandName, ...this.otherCommandConfigs].map((key) => commandConfig[key]);
|
|
143
143
|
this.options = defaultOptions(
|
|
144
144
|
// CLI flags, which if defined overrule subsequent values
|
|
145
145
|
this.argv,
|
|
@@ -169,7 +169,7 @@ class Command {
|
|
|
169
169
|
npmlog_1.default.addLevel('success', 3001, { fg: 'green', bold: true });
|
|
170
170
|
// create logger that subclasses use
|
|
171
171
|
Object.defineProperty(this, 'logger', {
|
|
172
|
-
value: npmlog_1.default.newGroup(this.
|
|
172
|
+
value: npmlog_1.default.newGroup(this.commandName),
|
|
173
173
|
});
|
|
174
174
|
// emit all buffered logs at configured level and higher
|
|
175
175
|
npmlog_1.default.resume();
|
|
@@ -241,10 +241,10 @@ class Command {
|
|
|
241
241
|
});
|
|
242
242
|
}
|
|
243
243
|
initialize() {
|
|
244
|
-
throw new validation_error_1.ValidationError(this.
|
|
244
|
+
throw new validation_error_1.ValidationError(this.commandName, 'initialize() needs to be implemented.');
|
|
245
245
|
}
|
|
246
246
|
execute() {
|
|
247
|
-
throw new validation_error_1.ValidationError(this.
|
|
247
|
+
throw new validation_error_1.ValidationError(this.commandName, 'execute() needs to be implemented.');
|
|
248
248
|
}
|
|
249
249
|
}
|
|
250
250
|
exports.Command = Command;
|
package/dist/command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AACnC,oDAA4B;AAC5B,kDAA0B;AAC1B,oDAAqC;AACrC,4CAAoB;AAEpB,qDAAiD;AACjD,iEAA4D;AAC5D,6DAAwD;AACxD,2DAAsD;AACtD,+CAA4C;AAC5C,yDAAqD;AAErD,iEAA6D;AAC7D,mDAAiD;AAEjD,mCAAmC;AACnC,MAAM,mBAAmB,GAAG,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;AAE7C,MAAa,OAAO;IAgBlB,YAAY,KAAU;QARtB,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { BaseChangelogOptions, VersioningStrategy } from '../models';
|
|
2
2
|
import { Package } from '../package';
|
|
3
|
+
import { PackageGraphNode } from '../package-graph';
|
|
3
4
|
/**
|
|
4
5
|
* @param {import('@lerna/package').Package} pkg
|
|
5
6
|
* @param {import('..').VersioningStrategy} type
|
|
6
7
|
* @param {import('..').BaseChangelogOptions & { prereleaseId?: string }} commandOptions
|
|
7
8
|
*/
|
|
8
|
-
export declare function recommendVersion(pkg: Package, type: VersioningStrategy, recommendationOptions: BaseChangelogOptions & {
|
|
9
|
+
export declare function recommendVersion(pkg: Package | PackageGraphNode, type: VersioningStrategy, recommendationOptions: BaseChangelogOptions & {
|
|
9
10
|
prereleaseId?: string;
|
|
10
|
-
}): Promise<
|
|
11
|
+
}): Promise<string | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recommend-version.js","sourceRoot":"","sources":["../../src/conventional-commits/recommend-version.ts"],"names":[],"mappings":";;;;;;AAAA,kGAAwE;AAExE,oDAAyB;AACzB,oDAA6C;
|
|
1
|
+
{"version":3,"file":"recommend-version.js","sourceRoot":"","sources":["../../src/conventional-commits/recommend-version.ts"],"names":[],"mappings":"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"}
|
package/dist/models/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import log from 'npmlog';
|
|
2
|
+
import npa from 'npm-package-arg';
|
|
2
3
|
import { Package } from '../package';
|
|
3
4
|
export declare type VersioningStrategy = 'fixed' | 'independent';
|
|
4
5
|
export declare type ChangelogType = 'fixed' | 'independent' | 'root';
|
|
@@ -15,6 +16,7 @@ export interface CommandOptions {
|
|
|
15
16
|
rollPublish?: boolean;
|
|
16
17
|
rollVersion?: boolean;
|
|
17
18
|
}
|
|
19
|
+
export declare type CommandType = '' | 'exec' | 'info' | 'publish' | 'version' | 'run';
|
|
18
20
|
export interface DescribeRefOptions {
|
|
19
21
|
cwd?: string;
|
|
20
22
|
match?: string;
|
|
@@ -89,6 +91,8 @@ export interface ProfileData {
|
|
|
89
91
|
export interface QueryGraphConfig {
|
|
90
92
|
/** "dependencies" excludes devDependencies from graph */
|
|
91
93
|
graphType?: 'allDependencies' | 'dependencies';
|
|
94
|
+
/** Treatment of local sibling dependencies, default "auto" */
|
|
95
|
+
localDependencies?: 'auto' | 'force' | 'explicit';
|
|
92
96
|
/** Whether or not to reject dependency cycles */
|
|
93
97
|
rejectCycles?: boolean;
|
|
94
98
|
}
|
|
@@ -112,6 +116,40 @@ export declare type GitCreateReleaseFn = () => Promise<{
|
|
|
112
116
|
export interface GitClient {
|
|
113
117
|
createRelease: (opts: GitClientRelease) => Promise<void>;
|
|
114
118
|
}
|
|
119
|
+
export declare type NpaResolveResult = (npa.FileResult | npa.HostedGitResult | npa.URLResult | npa.AliasResult | npa.RegistryResult) & {
|
|
120
|
+
explicitWorkspace?: boolean;
|
|
121
|
+
workspaceTarget?: string;
|
|
122
|
+
};
|
|
123
|
+
/** Passed between concurrent executions */
|
|
124
|
+
export interface OneTimePasswordCache {
|
|
125
|
+
otp?: string;
|
|
126
|
+
}
|
|
127
|
+
export interface ProjectConfig {
|
|
128
|
+
command?: string;
|
|
129
|
+
packages: string[];
|
|
130
|
+
useWorkspaces: boolean;
|
|
131
|
+
version: string;
|
|
132
|
+
}
|
|
133
|
+
/** The subset of package.json properties that Lerna-Lite uses */
|
|
134
|
+
export interface RawManifest {
|
|
135
|
+
name: string;
|
|
136
|
+
location: string;
|
|
137
|
+
version: string;
|
|
138
|
+
private?: boolean;
|
|
139
|
+
bin?: Record<string, string> | string;
|
|
140
|
+
scripts?: Record<string, string>;
|
|
141
|
+
dependencies?: Record<string, string>;
|
|
142
|
+
devDependencies?: Record<string, string>;
|
|
143
|
+
optionalDependencies?: Record<string, string>;
|
|
144
|
+
peerDependencies?: Record<string, string>;
|
|
145
|
+
publishConfig?: Record<'directory' | 'registry' | 'tag', string>;
|
|
146
|
+
workspaces?: string[] | {
|
|
147
|
+
packages: string[];
|
|
148
|
+
};
|
|
149
|
+
get: (str: string) => {
|
|
150
|
+
packages?: string[];
|
|
151
|
+
} | string[];
|
|
152
|
+
}
|
|
115
153
|
export interface ReleaseClient {
|
|
116
154
|
repos: {
|
|
117
155
|
createRelease: GitCreateReleaseFn;
|
package/dist/otplease.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { OneTimePasswordCache } from './models';
|
|
1
2
|
/**
|
|
2
3
|
* Attempt to execute Promise callback, prompting for OTP if necessary.
|
|
3
4
|
* @template {Record<string, unknown>} T
|
|
@@ -5,7 +6,7 @@
|
|
|
5
6
|
* @param {T} _opts The options to be passed to `fn`
|
|
6
7
|
* @param {OneTimePasswordCache} otpCache
|
|
7
8
|
*/
|
|
8
|
-
export declare function otplease(fn:
|
|
9
|
+
export declare function otplease<T extends Record<string, unknown>>(fn: (opts: T) => Promise<unknown>, _opts: T, otpCache: OneTimePasswordCache): Promise<unknown>;
|
|
9
10
|
/**
|
|
10
11
|
* Prompt user for one-time password.
|
|
11
12
|
* @returns {Promise<string>}
|
package/dist/otplease.js
CHANGED
|
@@ -2,10 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getOneTimePassword = exports.otplease = void 0;
|
|
4
4
|
const prompt_1 = require("./prompt");
|
|
5
|
-
/**
|
|
6
|
-
* @typedef {object} OneTimePasswordCache - Passed between concurrent executions
|
|
7
|
-
* @property {string} [otp] The one-time password, passed as an option or received via prompt
|
|
8
|
-
*/
|
|
9
5
|
// basic single-entry semaphore
|
|
10
6
|
const semaphore = {
|
|
11
7
|
wait() {
|
|
@@ -98,7 +94,7 @@ function attempt(fn, opts, otpCache) {
|
|
|
98
94
|
* @returns {Promise<string>}
|
|
99
95
|
*/
|
|
100
96
|
function getOneTimePassword(message = 'This operation requires a one-time password:') {
|
|
101
|
-
// Logic taken from npm internals: https://
|
|
97
|
+
// Logic taken from npm internals: https://github.com/npm/cli/blob/4f801d8a476f7ca52b0f182bf4e17a80db12b4e2/lib/utils/read-user-info.js#L21-L35
|
|
102
98
|
return (0, prompt_1.promptTextInput)(message, {
|
|
103
99
|
filter: (otp) => otp.replace(/\s+/g, ''),
|
|
104
100
|
validate: (otp) => (otp && /^[\d ]+$|^[A-Fa-f0-9]{64,64}$/.test(otp)) ||
|
package/dist/otplease.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otplease.js","sourceRoot":"","sources":["../src/otplease.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"otplease.js","sourceRoot":"","sources":["../src/otplease.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,9 +11,9 @@ export declare class PackageGraph extends Map {
|
|
|
11
11
|
* @param {'allDependencies'|'dependencies'} [graphType]
|
|
12
12
|
* Pass "dependencies" to create a graph of only dependencies,
|
|
13
13
|
* excluding the devDependencies that would normally be included.
|
|
14
|
-
* @param {boolean} [
|
|
14
|
+
* @param {boolean|'auto'|'force'|'explicit'} [localDependencies] Treatment of local sibling dependencies, default "auto"
|
|
15
15
|
*/
|
|
16
|
-
constructor(packages: Package[], graphType?: 'allDependencies' | 'dependencies',
|
|
16
|
+
constructor(packages: Package[], graphType?: 'allDependencies' | 'dependencies', localDependencies?: boolean | 'auto' | 'force' | 'explicit' | 'forceLocal');
|
|
17
17
|
get rawPackageList(): any[];
|
|
18
18
|
/**
|
|
19
19
|
* Takes a list of Packages and returns a list of those same Packages with any Packages
|
|
@@ -18,9 +18,13 @@ class PackageGraph extends Map {
|
|
|
18
18
|
* @param {'allDependencies'|'dependencies'} [graphType]
|
|
19
19
|
* Pass "dependencies" to create a graph of only dependencies,
|
|
20
20
|
* excluding the devDependencies that would normally be included.
|
|
21
|
-
* @param {boolean} [
|
|
21
|
+
* @param {boolean|'auto'|'force'|'explicit'} [localDependencies] Treatment of local sibling dependencies, default "auto"
|
|
22
22
|
*/
|
|
23
|
-
constructor(packages, graphType = 'allDependencies',
|
|
23
|
+
constructor(packages, graphType = 'allDependencies', localDependencies = 'auto') {
|
|
24
|
+
// For backward compatibility
|
|
25
|
+
if (localDependencies === true || localDependencies === 'forceLocal') {
|
|
26
|
+
localDependencies = 'force'; // eslint-disable-line
|
|
27
|
+
}
|
|
24
28
|
// @ts-ignore
|
|
25
29
|
super(packages.map((pkg) => { var _a; return [(_a = pkg === null || pkg === void 0 ? void 0 : pkg.name) !== null && _a !== void 0 ? _a : '', new lib_1.PackageGraphNode(pkg)]; }));
|
|
26
30
|
if (packages.length !== this.size) {
|
|
@@ -49,14 +53,38 @@ class PackageGraph extends Map {
|
|
|
49
53
|
// Yarn decided to ignore https://github.com/npm/npm/pull/15900 and implemented "link:"
|
|
50
54
|
// As they apparently have no intention of being compatible, we have to do it for them.
|
|
51
55
|
// @see https://github.com/yarnpkg/yarn/issues/4212
|
|
52
|
-
|
|
56
|
+
let spec = graphDependencies[depName].replace(/^link:/, 'file:');
|
|
57
|
+
// npa doesn't support the explicit workspace: protocol, supported by
|
|
58
|
+
// pnpm and Yarn.
|
|
59
|
+
const explicitWorkspace = /^workspace:/.test(spec);
|
|
60
|
+
let workspaceTarget;
|
|
61
|
+
if (explicitWorkspace) {
|
|
62
|
+
workspaceTarget = spec;
|
|
63
|
+
spec = spec.replace(/^workspace:/, '');
|
|
64
|
+
// when dependency is defined as target workspace, like `workspace:*`,
|
|
65
|
+
// we'll have to pull the version from its parent package version property
|
|
66
|
+
// example with `1.5.0`, ws:* => "1.5.0", ws:^ => "^1.5.0", ws:~ => "~1.5.0", ws:^1.5.0 => "^1.5.0"
|
|
67
|
+
if (spec === '*' || spec === '^' || spec === '~') {
|
|
68
|
+
const depPkg = packages.find(pkg => pkg.name === depName);
|
|
69
|
+
const version = depPkg === null || depPkg === void 0 ? void 0 : depPkg.version;
|
|
70
|
+
const specTarget = spec === '*' ? '' : spec;
|
|
71
|
+
spec = depPkg ? `${specTarget}${version}` : '';
|
|
72
|
+
}
|
|
73
|
+
}
|
|
53
74
|
const resolved = npm_package_arg_1.default.resolve(depName, spec, currentNode.location);
|
|
75
|
+
resolved.explicitWorkspace = explicitWorkspace;
|
|
76
|
+
if (resolved.explicitWorkspace) {
|
|
77
|
+
resolved.workspaceTarget = workspaceTarget;
|
|
78
|
+
}
|
|
54
79
|
if (!depNode) {
|
|
55
80
|
// it's an external dependency, store the resolution and bail
|
|
56
81
|
return currentNode.externalDependencies.set(depName, resolved);
|
|
57
82
|
}
|
|
58
|
-
if (
|
|
59
|
-
|
|
83
|
+
if (explicitWorkspace ||
|
|
84
|
+
localDependencies === 'force' ||
|
|
85
|
+
resolved.fetchSpec === depNode.location ||
|
|
86
|
+
(localDependencies !== 'explicit' && depNode.satisfies(resolved))) {
|
|
87
|
+
// a local file: specifier, a matching semver or a workspace: version
|
|
60
88
|
currentNode.localDependencies.set(depName, resolved);
|
|
61
89
|
depNode.localDependents.set(currentName, currentNode);
|
|
62
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAkC;AAElC,+BAA+E;AAE/E,0DAAsD;
|
|
1
|
+
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAkC;AAElC,+BAA+E;AAE/E,0DAAsD;AAGtD;;;;GAIG;AACH,MAAa,YAAa,SAAQ,GAAG;IACnC;;;;;;OAMG;IACH,YAAY,QAAmB,EAAE,YAAgD,iBAAiB,EAAE,oBAA4E,MAAM;QACpL,6BAA6B;QAC7B,IAAI,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,KAAK,YAAY,EAAE;YACpE,iBAAiB,GAAG,OAAO,CAAC,CAAC,sBAAsB;SACpD;QAED,aAAa;QACb,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAY,EAAE,EAAE,WAAC,OAAA,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,EAAE,IAAI,sBAAgB,CAAC,GAAG,CAAC,CAAC,CAAA,EAAA,CAAC,CAAC,CAAC;QAEpF,IAAI,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE;YACjC,0BAA0B;YAC1B,MAAM,IAAI,GAAqB,IAAI,GAAG,EAAE,CAAC;YAEzC,KAAK,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,QAAQ,EAAE;gBACzC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC/B;qBAAM;oBACL,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;iBAC5B;aACF;YAED,KAAK,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,EAAE;gBACpC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxB,MAAM,IAAI,kCAAe,CACvB,OAAO,EACP,CAAC,iBAAiB,IAAI,8BAA8B,EAAE,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CACjF,CAAC;iBACH;aACF;SACF;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,WAA6B,EAAE,WAAmB,EAAE,EAAE;YAClE,MAAM,iBAAiB,GACrB,SAAS,KAAK,cAAc;gBAC1B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,WAAW,CAAC,GAAG,CAAC,oBAAoB,EAAE,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC;gBACvF,CAAC,CAAC,MAAM,CAAC,MAAM,CACb,EAAE,EACF,WAAW,CAAC,GAAG,CAAC,eAAe,EAC/B,WAAW,CAAC,GAAG,CAAC,oBAAoB,EACpC,WAAW,CAAC,GAAG,CAAC,YAAY,CAC7B,CAAC;YAEN,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAClC,uFAAuF;gBACvF,uFAAuF;gBACvF,mDAAmD;gBACnD,IAAI,IAAI,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAEjE,qEAAqE;gBACrE,iBAAiB;gBACjB,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnD,IAAI,eAAmC,CAAC;gBACxC,IAAI,iBAAiB,EAAE;oBACrB,eAAe,GAAG,IAAI,CAAC;oBACvB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBAEvC,sEAAsE;oBACtE,0EAA0E;oBAC1E,mGAAmG;oBACnG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE;wBAChD,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;wBAC1D,MAAM,OAAO,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC;wBAChC,MAAM,UAAU,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;wBAC5C,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAChD;iBACF;gBAED,MAAM,QAAQ,GAAqB,yBAAG,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACpF,QAAQ,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;gBAC/C,IAAI,QAAQ,CAAC,iBAAiB,EAAE;oBAC9B,QAAQ,CAAC,eAAe,GAAG,eAAe,CAAC;iBAC5C;gBAED,IAAI,CAAC,OAAO,EAAE;oBACZ,6DAA6D;oBAC7D,OAAO,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;iBAChE;gBAED,IACE,iBAAiB;oBACjB,iBAAiB,KAAK,OAAO;oBAC7B,QAAQ,CAAC,SAAS,KAAK,OAAO,CAAC,QAAQ;oBACvC,CAAC,iBAAiB,KAAK,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,EACjE;oBACA,qEAAqE;oBACrE,WAAW,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;oBACrD,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;iBACvD;qBAAM;oBACL,4CAA4C;oBAC5C,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;iBACzD;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,gBAA2B;QACzC,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACH,aAAa,CAAC,gBAA2B;QACvC,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;;;OAOG;IACH,UAAU,CAAC,WAAsB,EAAE,QAAiD;QAClF,2EAA2E;QAC3E,MAAM,MAAM,GAAG,IAAI,GAAG,CAAmB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAExF,oDAAoD;QACpD,iCAAiC;QACjC,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YAC7B,2CAA2C;YAC3C,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAEzB,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAElC,IAAI,OAAO,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oBACnD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBACrB;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,kDAAkD;QAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;;OAOG;IACH,eAAe,CAAC,YAAsB;QACpC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAY,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;QAE/C,IAAI,CAAC,OAAO,CAAC,CAAC,WAA6B,EAAE,WAAmB,EAAE,EAAE;YAClE,MAAM,IAAI,GAAG,IAAI,GAAG,EAAoB,CAAC;YAEzC,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAA+B,EAAE,aAAqB,EAAE,iBAAsB,EAAE,EAAE;gBAC1G,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAExC,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;oBAC3B,OAAO;iBACR;gBAED,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAExB,IAAI,aAAa,KAAK,WAAW,EAAE;oBACjC,iBAAiB;oBACjB,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBAC5B,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAErB,OAAO;iBACR;gBAED,IAAI,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;oBACtC,qBAAqB;oBACrB,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CACzF,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CACrC,CAAC;oBACF,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;oBAEtE,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBAC9B,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;iBAC7B;gBAED,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACtD,CAAC,CAAC;YAEF,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,IAAA,kBAAY,EACV,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EACrD,YAAY,CACb,CAAC;QAEF,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACH,cAAc,CAAC,YAAsB;QACnC,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,WAAW,GAAG,IAAI,GAAG,EAA4C,CAAC;QACxE,MAAM,MAAM,GAAG,IAAI,GAAG,EAA0B,CAAC;QACjD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAC;QACnD,MAAM,SAAS,GAAqD,EAAE,CAAC;QAEvE,SAAS,MAAM,CAAC,QAAQ,EAAE,aAAa;YACrC,IAAI,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBAC7B,OAAO;aACR;YAED,IAAI,iBAAiB,GAAG,aAAa,CAAC;YACtC,OAAO,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;gBACzC,iBAAiB,GAAG,WAAW,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;aACxD;YAED,iGAAiG;YACjG,IAAI,cAAc,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;gBACzC,OAAO;aACR;YACD,cAAc,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAEtC,IACE,iBAAiB,KAAK,QAAQ;gBAC9B,CAAC,iBAAiB,CAAC,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EACnE;gBACA,MAAM,KAAK,GAAQ,IAAI,4BAAsB,EAAE,CAAC;gBAEhD,SAAS,CAAC,OAAO,CAAC,CAAC,WAAsD,EAAE,EAAE;oBAC3E,WAAW,CAAC,GAAG,CAAC,WAA+B,EAAE,KAAK,CAAC,CAAC;oBACxD,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBAC1B,MAAM,CAAC,MAAM,CAAC,WAAqC,CAAC,CAAC;gBACvD,CAAC,CAAC,CAAC;gBAEH,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAClB,aAAa;gBACb,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAElC,OAAO;aACR;YAED,IAAI,SAAS,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC/C,gDAAgD;gBAChD,cAAc,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;aAC7C;QACH,CAAC;QAED,SAAS,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ;YACtD,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5B,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjE,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;QAC3D,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;QAEjE,IAAA,kBAAY,EAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEvC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,UAAiC;QAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,GAAG,UAA8B;QACrC,IAAI,UAAU,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,EAAE;YACnC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC;SACrB;QAED,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,aAA+B;QACpC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAsB,EAAE,EAAE;YACtC,qCAAqC;YACrC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAElD,sCAAsC;YACtC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxUD,oCAwUC"}
|
package/dist/package.d.ts
CHANGED
|
@@ -1,17 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
* @typedef {object} RawManifest The subset of package.json properties that Lerna-Lite uses
|
|
3
|
-
* @property {string} name
|
|
4
|
-
* @property {string} version
|
|
5
|
-
* @property {boolean} [private]
|
|
6
|
-
* @property {Record<string, string>|string} [bin]
|
|
7
|
-
* @property {Record<string, string>} [scripts]
|
|
8
|
-
* @property {Record<string, string>} [dependencies]
|
|
9
|
-
* @property {Record<string, string>} [devDependencies]
|
|
10
|
-
* @property {Record<string, string>} [optionalDependencies]
|
|
11
|
-
* @property {Record<string, string>} [peerDependencies]
|
|
12
|
-
* @property {Record<'directory' | 'registry' | 'tag', string>} [publishConfig]
|
|
13
|
-
* @property {string[] | { packages: string[] }} [workspaces]
|
|
14
|
-
*/
|
|
1
|
+
import { CommandType, NpaResolveResult, RawManifest } from './models';
|
|
15
2
|
/**
|
|
16
3
|
* Lerna's internal representation of a local package, with
|
|
17
4
|
* many values resolved directly from the original JSON.
|
|
@@ -27,13 +14,13 @@ export declare class Package {
|
|
|
27
14
|
* @param {string} [dir] If `ref` is a JSON object, this is the location of the manifest
|
|
28
15
|
* @returns {Package}
|
|
29
16
|
*/
|
|
30
|
-
static lazy(ref:
|
|
17
|
+
static lazy(ref: string | Package | RawManifest, dir?: string): Package;
|
|
31
18
|
/**
|
|
32
19
|
* @param {RawManifest} pkg
|
|
33
20
|
* @param {string} location
|
|
34
21
|
* @param {string} [rootPath]
|
|
35
22
|
*/
|
|
36
|
-
constructor(pkg:
|
|
23
|
+
constructor(pkg: RawManifest, location: string, rootPath?: string);
|
|
37
24
|
get location(): string;
|
|
38
25
|
get private(): boolean;
|
|
39
26
|
get resolved(): {
|
|
@@ -50,8 +37,8 @@ export declare class Package {
|
|
|
50
37
|
get __isLernaPackage(): boolean;
|
|
51
38
|
get version(): string;
|
|
52
39
|
set version(version: string);
|
|
53
|
-
get contents():
|
|
54
|
-
set contents(subDirectory:
|
|
40
|
+
get contents(): string;
|
|
41
|
+
set contents(subDirectory: string);
|
|
55
42
|
get dependencies(): string[];
|
|
56
43
|
get devDependencies(): string[];
|
|
57
44
|
get optionalDependencies(): string[];
|
|
@@ -63,7 +50,7 @@ export declare class Package {
|
|
|
63
50
|
* @param {K} key field name to retrieve value
|
|
64
51
|
* @returns {RawManifest[K]} value stored under key, if present
|
|
65
52
|
*/
|
|
66
|
-
get(key:
|
|
53
|
+
get<K extends keyof RawManifest>(key: string): K;
|
|
67
54
|
/**
|
|
68
55
|
* Map-like storage of arbitrary values
|
|
69
56
|
* @template {keyof RawManifest} K
|
|
@@ -71,7 +58,7 @@ export declare class Package {
|
|
|
71
58
|
* @param {RawManifest[K]} val value to store
|
|
72
59
|
* @returns {Package} instance for chaining
|
|
73
60
|
*/
|
|
74
|
-
set(key: string, val:
|
|
61
|
+
set(key: string, val: RawManifest[keyof RawManifest]): Package;
|
|
75
62
|
/**
|
|
76
63
|
* Provide shallow copy for munging elsewhere
|
|
77
64
|
* @returns {Object}
|
|
@@ -91,6 +78,7 @@ export declare class Package {
|
|
|
91
78
|
* @param {Object} resolved npa metadata
|
|
92
79
|
* @param {String} depVersion semver
|
|
93
80
|
* @param {String} savePrefix npm_config_save_prefix
|
|
81
|
+
* @param {String} updatedByCommand - which command called this update?
|
|
94
82
|
*/
|
|
95
|
-
updateLocalDependency(resolved:
|
|
83
|
+
updateLocalDependency(resolved: NpaResolveResult, depVersion: string, savePrefix: string, updatedByCommand?: CommandType): void;
|
|
96
84
|
}
|
package/dist/package.js
CHANGED
|
@@ -39,20 +39,6 @@ function shallowCopy(json) {
|
|
|
39
39
|
return obj;
|
|
40
40
|
}, {});
|
|
41
41
|
}
|
|
42
|
-
/**
|
|
43
|
-
* @typedef {object} RawManifest The subset of package.json properties that Lerna-Lite uses
|
|
44
|
-
* @property {string} name
|
|
45
|
-
* @property {string} version
|
|
46
|
-
* @property {boolean} [private]
|
|
47
|
-
* @property {Record<string, string>|string} [bin]
|
|
48
|
-
* @property {Record<string, string>} [scripts]
|
|
49
|
-
* @property {Record<string, string>} [dependencies]
|
|
50
|
-
* @property {Record<string, string>} [devDependencies]
|
|
51
|
-
* @property {Record<string, string>} [optionalDependencies]
|
|
52
|
-
* @property {Record<string, string>} [peerDependencies]
|
|
53
|
-
* @property {Record<'directory' | 'registry' | 'tag', string>} [publishConfig]
|
|
54
|
-
* @property {string[] | { packages: string[] }} [workspaces]
|
|
55
|
-
*/
|
|
56
42
|
/**
|
|
57
43
|
* Lerna's internal representation of a local package, with
|
|
58
44
|
* many values resolved directly from the original JSON.
|
|
@@ -220,8 +206,10 @@ class Package {
|
|
|
220
206
|
* @param {Object} resolved npa metadata
|
|
221
207
|
* @param {String} depVersion semver
|
|
222
208
|
* @param {String} savePrefix npm_config_save_prefix
|
|
209
|
+
* @param {String} updatedByCommand - which command called this update?
|
|
223
210
|
*/
|
|
224
|
-
updateLocalDependency(resolved, depVersion, savePrefix) {
|
|
211
|
+
updateLocalDependency(resolved, depVersion, savePrefix, updatedByCommand) {
|
|
212
|
+
var _a;
|
|
225
213
|
const depName = resolved.name;
|
|
226
214
|
// first, try runtime dependencies
|
|
227
215
|
let depCollection = this.dependencies;
|
|
@@ -237,6 +225,14 @@ class Package {
|
|
|
237
225
|
if (resolved.registry || resolved.type === 'directory') {
|
|
238
226
|
// a version (1.2.3) OR range (^1.2.3) OR directory (file:../foo-pkg)
|
|
239
227
|
depCollection[depName] = `${savePrefix}${depVersion}`;
|
|
228
|
+
// when using explicit workspace protocol and we're not doing a Publish
|
|
229
|
+
// if we are publishing, we will skip this and so we'll keep regular semver range, e.g.: "workspace:*"" will be converted to "^1.2.3"
|
|
230
|
+
if (resolved.explicitWorkspace && updatedByCommand !== 'publish') {
|
|
231
|
+
// keep target workspace or bump when it's a workspace semver range (like `workspace:^1.2.3`)
|
|
232
|
+
depCollection[depName] = /^workspace:[*|^|~]{1}$/.test((_a = resolved === null || resolved === void 0 ? void 0 : resolved.workspaceTarget) !== null && _a !== void 0 ? _a : '')
|
|
233
|
+
? resolved.workspaceTarget // target like `workspace:*`
|
|
234
|
+
: `workspace:${depCollection[depName]}`; // range like `workspace:^1.2.3`
|
|
235
|
+
}
|
|
240
236
|
}
|
|
241
237
|
else if (resolved.gitCommittish) {
|
|
242
238
|
// a git url with matching committish (#v1.2.3 or #1.2.3)
|
package/dist/package.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":";;;;;;AAAA,sEAAkC;AAClC,gDAAwB;AACxB,oEAA0C;AAC1C,0DAAiC;
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../src/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,8 @@
|
|
|
3
3
|
* @param {string} cwd
|
|
4
4
|
* @param {Set<string>} seen
|
|
5
5
|
*/
|
|
6
|
-
export declare function applyExtends(config:
|
|
6
|
+
export declare function applyExtends(config: {
|
|
7
|
+
[key: string]: any;
|
|
8
|
+
}, cwd: string, seen?: Set<string>): {
|
|
9
|
+
[key: string]: any;
|
|
10
|
+
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-extends.js","sourceRoot":"","sources":["../../../src/project/lib/apply-extends.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,gEAAuC;AAEvC,qDAAiD;AACjD,6DAAyD;AAEzD;;;;GAIG;AACH,SAAgB,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"apply-extends.js","sourceRoot":"","sources":["../../../src/project/lib/apply-extends.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,gEAAuC;AAEvC,qDAAiD;AACjD,6DAAyD;AAEzD;;;;GAIG;AACH,SAAgB,YAAY,CAAC,MAA+B,EAAE,GAAW,EAAE,OAAO,IAAI,GAAG,EAAU;IACjG,IAAI,aAAa,GAAG,EAAE,CAAC;IAEvB,IAAI,SAAS,IAAI,MAAM,EAAE;QACvB,IAAI,aAAa,CAAC;QAElB,IAAI;YACF,aAAa,GAAG,IAAA,sBAAW,EAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;SAClD;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,IAAI,kCAAe,CAAC,WAAW,EAAE,4CAA4C,EAAE,GAAG,CAAC,CAAC;SAC3F;QAED,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAC3B,MAAM,IAAI,kCAAe,CAAC,WAAW,EAAE,oCAAoC,EAAE,IAAW,CAAC,CAAC;SAC3F;QAED,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAExB,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,wCAAwC;QAE/D,iDAAiD;QAEjD,aAAa,GAAG,YAAY,CAAC,aAAa,EAAE,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,CAAC;KAChF;IAED,OAAO,IAAA,8BAAa,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAC9C,CAAC;AA3BD,oCA2BC"}
|
|
@@ -2,4 +2,10 @@
|
|
|
2
2
|
* @param {{ [key: string]: unknown }} json
|
|
3
3
|
* @param {{ [key: string]: unknown }} defaults
|
|
4
4
|
*/
|
|
5
|
-
export declare function shallowExtend(json:
|
|
5
|
+
export declare function shallowExtend(json: {
|
|
6
|
+
[key: string]: any;
|
|
7
|
+
}, defaults?: {
|
|
8
|
+
[key: string]: any;
|
|
9
|
+
}): {
|
|
10
|
+
[key: string]: any;
|
|
11
|
+
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shallow-extend.js","sourceRoot":"","sources":["../../../src/project/lib/shallow-extend.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"shallow-extend.js","sourceRoot":"","sources":["../../../src/project/lib/shallow-extend.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,aAAa,CAAC,IAA6B,EAAE,WAAoC,EAAE;IACjG,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,mEAAmE;YACnE,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;SACxB;aAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACzC,GAAG,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACzC;aAAM;YACL,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;SAChB;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,QAAQ,CAAC,CAAC;AACf,CAAC;AAfD,sCAeC"}
|
|
@@ -1,10 +1,5 @@
|
|
|
1
1
|
import { Package } from '../package';
|
|
2
|
-
|
|
3
|
-
command?: string;
|
|
4
|
-
packages: string[];
|
|
5
|
-
useWorkspaces: boolean;
|
|
6
|
-
version: string;
|
|
7
|
-
}
|
|
2
|
+
import { ProjectConfig } from '../models';
|
|
8
3
|
/**
|
|
9
4
|
* A representation of the entire project managed by Lerna.
|
|
10
5
|
*
|
|
@@ -32,20 +27,19 @@ export declare class Project {
|
|
|
32
27
|
get version(): string;
|
|
33
28
|
set version(val: string);
|
|
34
29
|
get packageConfigs(): string[];
|
|
35
|
-
get packageParentDirs():
|
|
36
|
-
get manifest():
|
|
37
|
-
get licensePath():
|
|
30
|
+
get packageParentDirs(): Promise<string[]>;
|
|
31
|
+
get manifest(): Package;
|
|
32
|
+
get licensePath(): string;
|
|
38
33
|
get fileFinder(): (fileName: string, fileMapper: any, customGlobOpts?: any) => Promise<any>;
|
|
39
34
|
/**
|
|
40
35
|
* @returns {Promise<Package[]>} A promise resolving to a list of Package instances
|
|
41
36
|
*/
|
|
42
|
-
getPackages(): Promise<
|
|
37
|
+
getPackages(): Promise<Package[]>;
|
|
43
38
|
/**
|
|
44
39
|
* @returns {Package[]} A list of Package instances
|
|
45
40
|
*/
|
|
46
41
|
getPackagesSync(): string[];
|
|
47
|
-
getPackageLicensePaths(): Promise<
|
|
42
|
+
getPackageLicensePaths(): Promise<string[]>;
|
|
48
43
|
isIndependent(): boolean;
|
|
49
44
|
serializeConfig(): Promise<string>;
|
|
50
45
|
}
|
|
51
|
-
export {};
|
package/dist/project/project.js
CHANGED
|
@@ -86,13 +86,14 @@ class Project {
|
|
|
86
86
|
if (this.config.useWorkspaces) {
|
|
87
87
|
const workspaces = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.get('workspaces');
|
|
88
88
|
if (!workspaces) {
|
|
89
|
-
throw new validation_error_1.ValidationError('EWORKSPACES', (0, dedent_1.default) `
|
|
90
|
-
Yarn workspaces need to be defined in the root package.json.
|
|
91
|
-
See: https://github.com/lerna/lerna/blob/master/commands/bootstrap/README.md#--use-workspaces
|
|
89
|
+
throw new validation_error_1.ValidationError('EWORKSPACES', (0, dedent_1.default) `
|
|
90
|
+
Yarn workspaces need to be defined in the root package.json.
|
|
91
|
+
See: https://github.com/lerna/lerna/blob/master/commands/bootstrap/README.md#--use-workspaces
|
|
92
92
|
`);
|
|
93
93
|
}
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
const workspaceList = (workspaces.packages || workspaces);
|
|
95
|
+
npmlog_1.default.verbose('project workspaces packages', workspaceList.join(' '));
|
|
96
|
+
return workspaceList;
|
|
96
97
|
}
|
|
97
98
|
npmlog_1.default.verbose('project packages', (this.config.packages || [Project.PACKAGE_GLOB]).join(' '));
|
|
98
99
|
return this.config.packages || [Project.PACKAGE_GLOB];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA8C;AAC9C,oDAA4B;AAC5B,oDAA4B;AAC5B,8DAAqC;AACrC,oDAAyB;AACzB,gDAAwB;AACxB,kDAAyB;AACzB,oEAA0C;AAC1C,sEAA4C;AAE5C,wCAAqC;AACrC,uDAAmD;AACnD,0DAAsD;AACtD,6DAA4E;
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,18 @@
|
|
|
1
1
|
import npmlog from 'npmlog';
|
|
2
|
+
interface UncommittedConfig {
|
|
3
|
+
cwd: string;
|
|
4
|
+
log?: typeof npmlog;
|
|
5
|
+
}
|
|
2
6
|
/**
|
|
3
7
|
* Report uncommitted files. (async)
|
|
4
8
|
* @param {UncommittedConfig} options
|
|
5
9
|
* @returns {Promise<string[]>} A list of uncommitted files
|
|
6
10
|
*/
|
|
7
|
-
export declare function collectUncommitted({ cwd, log }:
|
|
8
|
-
cwd: any;
|
|
9
|
-
log?: npmlog.Logger | undefined;
|
|
10
|
-
}, gitDryRun?: boolean): Promise<any>;
|
|
11
|
+
export declare function collectUncommitted({ cwd, log }: UncommittedConfig, gitDryRun?: boolean): Promise<string[]>;
|
|
11
12
|
/**
|
|
12
13
|
* Report uncommitted files. (sync)
|
|
13
14
|
* @param {UncommittedConfig} options
|
|
14
15
|
* @returns {string[]} A list of uncommitted files
|
|
15
16
|
*/
|
|
16
|
-
export declare function collectUncommittedSync({ cwd, log }:
|
|
17
|
-
|
|
18
|
-
log?: typeof npmlog;
|
|
19
|
-
}, gitDryRun?: boolean): any;
|
|
17
|
+
export declare function collectUncommittedSync({ cwd, log }: UncommittedConfig, gitDryRun?: boolean): string[];
|
|
18
|
+
export {};
|
|
@@ -7,11 +7,6 @@ exports.collectUncommittedSync = exports.collectUncommitted = void 0;
|
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const npmlog_1 = __importDefault(require("npmlog"));
|
|
9
9
|
const child_process_1 = require("../child-process");
|
|
10
|
-
/**
|
|
11
|
-
* @typedef {object} UncommittedConfig
|
|
12
|
-
* @property {string} cwd
|
|
13
|
-
* @property {typeof npmlog} [log]
|
|
14
|
-
*/
|
|
15
10
|
const maybeColorize = (colorize) => (s) => (s !== ' ' ? colorize(s) : s);
|
|
16
11
|
const cRed = maybeColorize(chalk_1.default.red);
|
|
17
12
|
const cGreen = maybeColorize(chalk_1.default.green);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-uncommitted.js","sourceRoot":"","sources":["../../src/utils/collect-uncommitted.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAkD;
|
|
1
|
+
{"version":3,"file":"collect-uncommitted.js","sourceRoot":"","sources":["../../src/utils/collect-uncommitted.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oDAA4B;AAE5B,oDAAkD;AAOlD,MAAM,aAAa,GAAG,CAAC,QAAoC,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9G,MAAM,IAAI,GAAG,aAAa,CAAC,eAAK,CAAC,GAAG,CAAC,CAAC;AACtC,MAAM,MAAM,GAAG,aAAa,CAAC,eAAK,CAAC,KAAK,CAAC,CAAC;AAE1C,MAAM,aAAa,GAAG,CAAC,CAAC,EAAE,UAAmB,EAAE,QAAiB,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AAE9G,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,EAAE,CACtC,KAAK,CAAC,OAAO,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAE5F,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAExD,MAAM,WAAW,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAE7E,MAAM,CAAC,GAAG,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE7C,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC;AAEzE;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,SAAS,GAAG,KAAK;IAC5F,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,gCAAgC,CAAC,CAAC;IAEnE,OAAO,IAAA,oBAAI,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC;SAC9D,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AACnD,CAAC;AALD,gDAKC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,gBAAM,EAAqB,EAAE,SAAS,GAAG,KAAK;IAChG,GAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,IAAA,wBAAQ,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9E,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AALD,wDAKC"}
|
|
@@ -21,7 +21,7 @@ export declare class QueryGraph {
|
|
|
21
21
|
* @param {import("@lerna/package").Package[]} packages An array of Packages to build the graph out of
|
|
22
22
|
* @param {QueryGraphConfig} [options]
|
|
23
23
|
*/
|
|
24
|
-
constructor(packages: Package[], { graphType, rejectCycles }?: QueryGraphConfig);
|
|
24
|
+
constructor(packages: Package[], { graphType, localDependencies, rejectCycles }?: QueryGraphConfig);
|
|
25
25
|
_getNextLeaf(): any[];
|
|
26
26
|
_getNextCycle(): any;
|
|
27
27
|
getAvailablePackages(): PackageGraphNode[];
|
|
@@ -10,9 +10,9 @@ class QueryGraph {
|
|
|
10
10
|
* @param {import("@lerna/package").Package[]} packages An array of Packages to build the graph out of
|
|
11
11
|
* @param {QueryGraphConfig} [options]
|
|
12
12
|
*/
|
|
13
|
-
constructor(packages, { graphType = 'allDependencies', rejectCycles } = {}) {
|
|
13
|
+
constructor(packages, { graphType = 'allDependencies', localDependencies = 'auto', rejectCycles } = {}) {
|
|
14
14
|
// Create dependency graph
|
|
15
|
-
this.graph = new package_graph_1.PackageGraph(packages, graphType);
|
|
15
|
+
this.graph = new package_graph_1.PackageGraph(packages, graphType, localDependencies);
|
|
16
16
|
// Evaluate cycles
|
|
17
17
|
this.cycles = this.graph.collapseCycles(rejectCycles);
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-graph.js","sourceRoot":"","sources":["../../src/utils/query-graph.ts"],"names":[],"mappings":";;;AAAA,kEAA8D;AAK9D;;GAEG;AACH,MAAa,UAAU;IAgCrB;;;OAGG;IACH,YAAY,QAAmB,EAAE,EAAE,SAAS,GAAG,iBAAiB,EAAE,YAAY,KAAK,EAAsB;
|
|
1
|
+
{"version":3,"file":"query-graph.js","sourceRoot":"","sources":["../../src/utils/query-graph.ts"],"names":[],"mappings":";;;AAAA,kEAA8D;AAK9D;;GAEG;AACH,MAAa,UAAU;IAgCrB;;;OAGG;IACH,YAAY,QAAmB,EAAE,EAAE,SAAS,GAAG,iBAAiB,EAAE,iBAAiB,GAAG,MAAM,EAAE,YAAY,KAAK,EAAsB;QACnI,0BAA0B;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAI,4BAAY,CAAC,QAAQ,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;QAEtE,kBAAkB;QAClB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IAtCD;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,QAAmB,EAAE,OAAyB;QAC5D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,IAAI,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,MAAM,EAAE;YACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACxB,wCAAwC;gBACxC,aAAa;gBACb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACxB;YAED,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;SACtC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAcD,YAAY;QACV,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,aAAa;QACX,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QAElG,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,EAAE,CAAC;SACX;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE1B,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,oBAAoB;QAClB,0BAA0B;QAC1B,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAE9C,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,OAAO,iBAAiB,CAAC;SAC1B;QAED,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,IAAY;QACtB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,aAA+B;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEjC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;YAC/B,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;SAC7B;IACH,CAAC;CACF;AAxFD,gCAwFC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lerna-lite/core",
|
|
3
3
|
"description": "Lerna-Lite core implementation module",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.2.0",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"typings": "dist/index.d.ts",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"node-fetch": "^2.6.7",
|
|
58
58
|
"npm-lifecycle": "^3.1.5",
|
|
59
59
|
"npm-package-arg": "^9.0.2",
|
|
60
|
-
"npm-packlist": "^5.0.
|
|
60
|
+
"npm-packlist": "^5.0.3",
|
|
61
61
|
"npm-registry-fetch": "^13.1.1",
|
|
62
62
|
"npmlog": "^6.0.2",
|
|
63
63
|
"os": "^0.1.2",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"p-pipe": "^3.1.0",
|
|
66
66
|
"p-queue": "^6.6.2",
|
|
67
67
|
"p-reduce": "^2.1.0",
|
|
68
|
-
"pacote": "^13.
|
|
68
|
+
"pacote": "^13.3.0",
|
|
69
69
|
"path": "^0.12.7",
|
|
70
70
|
"resolve-from": "^5.0.0",
|
|
71
71
|
"semver": "^7.3.7",
|
|
@@ -104,5 +104,5 @@
|
|
|
104
104
|
"type": "ko_fi",
|
|
105
105
|
"url": "https://ko-fi.com/ghiscoding"
|
|
106
106
|
},
|
|
107
|
-
"gitHead": "
|
|
107
|
+
"gitHead": "b55b59d8c69053fe59be098499ae839f549e34ee"
|
|
108
108
|
}
|