Skip to content

Commit 35bccb0

Browse files
committed
merge upstream
2 parents 0850d55 + 8eb058d commit 35bccb0

Some content is hidden

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

58 files changed

+13955
-10277
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://unpkg.com/@changesets/config@2.0.0/schema.json",
33
"changelog": "@changesets/cli/changelog",
44
"commit": false,
5-
"ignore": ["playground", "gatsby-example", "nextjs-example"],
5+
"ignore": ["playground", "*-example"],
66
"access": "public",
77
"updateInternalDependencies": "patch",
88
"baseBranch": "main",

.eslintrc.js

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

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ Steps to reproduce the behavior:
1717
3. Scroll down to '....'
1818
4. See error
1919

20-
**Codesandbox link**
21-
Include a codesandox will help us to investigate the issue quicker.
20+
**StackBlitz link**
21+
Include a StackBLitz will help us to investigate the issue quicker.
22+
23+
[![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz_small.svg)](https://stackblitz.com/fork/github/devrnt/react-use-intercom/)
2224

2325
**Expected behavior**
2426
A clear and concise description of what you expected to happen.

.github/dependabot.yml

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

.github/workflows/deploy.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,16 @@ jobs:
1010
runs-on: ubuntu-20.04
1111
strategy:
1212
matrix:
13-
node-version: [18.16]
13+
node-version: [22.13.1]
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1717

1818
- name: Install pnpm
19-
uses: pnpm/action-setup@v2
20-
with:
21-
version: 8.6.5
19+
uses: pnpm/action-setup@v3
2220

2321
- name: Use Node ${{ matrix.node-version }}
24-
uses: actions/setup-node@v3
22+
uses: actions/setup-node@v4
2523
with:
2624
node-version: ${{ matrix.node-version }}
2725
cache: 'pnpm'
@@ -36,4 +34,4 @@ jobs:
3634
uses: peaceiris/actions-gh-pages@v3
3735
with:
3836
github_token: ${{ secrets.GITHUB_TOKEN }}
39-
publish_dir: ./apps/playground/dist
37+
publish_dir: ./apps/playground/dist

.github/workflows/e2e-testing.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ jobs:
55
runs-on: ubuntu-20.04
66
strategy:
77
matrix:
8-
node-version: [18]
8+
node-version: [22.13.1]
99

1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: Install pnpm
15-
uses: pnpm/action-setup@v2
16-
with:
17-
version: 8.6.5
15+
uses: pnpm/action-setup@v3
1816

1917
- name: Use Node ${{ matrix.node-version }}
20-
uses: actions/setup-node@v3
18+
uses: actions/setup-node@v4
2119
with:
2220
node-version: ${{ matrix.node-version }}
2321
cache: 'pnpm'
@@ -32,17 +30,13 @@ jobs:
3230
run: ./node_modules/cypress/bin/cypress install
3331

3432
- name: Cypress run
35-
uses: cypress-io/github-action@v4
33+
uses: cypress-io/github-action@v6
3634
with:
3735
install: false
38-
# build playground
39-
# build: pnpm dev:playground
40-
# start playground
4136
start: pnpm dev
4237
command: pnpm e2e
43-
# FIXME: this breaks it
44-
# wait-on: 'http://localhost:5173'
45-
# project: /packages/react-use-intercom
38+
wait-on: 'http://localhost:5173'
39+
project: ./apps/playground
4640

4741
# after the test run completes
4842
# store videos and any screenshots

.github/workflows/main.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@ jobs:
55
runs-on: ubuntu-20.04
66
strategy:
77
matrix:
8-
node-version: [18.16]
9-
8+
node-version: [22.13.1]
109
steps:
1110
- name: Checkout
12-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1312

1413
- name: Install pnpm
15-
uses: pnpm/action-setup@v2
16-
with:
17-
version: 8.6.5
14+
uses: pnpm/action-setup@v3
1815

1916
- name: Use Node ${{ matrix.node-version }}
20-
uses: actions/setup-node@v3
17+
uses: actions/setup-node@v4
2118
with:
2219
node-version: ${{ matrix.node-version }}
2320
cache: 'pnpm'

.github/workflows/pull-request.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ jobs:
55
runs-on: ubuntu-20.04
66
strategy:
77
matrix:
8-
node-version: [18.16]
8+
node-version: [22.13.1]
99

1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: Install pnpm
15-
uses: pnpm/action-setup@v2
16-
with:
17-
version: 8.6.5
15+
uses: pnpm/action-setup@v3
1816

1917
- name: Use Node ${{ matrix.node-version }}
20-
uses: actions/setup-node@v3
18+
uses: actions/setup-node@v4
2119
with:
2220
node-version: ${{ matrix.node-version }}
2321
cache: 'pnpm'
@@ -31,4 +29,4 @@ jobs:
3129
- uses: preactjs/compressed-size-action@v2
3230
with:
3331
repo-token: '${{ secrets.GITHUB_TOKEN }}'
34-
pattern: "packages/**/dist/**/*.?(m)js"
32+
pattern: "packages/**/dist/**/*.?(c)js"

.github/workflows/release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,21 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
strategy:
1515
matrix:
16-
node-version: [18.16]
16+
node-version: [22.13.1]
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Install pnpm
23-
uses: pnpm/action-setup@v2
24-
with:
25-
version: 8.6.5
23+
uses: pnpm/action-setup@v3
2624

2725
- name: Use Node ${{ matrix.node-version }}
28-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2927
with:
3028
node-version: ${{ matrix.node-version }}
3129
cache: 'pnpm'
32-
30+
3331
- name: Install dependencies
3432
run: pnpm install --frozen-lockfile
3533

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
auto-install-peers = true
22
node-linker=hoisted
3+
# This allows us to use workspace packages if available, otherwise pull from the remote registry
4+
link-workspace-packages = true

0 commit comments

Comments
 (0)