@cartesi/cli 2.0.0-alpha.2 → 2.0.0-alpha.3
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/config.d.ts +0 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -14
- package/dist/exec/util.d.ts.map +1 -1
- package/dist/exec/util.js +2 -0
- package/oclif.manifest.json +1 -1
- package/package.json +3 -3
package/dist/config.d.ts
CHANGED
|
@@ -94,7 +94,6 @@ export type Config = {
|
|
|
94
94
|
sdk: string;
|
|
95
95
|
};
|
|
96
96
|
export declare const defaultRootDriveConfig: () => DriveConfig;
|
|
97
|
-
export declare const defaultRamImage: () => string;
|
|
98
97
|
export declare const defaultMachineConfig: () => MachineConfig;
|
|
99
98
|
export declare const defaultConfig: () => Config;
|
|
100
99
|
export declare const getDriveFormat: (filename: string) => DriveFormat;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/config.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import bytes from "bytes";
|
|
2
|
-
import os from "os";
|
|
3
2
|
import { extname } from "path";
|
|
4
3
|
import { parse as parseToml } from "smol-toml";
|
|
5
4
|
/**
|
|
@@ -64,9 +63,7 @@ export class InvalidStringArrayError extends Error {
|
|
|
64
63
|
*/
|
|
65
64
|
const DEFAULT_FORMAT = "ext2";
|
|
66
65
|
const DEFAULT_RAM = "128Mi";
|
|
67
|
-
const
|
|
68
|
-
const DEFAULT_RAM_IMAGE_LINUX = "/usr/share/cartesi-machine/images/linux.bin";
|
|
69
|
-
const DEFAULT_RAM_IMAGE_MAC = "/opt/homebrew/share/cartesi-machine/images/linux.bin";
|
|
66
|
+
const DEFAULT_RAM_IMAGE = "/usr/share/cartesi-machine/images/linux.bin";
|
|
70
67
|
export const DEFAULT_SDK = "cartesi/sdk:0.12.0-alpha.1";
|
|
71
68
|
export const defaultRootDriveConfig = () => ({
|
|
72
69
|
builder: "docker",
|
|
@@ -76,14 +73,6 @@ export const defaultRootDriveConfig = () => ({
|
|
|
76
73
|
format: DEFAULT_FORMAT,
|
|
77
74
|
tags: [],
|
|
78
75
|
});
|
|
79
|
-
export const defaultRamImage = () => {
|
|
80
|
-
switch (os.platform()) {
|
|
81
|
-
case "darwin":
|
|
82
|
-
return DEFAULT_RAM_IMAGE_MAC;
|
|
83
|
-
default:
|
|
84
|
-
return DEFAULT_RAM_IMAGE_LINUX;
|
|
85
|
-
}
|
|
86
|
-
};
|
|
87
76
|
export const defaultMachineConfig = () => ({
|
|
88
77
|
assertRollingTemplate: undefined,
|
|
89
78
|
bootargs: [],
|
|
@@ -93,7 +82,7 @@ export const defaultMachineConfig = () => ({
|
|
|
93
82
|
maxMCycle: undefined,
|
|
94
83
|
noRollup: undefined,
|
|
95
84
|
ramLength: DEFAULT_RAM,
|
|
96
|
-
ramImage:
|
|
85
|
+
ramImage: DEFAULT_RAM_IMAGE,
|
|
97
86
|
store: "image",
|
|
98
87
|
user: undefined,
|
|
99
88
|
});
|
|
@@ -268,7 +257,7 @@ const parseMachine = (value) => {
|
|
|
268
257
|
maxMCycle: parseOptionalNumber(toml["max-mcycle"]),
|
|
269
258
|
noRollup: parseBoolean(toml["no-rollup"], false),
|
|
270
259
|
ramLength: parseString(toml["ram-length"], DEFAULT_RAM),
|
|
271
|
-
ramImage: parseString(toml["ram-image"],
|
|
260
|
+
ramImage: parseString(toml["ram-image"], DEFAULT_RAM_IMAGE),
|
|
272
261
|
store: "image",
|
|
273
262
|
user: parseOptionalString(toml.user),
|
|
274
263
|
};
|
package/dist/exec/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/exec/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAqB,OAAO,EAAE,MAAM,OAAO,CAAC;AAGnD,MAAM,MAAM,qBAAqB,GAC3B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GACpC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,GAAG,OAAO,GAAG,qBAAqB,CAAC;AACzE,eAAO,MAAM,mBAAmB,YACnB,MAAM,QACT,SAAS,MAAM,EAAE,WACd,0BAA0B;YAbvB,MAAM;kBAAgB,KAAK;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/exec/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAqB,OAAO,EAAE,MAAM,OAAO,CAAC;AAGnD,MAAM,MAAM,qBAAqB,GAC3B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GACpC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,GAAG,OAAO,GAAG,qBAAqB,CAAC;AACzE,eAAO,MAAM,mBAAmB,YACnB,MAAM,QACT,SAAS,MAAM,EAAE,WACd,0BAA0B;YAbvB,MAAM;kBAAgB,KAAK;GAoD1C,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,GAAG,gBAAgB,GACrD,qBAAqB,CAAC;AAC1B,eAAO,MAAM,uBAAuB,YACvB,MAAM,QACT,SAAS,MAAM,EAAE,WACd,0BAA0B;;;;;CA8CtC,CAAC"}
|
package/dist/exec/util.js
CHANGED
|
@@ -23,6 +23,7 @@ export const execaDockerFallback = async (command, args, options) => {
|
|
|
23
23
|
"--workdir",
|
|
24
24
|
"/work",
|
|
25
25
|
"--interactive",
|
|
26
|
+
"--rm",
|
|
26
27
|
"--user",
|
|
27
28
|
`${userInfo.uid}:${userInfo.gid}`,
|
|
28
29
|
];
|
|
@@ -52,6 +53,7 @@ export const spawnSyncDockerFallback = (command, args, options) => {
|
|
|
52
53
|
"--workdir",
|
|
53
54
|
"/work",
|
|
54
55
|
"--interactive",
|
|
56
|
+
"--rm",
|
|
55
57
|
"--user",
|
|
56
58
|
`${userInfo.uid}:${userInfo.gid}`,
|
|
57
59
|
];
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cartesi/cli",
|
|
3
|
-
"version": "2.0.0-alpha.
|
|
3
|
+
"version": "2.0.0-alpha.3",
|
|
4
4
|
"description": "Cartesi CLI",
|
|
5
5
|
"author": "Danilo Tuler <tuler@pobox.com>",
|
|
6
6
|
"bin": {
|
|
@@ -65,9 +65,9 @@
|
|
|
65
65
|
"tslib": "^2.8.0",
|
|
66
66
|
"typescript": "^5.6.3",
|
|
67
67
|
"vitest": "^2.1.3",
|
|
68
|
-
"@cartesi/devnet": "2.0.0-alpha.1",
|
|
69
68
|
"@cartesi/eslint-config": "0.0.0",
|
|
70
|
-
"tsconfig": "0.0.0"
|
|
69
|
+
"tsconfig": "0.0.0",
|
|
70
|
+
"@cartesi/devnet": "2.0.0-alpha.2"
|
|
71
71
|
},
|
|
72
72
|
"oclif": {
|
|
73
73
|
"bin": "cartesi",
|