Revert "[sitecore-jss-nextjs][templates/nextjs] Move graphql client i…

…mports - followup (#1650)" This reverts commit 626675c.
Sitecore · Nov 1, 2023 · 22fc221 · 22fc221
1 parent 626675c
commit 22fc221
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/packages/create-sitecore-jss/src/templates/nextjs/src/lib/graphql-client-factory/create.ts b/packages/create-sitecore-jss/src/templates/nextjs/src/lib/graphql-client-factory/create.ts
@@ -1,8 +1,8 @@
 import {
   GraphQLRequestClientFactoryConfig,
   GraphQLRequestClient,
-  getEdgeProxyContentUrl
-} from '@sitecore-jss/sitecore-jss-nextjs/graphql';
+} from '@sitecore-jss/sitecore-jss-nextjs/graphql-client';
+import { getEdgeProxyContentUrl } from '@sitecore-jss/sitecore-jss-nextjs/utils';
 import { JssConfig } from 'lib/config';
 
 /**

diff --git a/packages/sitecore-jss-nextjs/graphql-client.d.ts b/packages/sitecore-jss-nextjs/graphql-client.d.ts
@@ -0,0 +1 @@
+export * from './types/graphql-client/index';
diff --git a/packages/sitecore-jss-nextjs/graphql-client.js b/packages/sitecore-jss-nextjs/graphql-client.js
@@ -0,0 +1 @@
+module.exports = require('./dist/cjs/graphql-client/index');
diff --git a/packages/sitecore-jss-nextjs/graphql.d.ts b/packages/sitecore-jss-nextjs/graphql.d.ts
diff --git a/packages/sitecore-jss-nextjs/graphql.js b/packages/sitecore-jss-nextjs/graphql.js
diff --git a/.../sitecore-jss-nextjs/src/graphql/index.ts → ...re-jss-nextjs/src/graphql-client/index.ts b/.../sitecore-jss-nextjs/src/graphql/index.ts → ...re-jss-nextjs/src/graphql-client/index.ts
@@ -2,5 +2,4 @@ export {
   GraphQLRequestClient,
   GraphQLRequestClientFactory,
   GraphQLRequestClientFactoryConfig,
-  getEdgeProxyContentUrl,
-} from '@sitecore-jss/sitecore-jss/graphql';
+} from '@sitecore-jss/sitecore-jss';
diff --git a/packages/sitecore-jss-nextjs/src/index.ts b/packages/sitecore-jss-nextjs/src/index.ts
@@ -15,7 +15,7 @@ export {
 
 // we will remove the root exports for these later
 // we cannot mark exports as deprected directly, so we're using this hack instead
-import { GraphQLRequestClient as GraphQLRequestClientDep } from './graphql';
+import { GraphQLRequestClient as GraphQLRequestClientDep } from './graphql-client';
 import {
   isEditorActive as isEditorActiveDep,
   resetEditorChromes as resetEditorChromesDep,
@@ -43,7 +43,7 @@ const {
   handleEditorFastRefreshDep,
   getPublicUrlDep,
 };
-/** @deprecated use import from '@sitecore-jss/sitecore-jss-nextjs/graphql' instead */
+/** @deprecated use import from '@sitecore-jss/sitecore-jss-nextjs/graphql-client' instead */
 const { GraphQLRequestClientDep: GraphQLRequestClient } = {
   GraphQLRequestClientDep,
 };

diff --git a/packages/sitecore-jss-nextjs/src/utils/index.ts b/packages/sitecore-jss-nextjs/src/utils/index.ts
@@ -5,3 +5,4 @@ export {
   resetEditorChromes,
   resolveUrl,
 } from '@sitecore-jss/sitecore-jss/utils';
+export { getEdgeProxyContentUrl } from '@sitecore-jss/sitecore-jss/graphql';
diff --git a/packages/sitecore-jss-nextjs/tsconfig.json b/packages/sitecore-jss-nextjs/tsconfig.json
@@ -18,7 +18,7 @@
     "editing.d.ts",
     "monitoring.d.ts",
     "site.d.ts",
-    "graphql.d.ts",
+    "graphql-client.d.ts",
     "utils.d.ts",
     "src/tests/*",
     "src/test-data/*",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('./dist/cjs/graphql-client/index');