@lerna-lite/core 4.3.0 → 4.4.1
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.js +2 -2
- package/dist/command.js.map +1 -1
- package/dist/models/command-options.d.ts +2 -2
- package/dist/models/interfaces.d.ts +3 -1
- package/dist/package-graph/lib/cyclic-package-graph-node.js.map +1 -1
- package/dist/package-graph/package-graph.d.ts +4 -5
- package/dist/package-graph/package-graph.js +13 -14
- package/dist/package-graph/package-graph.js.map +1 -1
- package/dist/project/project.js +2 -10
- package/dist/project/project.js.map +1 -1
- package/dist/utils/catalog-utils.d.ts +7 -0
- package/dist/utils/catalog-utils.js +53 -0
- package/dist/utils/catalog-utils.js.map +1 -0
- package/dist/utils/collect-updates/collect-updates.js +1 -1
- package/dist/utils/collect-updates/collect-updates.js.map +1 -1
- package/dist/utils/collect-updates/lib/make-diff-predicate.d.ts +2 -2
- package/dist/utils/collect-updates/lib/make-diff-predicate.js +24 -32
- package/dist/utils/collect-updates/lib/make-diff-predicate.js.map +1 -1
- package/dist/utils/object-utils.d.ts +1 -0
- package/dist/utils/object-utils.js +13 -0
- package/dist/utils/object-utils.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/dist/utils/run-topologically.d.ts +1 -1
- package/dist/utils/run-topologically.js +2 -2
- package/dist/utils/run-topologically.js.map +1 -1
- package/package.json +4 -4
package/dist/command.js
CHANGED
|
@@ -186,9 +186,9 @@ export class Command {
|
|
|
186
186
|
chain = chain.then(() => this.project.getPackages());
|
|
187
187
|
chain = chain.then((packages) => {
|
|
188
188
|
const { graphType } = this.options.command?.[this.commandName] ?? {};
|
|
189
|
-
this.packageGraph = new PackageGraph(packages || [], graphType ?? 'allDependencies');
|
|
189
|
+
this.packageGraph = new PackageGraph(packages || [], graphType ?? 'allDependencies', 'auto', this.options.npmClient);
|
|
190
190
|
return getFilteredPackages(this.packageGraph, this.execOpts, this.options).then((filteredPackages) => {
|
|
191
|
-
this.packageGraph = new PackageGraph(filteredPackages || [], graphType ?? 'allDependencies');
|
|
191
|
+
this.packageGraph = new PackageGraph(filteredPackages || [], graphType ?? 'allDependencies', 'auto', this.options.npmClient);
|
|
192
192
|
});
|
|
193
193
|
});
|
|
194
194
|
}
|
package/dist/command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../src/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ArboristLoadOption, ChangelogPresetOptions, RemoteClientType } from './interfaces.js';
|
|
1
|
+
import type { ArboristLoadOption, ChangelogPresetOptions, NpmClient, RemoteClientType } from './interfaces.js';
|
|
2
2
|
export interface ChangedCommandOption {
|
|
3
3
|
conventionalCommits?: boolean;
|
|
4
4
|
conventionalGraduate: boolean | string | string[];
|
|
@@ -146,7 +146,7 @@ export interface PublishCommandOption extends VersionCommandOption {
|
|
|
146
146
|
}
|
|
147
147
|
export interface RunCommandOption {
|
|
148
148
|
dryRun?: boolean;
|
|
149
|
-
npmClient?:
|
|
149
|
+
npmClient?: NpmClient;
|
|
150
150
|
stream?: boolean;
|
|
151
151
|
parallel?: boolean;
|
|
152
152
|
noBail?: boolean;
|
|
@@ -116,6 +116,7 @@ export interface QueryGraphConfig {
|
|
|
116
116
|
localDependencies?: 'auto' | 'force' | 'explicit';
|
|
117
117
|
rejectCycles?: boolean;
|
|
118
118
|
premajorVersionBump?: 'default' | 'force-patch';
|
|
119
|
+
npmClient?: NpmClient;
|
|
119
120
|
}
|
|
120
121
|
export interface TopologicalConfig extends QueryGraphConfig {
|
|
121
122
|
concurrency?: number;
|
|
@@ -124,6 +125,7 @@ export type NpaResolveResult = (npa.FileResult | npa.HostedGitResult | npa.URLRe
|
|
|
124
125
|
catalogSpec?: string;
|
|
125
126
|
workspaceSpec?: string;
|
|
126
127
|
};
|
|
128
|
+
export type NpmClient = 'npm' | 'pnpm' | 'yarn' | 'bun';
|
|
127
129
|
export interface LernaConfig {
|
|
128
130
|
command?: {
|
|
129
131
|
init?: InitCommandOption;
|
|
@@ -134,7 +136,7 @@ export interface LernaConfig {
|
|
|
134
136
|
describeTag?: string;
|
|
135
137
|
packages?: string[];
|
|
136
138
|
loglevel?: 'silent' | 'error' | 'warn' | 'notice' | 'http' | 'timing' | 'info' | 'verbose' | 'silly';
|
|
137
|
-
npmClient?:
|
|
139
|
+
npmClient?: NpmClient;
|
|
138
140
|
useWorkspaces?: boolean;
|
|
139
141
|
version: string;
|
|
140
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cyclic-package-graph-node.js","sourceRoot":"","sources":["../../../src/package-graph/lib/cyclic-package-graph-node.ts"],"names":[],"mappings":"AAEA,IAAI,mBAAmB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cyclic-package-graph-node.js","sourceRoot":"","sources":["../../../src/package-graph/lib/cyclic-package-graph-node.ts"],"names":[],"mappings":"AAEA,IAAI,mBAAmB,GAAG,CAAC,CAAC;AAU5B,MAAM,OAAO,sBAAuB,SAAQ,GAAsD;IAKhG;QACE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,mBAAmB,IAAI,CAAC,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAqD,CAAC;QACtF,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAqD,CAAC;IACtF,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,QAAQ;QACN,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAC5C,IAA+B,CAAC,OAAO,CAAC,CAAC,CAAC,kBAAkB,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CACtF,CAAC;QAGF,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAErB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAKD,OAAO;QACL,MAAM,MAAM,GAAuB,EAAE,CAAC;QAEtC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACjC,IAAK,IAA+B,CAAC,OAAO,EAAE,CAAC;gBAC7C,MAAM,CAAC,IAAI,CAAC,GAAI,IAA+B,CAAC,OAAO,EAAE,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,IAAwB,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAQD,QAAQ,CAAC,IAAY;QACnB,KAAK,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;YAC9C,IAAK,WAAsC,CAAC,OAAO,EAAE,CAAC;gBACpD,IAAK,WAAsC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3D,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;iBAAM,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAOD,MAAM,CAAC,IAA+C;QACpD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAElB,KAAK,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACtE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAClE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;IAMD,MAAM,CAAC,aAAwD;QAE7D,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAGlD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;CACF"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
|
+
import type { NpmClient } from '../models/interfaces.js';
|
|
1
2
|
import type { Package } from '../package.js';
|
|
2
3
|
import { CyclicPackageGraphNode } from './lib/cyclic-package-graph-node.js';
|
|
3
4
|
import { PackageGraphNode } from './lib/package-graph-node.js';
|
|
4
5
|
export declare const YARN_PATCH_PROTOCOL_REG_EXP: RegExp;
|
|
5
6
|
export declare class PackageGraph extends Map<string, PackageGraphNode> {
|
|
6
7
|
hasWorkspaceCatalog: boolean;
|
|
7
|
-
|
|
8
|
+
npmClient: NpmClient;
|
|
9
|
+
constructor(packages: Package[], graphType?: 'allDependencies' | 'dependencies', localDependencies?: boolean | 'auto' | 'force' | 'explicit' | 'forceLocal', client?: NpmClient);
|
|
8
10
|
get rawPackageList(): Package[];
|
|
9
11
|
addDependencies(filteredPackages: Package[]): Package[];
|
|
10
12
|
addDependents(filteredPackages: Package[]): Package[];
|
|
11
|
-
readWorkspaceCatalogConfig():
|
|
12
|
-
catalog: any;
|
|
13
|
-
catalogs: any;
|
|
14
|
-
};
|
|
13
|
+
readWorkspaceCatalogConfig(npmClient: NpmClient): import("../utils/catalog-utils.js").CatalogConfig;
|
|
15
14
|
extendList(packageList: Package[], nodeProp: 'localDependencies' | 'localDependents'): Package[];
|
|
16
15
|
collapseCycles(rejectCycles?: boolean): Set<CyclicPackageGraphNode>;
|
|
17
16
|
prune(...candidates: PackageGraphNode[]): void;
|
|
@@ -1,20 +1,19 @@
|
|
|
1
|
-
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
-
import { join } from 'node:path';
|
|
3
1
|
import { log } from '@lerna-lite/npmlog';
|
|
4
2
|
import npa from 'npm-package-arg';
|
|
5
|
-
import {
|
|
3
|
+
import { extractCatalogConfigFromPkg, extractCatalogConfigFromYaml } from '../utils/catalog-utils.js';
|
|
6
4
|
import { ValidationError } from '../validation-error.js';
|
|
7
5
|
import { CyclicPackageGraphNode } from './lib/cyclic-package-graph-node.js';
|
|
8
6
|
import { PackageGraphNode } from './lib/package-graph-node.js';
|
|
9
7
|
import { reportCycles } from './lib/report-cycles.js';
|
|
10
8
|
export const YARN_PATCH_PROTOCOL_REG_EXP = new RegExp(`patch:(.*)@npm%3A(.*)#~\\/.yarn\\/patches\\/(.*).patch`);
|
|
11
9
|
export class PackageGraph extends Map {
|
|
12
|
-
constructor(packages, graphType = 'allDependencies', localDependencies = 'auto') {
|
|
10
|
+
constructor(packages, graphType = 'allDependencies', localDependencies = 'auto', client = 'npm') {
|
|
13
11
|
if (localDependencies === true || localDependencies === 'forceLocal') {
|
|
14
12
|
localDependencies = 'force';
|
|
15
13
|
}
|
|
16
14
|
super(packages.map((pkg) => [pkg?.name ?? '', new PackageGraphNode(pkg)]));
|
|
17
15
|
this.hasWorkspaceCatalog = false;
|
|
16
|
+
this.npmClient = 'npm';
|
|
18
17
|
if (packages.length !== this.size) {
|
|
19
18
|
const seen = new Map();
|
|
20
19
|
for (const { name, location } of packages) {
|
|
@@ -31,7 +30,8 @@ export class PackageGraph extends Map {
|
|
|
31
30
|
}
|
|
32
31
|
}
|
|
33
32
|
}
|
|
34
|
-
|
|
33
|
+
this.npmClient = client;
|
|
34
|
+
const { catalog, catalogs } = this.readWorkspaceCatalogConfig(this.npmClient);
|
|
35
35
|
if (Object.keys(catalog).length > 0 || Object.keys(catalogs).length > 0) {
|
|
36
36
|
this.hasWorkspaceCatalog = true;
|
|
37
37
|
}
|
|
@@ -99,15 +99,14 @@ export class PackageGraph extends Map {
|
|
|
99
99
|
addDependents(filteredPackages) {
|
|
100
100
|
return this.extendList(filteredPackages, 'localDependents');
|
|
101
101
|
}
|
|
102
|
-
readWorkspaceCatalogConfig() {
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
};
|
|
102
|
+
readWorkspaceCatalogConfig(npmClient) {
|
|
103
|
+
if (npmClient === 'pnpm') {
|
|
104
|
+
return extractCatalogConfigFromYaml();
|
|
105
|
+
}
|
|
106
|
+
else if (npmClient === 'bun') {
|
|
107
|
+
return extractCatalogConfigFromPkg();
|
|
108
|
+
}
|
|
109
|
+
return { catalog: {}, catalogs: {} };
|
|
111
110
|
}
|
|
112
111
|
extendList(packageList, nodeProp) {
|
|
113
112
|
const search = new Set(packageList.map(({ name }) => this.get(name)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"package-graph.js","sourceRoot":"","sources":["../../src/package-graph/package-graph.ts"],"names":[],"mappings":"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"}
|
package/dist/project/project.js
CHANGED
|
@@ -10,6 +10,7 @@ import pMap from 'p-map';
|
|
|
10
10
|
import { globSync } from 'tinyglobby';
|
|
11
11
|
import { writeJsonFile } from 'write-json-file';
|
|
12
12
|
import { Package } from '../package.js';
|
|
13
|
+
import { looselyJsonParse } from '../utils/object-utils.js';
|
|
13
14
|
import { ValidationError } from '../validation-error.js';
|
|
14
15
|
import { applyExtends } from './lib/apply-extends.js';
|
|
15
16
|
import { makeFileFinder, makeSyncFileFinder } from './lib/make-file-finder.js';
|
|
@@ -160,16 +161,7 @@ export class Project {
|
|
|
160
161
|
if (!/.*lerna\.json[c|5]?$/gi.test(filepath)) {
|
|
161
162
|
return defaultLoaders['.json'](filepath, content);
|
|
162
163
|
}
|
|
163
|
-
|
|
164
|
-
return JSON5.parse(content);
|
|
165
|
-
}
|
|
166
|
-
catch (err) {
|
|
167
|
-
if (err instanceof Error) {
|
|
168
|
-
err.name = 'JSONError';
|
|
169
|
-
err.message = `Error in: ${filepath}\n${err.message}`;
|
|
170
|
-
}
|
|
171
|
-
throw err;
|
|
172
|
-
}
|
|
164
|
+
return looselyJsonParse(content, filepath);
|
|
173
165
|
}
|
|
174
166
|
serializeConfig() {
|
|
175
167
|
if (this.rootConfigLocation.endsWith('lerna.json5')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../src/project/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export type CatalogConfig = {
|
|
2
|
+
catalog: Record<string, string>;
|
|
3
|
+
catalogs: Record<string, Record<string, string>>;
|
|
4
|
+
};
|
|
5
|
+
export declare function extractCatalogConfigFromYaml(yamlContent?: string): CatalogConfig;
|
|
6
|
+
export declare function extractCatalogConfigFromPkg(pkgContent?: string): CatalogConfig;
|
|
7
|
+
export declare function diffCatalogs(prev: CatalogConfig, curr: CatalogConfig): Set<string>;
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { parse as yamlParse } from 'yaml';
|
|
4
|
+
import { looselyJsonParse } from './object-utils.js';
|
|
5
|
+
export function extractCatalogConfigFromYaml(yamlContent) {
|
|
6
|
+
let fileContent = yamlContent || '';
|
|
7
|
+
if (!yamlContent) {
|
|
8
|
+
const yamlPath = join(process.cwd(), 'pnpm-workspace.yaml');
|
|
9
|
+
if (existsSync(yamlPath)) {
|
|
10
|
+
fileContent = readFileSync(yamlPath, 'utf8');
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
const config = yamlParse(fileContent) || {};
|
|
14
|
+
return {
|
|
15
|
+
catalog: config.catalog || {},
|
|
16
|
+
catalogs: config.catalogs || {},
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
export function extractCatalogConfigFromPkg(pkgContent) {
|
|
20
|
+
let fileContent = pkgContent || '';
|
|
21
|
+
if (!pkgContent) {
|
|
22
|
+
const pkgPath = join(process.cwd(), 'package.json');
|
|
23
|
+
if (existsSync(pkgPath)) {
|
|
24
|
+
fileContent = readFileSync(pkgPath, 'utf8');
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
const pkg = looselyJsonParse(fileContent) || {};
|
|
28
|
+
const ws = pkg.workspaces || {};
|
|
29
|
+
return {
|
|
30
|
+
catalog: ws.catalog || {},
|
|
31
|
+
catalogs: ws.catalogs || {},
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export function diffCatalogs(prev, curr) {
|
|
35
|
+
const changed = new Set();
|
|
36
|
+
const compareDeps = (prevDeps = {}, currDeps = {}) => {
|
|
37
|
+
const allDeps = new Set([...Object.keys(prevDeps), ...Object.keys(currDeps)]);
|
|
38
|
+
for (const dep of allDeps) {
|
|
39
|
+
if (!(dep in prevDeps) || !(dep in currDeps) || prevDeps[dep] !== currDeps[dep]) {
|
|
40
|
+
changed.add(dep);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
compareDeps(prev.catalog, curr.catalog);
|
|
45
|
+
const prevCatalogs = prev.catalogs || {};
|
|
46
|
+
const currCatalogs = curr.catalogs || {};
|
|
47
|
+
const allCatalogNames = new Set([...Object.keys(prevCatalogs), ...Object.keys(currCatalogs)]);
|
|
48
|
+
for (const catName of allCatalogNames) {
|
|
49
|
+
compareDeps(prevCatalogs[catName], currCatalogs[catName]);
|
|
50
|
+
}
|
|
51
|
+
return changed;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=catalog-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"catalog-utils.js","sourceRoot":"","sources":["../../src/utils/catalog-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export function collectUpdates(filteredPackages, packageGraph, execOpts, command
|
|
|
54
54
|
log.info('', `Looking for changed packages since ${committish}`);
|
|
55
55
|
const changedCatalogDeps = [];
|
|
56
56
|
if (prevTag && packageGraph.hasWorkspaceCatalog) {
|
|
57
|
-
changedCatalogDeps.push(...diffWorkspaceCatalog(prevTag));
|
|
57
|
+
changedCatalogDeps.push(...diffWorkspaceCatalog(prevTag, packageGraph.npmClient));
|
|
58
58
|
}
|
|
59
59
|
const hasDiff = makeDiffPredicate(committish, execOpts, commandOptions.ignoreChanges, changedCatalogDeps, {
|
|
60
60
|
independentSubpackages,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"collect-updates.js","sourceRoot":"","sources":["../../../src/utils/collect-updates/collect-updates.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ExecOpts } from '../../../models/interfaces.js';
|
|
1
|
+
import type { ExecOpts, NpmClient } from '../../../models/interfaces.js';
|
|
2
2
|
import { type PackageGraphNode } from '../../../package-graph/lib/package-graph-node.js';
|
|
3
3
|
export declare function makeDiffPredicate(committish: string, execOpts: ExecOpts, ignorePatterns: string[] | undefined, changedCatalogDeps: string[] | undefined, diffOpts: {
|
|
4
4
|
independentSubpackages?: boolean;
|
|
5
5
|
}): (node: PackageGraphNode) => boolean;
|
|
6
|
-
export declare function diffWorkspaceCatalog(prevTag: string): string[];
|
|
6
|
+
export declare function diffWorkspaceCatalog(prevTag: string, npmClient: NpmClient): string[];
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { readFileSync } from 'node:fs';
|
|
1
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import { dirname, join, relative } from 'node:path';
|
|
3
3
|
import { log } from '@lerna-lite/npmlog';
|
|
4
4
|
import { filter as minimatchFilter } from 'minimatch';
|
|
5
5
|
import slash from 'slash';
|
|
6
6
|
import { globSync } from 'tinyglobby';
|
|
7
|
-
import { parse } from 'yaml';
|
|
8
7
|
import { execSync } from '../../../child-process.js';
|
|
8
|
+
import { diffCatalogs, extractCatalogConfigFromPkg, extractCatalogConfigFromYaml, } from '../../catalog-utils.js';
|
|
9
9
|
export function makeDiffPredicate(committish, execOpts, ignorePatterns = [], changedCatalogDeps = [], diffOpts) {
|
|
10
10
|
const ignoreFilters = new Set(ignorePatterns.map((p) => minimatchFilter(`!${p}`, {
|
|
11
11
|
matchBase: true,
|
|
@@ -63,40 +63,32 @@ function diffSinceIn(committish, location, execOpts, diffOpts) {
|
|
|
63
63
|
log.silly('checking diff', formattedLocation);
|
|
64
64
|
return execSync('git', args, execOpts);
|
|
65
65
|
}
|
|
66
|
-
export function diffWorkspaceCatalog(prevTag) {
|
|
67
|
-
const changedDependencies = [];
|
|
66
|
+
export function diffWorkspaceCatalog(prevTag, npmClient) {
|
|
68
67
|
try {
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
if (
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
89
|
-
else if (line.startsWith('+ catalog.') && line.includes(':')) {
|
|
90
|
-
const key = line.substring(10).split(':')[0].trim();
|
|
91
|
-
if (key && !changedDependencies.includes(key)) {
|
|
92
|
-
changedDependencies.push(key);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
});
|
|
68
|
+
const cwd = process.cwd();
|
|
69
|
+
const yamlPath = join(cwd, 'pnpm-workspace.yaml');
|
|
70
|
+
const jsonPath = join(cwd, 'package.json');
|
|
71
|
+
let prevConfig = { catalog: {}, catalogs: {} };
|
|
72
|
+
let currConfig = { catalog: {}, catalogs: {} };
|
|
73
|
+
if (npmClient === 'pnpm' && existsSync(yamlPath)) {
|
|
74
|
+
const prevYamlStr = execSync(`git show ${prevTag}:pnpm-workspace.yaml`);
|
|
75
|
+
const currYamlStr = readFileSync(yamlPath, 'utf8');
|
|
76
|
+
prevConfig = extractCatalogConfigFromYaml(prevYamlStr);
|
|
77
|
+
currConfig = extractCatalogConfigFromYaml(currYamlStr);
|
|
78
|
+
}
|
|
79
|
+
else if (npmClient === 'bun' && existsSync(jsonPath)) {
|
|
80
|
+
const prevJsonStr = execSync(`git show ${prevTag}:package.json`);
|
|
81
|
+
const currJsonStr = readFileSync(jsonPath, 'utf8');
|
|
82
|
+
prevConfig = extractCatalogConfigFromPkg(prevJsonStr);
|
|
83
|
+
currConfig = extractCatalogConfigFromPkg(currJsonStr);
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
return [];
|
|
96
87
|
}
|
|
88
|
+
return Array.from(diffCatalogs(prevConfig, currConfig));
|
|
97
89
|
}
|
|
98
90
|
catch {
|
|
91
|
+
return [];
|
|
99
92
|
}
|
|
100
|
-
return changedDependencies;
|
|
101
93
|
}
|
|
102
94
|
//# sourceMappingURL=make-diff-predicate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make-diff-predicate.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/make-diff-predicate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"make-diff-predicate.js","sourceRoot":"","sources":["../../../../src/utils/collect-updates/lib/make-diff-predicate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export declare function deleteComplexObjectProp(object: any, path: string, sourceName?: string): any;
|
|
2
2
|
export declare function getComplexObjectValue<T>(object: any, path: string): T;
|
|
3
3
|
export declare function isEmpty(obj: object): boolean;
|
|
4
|
+
export declare function looselyJsonParse(content: string, filepath?: string): any;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { log } from '@lerna-lite/npmlog';
|
|
2
|
+
import JSON5 from 'json5';
|
|
2
3
|
export function deleteComplexObjectProp(object, path, sourceName) {
|
|
3
4
|
if (!object || !path) {
|
|
4
5
|
return object;
|
|
@@ -24,4 +25,16 @@ export function getComplexObjectValue(object, path) {
|
|
|
24
25
|
export function isEmpty(obj) {
|
|
25
26
|
return !obj || Object.keys(obj).length === 0;
|
|
26
27
|
}
|
|
28
|
+
export function looselyJsonParse(content, filepath = '') {
|
|
29
|
+
try {
|
|
30
|
+
return JSON5.parse(content || '{}');
|
|
31
|
+
}
|
|
32
|
+
catch (err) {
|
|
33
|
+
if (err instanceof Error) {
|
|
34
|
+
err.name = 'JSONError';
|
|
35
|
+
err.message = `Error in: ${filepath}\n${err.message}`;
|
|
36
|
+
}
|
|
37
|
+
throw err;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
27
40
|
//# sourceMappingURL=object-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../src/utils/object-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"object-utils.js","sourceRoot":"","sources":["../../src/utils/object-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,MAAM,UAAU,uBAAuB,CAAC,MAAW,EAAE,IAAY,EAAE,UAAmB;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAEvC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;QAChC,IAAI,QAAQ,KAAK,SAAS,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7E,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;YACjB,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,IAAI,gBAAgB,UAAU,IAAI,KAAK,GAAG,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACH,CAAC,EAAE,MAAM,CAAC,CAAC;AACb,CAAC;AAUD,MAAM,UAAU,qBAAqB,CAAI,MAAW,EAAE,IAAY;IAChE,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;AACpE,CAAC;AAMD,MAAM,UAAU,OAAO,CAAC,GAAW;IACjC,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC/C,CAAC;AAQD,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,QAAQ,GAAG,EAAE;IAC7D,IAAI,CAAC;QACH,OAAO,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YACzB,GAAG,CAAC,IAAI,GAAG,WAAW,CAAC;YACvB,GAAG,CAAC,OAAO,GAAG,aAAa,QAAQ,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC;QACxD,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -6,7 +6,7 @@ export declare class QueryGraph {
|
|
|
6
6
|
graph: PackageGraph;
|
|
7
7
|
cycles: Set<any>;
|
|
8
8
|
static toposort(packages: Package[], options?: QueryGraphConfig): Package[];
|
|
9
|
-
constructor(packages: Package[], { graphType, localDependencies, rejectCycles }?: QueryGraphConfig);
|
|
9
|
+
constructor(packages: Package[], { graphType, localDependencies, rejectCycles, npmClient }?: QueryGraphConfig);
|
|
10
10
|
_getNextLeaf(): PackageGraphNode[];
|
|
11
11
|
_getNextCycle(): any;
|
|
12
12
|
getAvailablePackages(): PackageGraphNode[];
|
|
@@ -13,8 +13,8 @@ export class QueryGraph {
|
|
|
13
13
|
}
|
|
14
14
|
return result;
|
|
15
15
|
}
|
|
16
|
-
constructor(packages, { graphType = 'allDependencies', localDependencies = 'auto', rejectCycles } = {}) {
|
|
17
|
-
this.graph = new PackageGraph(packages, graphType, localDependencies);
|
|
16
|
+
constructor(packages, { graphType = 'allDependencies', localDependencies = 'auto', rejectCycles, npmClient } = {}) {
|
|
17
|
+
this.graph = new PackageGraph(packages, graphType, localDependencies, npmClient);
|
|
18
18
|
this.cycles = this.graph.collapseCycles(rejectCycles);
|
|
19
19
|
}
|
|
20
20
|
_getNextLeaf() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-graph.js","sourceRoot":"","sources":["../../src/utils/query-graph.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAKjE,MAAM,OAAO,UAAU;IAYrB,MAAM,CAAC,QAAQ,CAAC,QAAmB,EAAE,OAA0B;QAC7D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAGzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAED,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAMD,YACE,QAAmB,EACnB,EAAE,SAAS,GAAG,iBAAiB,EAAE,iBAAiB,GAAG,MAAM,EAAE,YAAY,KAAK,EAAsB;
|
|
1
|
+
{"version":3,"file":"query-graph.js","sourceRoot":"","sources":["../../src/utils/query-graph.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAKjE,MAAM,OAAO,UAAU;IAYrB,MAAM,CAAC,QAAQ,CAAC,QAAmB,EAAE,OAA0B;QAC7D,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,MAAM,GAAc,EAAE,CAAC;QAE7B,IAAI,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QAEzC,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAGzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACtB,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAED,KAAK,GAAG,KAAK,CAAC,oBAAoB,EAAE,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAMD,YACE,QAAmB,EACnB,EAAE,SAAS,GAAG,iBAAiB,EAAE,iBAAiB,GAAG,MAAM,EAAE,YAAY,EAAE,SAAS,KAAK,EAAsB;QAG/G,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAC,QAAQ,EAAE,SAA+C,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;QAGvH,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,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,CAAC;YACX,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE1B,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,oBAAoB;QAElB,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAE9C,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAC;QAC3B,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;IAC9B,CAAC;IAKD,WAAW,CAAC,IAAY;QACtB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAKD,UAAU,CAAC,aAA+B;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEjC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChC,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { TopologicalConfig } from '../models/interfaces.js';
|
|
2
2
|
import type { Package } from '../package.js';
|
|
3
|
-
export declare function runTopologically<T = any>(packages: Package[], runner: (pkg: Package) => Promise<T>, { concurrency, graphType, rejectCycles }?: TopologicalConfig): Promise<unknown>;
|
|
3
|
+
export declare function runTopologically<T = any>(packages: Package[], runner: (pkg: Package) => Promise<T>, { concurrency, graphType, rejectCycles, npmClient }?: TopologicalConfig): Promise<unknown>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import PQueue from 'p-queue';
|
|
2
2
|
import { QueryGraph } from './query-graph.js';
|
|
3
|
-
export function runTopologically(packages, runner, { concurrency, graphType, rejectCycles } = {}) {
|
|
3
|
+
export function runTopologically(packages, runner, { concurrency, graphType, rejectCycles, npmClient = 'npm' } = {}) {
|
|
4
4
|
const queue = new PQueue({ concurrency });
|
|
5
|
-
const graph = new QueryGraph(packages, { graphType, rejectCycles });
|
|
5
|
+
const graph = new QueryGraph(packages, { graphType, rejectCycles, npmClient });
|
|
6
6
|
return new Promise((resolve, reject) => {
|
|
7
7
|
const returnValues = [];
|
|
8
8
|
const queueNextAvailablePackages = () => graph.getAvailablePackages().forEach(({ pkg, name }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-topologically.js","sourceRoot":"","sources":["../../src/utils/run-topologically.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAK7B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAW9C,MAAM,UAAU,gBAAgB,CAC9B,QAAmB,EACnB,MAAoC,EACpC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,KAAK,EAAuB;
|
|
1
|
+
{"version":3,"file":"run-topologically.js","sourceRoot":"","sources":["../../src/utils/run-topologically.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,SAAS,CAAC;AAK7B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAW9C,MAAM,UAAU,gBAAgB,CAC9B,QAAmB,EACnB,MAAoC,EACpC,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,GAAG,KAAK,KAAK,EAAuB;IAErF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC,CAAC;IAE/E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,YAAY,GAAU,EAAE,CAAC;QAE/B,MAAM,0BAA0B,GAAG,GAAG,EAAE,CACtC,KAAK,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE;YACrD,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAExB,KAAK;iBACF,GAAG,CAAC,GAAG,EAAE,CACR,MAAM,CAAC,GAAG,CAAC;iBACR,IAAI,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC9C,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAkC,CAAC,CAAC;iBAChE,IAAI,CAAC,GAAG,EAAE,CAAC,0BAA0B,EAAE,CAAC,CAC5C;iBACA,KAAK,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;QAEL,0BAA0B,EAAE,CAAC;QAE7B,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;AACL,CAAC"}
|
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": "4.
|
|
4
|
+
"version": "4.4.1",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"glob-parent": "^6.0.2",
|
|
45
45
|
"json5": "^2.2.3",
|
|
46
46
|
"load-json-file": "^7.0.1",
|
|
47
|
-
"minimatch": "^10.0.
|
|
47
|
+
"minimatch": "^10.0.3",
|
|
48
48
|
"multimatch": "^7.0.0",
|
|
49
49
|
"npm-package-arg": "^12.0.2",
|
|
50
50
|
"p-map": "^7.0.3",
|
|
@@ -58,11 +58,11 @@
|
|
|
58
58
|
"write-file-atomic": "^6.0.0",
|
|
59
59
|
"write-json-file": "^6.0.0",
|
|
60
60
|
"write-package": "^7.1.0",
|
|
61
|
-
"yaml": "2.8.0"
|
|
61
|
+
"yaml": "^2.8.0"
|
|
62
62
|
},
|
|
63
63
|
"funding": {
|
|
64
64
|
"type": "ko_fi",
|
|
65
65
|
"url": "https://ko-fi.com/ghiscoding"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "2d6ac0279b319fc29ddac230b0570c8a4ee4241a"
|
|
68
68
|
}
|