feat: (#591) migrating to src/gqty and exposing @faustjs/next/client

wpengine · Oct 22, 2021 · 38888e8 · 38888e8
1 parent bb466b8
commit 38888e8
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 21 deletions.
diff --git a/packages/next/client.d.ts b/packages/next/client.d.ts
@@ -0,0 +1 @@
+export * from './dist/cjs/export/client';
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -2,13 +2,17 @@
   "name": "@faustjs/next",
   "version": "0.12.4",
   "description": "This module helps you use WordPress as a Headless CMS with Next.js",
-  "main": "dist/cjs/index.js",
-  "module": "dist/mjs/index.js",
-  "types": "dist/cjs/index.d.ts",
+  "main": "dist/cjs/export/index.js",
+  "module": "dist/mjs/export/index.js",
+  "types": "dist/cjs/export/index.d.ts",
   "exports": {
     ".": {
-      "import": "./dist/mjs/index.js",
-      "require": "./dist/cjs/index.js"
+      "import": "./dist/mjs/export/index.js",
+      "require": "./dist/cjs/export/index.js"
+    },
+    "./client": {
+      "import": "./dist/mjs/export/client.js",
+      "require": "./dist/cjs/export/client.js"
     }
   },
   "scripts": {

diff --git a/packages/next/src/HeadlessProvider.tsx b/packages/next/src/HeadlessProvider.tsx
@@ -1,12 +1,12 @@
 import isNil from 'lodash/isNil';
 import React from 'react';
-import type { getClient } from './client';
+import type { getClient } from './gqty/client';
 import {
   AUTH_CLIENT_CACHE_PROP,
   CLIENT_CACHE_PROP,
   PageProps,
 } from './getProps';
-import { HeadlessContext } from './client';
+import { HeadlessContext } from './gqty/client';
 
 /**
  * The HeadlessProvider is a React component required to properly facilitate SSR and SSG for Faust.js.

diff --git a/packages/next/src/export/client.ts b/packages/next/src/export/client.ts
@@ -0,0 +1 @@
+export * from '../gqty';
diff --git a/packages/next/src/export/index.ts b/packages/next/src/export/index.ts
@@ -0,0 +1,7 @@
+export * from '../gqty/client';
+export * from '../config';
+export * from '../getProps';
+export * from '../HeadlessProvider';
+export * from '../utils';
+export * from '../withFaust';
+export * from '../log';
diff --git a/packages/next/src/getProps.tsx b/packages/next/src/getProps.tsx
@@ -13,7 +13,7 @@ import { RouterContext } from 'next/dist/shared/lib/router-context';
 
 import React, { FunctionComponent, ComponentClass } from 'react';
 import { config } from './config';
-import { getClient, HeadlessContext } from './client';
+import { getClient, HeadlessContext } from './gqty/client';
 
 import {
   hasCategoryId,

diff --git a/packages/next/src/client.ts → packages/next/src/gqty/client.ts b/packages/next/src/client.ts → packages/next/src/gqty/client.ts
diff --git a/packages/next/src/hooks/index.ts → packages/next/src/gqty/hooks/index.ts b/packages/next/src/hooks/index.ts → packages/next/src/gqty/hooks/index.ts
diff --git a/packages/next/src/hooks/useAuth.ts → packages/next/src/gqty/hooks/useAuth.ts b/packages/next/src/hooks/useAuth.ts → packages/next/src/gqty/hooks/useAuth.ts
diff --git a/packages/next/src/hooks/useCategory.ts → packages/next/src/gqty/hooks/useCategory.ts b/packages/next/src/hooks/useCategory.ts → packages/next/src/gqty/hooks/useCategory.ts
@@ -3,7 +3,7 @@ import type { RequiredSchema } from '@faustjs/react';
 import { useRouter } from 'next/router';
 import isString from 'lodash/isString';
 import defaults from 'lodash/defaults';
-import { hasCategoryId, hasCategorySlug } from '../utils';
+import { hasCategoryId, hasCategorySlug } from '../../utils';
 import type { NextClientHooks } from '.';
 
 export function create<Schema extends RequiredSchema>(

diff --git a/packages/next/src/hooks/useHydrateCache.ts → ...es/next/src/gqty/hooks/useHydrateCache.ts b/packages/next/src/hooks/useHydrateCache.ts → ...es/next/src/gqty/hooks/useHydrateCache.ts
diff --git a/packages/next/src/hooks/useLazyQuery.ts → packages/next/src/gqty/hooks/useLazyQuery.ts b/packages/next/src/hooks/useLazyQuery.ts → packages/next/src/gqty/hooks/useLazyQuery.ts
diff --git a/packages/next/src/hooks/useLogin.ts → packages/next/src/gqty/hooks/useLogin.ts b/packages/next/src/hooks/useLogin.ts → packages/next/src/gqty/hooks/useLogin.ts
diff --git a/packages/next/src/hooks/useLogout.ts → packages/next/src/gqty/hooks/useLogout.ts b/packages/next/src/hooks/useLogout.ts → packages/next/src/gqty/hooks/useLogout.ts
diff --git a/packages/next/src/hooks/useMutation.ts → packages/next/src/gqty/hooks/useMutation.ts b/packages/next/src/hooks/useMutation.ts → packages/next/src/gqty/hooks/useMutation.ts
diff --git a/packages/next/src/hooks/usePage.ts → packages/next/src/gqty/hooks/usePage.ts b/packages/next/src/hooks/usePage.ts → packages/next/src/gqty/hooks/usePage.ts
@@ -3,7 +3,7 @@ import type { RequiredSchema } from '@faustjs/react';
 import { useRouter } from 'next/router';
 import defaults from 'lodash/defaults';
 import isString from 'lodash/isString';
-import { hasPageId, hasPageUri } from '../utils';
+import { hasPageId, hasPageUri } from '../../utils';
 import type { NextClientHooks } from '.';
 
 export function create<Schema extends RequiredSchema>(

diff --git a/packages/next/src/hooks/usePaginatedQuery.ts → .../next/src/gqty/hooks/usePaginatedQuery.ts b/packages/next/src/hooks/usePaginatedQuery.ts → .../next/src/gqty/hooks/usePaginatedQuery.ts
diff --git a/packages/next/src/hooks/usePost.ts → packages/next/src/gqty/hooks/usePost.ts b/packages/next/src/hooks/usePost.ts → packages/next/src/gqty/hooks/usePost.ts
@@ -3,7 +3,7 @@ import type { RequiredSchema } from '@faustjs/react';
 import { useRouter } from 'next/router';
 import defaults from 'lodash/defaults';
 import isString from 'lodash/isString';
-import { hasPostId, hasPostSlug, hasPostUri } from '../utils';
+import { hasPostId, hasPostSlug, hasPostUri } from '../../utils';
 import type { NextClientHooks } from '.';
 
 export function create<Schema extends RequiredSchema>(

diff --git a/packages/next/src/hooks/usePosts.ts → packages/next/src/gqty/hooks/usePosts.ts b/packages/next/src/hooks/usePosts.ts → packages/next/src/gqty/hooks/usePosts.ts
@@ -1,7 +1,7 @@
 import type { RequiredSchema } from '@faustjs/react';
 import { useRouter } from 'next/router';
 import defaults from 'lodash/defaults';
-import { hasCategoryId, hasCategorySlug } from '../utils';
+import { hasCategoryId, hasCategorySlug } from '../../utils';
 import type { NextClientHooks } from '.';
 
 export function create<Schema extends RequiredSchema>(

diff --git a/packages/next/src/hooks/usePreview.ts → packages/next/src/gqty/hooks/usePreview.ts b/packages/next/src/hooks/usePreview.ts → packages/next/src/gqty/hooks/usePreview.ts
@@ -2,7 +2,7 @@ import { PageIdType, PostIdType } from '@faustjs/core/client';
 import type { RequiredSchema } from '@faustjs/react';
 import isUndefined from 'lodash/isUndefined';
 import { useRouter } from 'next/router';
-import { hasPageId, hasPostId } from '../utils';
+import { hasPageId, hasPostId } from '../../utils';
 import type { NextClientHooks, NextClientHooksWithAuth } from '.';
 
 export type UsePreviewResponse<Schema extends RequiredSchema> =

diff --git a/packages/next/src/hooks/useQuery.ts → packages/next/src/gqty/hooks/useQuery.ts b/packages/next/src/hooks/useQuery.ts → packages/next/src/gqty/hooks/useQuery.ts
diff --git a/packages/next/src/hooks/useSubscription.ts → ...es/next/src/gqty/hooks/useSubscription.ts b/packages/next/src/hooks/useSubscription.ts → ...es/next/src/gqty/hooks/useSubscription.ts
diff --git a/...ges/next/src/hooks/useTransactionQuery.ts → ...ext/src/gqty/hooks/useTransactionQuery.ts b/...ges/next/src/hooks/useTransactionQuery.ts → ...ext/src/gqty/hooks/useTransactionQuery.ts
diff --git a/packages/next/src/gqty/index.ts b/packages/next/src/gqty/index.ts
@@ -0,0 +1,2 @@
+export * from './client';
+export * from './hooks';
diff --git a/packages/next/src/index.ts b/packages/next/src/index.ts
diff --git a/packages/next/src/log.ts b/packages/next/src/log.ts
@@ -1,6 +1,6 @@
 import type { LoggerOptions } from '@gqty/logger';
 import defaults from 'lodash/defaults';
-import type { NextClient } from './client';
+import type { NextClient } from './gqty/client';
 
 export async function logQueries(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './client';
		export * from './hooks';