Skip to content

Commit 19d4669

Browse files
committed
fix: PnP compatibility
1 parent 1777546 commit 19d4669

File tree

13 files changed

+73
-172
lines changed

13 files changed

+73
-172
lines changed

.changeset/itchy-guests-argue.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@data-client/react': patch
3+
---
4+
5+
Fix pnp compatibility
6+
7+
Change import from @data-client/normalizr -> @data-client/core
8+
as `core` is explicit dependency

__tests__/UnionSchema.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Entity, schema } from '@data-client/endpoint';
1+
import { Entity, schema } from '@data-client/rest';
22

33
export enum SequenceType {
44
TemporalCatDiff = 'temporal_cat_diff',

examples/github-app/package-lock.json

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/github-app/package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,12 @@
5151
"@anansi/router": "0.10.10",
5252
"@ant-design/icons": "^5.0.0",
5353
"@data-client/graphql": "^0.14.0",
54+
"@data-client/img": "^0.14.15",
5455
"@data-client/react": "^0.14.0",
5556
"@data-client/rest": "^0.14.0",
5657
"@js-temporal/polyfill": "^0.4.4",
5758
"antd": "5.22.7",
59+
"history": "^5.3.0",
5860
"parse-link-header": "^2.0.0",
5961
"react": "19.0.0",
6062
"react-dom": "19.0.0",

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@
5858
"@babel/preset-flow": "^7.18.6",
5959
"@changesets/changelog-github": "^0.5.0",
6060
"@changesets/cli": "^2.26.1",
61-
"@data-client/react": "workspace:^",
62-
"@data-client/test": "workspace:^",
61+
"@data-client/react": "workspace:*",
62+
"@data-client/rest": "workspace:*",
63+
"@data-client/test": "workspace:*",
6364
"@js-temporal/polyfill": "^0.4.4",
6465
"@react-navigation/native": "^7.0.0",
6566
"@react-navigation/native-stack": "^7.0.0",

packages/img/src/__tests__/Img.web.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DataProvider } from '@data-client/react';
2-
import { getByTestId, render, waitFor } from '@testing-library/react';
3-
import React, { Suspense } from 'react';
2+
import { render, waitFor } from '@testing-library/react';
3+
import { Suspense } from 'react';
44

55
import { Img } from '..';
66

packages/react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
"build:js:node": "BROWSERSLIST_ENV=node12 yarn g:rollup",
158158
"build:js:browser": "BROWSERSLIST_ENV=legacy yarn g:rollup",
159159
"build:bundle": "yarn g:runs build:js:\\* && echo '{\"type\":\"commonjs\"}' > dist/package.json",
160-
"build:clean": "yarn g:clean ./index.d.ts",
160+
"build:clean": "yarn g:clean index.d.ts next.d.ts native",
161161
"build:legacy-types": "yarn g:downtypes lib ts3.4",
162162
"build": "run build:lib && run build:legacy:lib && run build:native:lib && run build:bundle",
163163
"dev": "run build:lib -w",

packages/react/src/__tests__/integration-endpoint.web.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { schema, Entity } from '@data-client/endpoint';
2-
import { Endpoint } from '@data-client/endpoint';
31
import { DataProvider } from '@data-client/react';
42
import { DataProvider as ExternalDataProvider } from '@data-client/react/redux';
3+
import { schema, Entity, Endpoint } from '@data-client/rest';
54
import {
65
CoolerArticleResource,
76
EditorArticleResource,

packages/react/src/__tests__/integration-optimistic-endpoint.web.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Endpoint, Entity } from '@data-client/endpoint';
21
import { CacheProvider } from '@data-client/react';
32
import { DataProvider as ExternalDataProvider } from '@data-client/react/redux';
3+
import { Endpoint, Entity } from '@data-client/rest';
44
import { afterEach, jest } from '@jest/globals';
55
import {
66
OptimisticArticleResource,

packages/react/src/components/__tests__/AsyncBoundary.web.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { Endpoint } from '@data-client/endpoint';
2-
import { NetworkError } from '@data-client/rest';
1+
import { NetworkError, Endpoint } from '@data-client/rest';
32
import { render } from '@testing-library/react';
43
import { ReactElement, StrictMode } from 'react';
54

packages/react/src/hooks/useCancelling.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { EndpointInterface } from '@data-client/normalizr';
1+
import type { EndpointInterface } from '@data-client/core';
22
import { useMemo, useRef } from 'react';
33

44
/**

0 commit comments

Comments
 (0)