Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feat/1075-discrim…
Browse files Browse the repository at this point in the history
…inated-unions-more-types
  • Loading branch information
maxArturo committed Dec 19, 2022
2 parents 1eb060e + ad43854 commit 021ca61
Show file tree
Hide file tree
Showing 32 changed files with 1,290 additions and 208 deletions.
8 changes: 4 additions & 4 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
daysUntilStale: 90
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
daysUntilClose: 30
# Issues with these labels will never be considered stale
# exemptLabels:
# - pinned
exemptLabels:
- enhancement
# - security
# Label to use when marking an issue as stale
staleLabel: stale
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
typescript: ["4.2", "4.3", "4.4", "4.5", "4.6"]
node: ["18"]
typescript: ["4.5", "4.6", "4.7", "4.8", "4.9"]
name: Test with TypeScript ${{ matrix.typescript }} on Node ${{ matrix.node }}
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ["14"]
node: ["18"]
name: Lint on Node ${{ matrix.node }}
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### 3.10

- New parser that allows parsing to continue after non-fatal errors have occured. This allows Zod to surface more errors to the user at once.
- New parser that allows parsing to continue after non-fatal errors have occurred. This allows Zod to surface more errors to the user at once.

### 3.9

Expand Down
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Contributing

When it comes to open source, there are different ways you can contribute, all
of which are valuable. Here's few guidelines that should help you as you prepare
your contribution.
Expand Down Expand Up @@ -27,7 +29,7 @@ The following steps will get you setup to contribute changes to this repo:

3. Run `yarn` to install dependencies.

4. Start playing with the code! You can do some simple experimentation in `src/playground.ts` (see `yarn play` below) or start implementing a feature right away.
4. Start playing with the code! You can do some simple experimentation in [`playground.ts`](playground.ts) (see `yarn play` below) or start implementing a feature right away.

### Commands

Expand All @@ -45,7 +47,7 @@ The following steps will get you setup to contribute changes to this repo:

**`yarn play`**

- executes `src/playground.ts`, watches for changes. useful for experimentation
- executes [`playground.ts`](playground.ts), watches for changes. useful for experimentation

### Tests

Expand Down
Loading

0 comments on commit 021ca61

Please sign in to comment.