fix: Export Endpoint through core

reactive · Jul 14, 2020 · 8b60dea · 8b60dea
1 parent 6e9b8b0
commit 8b60dea
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/packages/core/rollup.config.js b/packages/core/rollup.config.js
@@ -15,6 +15,7 @@ const dependencies = Object.keys(pkg.dependencies)
       ![
         '@rest-hooks/normalizr',
         '@rest-hooks/use-enhanced-reducer',
+        '@rest-hooks/endpoint',
         '@babel/runtime',
       ].includes(dep),
   );

diff --git a/packages/core/src/react-integration/__tests__/subscriptions.tsx b/packages/core/src/react-integration/__tests__/subscriptions.tsx
@@ -62,7 +62,7 @@ for (const makeProvider of [makeCacheProvider, makeExternalCacheProvider]) {
       renderRestHook.cleanup();
     });
 
-    it.only('useSubscription() + useCache()', async () => {
+    it('useSubscription() + useCache()', async () => {
       jest.useFakeTimers();
       const frequency: number = (PollingArticleResource.detailShape()
         .options as any).pollFrequency;

diff --git a/packages/endpoint/src/__tests__/endpoint.ts b/packages/endpoint/src/__tests__/endpoint.ts
@@ -291,7 +291,7 @@ describe('Endpoint', () => {
         );
       });
 
-      it.only('should use extended token', async () => {
+      it('should use extended token', async () => {
         //sdf @ts-expect-error
         const UserCurrent = new AuthEndpoint(fetchAuthd, {
           token: 'password3',

diff --git a/packages/rest-hooks/src/index.ts b/packages/rest-hooks/src/index.ts
@@ -24,6 +24,8 @@ export {
   schema as schemas,
   // TODO: get rid of these exports once core has been out for a while
   usePromisifiedDispatch,
+  Endpoint,
+  Index,
 } from '@rest-hooks/core';
 export type {
   FetchShape,
@@ -54,9 +56,6 @@ export type {
   NormalizeNullable,
   Denormalize,
   DenormalizeNullable,
-} from '@rest-hooks/core';
-export { Endpoint, Index } from '@rest-hooks/endpoint';
-export type {
   EndpointExtraOptions,
   FetchFunction,
   ResolveType,
@@ -68,7 +67,8 @@ export type {
   IndexInterface,
   IndexParams,
   ArrayElement,
-} from '@rest-hooks/endpoint';
+} from '@rest-hooks/core';
+
 export { Resource, SimpleResource } from './resource';
 export type { SchemaDetail, SchemaList } from './resource/types';
 export {

diff --git a/packages/rest-hooks/src/resource/SimpleResource.ts b/packages/rest-hooks/src/resource/SimpleResource.ts
@@ -1,6 +1,14 @@
-import { FlatEntity, schema, ReadShape, MutateShape } from '@rest-hooks/core';
-import type { AbstractInstanceType } from '@rest-hooks/core';
-import { Endpoint, EndpointExtraOptions } from '@rest-hooks/endpoint';
+import {
+  FlatEntity,
+  schema,
+  ReadShape,
+  MutateShape,
+  Endpoint,
+} from '@rest-hooks/core';
+import type {
+  AbstractInstanceType,
+  EndpointExtraOptions,
+} from '@rest-hooks/core';
 
 import { SchemaDetail, SchemaList } from './types';
 import { NotImplementedError } from './errors';