Skip to content

Commit

Permalink
bump TS deps (#9660)
Browse files Browse the repository at this point in the history
_evergreen_

## Description

The recent typescript-eslint bump missed a "resolutions" field (in an amendment). This corrects that, which stops this message:
```
WARNING: You are currently running a version of TypeScript which is not officially supported by @typescript-eslint/typescript-estree.
```

This also removes the `@category` tag on some vendored code to stop those lint warnings.

Then bumps a bunch of devdeps.

### Security Considerations
none
### Scaling Considerations
none

### Documentation Considerations
none
### Testing Considerations
CI
### Upgrade Considerations
none
  • Loading branch information
mergify[bot] authored Jul 9, 2024
2 parents 8f019c0 + 6fc505f commit bc48a8b
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 90 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"eslint-plugin-ava": "^14.0.0",
"eslint-plugin-github": "^4.10.2",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "^48.2.2",
"eslint-plugin-jsdoc": "^48.5.2",
"eslint-plugin-prettier": "^5.1.3",
"lerna": "^5.6.2",
"npm-run-all": "^4.1.5",
Expand All @@ -34,13 +34,13 @@
"type-coverage": "^2.27.1",
"typedoc": "^0.25.13",
"typedoc-plugin-markdown": "^3.17.1",
"typescript": "^5.5.2",
"typescript": "^5.5.3",
"typescript-eslint": "^7.15.0"
},
"resolutions": {
"**/protobufjs": "^7.2.6",
"**/@types/estree": "^1.0.0",
"**/@typescript-eslint/typescript-estree": "^7.13.1"
"**/@typescript-eslint/typescript-estree": "^7.15.0"
},
"engines": {
"node": "^18.12 || ^20.9"
Expand Down
2 changes: 1 addition & 1 deletion packages/ERTP/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@endo/bundle-source": "^3.2.3",
"@fast-check/ava": "^1.1.5",
"ava": "^5.3.0",
"tsd": "^0.30.7"
"tsd": "^0.31.1"
},
"files": [
"src",
Expand Down
4 changes: 2 additions & 2 deletions packages/cosmic-proto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@
"@endo/import-bundle": "^1.1.2",
"ava": "^5.3.1",
"rimraf": "^5.0.0",
"tsd": "^0.30.7",
"tsd": "^0.31.1",
"tsimp": "^2.0.11",
"typescript": "^5.5.2"
"typescript": "^5.5.3"
},
"dependencies": {
"@cosmjs/amino": "^0.32.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/internal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"devDependencies": {
"@endo/init": "^1.1.2",
"ava": "^5.3.0",
"tsd": "^0.30.7"
"tsd": "^0.31.1"
},
"ava": {
"require": [
Expand Down
26 changes: 10 additions & 16 deletions packages/internal/src/tagged.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ A tag's name is usually a string (and must be a string, number, or symbol), but
A type `A` returned by `Tagged` is assignable to another type `B` returned by `Tagged` if and only if:
- the underlying (untagged) type of `A` is assignable to the underlying type of `B`;
- `A` contains at least all the tags `B` has;
- and the metadata type for each of `A`'s tags is assignable to the metadata type of `B`'s corresponding tag.
- `A` contains at least all the tags `B` has;
- and the metadata type for each of `A`'s tags is assignable to the metadata type of `B`'s corresponding tag.
There have been several discussions about adding similar features to TypeScript. Unfortunately, nothing has (yet) moved forward:
- [Microsoft/TypeScript#202](https://github.com/microsoft/TypeScript/issues/202)
- [Microsoft/TypeScript#4895](https://github.com/microsoft/TypeScript/issues/4895)
- [Microsoft/TypeScript#33290](https://github.com/microsoft/TypeScript/pull/33290)
- [Microsoft/TypeScript#202](https://github.com/microsoft/TypeScript/issues/202)
- [Microsoft/TypeScript#4895](https://github.com/microsoft/TypeScript/issues/4895)
- [Microsoft/TypeScript#33290](https://github.com/microsoft/TypeScript/pull/33290)
@example
```
Expand All @@ -37,12 +37,12 @@ type AccountNumber = Tagged<number, 'AccountNumber'>;
type AccountBalance = Tagged<number, 'AccountBalance'>;
function createAccountNumber(): AccountNumber {
// As you can see, casting from a `number` (the underlying type being tagged) is allowed.
return 2 as AccountNumber;
// As you can see, casting from a `number` (the underlying type being tagged) is allowed.
return 2 as AccountNumber;
}
function getMoneyForAccount(accountNumber: AccountNumber): AccountBalance {
return 4 as AccountBalance;
return 4 as AccountBalance;
}
// This will compile successfully.
Expand All @@ -69,8 +69,6 @@ type SpecialCacheKey = Tagged<Url, 'SpecialCacheKey'>;
// You can also pass a union of tag names, so this is equivalent to the above, although it doesn't give you the ability to assign distinct metadata to each tag.
type SpecialCacheKey2 = Tagged<string, 'URL' | 'SpecialCacheKey'>;
```
@category Type
*/
export type Tagged<
Type,
Expand Down Expand Up @@ -102,8 +100,6 @@ function parse<T extends JsonOf<unknown>>(it: T) {
const x = stringify({ hello: 'world' });
const parsed = parse(x); // The type of `parsed` is { hello: string }
```
@category Type
*/
export type GetTagMetadata<
Type extends Tag<TagName, unknown>,
Expand All @@ -125,8 +121,8 @@ import type {Tagged, UnwrapTagged} from 'type-fest';
type AccountType = Tagged<'SAVINGS' | 'CHECKING', 'AccountType'>;
const moneyByAccountType: Record<UnwrapTagged<AccountType>, number> = {
SAVINGS: 99,
CHECKING: 0.1
SAVINGS: 99,
CHECKING: 0.1
};
// Without UnwrapTagged, the following expression would throw a type error.
Expand All @@ -135,8 +131,6 @@ const money = moneyByAccountType.SAVINGS; // TS error: Property 'SAVINGS' does n
// Attempting to pass an non-Tagged type to UnwrapTagged will raise a type error.
type WontWork = UnwrapTagged<string>;
```
@category Type
*/
export type UnwrapTagged<TaggedType extends Tag<PropertyKey, any>> =
RemoveAllTags<TaggedType>;
Expand Down
2 changes: 1 addition & 1 deletion packages/vat-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@endo/far": "^1.1.2",
"@endo/ses-ava": "^1.2.2",
"ava": "^5.3.0",
"tsd": "^0.30.7"
"tsd": "^0.31.1"
},
"ava": {
"require": [
Expand Down
2 changes: 1 addition & 1 deletion packages/zoe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"ava": "^5.3.0",
"c8": "^9.1.0",
"import-meta-resolve": "^2.2.1",
"tsd": "^0.30.7"
"tsd": "^0.31.1"
},
"files": [
"bundles/",
Expand Down
Loading

0 comments on commit bc48a8b

Please sign in to comment.