Skip to content

Commit 47380d6

Browse files
authored
Merge branch 'master' into boneskull/fix-prettier-package-json
2 parents b93924f + 901ae39 commit 47380d6

File tree

51 files changed

+374
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+374
-293
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
"engines": {
88
"node": ">=16"
99
},
10-
"packageManager": "yarn@4.1.1",
10+
"packageManager": "yarn@4.2.2",
1111
"devDependencies": {
12-
"@jessie.js/eslint-plugin": "^0.3.0",
12+
"@jessie.js/eslint-plugin": "^0.4.1",
1313
"@octokit/core": "^3.4.0",
14-
"ava": "^6.1.2",
14+
"ava": "^6.1.3",
1515
"eslint": "^8.57.0",
1616
"eslint-config-airbnb-base": "^15.0.0",
1717
"eslint-config-jessie": "^0.0.6",
1818
"eslint-config-prettier": "^9.1.0",
19-
"eslint-plugin-import": "^2.29.0",
20-
"eslint-plugin-jsdoc": "^48.2.2",
19+
"eslint-plugin-import": "^2.29.1",
20+
"eslint-plugin-jsdoc": "^48.2.5",
2121
"lerna": "^5.6.2",
2222
"lerna-update-wizard": "^0.17.5",
2323
"prettier": "^3.2.5",
2424
"ts-api-utils": "~1.0.1",
2525
"type-coverage": "^2.26.3",
26-
"typedoc": "^0.25.12",
26+
"typedoc": "^0.25.13",
2727
"typedoc-plugin-markdown": "^3.17.1",
2828
"typescript": "5.5.0-beta",
2929
"typescript-eslint": "^7.3.1"

packages/base64/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
"test": "ava"
4343
},
4444
"devDependencies": {
45-
"ava": "^6.1.2",
46-
"babel-eslint": "^10.0.3",
45+
"ava": "^6.1.3",
46+
"babel-eslint": "^10.1.0",
4747
"c8": "^7.14.0",
4848
"eslint": "^8.57.0",
4949
"eslint-config-airbnb-base": "^15.0.0",
5050
"eslint-config-prettier": "^9.1.0",
51-
"eslint-plugin-eslint-comments": "^3.1.2",
52-
"eslint-plugin-import": "^2.29.0",
51+
"eslint-plugin-eslint-comments": "^3.2.0",
52+
"eslint-plugin-import": "^2.29.1",
5353
"prettier": "^3.2.5",
5454
"typescript": "5.5.0-beta"
5555
},

packages/bundle-source/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"devDependencies": {
4040
"@endo/lockdown": "^1.0.7",
4141
"@endo/ses-ava": "^1.2.2",
42-
"ava": "^6.1.2",
42+
"ava": "^6.1.3",
4343
"c8": "^7.14.0",
4444
"typescript": "5.5.0-beta"
4545
},

packages/captp/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"devDependencies": {
5050
"@endo/init": "^1.1.2",
5151
"@endo/ses-ava": "^1.2.2",
52-
"ava": "^6.1.2",
52+
"ava": "^6.1.3",
5353
"c8": "^7.14.0",
5454
"typescript": "5.5.0-beta"
5555
},

packages/check-bundle/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
"@endo/bundle-source": "^3.2.3",
4949
"@endo/init": "^1.1.2",
5050
"@endo/zip": "^1.0.5",
51-
"ava": "^6.1.2",
52-
"babel-eslint": "^10.0.3",
51+
"ava": "^6.1.3",
52+
"babel-eslint": "^10.1.0",
5353
"c8": "^7.14.0",
5454
"eslint": "^8.57.0",
5555
"eslint-config-airbnb-base": "^15.0.0",
5656
"eslint-config-prettier": "^9.1.0",
57-
"eslint-plugin-eslint-comments": "^3.1.2",
58-
"eslint-plugin-import": "^2.29.0",
57+
"eslint-plugin-eslint-comments": "^3.2.0",
58+
"eslint-plugin-import": "^2.29.1",
5959
"prettier": "^3.2.5",
6060
"typescript": "5.5.0-beta"
6161
},

packages/cjs-module-analyzer/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
"test": "ava"
3333
},
3434
"devDependencies": {
35-
"ava": "^6.1.2",
36-
"babel-eslint": "^10.0.3",
35+
"ava": "^6.1.3",
36+
"babel-eslint": "^10.1.0",
3737
"c8": "^7.14.0",
3838
"eslint": "^8.57.0",
3939
"eslint-config-airbnb-base": "^15.0.0",
4040
"eslint-config-prettier": "^9.1.0",
41-
"eslint-plugin-eslint-comments": "^3.1.2",
42-
"eslint-plugin-import": "^2.29.0",
41+
"eslint-plugin-eslint-comments": "^3.2.0",
42+
"eslint-plugin-import": "^2.29.1",
4343
"prettier": "^3.2.5",
4444
"typescript": "5.5.0-beta"
4545
},

packages/cli/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
"ses": "^1.5.0"
5050
},
5151
"devDependencies": {
52-
"ava": "^6.1.2",
53-
"babel-eslint": "^10.0.3",
52+
"ava": "^6.1.3",
53+
"babel-eslint": "^10.1.0",
5454
"eslint": "^8.57.0",
5555
"eslint-config-airbnb-base": "^15.0.0",
5656
"eslint-config-prettier": "^9.1.0",
57-
"eslint-plugin-eslint-comments": "^3.1.2",
58-
"eslint-plugin-import": "^2.29.0",
57+
"eslint-plugin-eslint-comments": "^3.2.0",
58+
"eslint-plugin-import": "^2.29.1",
5959
"prettier": "^3.2.5",
6060
"typescript": "5.5.0-beta"
6161
},

packages/cli/src/commands/bundle.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { E } from '@endo/far';
55
import bundleSource from '@endo/bundle-source';
66
import { makeReaderRef } from '@endo/daemon';
77
import { withEndoAgent } from '../context.js';
8+
import { parsePetNamePath } from '../pet-name.js';
89

910
const textEncoder = new TextEncoder();
1011

@@ -22,11 +23,13 @@ export const bundleCommand = async ({
2223
format: 'endoZipBase64',
2324
})
2425
);
26+
assert(bundleName === undefined || typeof bundleName === 'string');
27+
const bundlePath = bundleName && parsePetNamePath(bundleName);
2528
process.stdout.write(`${bundle.endoZipBase64Sha512}\n`);
2629
const bundleText = JSON.stringify(bundle);
2730
const bundleBytes = textEncoder.encode(bundleText);
2831
const readerRef = makeReaderRef([bundleBytes]);
2932
return withEndoAgent(agentNames, { os, process }, async ({ agent }) => {
30-
await E(agent).storeBlob(readerRef, bundleName);
33+
await E(agent).storeBlob(readerRef, bundlePath);
3134
});
3235
};

packages/cli/src/commands/cat.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import os from 'os';
44
import { E } from '@endo/far';
55
import { makeRefReader } from '@endo/daemon';
66
import { withEndoAgent } from '../context.js';
7+
import { parsePetNamePath } from '../pet-name.js';
78

89
export const cat = async ({ name, agentNames }) =>
910
withEndoAgent(agentNames, { os, process }, async ({ agent }) => {
10-
const readable = await E(agent).lookup(name);
11+
const readable = await E(agent).lookup(...parsePetNamePath(name));
1112
const readerRef = E(readable).streamBase64();
1213
const reader = makeRefReader(readerRef);
1314
for await (const chunk of reader) {

packages/cli/src/commands/follow.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import os from 'os';
44
import { E } from '@endo/far';
55
import { makeRefIterator } from '@endo/daemon';
66
import { withEndoAgent } from '../context.js';
7+
import { parsePetNamePath } from '../pet-name.js';
78

89
export const followCommand = async ({ name, agentNames }) =>
910
withEndoAgent(agentNames, { os, process }, async ({ agent }) => {
10-
const iterable = await E(agent).lookup(name);
11+
const iterable = await E(agent).lookup(...parsePetNamePath(name));
1112
for await (const iterand of makeRefIterator(iterable)) {
1213
console.log(iterand);
1314
}

0 commit comments

Comments
 (0)