@aztec/cli 0.13.1 → 0.14.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/dest/github.d.ts +4 -0
- package/dest/github.d.ts.map +1 -0
- package/dest/github.js +4 -0
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +22 -4
- package/dest/unbox.d.ts.map +1 -1
- package/dest/unbox.js +2 -4
- package/dest/update/common.d.ts +17 -0
- package/dest/update/common.d.ts.map +1 -0
- package/dest/update/common.js +2 -0
- package/dest/update/noir.d.ts +10 -0
- package/dest/update/noir.d.ts.map +1 -0
- package/dest/update/noir.js +63 -0
- package/dest/update/npm.d.ts +32 -0
- package/dest/update/npm.d.ts.map +1 -0
- package/dest/update/npm.js +106 -0
- package/dest/update/update.d.ts +3 -0
- package/dest/update/update.d.ts.map +1 -0
- package/dest/update/update.js +93 -0
- package/dest/utils.d.ts +6 -0
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +27 -2
- package/package.json +9 -8
- package/src/github.ts +3 -0
- package/src/index.ts +25 -3
- package/src/unbox.ts +2 -3
- package/src/update/common.ts +16 -0
- package/src/update/noir.ts +79 -0
- package/src/update/npm.ts +129 -0
- package/src/update/update.ts +126 -0
- package/src/utils.ts +29 -1
package/dest/github.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../src/github.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,kBAAkB,CAAC;AAC5C,eAAO,MAAM,WAAW,mBAAmB,CAAC;AAC5C,eAAO,MAAM,iBAAiB,mBAAmB,CAAC"}
|
package/dest/github.js
ADDED
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export const GITHUB_OWNER = 'AztecProtocol';
|
|
2
|
+
export const GITHUB_REPO = 'aztec-packages';
|
|
3
|
+
export const GITHUB_TAG_PREFIX = 'aztec-packages';
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0aHViLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2dpdGh1Yi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxZQUFZLEdBQUcsZUFBZSxDQUFDO0FBQzVDLE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQztBQUM1QyxNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FBRyxnQkFBZ0IsQ0FBQyJ9
|
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAO3D,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAsC5C;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAopBxE"}
|
package/dest/index.js
CHANGED
|
@@ -13,7 +13,9 @@ import { format } from 'util';
|
|
|
13
13
|
import { mnemonicToAccount } from 'viem/accounts';
|
|
14
14
|
import { createCompatibleClient } from './client.js';
|
|
15
15
|
import { encodeArgs, parseStructString } from './encoding.js';
|
|
16
|
+
import { GITHUB_TAG_PREFIX } from './github.js';
|
|
16
17
|
import { unboxContract } from './unbox.js';
|
|
18
|
+
import { update } from './update/update.js';
|
|
17
19
|
import { deployAztecContracts, getContractArtifact, getExampleContractArtifacts, getFunctionArtifact, getTxSender, parseAztecAddress, parseEthereumAddress, parseField, parseFields, parseOptionalAztecAddress, parseOptionalInteger, parseOptionalLogId, parseOptionalSelector, parseOptionalTxHash, parsePartialAddress, parsePrivateKey, parsePublicKey, parseSaltFromHexString, parseTxHash, prepTx, } from './utils.js';
|
|
18
20
|
const accountCreationSalt = Fr.ZERO;
|
|
19
21
|
const { ETHEREUM_HOST = 'http://localhost:8545', PRIVATE_KEY, API_KEY } = process.env;
|
|
@@ -26,8 +28,8 @@ const { ETHEREUM_HOST = 'http://localhost:8545', PRIVATE_KEY, API_KEY } = proces
|
|
|
26
28
|
export function getProgram(log, debugLogger) {
|
|
27
29
|
const program = new Command();
|
|
28
30
|
const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../package.json');
|
|
29
|
-
const
|
|
30
|
-
program.name('aztec-cli').description('CLI for interacting with Aztec.').version(
|
|
31
|
+
const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
|
|
32
|
+
program.name('aztec-cli').description('CLI for interacting with Aztec.').version(cliVersion);
|
|
31
33
|
const pxeOption = new Option('-u, --rpc-url <string>', 'URL of the PXE')
|
|
32
34
|
.env('PXE_URL')
|
|
33
35
|
.default('http://localhost:8080')
|
|
@@ -146,6 +148,11 @@ export function getProgram(log, debugLogger) {
|
|
|
146
148
|
const contractArtifact = await getContractArtifact(artifactPath, log);
|
|
147
149
|
const constructorArtifact = contractArtifact.functions.find(({ name }) => name === 'constructor');
|
|
148
150
|
const client = await createCompatibleClient(rpcUrl, debugLogger);
|
|
151
|
+
const nodeInfo = await client.getNodeInfo();
|
|
152
|
+
const expectedAztecNrVersion = `${GITHUB_TAG_PREFIX}-v${nodeInfo.sandboxVersion}`;
|
|
153
|
+
if (contractArtifact.aztecNrVersion && contractArtifact.aztecNrVersion !== expectedAztecNrVersion) {
|
|
154
|
+
log(`\nWarning: Contract was compiled with a different version of Aztec.nr: ${contractArtifact.aztecNrVersion}. Consider updating Aztec.nr to ${expectedAztecNrVersion}\n`);
|
|
155
|
+
}
|
|
149
156
|
const deployer = new ContractDeployer(contractArtifact, client, publicKey);
|
|
150
157
|
const constructor = getFunctionArtifact(contractArtifact, 'constructor');
|
|
151
158
|
if (!constructor)
|
|
@@ -484,7 +491,7 @@ export function getProgram(log, debugLogger) {
|
|
|
484
491
|
.argument('[localDirectory]', 'Local directory to unbox source folder to (relative or absolute), optional - defaults to `<contractName>/`')
|
|
485
492
|
.action(async (contractName, localDirectory) => {
|
|
486
493
|
const unboxTo = localDirectory ? localDirectory : contractName;
|
|
487
|
-
await unboxContract(contractName, unboxTo,
|
|
494
|
+
await unboxContract(contractName, unboxTo, cliVersion, log);
|
|
488
495
|
});
|
|
489
496
|
program
|
|
490
497
|
.command('get-node-info')
|
|
@@ -525,9 +532,20 @@ export function getProgram(log, debugLogger) {
|
|
|
525
532
|
const selector = FunctionSelector.fromSignature(functionSignature);
|
|
526
533
|
log(`${selector}`);
|
|
527
534
|
});
|
|
535
|
+
program
|
|
536
|
+
.command('update')
|
|
537
|
+
.description('Updates Nodejs and Noir dependencies')
|
|
538
|
+
.argument('[projectPath]', 'Path to the project directory', process.cwd())
|
|
539
|
+
.option('--contract [paths...]', 'Paths to contracts to update dependencies', [])
|
|
540
|
+
.option('--sandbox-version <semver>', 'The sandbox version to update to. Defaults to latest', 'latest')
|
|
541
|
+
.addOption(pxeOption)
|
|
542
|
+
.action(async (projectPath, options) => {
|
|
543
|
+
const { contract } = options;
|
|
544
|
+
await update(projectPath, contract, options.rpcUrl, options.sandboxVersion, log, debugLogger);
|
|
545
|
+
});
|
|
528
546
|
compileContract(program, 'compile', log);
|
|
529
547
|
generateTypescriptInterface(program, 'generate-typescript', log);
|
|
530
548
|
generateNoirInterface(program, 'generate-noir-interface', log);
|
|
531
549
|
return program;
|
|
532
550
|
}
|
|
533
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
551
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dest/unbox.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unbox.d.ts","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"unbox.d.ts","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAmS9C;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,EAC3B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,KAAK,iBA6BX"}
|
package/dest/unbox.js
CHANGED
|
@@ -2,9 +2,7 @@ import { promises as fs } from 'fs';
|
|
|
2
2
|
import JSZip from 'jszip';
|
|
3
3
|
import fetch from 'node-fetch';
|
|
4
4
|
import * as path from 'path';
|
|
5
|
-
|
|
6
|
-
const GITHUB_REPO = 'aztec-packages';
|
|
7
|
-
const GITHUB_TAG_PREFIX = 'aztec-packages';
|
|
5
|
+
import { GITHUB_OWNER, GITHUB_REPO, GITHUB_TAG_PREFIX } from './github.js';
|
|
8
6
|
const BOXES_PATH = 'yarn-project/boxes';
|
|
9
7
|
/**
|
|
10
8
|
* If the box contains the noir contract source code, we don't need to download it from github.
|
|
@@ -275,4 +273,4 @@ export async function unboxContract(contractName, outputDirectoryName, packageVe
|
|
|
275
273
|
log('And in another terminal in the same directory,');
|
|
276
274
|
log(' yarn start:dev');
|
|
277
275
|
}
|
|
278
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"unbox.js","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"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"}
|
|
276
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"unbox.js","sourceRoot":"","sources":["../src/unbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tracks changes to dependencies
|
|
3
|
+
*/
|
|
4
|
+
export type DependencyChanges = {
|
|
5
|
+
/** Which file was changed */
|
|
6
|
+
file: string;
|
|
7
|
+
/** changes done to the file */
|
|
8
|
+
dependencies: Array<{
|
|
9
|
+
/** Name of the dependency being changed */
|
|
10
|
+
name: string;
|
|
11
|
+
/** Previous version of the dependency */
|
|
12
|
+
from: string;
|
|
13
|
+
/** New version of the dependency (after the update) */
|
|
14
|
+
to: string;
|
|
15
|
+
}>;
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=common.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/update/common.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,6BAA6B;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,YAAY,EAAE,KAAK,CAAC;QAClB,2CAA2C;QAC3C,IAAI,EAAE,MAAM,CAAC;QACb,yCAAyC;QACzC,IAAI,EAAE,MAAM,CAAC;QACb,uDAAuD;QACvD,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC,CAAC;CACJ,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { LogFn } from '@aztec/foundation/log';
|
|
2
|
+
import { DependencyChanges } from './common.js';
|
|
3
|
+
/**
|
|
4
|
+
* Updates Aztec.nr dependencies
|
|
5
|
+
* @param contractPath - Path to the contract to be updated
|
|
6
|
+
* @param tag - The tag to update to
|
|
7
|
+
* @param log - Logging function
|
|
8
|
+
*/
|
|
9
|
+
export declare function updateAztecNr(contractPath: string, tag: string, log: LogFn): Promise<DependencyChanges>;
|
|
10
|
+
//# sourceMappingURL=noir.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"noir.d.ts","sourceRoot":"","sources":["../../src/update/noir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAS9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAuC7G"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { parseNoirPackageConfig } from '@aztec/foundation/noir';
|
|
2
|
+
import TOML from '@ltd/j-toml';
|
|
3
|
+
import { readFile } from 'fs/promises';
|
|
4
|
+
import { EOL } from 'os';
|
|
5
|
+
import { join, relative, resolve } from 'path';
|
|
6
|
+
import { atomicUpdateFile } from '../utils.js';
|
|
7
|
+
/**
|
|
8
|
+
* Updates Aztec.nr dependencies
|
|
9
|
+
* @param contractPath - Path to the contract to be updated
|
|
10
|
+
* @param tag - The tag to update to
|
|
11
|
+
* @param log - Logging function
|
|
12
|
+
*/
|
|
13
|
+
export async function updateAztecNr(contractPath, tag, log) {
|
|
14
|
+
const configFilepath = resolve(join(contractPath, 'Nargo.toml'));
|
|
15
|
+
const packageConfig = parseNoirPackageConfig(TOML.parse(await readFile(configFilepath, 'utf-8')));
|
|
16
|
+
const changes = {
|
|
17
|
+
dependencies: [],
|
|
18
|
+
file: configFilepath,
|
|
19
|
+
};
|
|
20
|
+
log(`Updating Aztec.nr libraries to ${tag} in ${relative(process.cwd(), changes.file)}`);
|
|
21
|
+
for (const dep of Object.values(packageConfig.dependencies)) {
|
|
22
|
+
if (!('git' in dep)) {
|
|
23
|
+
continue;
|
|
24
|
+
}
|
|
25
|
+
// remove trailing slash
|
|
26
|
+
const gitUrl = dep.git.toLowerCase().replace(/\/$/, '');
|
|
27
|
+
if (gitUrl !== 'https://github.com/aztecprotocol/aztec-packages') {
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
if (dep.tag !== tag) {
|
|
31
|
+
// show the Aztec.nr package name rather than the lib name
|
|
32
|
+
const dirParts = dep.directory?.split('/') ?? [];
|
|
33
|
+
changes.dependencies.push({
|
|
34
|
+
name: dirParts.slice(-2).join('/'),
|
|
35
|
+
from: dep.tag,
|
|
36
|
+
to: tag,
|
|
37
|
+
});
|
|
38
|
+
dep.tag = tag;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
if (changes.dependencies.length > 0) {
|
|
42
|
+
const contents = prettyPrintTOML(packageConfig);
|
|
43
|
+
await atomicUpdateFile(configFilepath, contents);
|
|
44
|
+
}
|
|
45
|
+
return changes;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* Pretty prints a NoirPackageConfig to a string
|
|
49
|
+
* @param packageConfig - Nargo.toml contents
|
|
50
|
+
* @returns The Nargo.toml contents as a string
|
|
51
|
+
*/
|
|
52
|
+
function prettyPrintTOML(packageConfig) {
|
|
53
|
+
// hint to TOML.stringify how we want the file to look like
|
|
54
|
+
return TOML.stringify({
|
|
55
|
+
package: TOML.Section(packageConfig.package),
|
|
56
|
+
dependencies: TOML.Section(Object.fromEntries(Object.entries(packageConfig.dependencies).map(([name, dep]) => [name, TOML.inline(dep)]))),
|
|
57
|
+
}, {
|
|
58
|
+
indent: 2,
|
|
59
|
+
newline: EOL,
|
|
60
|
+
newlineAround: 'section',
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9pci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91cGRhdGUvbm9pci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQXFCLHNCQUFzQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFbkYsT0FBTyxJQUFJLE1BQU0sYUFBYSxDQUFDO0FBQy9CLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLElBQUksQ0FBQztBQUN6QixPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFL0MsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRy9DOzs7OztHQUtHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxhQUFhLENBQUMsWUFBb0IsRUFBRSxHQUFXLEVBQUUsR0FBVTtJQUMvRSxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxZQUFZLENBQUMsQ0FBQyxDQUFDO0lBQ2pFLE1BQU0sYUFBYSxHQUFHLHNCQUFzQixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsRyxNQUFNLE9BQU8sR0FBc0I7UUFDakMsWUFBWSxFQUFFLEVBQUU7UUFDaEIsSUFBSSxFQUFFLGNBQWM7S0FDckIsQ0FBQztJQUVGLEdBQUcsQ0FBQyxrQ0FBa0MsR0FBRyxPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUN6RixLQUFLLE1BQU0sR0FBRyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLFlBQVksQ0FBQyxFQUFFO1FBQzNELElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxHQUFHLENBQUMsRUFBRTtZQUNuQixTQUFTO1NBQ1Y7UUFFRCx3QkFBd0I7UUFDeEIsTUFBTSxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBQ3hELElBQUksTUFBTSxLQUFLLGlEQUFpRCxFQUFFO1lBQ2hFLFNBQVM7U0FDVjtRQUVELElBQUksR0FBRyxDQUFDLEdBQUcsS0FBSyxHQUFHLEVBQUU7WUFDbkIsMERBQTBEO1lBQzFELE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNqRCxPQUFPLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQztnQkFDeEIsSUFBSSxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO2dCQUNsQyxJQUFJLEVBQUUsR0FBRyxDQUFDLEdBQUc7Z0JBQ2IsRUFBRSxFQUFFLEdBQUc7YUFDUixDQUFDLENBQUM7WUFFSCxHQUFHLENBQUMsR0FBRyxHQUFHLEdBQUcsQ0FBQztTQUNmO0tBQ0Y7SUFFRCxJQUFJLE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtRQUNuQyxNQUFNLFFBQVEsR0FBRyxlQUFlLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDaEQsTUFBTSxnQkFBZ0IsQ0FBQyxjQUFjLEVBQUUsUUFBUSxDQUFDLENBQUM7S0FDbEQ7SUFFRCxPQUFPLE9BQU8sQ0FBQztBQUNqQixDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILFNBQVMsZUFBZSxDQUFDLGFBQWdDO0lBQ3ZELDJEQUEyRDtJQUMzRCxPQUFPLElBQUksQ0FBQyxTQUFTLENBQ25CO1FBQ0UsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQztRQUM1QyxZQUFZLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FDeEIsTUFBTSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLGFBQWEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDOUc7S0FDRixFQUNEO1FBQ0UsTUFBTSxFQUFFLENBQUM7UUFDVCxPQUFPLEVBQUUsR0FBVTtRQUNuQixhQUFhLEVBQUUsU0FBUztLQUN6QixDQUNGLENBQUM7QUFDSixDQUFDIn0=
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { LogFn } from '@aztec/foundation/log';
|
|
2
|
+
import { SemVer } from 'semver';
|
|
3
|
+
import { DependencyChanges } from './common.js';
|
|
4
|
+
/**
|
|
5
|
+
* Looks up a package.json file and returns its contents
|
|
6
|
+
* @param projectPath - Path to Nodejs project
|
|
7
|
+
* @returns The parsed package.json
|
|
8
|
+
*/
|
|
9
|
+
export declare function readPackageJson(projectPath: string): Promise<{
|
|
10
|
+
/** dependencies */
|
|
11
|
+
dependencies?: Record<string, string>;
|
|
12
|
+
}>;
|
|
13
|
+
/**
|
|
14
|
+
* Queries the npm registry for the latest version of a package
|
|
15
|
+
* @param packageName - The package to query
|
|
16
|
+
* @param distTag - The distribution tag
|
|
17
|
+
* @returns The latest version of the package on that distribution tag
|
|
18
|
+
*/
|
|
19
|
+
export declare function getNewestVersion(packageName: string, distTag?: string): Promise<SemVer>;
|
|
20
|
+
/**
|
|
21
|
+
* Updates a project's \@aztec/* dependencies to the specific version
|
|
22
|
+
* @param projectPath - Path to Nodejs project
|
|
23
|
+
* @param aztecVersion - The version to update to
|
|
24
|
+
* @returns True if the project was updated
|
|
25
|
+
*/
|
|
26
|
+
export declare function updateAztecDeps(projectPath: string, aztecVersion: SemVer, log: LogFn): Promise<DependencyChanges>;
|
|
27
|
+
/**
|
|
28
|
+
* Updates a project's yarn.lock or package-lock.json
|
|
29
|
+
* @param projectPath - Path to Nodejs project
|
|
30
|
+
*/
|
|
31
|
+
export declare function updateLockfile(projectPath: string, log: LogFn): void;
|
|
32
|
+
//# sourceMappingURL=npm.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"npm.d.ts","sourceRoot":"","sources":["../../src/update/npm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAM9C,OAAO,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAClE,mBAAmB;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC,CAKD;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,SAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/F;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,KAAK,GACT,OAAO,CAAC,iBAAiB,CAAC,CAyC5B;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,IAAI,CAuBpE"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { spawnSync } from 'child_process';
|
|
2
|
+
import { existsSync } from 'fs';
|
|
3
|
+
import { readFile } from 'fs/promises';
|
|
4
|
+
import { join, relative, resolve } from 'path';
|
|
5
|
+
import { parse } from 'semver';
|
|
6
|
+
import { atomicUpdateFile } from '../utils.js';
|
|
7
|
+
/**
|
|
8
|
+
* Looks up a package.json file and returns its contents
|
|
9
|
+
* @param projectPath - Path to Nodejs project
|
|
10
|
+
* @returns The parsed package.json
|
|
11
|
+
*/
|
|
12
|
+
export async function readPackageJson(projectPath) {
|
|
13
|
+
const configFilepath = resolve(join(projectPath, 'package.json'));
|
|
14
|
+
const pkg = JSON.parse(await readFile(configFilepath, 'utf-8'));
|
|
15
|
+
return pkg;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Queries the npm registry for the latest version of a package
|
|
19
|
+
* @param packageName - The package to query
|
|
20
|
+
* @param distTag - The distribution tag
|
|
21
|
+
* @returns The latest version of the package on that distribution tag
|
|
22
|
+
*/
|
|
23
|
+
export async function getNewestVersion(packageName, distTag = 'latest') {
|
|
24
|
+
const url = new URL(packageName, 'https://registry.npmjs.org/');
|
|
25
|
+
const response = await fetch(url);
|
|
26
|
+
if (!response.ok) {
|
|
27
|
+
throw new Error(`Failed to fetch ${url}`);
|
|
28
|
+
}
|
|
29
|
+
const body = await response.json();
|
|
30
|
+
const latestVersion = parse(body['dist-tags'][distTag]);
|
|
31
|
+
if (!latestVersion) {
|
|
32
|
+
throw new Error(`Failed to get latest version from registry`);
|
|
33
|
+
}
|
|
34
|
+
return latestVersion;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Updates a project's \@aztec/* dependencies to the specific version
|
|
38
|
+
* @param projectPath - Path to Nodejs project
|
|
39
|
+
* @param aztecVersion - The version to update to
|
|
40
|
+
* @returns True if the project was updated
|
|
41
|
+
*/
|
|
42
|
+
export async function updateAztecDeps(projectPath, aztecVersion, log) {
|
|
43
|
+
const pkg = await readPackageJson(projectPath);
|
|
44
|
+
const changes = {
|
|
45
|
+
file: resolve(join(projectPath, 'package.json')),
|
|
46
|
+
dependencies: [],
|
|
47
|
+
};
|
|
48
|
+
if (!pkg.dependencies) {
|
|
49
|
+
return changes;
|
|
50
|
+
}
|
|
51
|
+
log(`Updating @aztec packages to ${aztecVersion} in ${relative(process.cwd(), changes.file)}`);
|
|
52
|
+
const version = aztecVersion.version;
|
|
53
|
+
for (const name of Object.keys(pkg.dependencies)) {
|
|
54
|
+
if (!name.startsWith('@aztec/')) {
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
// different release schedule
|
|
58
|
+
if (name === '@aztec/aztec-ui') {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
if (pkg.dependencies[name] !== version) {
|
|
62
|
+
changes.dependencies.push({
|
|
63
|
+
name,
|
|
64
|
+
from: pkg.dependencies[name],
|
|
65
|
+
to: version,
|
|
66
|
+
});
|
|
67
|
+
pkg.dependencies[name] = version;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (changes.dependencies.length > 0) {
|
|
71
|
+
const contents = JSON.stringify(pkg, null, 2) + '\n';
|
|
72
|
+
await atomicUpdateFile(resolve(join(projectPath, 'package.json')), contents);
|
|
73
|
+
}
|
|
74
|
+
return changes;
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* Updates a project's yarn.lock or package-lock.json
|
|
78
|
+
* @param projectPath - Path to Nodejs project
|
|
79
|
+
*/
|
|
80
|
+
export function updateLockfile(projectPath, log) {
|
|
81
|
+
const isNpm = existsSync(resolve(join(projectPath, 'package-lock.json')));
|
|
82
|
+
const isYarn = existsSync(resolve(join(projectPath, 'yarn.lock')));
|
|
83
|
+
const isPnpm = existsSync(resolve(join(projectPath, 'pnpm-lock.yaml')));
|
|
84
|
+
if (isPnpm) {
|
|
85
|
+
spawnSync('pnpm', ['install'], {
|
|
86
|
+
cwd: projectPath,
|
|
87
|
+
stdio: 'inherit',
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
else if (isYarn) {
|
|
91
|
+
spawnSync('yarn', ['install'], {
|
|
92
|
+
cwd: projectPath,
|
|
93
|
+
stdio: 'inherit',
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
else if (isNpm) {
|
|
97
|
+
spawnSync('npm', ['install'], {
|
|
98
|
+
cwd: projectPath,
|
|
99
|
+
stdio: 'inherit',
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
log(`No lockfile found in ${projectPath}. Skipping lockfile update...`);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3VwZGF0ZS9ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUMxQyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ2hDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFDdkMsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLE1BQU0sTUFBTSxDQUFDO0FBQy9DLE9BQU8sRUFBVSxLQUFLLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFdkMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRy9DOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGVBQWUsQ0FBQyxXQUFtQjtJQUl2RCxNQUFNLGNBQWMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxjQUFjLENBQUMsQ0FBQyxDQUFDO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxRQUFRLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFFaEUsT0FBTyxHQUFHLENBQUM7QUFDYixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGdCQUFnQixDQUFDLFdBQW1CLEVBQUUsT0FBTyxHQUFHLFFBQVE7SUFDNUUsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLENBQUMsV0FBVyxFQUFFLDZCQUE2QixDQUFDLENBQUM7SUFDaEUsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDbEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUU7UUFDaEIsTUFBTSxJQUFJLEtBQUssQ0FBQyxtQkFBbUIsR0FBRyxFQUFFLENBQUMsQ0FBQztLQUMz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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/update/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,MAAM,CAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CA8Df"}
|