Skip to content

Commit ffd4ab0

Browse files
authored
Merge branch 'main' into chris/mobile-322-the-customer-reports-that-offline-mode-stopped-working-after
2 parents d5f0bfc + edbd18c commit ffd4ab0

24 files changed

+124
-52
lines changed

.changeset/flat-grapes-visit.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/fruity-clocks-send.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/green-roses-decide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

integration/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ Assuming you have a `react-parcel` template defined in `integration/templates`,
368368
```
369369
370370
Here's what each thing is doing:
371-
372371
- `setName`: Set internal name
373372
- `useTemplate`: Define which template inside `integration/templates` to use
374373
- `setEnvFormatter`: Define how environment variables should be formatted. The first argument accepts `'public'` and `'private'`. Inside [`envs.ts`](./presets/envs.ts) the environment variables you can use through [`withEnv`](#environment-configs) are defined. Since different frameworks require environment variables to be in different formats (e.g. Next.js wants public env vars to be prefixed with `NEXT_PUBLIC_`) you can use this formatter to change that.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
"json5": "2.2.3",
127127
"jsonwebtoken": "9.0.2",
128128
"lint-staged": "^14.0.1",
129-
"prettier": "^3.5.3",
129+
"prettier": "^3.6.2",
130130
"prettier-plugin-astro": "^0.14.1",
131131
"prettier-plugin-packagejson": "^2.5.15",
132132
"prettier-plugin-tailwindcss": "^0.6.12",

packages/localizations/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ We're open to all community contributions! If you'd like to contribute in any wa
6666
1. Open the [`localizations/src/en-US.ts`](https://github.com/clerk/javascript/blob/main/packages/localizations/src/en-US.ts) file and add your new key to the object. `en-US` is the default language. If you feel comfortable adding your message in another language than English, feel free to also edit other files.
6767

6868
1. Use the new localization key inside the component. There are two ways:
69-
7069
- The string is inside a component like `<Text>`:
7170

7271
```diff

packages/remix/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
</div>
2727

28-
> [!IMPORTANT] If you're starting a new project with React Router v7 or are in the process of upgrading a Remix v2 application, please use the [`@clerk/react-router`](https://clerk.com/docs/references/react-router/overview) SDK. `@clerk/remix` is only compatible with Remix v2.
28+
> [!WARNING]
29+
> `@clerk/remix` is deprecated and no longer receiving updates. If you're starting a new project with React Router v7 or are in the process of upgrading a Remix v2 application to Remix v3, please use the [`@clerk/react-router`](https://clerk.com/docs/references/react-router/overview) SDK.
2930
3031
## Getting Started
3132

packages/shared/src/compiled/path-to-regexp/index.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ function _(r) {
4545
break;
4646
}
4747
if (!u) throw new TypeError('Missing parameter name at '.concat(e));
48-
n.push({
48+
(n.push({
4949
type: 'NAME',
5050
index: e,
5151
value: u,
5252
}),
53-
(e = t);
53+
(e = t));
5454
continue;
5555
}
5656
if (a === '(') {
@@ -74,12 +74,12 @@ function _(r) {
7474
}
7575
if (o) throw new TypeError('Unbalanced pattern at '.concat(e));
7676
if (!m) throw new TypeError('Missing pattern at '.concat(e));
77-
n.push({
77+
(n.push({
7878
type: 'PATTERN',
7979
index: e,
8080
value: m,
8181
}),
82-
(e = t);
82+
(e = t));
8383
continue;
8484
}
8585
n.push({
@@ -147,15 +147,15 @@ function F(r, n) {
147147
C = f('PATTERN');
148148
if (x || C) {
149149
var g = T || '';
150-
u.indexOf(g) === -1 && ((p += g), (g = '')),
150+
(u.indexOf(g) === -1 && ((p += g), (g = '')),
151151
p && (o.push(p), (p = '')),
152152
o.push({
153153
name: x || m++,
154154
prefix: g,
155155
suffix: '',
156156
pattern: C || A(g),
157157
modifier: f('MODIFIER') || '',
158-
});
158+
}));
159159
continue;
160160
}
161161
var i = T || f('ESCAPED_CHAR');
@@ -170,14 +170,14 @@ function F(r, n) {
170170
y = f('NAME') || '',
171171
O = f('PATTERN') || '',
172172
b = d();
173-
w('CLOSE'),
173+
(w('CLOSE'),
174174
o.push({
175175
name: y || (O ? m++ : ''),
176176
pattern: y && !O ? A(g) : O,
177177
prefix: g,
178178
suffix: b,
179179
modifier: f('MODIFIER') || '',
180-
});
180+
}));
181181
continue;
182182
}
183183
w('END');
@@ -240,14 +240,14 @@ function D(r) {
240240
function $(r, n) {
241241
if (!n) return r;
242242
for (var e = /\((?:\?<(.*?)>)?(?!\?)/g, a = 0, u = e.exec(r.source); u; )
243-
n.push({
243+
(n.push({
244244
name: u[1] || a++,
245245
prefix: '',
246246
suffix: '',
247247
modifier: '',
248248
pattern: '',
249249
}),
250-
(u = e.exec(r.source));
250+
(u = e.exec(r.source)));
251251
return r;
252252
}
253253

@@ -316,11 +316,11 @@ function U(r, n, e) {
316316
else x += '(?:'.concat(R).concat(y, ')').concat(i.modifier);
317317
}
318318
}
319-
if (m) u || (x += ''.concat(T, '?')), (x += e.endsWith ? '(?='.concat(A, ')') : '$');
319+
if (m) (u || (x += ''.concat(T, '?')), (x += e.endsWith ? '(?='.concat(A, ')') : '$'));
320320
else {
321321
var b = r[r.length - 1],
322322
l = typeof b == 'string' ? T.indexOf(b[b.length - 1]) > -1 : b === void 0;
323-
u || (x += '(?:'.concat(T, '(?=').concat(A, '))?')), l || (x += '(?='.concat(T, '|').concat(A, ')'));
323+
(u || (x += '(?:'.concat(T, '(?=').concat(A, '))?')), l || (x += '(?='.concat(T, '|').concat(A, ')')));
324324
}
325325
return new RegExp(x, D(e));
326326
}

packages/shared/src/errors/clerkApiResponseError.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ interface ClerkAPIResponseOptions extends Omit<ClerkErrorParams, 'message' | 'co
1111
retryAfter?: number;
1212
}
1313

14-
/**
15-
* Class representing a Clerk API Response Error.
16-
*/
1714
export class ClerkAPIResponseError extends ClerkError implements ClerkAPIResponseErrorInterface {
1815
static kind = 'ClerkAPIResponseError';
1916
status: number;

packages/shared/src/react/hooks/__tests__/createBillingPaginatedHook.spec.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { act, renderHook, waitFor } from '@testing-library/react';
22
import { beforeEach, describe, expect, it, vi } from 'vitest';
33

44
import type { ClerkResource } from '../../../types';
5+
import type { ResourceCacheStableKey } from '../../stable-keys';
56
import { createBillingPaginatedHook } from '../createBillingPaginatedHook';
67
import { createMockClerk, createMockOrganization, createMockQueryClient, createMockUser } from './mocks/clerk';
78
import { wrapper } from './wrapper';
@@ -33,13 +34,13 @@ const useFetcherMock = vi.fn(() => fetcherMock);
3334

3435
const useDummyAuth = createBillingPaginatedHook<DummyResource, DummyParams>({
3536
hookName: 'useDummyAuth',
36-
resourceType: 'dummy',
37+
resourceType: 'dummy' as ResourceCacheStableKey,
3738
useFetcher: useFetcherMock,
3839
});
3940

4041
const useDummyUnauth = createBillingPaginatedHook<DummyResource, DummyParams>({
4142
hookName: 'useDummyUnauth',
42-
resourceType: 'dummy',
43+
resourceType: 'dummy' as ResourceCacheStableKey,
4344
useFetcher: useFetcherMock,
4445
options: { unauthenticated: true },
4546
});

0 commit comments

Comments
 (0)