@lerna-lite/core 1.6.0 → 1.8.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/conventional-commits/update-changelog.d.ts +1 -1
- package/dist/conventional-commits/update-changelog.js +48 -3
- package/dist/conventional-commits/update-changelog.js.map +1 -1
- package/dist/models/command-options.d.ts +9 -1
- package/dist/models/interfaces.d.ts +4 -0
- package/dist/project/project.d.ts +2 -2
- package/dist/project/project.js +0 -2
- package/dist/project/project.js.map +1 -1
- package/dist/utils/collect-updates/collect-updates.js +10 -3
- package/dist/utils/collect-updates/collect-updates.js.map +1 -1
- package/dist/utils/collect-updates/lib/has-tags.d.ts +2 -1
- package/dist/utils/collect-updates/lib/has-tags.js +8 -2
- package/dist/utils/collect-updates/lib/has-tags.js.map +1 -1
- package/dist/utils/describe-ref.js +12 -4
- package/dist/utils/describe-ref.js.map +1 -1
- package/package.json +11 -9
|
@@ -19,7 +19,7 @@ const read_existing_changelog_1 = require("./read-existing-changelog");
|
|
|
19
19
|
*/
|
|
20
20
|
async function updateChangelog(pkg, type, updateOptions) {
|
|
21
21
|
npmlog_1.default.silly(type, 'for %s at %s', pkg.name, pkg.location);
|
|
22
|
-
const { changelogPreset, rootPath, tagPrefix = 'v', version
|
|
22
|
+
const { changelogPreset, rootPath, tagPrefix = 'v', version, changelogIncludeCommitAuthorFullname, changelogHeaderMessage = '', changelogVersionMessage = '', } = updateOptions;
|
|
23
23
|
const config = await get_changelog_config_1.GetChangelogConfig.getChangelogConfig(changelogPreset, rootPath);
|
|
24
24
|
const options = {};
|
|
25
25
|
const context = {}; // pass as positional because cc-core's merge-config is wack
|
|
@@ -34,6 +34,14 @@ async function updateChangelog(pkg, type, updateOptions) {
|
|
|
34
34
|
}
|
|
35
35
|
// NOTE: must pass as positional argument due to weird bug in merge-config
|
|
36
36
|
const gitRawCommitsOpts = Object.assign({}, options.config.gitRawCommitsOpts);
|
|
37
|
+
// when including commit author's name, we need to change the conventional commit format
|
|
38
|
+
// available formats can be found at Git's url: https://git-scm.com/docs/git-log#_pretty_formats
|
|
39
|
+
// we will later extract a defined token from the string, of ">>author=%an<<",
|
|
40
|
+
// and reformat the string to get a commit string that would add (@authorName) to the end of the commit string, ie:
|
|
41
|
+
// **deps:** update all non-major dependencies ([ed1db35](https://github.com/ghiscoding/lerna-lite/commit/ed1db35)) (@Renovate-Bot)
|
|
42
|
+
if (changelogIncludeCommitAuthorFullname) {
|
|
43
|
+
gitRawCommitsOpts.format = '%B%n-hash-%n%H>>author=%an<<';
|
|
44
|
+
}
|
|
37
45
|
if (type === 'root') {
|
|
38
46
|
context.version = version;
|
|
39
47
|
// preserve tagPrefix because cc-core can't find the currentTag otherwise
|
|
@@ -59,9 +67,14 @@ async function updateChangelog(pkg, type, updateOptions) {
|
|
|
59
67
|
// generate the markdown for the upcoming release.
|
|
60
68
|
const changelogStream = (0, conventional_changelog_core_1.default)(options, context, gitRawCommitsOpts);
|
|
61
69
|
return Promise.all([
|
|
62
|
-
|
|
70
|
+
// prettier-ignore
|
|
71
|
+
(0, get_stream_1.default)(changelogStream).then((0, make_bump_only_filter_1.makeBumpOnlyFilter)(pkg)),
|
|
63
72
|
(0, read_existing_changelog_1.readExistingChangelog)(pkg),
|
|
64
|
-
]).then(([
|
|
73
|
+
]).then(([inputEntry, [changelogFileLoc, changelogContents]]) => {
|
|
74
|
+
// are we including commit author's name in changelog?
|
|
75
|
+
const newEntry = changelogIncludeCommitAuthorFullname
|
|
76
|
+
? parseChangelogCommitAuthorFullName(inputEntry, changelogIncludeCommitAuthorFullname)
|
|
77
|
+
: inputEntry;
|
|
65
78
|
npmlog_1.default.silly(type, 'writing new entry: %j', newEntry);
|
|
66
79
|
const changelogVersion = type === 'root' ? changelogVersionMessage : '';
|
|
67
80
|
const changelogHeader = constants_1.CHANGELOG_HEADER.replace(/%s/g, type === 'root' ? ((changelogHeaderMessage === null || changelogHeaderMessage === void 0 ? void 0 : changelogHeaderMessage.length) > 0 ? changelogHeaderMessage + constants_1.EOL : '') : '');
|
|
@@ -79,4 +92,36 @@ async function updateChangelog(pkg, type, updateOptions) {
|
|
|
79
92
|
});
|
|
80
93
|
}
|
|
81
94
|
exports.updateChangelog = updateChangelog;
|
|
95
|
+
/**
|
|
96
|
+
* From an input entry string that most often, not always, include commit author's name within defined tokens ">>author=AUTHOR_NAME<<"
|
|
97
|
+
* We will want to extract the author's name from the commit url and recreate the commit url string and add its author to the end of the string.
|
|
98
|
+
* You might be wondering, WHY is the commit author part of the commit url?
|
|
99
|
+
* Mainly because it seems that adding a `format` to the `conventional-changelog-core` of `gitRawCommitsOpts`
|
|
100
|
+
* will always include it as part of the final commit url because of this line where it parses the template and always seems to include whatever we add into the commit url
|
|
101
|
+
* https://github.com/conventional-changelog/conventional-changelog/blob/master/packages/git-raw-commits/index.js#L27
|
|
102
|
+
*
|
|
103
|
+
* We will transform a string that looks like this:
|
|
104
|
+
* "deps: update all non-major dependencies ([ed1db35](https://github.com/ghiscoding/lerna-lite/commit/ed1db35>>author=Renovate Bot<<))"
|
|
105
|
+
* then extract the commit author's name and transform it into a new string that will look like below
|
|
106
|
+
* "deps: update all non-major dependencies ([ed1db35](https://github.com/ghiscoding/lerna-lite/commit/ed1db35)) (@Renovate-Bot)"
|
|
107
|
+
* @param changelogEntry - changelog entry of a version being released which can contain multiple line entries
|
|
108
|
+
* @returns
|
|
109
|
+
*/
|
|
110
|
+
function parseChangelogCommitAuthorFullName(changelogEntry, commitAuthorFullnameMessage) {
|
|
111
|
+
// to transform the string into what we want, we need to move the substring outside of the url and remove extra search tokens
|
|
112
|
+
// from this:
|
|
113
|
+
// "...ed1db35>>author=Renovate Bot<<))"
|
|
114
|
+
// into this:
|
|
115
|
+
// "...ed1db35)) (Renovate-Bot)"
|
|
116
|
+
// or as a custom message like this " by **%a**" into this:
|
|
117
|
+
// "...ed1db35)) by **Renovate-Bot**"
|
|
118
|
+
return changelogEntry.replace(/(.*)(>>author=)(.*)(<<)(.*)/g, (_, lineStart, _tokenStart, authorName, _tokenEnd, lineEnd) => {
|
|
119
|
+
// rebuild the commit string, we'll also replace any whitespaces to hypen in author's name to make it a valid "@" user ref
|
|
120
|
+
const commitMsg = `${lineStart}${lineEnd || ''}`;
|
|
121
|
+
const authorMsg = typeof commitAuthorFullnameMessage === 'string'
|
|
122
|
+
? commitAuthorFullnameMessage.replace(/%a/g, authorName || '')
|
|
123
|
+
: ` (${authorName})`;
|
|
124
|
+
return commitMsg + authorMsg;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
82
127
|
//# sourceMappingURL=update-changelog.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-changelog.js","sourceRoot":"","sources":["../../src/conventional-commits/update-changelog.ts"],"names":[],"mappings":";;;;;;AAAA,8FAAoE;AACpE,wDAA0B;AAC1B,4DAAmC;AACnC,oDAAyB;AAEzB,2CAAgE;AAChE,iEAA4D;AAC5D,mEAA6D;AAC7D,uEAAkE;AAIlE;;;;GAIG;AACI,KAAK,UAAU,eAAe,CACnC,GAAY,EACZ,IAAsC,EACtC,aAAoC;IAEpC,gBAAG,CAAC,KAAK,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IAExD,MAAM,EACJ,eAAe,EACf,QAAQ,EACR,SAAS,GAAG,GAAG,EACf,OAAO,
|
|
1
|
+
{"version":3,"file":"update-changelog.js","sourceRoot":"","sources":["../../src/conventional-commits/update-changelog.ts"],"names":[],"mappings":"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"}
|
|
@@ -126,7 +126,15 @@ export interface VersionCommandOption {
|
|
|
126
126
|
conventionalPrerelease?: boolean | string;
|
|
127
127
|
/** Add a custom message at the top of your "changelog.md" which is located in the root of your project. This option only works when using --conventional-commits. */
|
|
128
128
|
changelogHeaderMessage?: string;
|
|
129
|
-
/**
|
|
129
|
+
/**
|
|
130
|
+
* Specify if we want to include the commit author's name, when using conventional-commits with changelog.
|
|
131
|
+
* We can optionally provide a custom message or else a default format will be used.
|
|
132
|
+
*/
|
|
133
|
+
changelogIncludeCommitAuthorFullname?: boolean | string;
|
|
134
|
+
/**
|
|
135
|
+
* Add a custom message as a prefix to each new version in your "changelog.md" which is located in the root of your project.
|
|
136
|
+
* This option only works when using --conventional-commits.
|
|
137
|
+
*/
|
|
130
138
|
changelogVersionMessage?: string;
|
|
131
139
|
/** Defaults 'angular', custom conventional-changelog preset. */
|
|
132
140
|
changelogPreset?: string;
|
|
@@ -60,6 +60,7 @@ export interface UpdateChangelogOption {
|
|
|
60
60
|
changelogHeaderMessage?: string;
|
|
61
61
|
changelogVersionMessage?: string;
|
|
62
62
|
changelogPreset?: string;
|
|
63
|
+
changelogIncludeCommitAuthorFullname?: boolean | string;
|
|
63
64
|
rootPath?: string;
|
|
64
65
|
tagPrefix?: string;
|
|
65
66
|
version?: string;
|
|
@@ -189,6 +190,9 @@ export interface UpdateCollectorOptions {
|
|
|
189
190
|
forcePublish?: boolean | string[];
|
|
190
191
|
/** Ref to use when querying git, defaults to most recent annotated tag */
|
|
191
192
|
since?: string;
|
|
193
|
+
/** are we using Lerna independent mode? */
|
|
194
|
+
isIndependent?: boolean;
|
|
195
|
+
/** are we using conventional commits? */
|
|
192
196
|
conventionalCommits?: boolean;
|
|
193
197
|
conventionalGraduate?: boolean;
|
|
194
198
|
excludeDependents?: boolean;
|
|
@@ -15,7 +15,7 @@ export declare class Project {
|
|
|
15
15
|
/**
|
|
16
16
|
* @param {string} [cwd] Defaults to process.cwd()
|
|
17
17
|
*/
|
|
18
|
-
constructor(cwd
|
|
18
|
+
constructor(cwd?: string);
|
|
19
19
|
/**
|
|
20
20
|
* @param {string} [cwd] Defaults to process.cwd()
|
|
21
21
|
*/
|
|
@@ -27,7 +27,7 @@ export declare class Project {
|
|
|
27
27
|
get version(): string;
|
|
28
28
|
set version(val: string);
|
|
29
29
|
get packageConfigs(): string[];
|
|
30
|
-
get packageParentDirs():
|
|
30
|
+
get packageParentDirs(): string[];
|
|
31
31
|
get manifest(): RawManifest;
|
|
32
32
|
get licensePath(): string;
|
|
33
33
|
get fileFinder(): (fileName: string, fileMapper: any, customGlobOpts?: any) => Promise<any>;
|
package/dist/project/project.js
CHANGED
|
@@ -196,6 +196,4 @@ Project.PACKAGE_GLOB = 'packages/*';
|
|
|
196
196
|
Project.LICENSE_GLOB = 'LICEN{S,C}E{,.*}';
|
|
197
197
|
Project.PACKAGE_GLOB = 'packages/*';
|
|
198
198
|
Project.LICENSE_GLOB = 'LICEN{S,C}E{,.*}';
|
|
199
|
-
module.exports.getPackages = Project.getPackages;
|
|
200
|
-
module.exports.getPackagesSync = Project.getPackagesSync;
|
|
201
199
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA8C;AAC9C,oDAA4B;AAC5B,oDAA+C;AAC/C,8DAAqC;AACrC,oDAAyB;AACzB,gDAAwB;AACxB,kDAAyB;AACzB,oEAA0C;AAC1C,sEAA4C;AAE5C,wCAAqC;AACrC,uDAAmD;AACnD,0DAAsD;AACtD,6DAA4E;AAG5E;;;;;GAKG;AACH,MAAa,OAAO;IAOlB;;OAEG;IACH,YAAY,
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ const make_diff_predicate_1 = require("./lib/make-diff-predicate");
|
|
|
18
18
|
* @param {UpdateCollectorOptions} commandOptions
|
|
19
19
|
*/
|
|
20
20
|
function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions, gitDryRun = false) {
|
|
21
|
-
const { forcePublish, conventionalCommits, conventionalGraduate, excludeDependents } = commandOptions;
|
|
21
|
+
const { forcePublish, conventionalCommits, conventionalGraduate, excludeDependents, isIndependent } = commandOptions;
|
|
22
22
|
// If --conventional-commits and --conventional-graduate are both set, ignore --force-publish
|
|
23
23
|
const useConventionalGraduate = conventionalCommits && conventionalGraduate;
|
|
24
24
|
const forced = (0, get_packages_for_option_1.getPackagesForOption)(useConventionalGraduate ? conventionalGraduate : forcePublish);
|
|
@@ -26,9 +26,16 @@ function collectUpdates(filteredPackages, packageGraph, execOpts, commandOptions
|
|
|
26
26
|
? packageGraph
|
|
27
27
|
: new Map(filteredPackages.map(({ name }) => [name, packageGraph.get(name)]));
|
|
28
28
|
let committish = commandOptions.since;
|
|
29
|
-
|
|
29
|
+
const tagPattern = isIndependent ? '*@*' : '';
|
|
30
|
+
if ((0, has_tags_1.hasTags)(execOpts, tagPattern)) {
|
|
31
|
+
const describeOptions = {
|
|
32
|
+
...execOpts,
|
|
33
|
+
};
|
|
34
|
+
if (isIndependent) {
|
|
35
|
+
describeOptions.match = tagPattern;
|
|
36
|
+
}
|
|
30
37
|
// describe the last annotated tag in the current branch
|
|
31
|
-
const { sha, refCount, lastTagName } = (0, describe_ref_1.describeRefSync)(
|
|
38
|
+
const { sha, refCount, lastTagName } = (0, describe_ref_1.describeRefSync)(describeOptions, commandOptions.includeMergedTags, gitDryRun);
|
|
32
39
|
// TODO: warn about dirty tree?
|
|
33
40
|
if (refCount === '0' && forced.size === 0 && !committish) {
|
|
34
41
|
// no commits since previous release
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAKzB,kDAAkD;AAClD,6DAAyD;AACzD,2EAAqE;AACrE,6CAAyC;AACzC,mEAA8D;AAE9D;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,gBAA2B,EAC3B,YAA0B,EAC1B,QAAkB,EAClB,cAAsC,EACtC,SAAS,GAAG,KAAK;IAEjB,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,GAAG,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Determine if any git tags are reachable.
|
|
3
3
|
* @param {import("@lerna/child-process").ExecOpts} opts
|
|
4
|
+
* @param {string} tagPattern
|
|
4
5
|
*/
|
|
5
|
-
export declare function hasTags(opts: any): boolean;
|
|
6
|
+
export declare function hasTags(opts: any, tagPattern: string): boolean;
|
|
@@ -9,12 +9,18 @@ const child_process_1 = require("../../../child-process");
|
|
|
9
9
|
/**
|
|
10
10
|
* Determine if any git tags are reachable.
|
|
11
11
|
* @param {import("@lerna/child-process").ExecOpts} opts
|
|
12
|
+
* @param {string} tagPattern
|
|
12
13
|
*/
|
|
13
|
-
function hasTags(opts) {
|
|
14
|
+
function hasTags(opts, tagPattern) {
|
|
14
15
|
npmlog_1.default.silly('hasTags', '');
|
|
15
16
|
let result = false;
|
|
17
|
+
const args = ['tag'];
|
|
18
|
+
if (tagPattern) {
|
|
19
|
+
npmlog_1.default.verbose('hasTags', `filter for tags with '${tagPattern}' pattern`);
|
|
20
|
+
args.push('--list', tagPattern);
|
|
21
|
+
}
|
|
16
22
|
try {
|
|
17
|
-
result = !!(0, child_process_1.execSync)('git',
|
|
23
|
+
result = !!(0, child_process_1.execSync)('git', args, opts);
|
|
18
24
|
}
|
|
19
25
|
catch (err) {
|
|
20
26
|
npmlog_1.default.warn('ENOTAGS', 'No git tags were reachable from this branch!');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"has-tags.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/has-tags.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAEzB,0DAAkD;AAElD
|
|
1
|
+
{"version":3,"file":"has-tags.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/has-tags.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAEzB,0DAAkD;AAElD;;;;GAIG;AACH,SAAgB,OAAO,CAAC,IAAI,EAAE,UAAkB;IAC9C,gBAAG,CAAC,KAAK,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACzB,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAErB,IAAI,UAAU,EAAE;QACd,gBAAG,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,UAAU,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;KACjC;IAED,IAAI;QACF,MAAM,GAAG,CAAC,CAAC,IAAA,wBAAQ,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;KACxC;IAAC,OAAO,GAAQ,EAAE;QACjB,gBAAG,CAAC,IAAI,CAAC,SAAS,EAAE,8CAA8C,CAAC,CAAC;QACpE,gBAAG,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;KACnC;IAED,gBAAG,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE1C,OAAO,MAAM,CAAC;AAChB,CAAC;AApBD,0BAoBC"}
|
|
@@ -41,8 +41,12 @@ function describeRef(options = {}, includeMergedTags, gitDryRun = false) {
|
|
|
41
41
|
const promise = (0, child_process_1.exec)('git', getArgs(options, includeMergedTags), options, gitDryRun);
|
|
42
42
|
return promise.then(({ stdout } = { stdout: '' }) => {
|
|
43
43
|
const result = parse(stdout, options.cwd);
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
if (options === null || options === void 0 ? void 0 : options.match) {
|
|
45
|
+
npmlog_1.default.verbose('git-describe', '%j => %j', options === null || options === void 0 ? void 0 : options.match, stdout);
|
|
46
|
+
}
|
|
47
|
+
if (stdout) {
|
|
48
|
+
npmlog_1.default.silly('git-describe', 'parsed => %j', result);
|
|
49
|
+
}
|
|
46
50
|
return result;
|
|
47
51
|
});
|
|
48
52
|
}
|
|
@@ -54,8 +58,12 @@ exports.describeRef = describeRef;
|
|
|
54
58
|
function describeRefSync(options = {}, includeMergedTags, gitDryRun = false) {
|
|
55
59
|
const stdout = (0, child_process_1.execSync)('git', getArgs(options, includeMergedTags), options, gitDryRun);
|
|
56
60
|
const result = parse(stdout, options.cwd);
|
|
57
|
-
|
|
58
|
-
|
|
61
|
+
if (options === null || options === void 0 ? void 0 : options.match) {
|
|
62
|
+
npmlog_1.default.verbose('git-describe.sync', '%j => %j', options === null || options === void 0 ? void 0 : options.match, stdout);
|
|
63
|
+
}
|
|
64
|
+
if (stdout) {
|
|
65
|
+
npmlog_1.default.silly('git-describe', 'parsed => %j', result);
|
|
66
|
+
}
|
|
59
67
|
return result;
|
|
60
68
|
}
|
|
61
69
|
exports.describeRefSync = describeRefSync;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"describe-ref.js","sourceRoot":"","sources":["../../src/utils/describe-ref.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAyB;AAGzB,oDAAkD;AAElD;;;;GAIG;AACH,SAAS,OAAO,CAAC,OAA2B,EAAE,iBAA2B;IACvE,IAAI,IAAI,GAAG;QACT,UAAU;QACV,2CAA2C;QAC3C,UAAU;QACV,6DAA6D;QAC7D,QAAQ;QACR,0CAA0C;QAC1C,SAAS;QACT,6CAA6C;QAC7C,gBAAgB;KACjB,CAAC;IAEF,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;KACrC;IAED,IAAI,iBAAiB,EAAE;QACrB,0DAA0D;QAC1D,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,gBAAgB,CAAC,CAAC;KACvD;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAClB,UAA8B,EAAE,EAChC,iBAA2B,EAC3B,SAAS,GAAG,KAAK;IAEjB,MAAM,OAAO,GAAG,IAAA,oBAAI,EAAC,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAErF,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE;QAClD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAE1C,gBAAG,CAAC,OAAO,CAAC,cAAc,EAAE,UAAU,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"describe-ref.js","sourceRoot":"","sources":["../../src/utils/describe-ref.ts"],"names":[],"mappings":"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"}
|
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.8.0",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"typings": "dist/index.d.ts",
|
|
@@ -31,9 +31,9 @@
|
|
|
31
31
|
"npm": ">=8.0.0"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@npmcli/run-script": "^4.1.
|
|
34
|
+
"@npmcli/run-script": "^4.1.7",
|
|
35
35
|
"@octokit/plugin-enterprise-rest": "^6.0.1",
|
|
36
|
-
"@octokit/rest": "^
|
|
36
|
+
"@octokit/rest": "^19.0.3",
|
|
37
37
|
"async": "^3.2.4",
|
|
38
38
|
"chalk": "^4.1.2",
|
|
39
39
|
"clone-deep": "^4.0.1",
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"execa": "^5.1.1",
|
|
47
47
|
"fs-extra": "^10.1.0",
|
|
48
48
|
"get-stream": "^6.0.1",
|
|
49
|
-
"git-url-parse": "^
|
|
49
|
+
"git-url-parse": "^12.0.0",
|
|
50
50
|
"glob-parent": "^6.0.2",
|
|
51
51
|
"globby": "^11.1.0",
|
|
52
52
|
"graceful-fs": "^4.2.10",
|
|
@@ -60,8 +60,8 @@
|
|
|
60
60
|
"minimatch": "^5.1.0",
|
|
61
61
|
"node-fetch": "^2.6.7",
|
|
62
62
|
"npm-package-arg": "^9.1.0",
|
|
63
|
-
"npm-packlist": "^5.1.
|
|
64
|
-
"npm-registry-fetch": "^13.
|
|
63
|
+
"npm-packlist": "^5.1.1",
|
|
64
|
+
"npm-registry-fetch": "^13.3.0",
|
|
65
65
|
"npmlog": "^6.0.2",
|
|
66
66
|
"os": "^0.1.2",
|
|
67
67
|
"p-map": "^4.0.0",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
"yargs": "^17.5.1"
|
|
87
87
|
},
|
|
88
88
|
"devDependencies": {
|
|
89
|
-
"@types/async": "^3.2.
|
|
89
|
+
"@types/async": "^3.2.15",
|
|
90
90
|
"@types/clone-deep": "^4.0.1",
|
|
91
91
|
"@types/conventional-changelog-core": "^4.2.1",
|
|
92
92
|
"@types/conventional-recommended-bump": "^6.1.0",
|
|
@@ -97,17 +97,19 @@
|
|
|
97
97
|
"@types/glob-parent": "^5.1.1",
|
|
98
98
|
"@types/inquirer": "^8.2.1",
|
|
99
99
|
"@types/load-json-file": "^5.1.0",
|
|
100
|
+
"@types/minimatch": "^3.0.5",
|
|
100
101
|
"@types/npm-package-arg": "^6.1.1",
|
|
101
102
|
"@types/p-map": "^2.0.0",
|
|
102
103
|
"@types/semver": "^7.3.10",
|
|
103
104
|
"@types/strong-log-transformer": "^1.0.0",
|
|
104
105
|
"@types/write-file-atomic": "^4.0.0",
|
|
105
106
|
"@types/write-json-file": "^3.2.1",
|
|
106
|
-
"@types/write-pkg": "^4.0.0"
|
|
107
|
+
"@types/write-pkg": "^4.0.0",
|
|
108
|
+
"yargs-parser": "^21.0.1"
|
|
107
109
|
},
|
|
108
110
|
"funding": {
|
|
109
111
|
"type": "ko_fi",
|
|
110
112
|
"url": "https://ko-fi.com/ghiscoding"
|
|
111
113
|
},
|
|
112
|
-
"gitHead": "
|
|
114
|
+
"gitHead": "ada7348275854aacb334f8d9650f5f0f2b4318f2"
|
|
113
115
|
}
|