Skip to content

Commit ce40d92

Browse files
authored
Merge branch 'vercel:main' into loading-state
2 parents 5291976 + cc97171 commit ce40d92

File tree

6 files changed

+293
-63
lines changed

6 files changed

+293
-63
lines changed

.github/workflows/install/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ description: 'Set up and install dependencies'
33

44
inputs:
55
fetch-depth:
6+
description: 'Number of commits to fetch'
67
default: '1'
78
required: false
89
persist-credentials:
9-
default: true
10+
description: 'Whether to persist credentials'
11+
default: "true"
1012
required: false
1113

1214

@@ -17,7 +19,7 @@ runs:
1719
uses: actions/checkout@v3
1820

1921
- name: Setup pnpm
20-
uses: pnpm/[email protected].2
22+
uses: pnpm/[email protected].4
2123

2224
- name: Use Node.js 16
2325
uses: actions/setup-node@v3
@@ -27,9 +29,6 @@ runs:
2729

2830
- name: Install Dependencies
2931
shell: bash
30-
3132
run: |
3233
corepack enable
3334
pnpm install
34-
env:
35-
CI: true

.github/workflows/release.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/test-release.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Test and Release
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
tags:
8+
- v*
9+
pull_request:
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v3
17+
18+
- name: Install
19+
uses: ./.github/workflows/install
20+
21+
- name: Lint
22+
run: |
23+
pnpm run-all-checks
24+
pnpm clean
25+
pnpm build
26+
pnpm test-packaging
27+
release:
28+
runs-on: ubuntu-latest
29+
needs: test
30+
if: ${{ contains('refs/tags', github.ref) == 'true' }}
31+
steps:
32+
- name: Check out
33+
uses: actions/checkout@v3
34+
35+
- name: Install
36+
uses: ./.github/workflows/install
37+
38+
- name: Release
39+
run: pnpm publish --access public --no-git-checks
40+
env:
41+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN_ELEVATED }}

.github/workflows/test.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

core/use-swr.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,18 @@ export const useSWRHandler = <Data = any, Error = any>(
111111
let equal = true
112112
for (const _ in stateDependencies) {
113113
const t = _ as keyof StateDependencies
114-
if (!compare(current[t], prev[t])) {
115-
if (t === 'data' && isUndefined(prev[t])) {
116-
if (!compare(current[t], returnedData)) {
114+
if (t === 'data') {
115+
if (!compare(current[t], prev[t])) {
116+
if (isUndefined(prev[t])) {
117+
if (!compare(current[t], returnedData)) {
118+
equal = false
119+
}
120+
} else {
117121
equal = false
118122
}
119-
} else {
123+
}
124+
} else {
125+
if (current[t] !== prev[t]) {
120126
equal = false
121127
}
122128
}

0 commit comments

Comments
 (0)