Skip to content

Commit e66ac73

Browse files
braxtonhallbraxtonhall
committed
Merge branch 'master' into fix-combine-with-all-errors
2 parents 82357cf + 2e25831 commit e66ac73

20 files changed

+9946
-14660
lines changed

‎.changeset/config.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/config@3.0.0/schema.json",
3+
"changelog": [
4+
"@changesets/changelog-github",
5+
{
6+
"repo": "supermacro/neverthrow"
7+
}
8+
],
9+
"commit": false,
10+
"fixed": [],
11+
"linked": [],
12+
"access": "public",
13+
"baseBranch": "master",
14+
"updateInternalDependencies": "patch",
15+
"ignore": []
16+
}

‎.changeset/three-mice-act.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"neverthrow": patch
3+
---
4+
5+
Made err() infer strings narrowly for easier error tagging.

‎.circleci/config.yml

-69
This file was deleted.

‎.github/workflows/ci.yml

+108
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: CI
2+
on:
3+
pull_request:
4+
push:
5+
branches:
6+
- master
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
9+
cancel-in-progress: true
10+
11+
env:
12+
RUNNER_NODE_VERSION: 22
13+
jobs:
14+
install_deps:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Use Node.js ${{ env.RUNNER_NODE_VERSION }}
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: ${{ env.RUNNER_NODE_VERSION }}
22+
- name: cache dependencies
23+
uses: actions/cache@v4
24+
id: cache-dependencies
25+
with:
26+
path: "node_modules"
27+
key: depends-node${{ env.RUNNER_NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
28+
- name: install dependencies
29+
if: steps.cache-dependencies.outputs.cache-hit != 'true'
30+
run: npm i
31+
32+
typecheck:
33+
runs-on: ubuntu-latest
34+
needs: install_deps
35+
steps:
36+
- uses: actions/checkout@v4
37+
- name: Use Node.js ${{ env.RUNNER_NODE_VERSION }}
38+
uses: actions/setup-node@v4
39+
with:
40+
node-version: ${{ env.RUNNER_NODE_VERSION }}
41+
- name: restore dependencies cache
42+
uses: actions/cache/restore@v4
43+
with:
44+
path: "node_modules"
45+
key: depends-node${{ env.RUNNER_NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
46+
- name: typecheck
47+
run: npm run typecheck
48+
49+
lint:
50+
runs-on: ubuntu-latest
51+
needs: install_deps
52+
steps:
53+
- uses: actions/checkout@v4
54+
- name: Use Node.js ${{ env.RUNNER_NODE_VERSION }}
55+
uses: actions/setup-node@v4
56+
with:
57+
node-version: ${{ env.RUNNER_NODE_VERSION }}
58+
- name: restore dependencies cache
59+
uses: actions/cache/restore@v4
60+
with:
61+
path: "node_modules"
62+
key: depends-node${{ env.RUNNER_NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
63+
- name: lint
64+
run: npm run lint
65+
66+
build:
67+
runs-on: ubuntu-latest
68+
needs: install_deps
69+
steps:
70+
- uses: actions/checkout@v4
71+
- name: Use Node.js ${{ env.RUNNER_NODE_VERSION }}
72+
uses: actions/setup-node@v4
73+
with:
74+
node-version: ${{ env.RUNNER_NODE_VERSION }}
75+
- name: restore dependencies cache
76+
uses: actions/cache/restore@v4
77+
with:
78+
path: "node_modules"
79+
key: depends-node${{ env.RUNNER_NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
80+
- name: build
81+
run: npm run build
82+
83+
test:
84+
runs-on: ubuntu-latest
85+
needs: install_deps
86+
strategy:
87+
matrix:
88+
node-version: [18, 20, 22]
89+
steps:
90+
- uses: actions/checkout@v4
91+
- name: Use Node.js ${{ matrix.node-version }}
92+
uses: actions/setup-node@v4
93+
with:
94+
node-version: ${{ matrix.node-version }}
95+
- name: restore dependencies cache
96+
uses: actions/cache/restore@v4
97+
with:
98+
path: "node_modules"
99+
key: depends-node${{ env.RUNNER_NODE_VERSION }}-${{ hashFiles('package-lock.json') }}
100+
- name: test
101+
run: npm run test
102+
test_result:
103+
runs-on: ubuntu-latest
104+
needs: test
105+
if: ${{ always() }}
106+
steps:
107+
- run: exit 1
108+
if: ${{ needs.test.result != 'success' }}

‎.github/workflows/release.yml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
concurrency: ${{ github.workflow }}-${{ github.ref }}
9+
10+
jobs:
11+
create_pr:
12+
name: Release
13+
runs-on: ubuntu-latest
14+
outputs:
15+
hasChangesets: ${{ steps.changesets.outputs.hasChangesets }}
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- uses: actions/setup-node@v4
20+
with:
21+
node-version: 22
22+
cache: 'npm'
23+
24+
- run: npm i
25+
26+
- name: Create Release Pull Request
27+
id: changesets
28+
uses: changesets/action@v1
29+
env:
30+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
31+
32+
release:
33+
needs: create_pr
34+
if: needs.create_pr.outputs.hasChangesets == 'false'
35+
runs-on: ubuntu-latest
36+
environment: deploy
37+
steps:
38+
- uses: actions/checkout@v4
39+
40+
- uses: actions/setup-node@v4
41+
with:
42+
node-version: 22
43+
cache: 'npm'
44+
45+
- run: npm i
46+
47+
- name: release
48+
id: changesets
49+
uses: changesets/action@v1
50+
with:
51+
publish: npm run release
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
55+

‎CHANGELOG.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# neverthrow
2+
3+
## 7.0.1
4+
5+
### Patch Changes
6+
7+
- [#527](https://github.com/supermacro/neverthrow/pull/527) [`2e1f198`](https://github.com/supermacro/neverthrow/commit/2e1f19899800ce5e1164412c6a693cf2f1c40b20) Thanks [@3846masa](https://github.com/3846masa)! - fix: change type definitions to make inferring types of safeTry more strict
8+
9+
- [#497](https://github.com/supermacro/neverthrow/pull/497) [`e06203e`](https://github.com/supermacro/neverthrow/commit/e06203e90b2b64edaa42707cbca8383c9f4765e8) Thanks [@braxtonhall](https://github.com/braxtonhall)! - enhance type inferrence of `match`
10+
11+
## 7.0.0
12+
13+
### Major Changes
14+
15+
- [#553](https://github.com/supermacro/neverthrow/pull/553) [`5a3af0a`](https://github.com/supermacro/neverthrow/commit/5a3af0a55d0c440dfd50bfbbe021c6e4b973184b) Thanks [@m-shaka](https://github.com/m-shaka)! - Declare the minimum supported Node.js version
16+
17+
`Neverthrow` does not depend on any Node.js version-specific features, so it should work with any version of Node.js that supports ES6 and other runtimes like Browser, Deno, etc.
18+
19+
However, for the sake of maintaining a consistent development environment, we should declare the minimum supported version of Node.js in the `engines` field of the `package.json` file.

‎CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @m-shaka @supermacro

0 commit comments

Comments
 (0)