diff --git a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/imageFieldProxy.ts b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/imageFieldProxy.ts index 948f8af8..9aa20abd 100644 --- a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/imageFieldProxy.ts +++ b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/imageFieldProxy.ts @@ -1,10 +1,11 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as gatsbyImgix from 'gatsby-plugin-imgix' import * as RE from 'fp-ts/ReaderEither' import * as R from 'fp-ts/Record' import * as O from 'fp-ts/Option' import { pipe } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { ProxyDocumentSubtreeEnv } from '../lib/proxyDocumentSubtree' import { refineFieldValue } from '../lib/refineFieldValue' import { sprintf } from '../lib/sprintf' diff --git a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/linkFieldProxy.ts b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/linkFieldProxy.ts index 93067461..9dd8b772 100644 --- a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/linkFieldProxy.ts +++ b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/linkFieldProxy.ts @@ -1,9 +1,10 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as PrismicDOM from 'prismic-dom' import * as RE from 'fp-ts/ReaderEither' import * as O from 'fp-ts/Option' import { pipe } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { ProxyDocumentSubtreeEnv } from '../lib/proxyDocumentSubtree' import { createGetProxy } from '../lib/createGetProxy' diff --git a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/sliceFieldProxy.ts b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/sliceFieldProxy.ts index b36ace10..7021a32b 100644 --- a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/sliceFieldProxy.ts +++ b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/sliceFieldProxy.ts @@ -1,9 +1,10 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as RE from 'fp-ts/ReaderEither' import * as A from 'fp-ts/Array' import * as R from 'fp-ts/Record' import { pipe } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { proxyDocumentSubtree, ProxyDocumentSubtreeEnv, diff --git a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/slicesFieldProxy.ts b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/slicesFieldProxy.ts index 933b407d..af95df28 100644 --- a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/slicesFieldProxy.ts +++ b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/slicesFieldProxy.ts @@ -1,8 +1,9 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as RE from 'fp-ts/ReaderEither' import * as A from 'fp-ts/Array' import { pipe } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { proxyDocumentSubtree, ProxyDocumentSubtreeEnv, diff --git a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/structuredTextFieldProxy.ts b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/structuredTextFieldProxy.ts index 7e21e7da..8c580e3a 100644 --- a/packages/gatsby-plugin-prismic-previews/src/fieldProxies/structuredTextFieldProxy.ts +++ b/packages/gatsby-plugin-prismic-previews/src/fieldProxies/structuredTextFieldProxy.ts @@ -1,8 +1,9 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as PrismicDOM from 'prismic-dom' import * as RE from 'fp-ts/ReaderEither' import { pipe } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { ProxyDocumentSubtreeEnv } from '../lib/proxyDocumentSubtree' export const valueRefinement = ( diff --git a/packages/gatsby-plugin-prismic-previews/src/lib/proxyDocumentSubtree.ts b/packages/gatsby-plugin-prismic-previews/src/lib/proxyDocumentSubtree.ts index 7db271a4..de32ac86 100644 --- a/packages/gatsby-plugin-prismic-previews/src/lib/proxyDocumentSubtree.ts +++ b/packages/gatsby-plugin-prismic-previews/src/lib/proxyDocumentSubtree.ts @@ -1,9 +1,10 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as RE from 'fp-ts/ReaderEither' import * as O from 'fp-ts/Option' import { pipe } from 'fp-ts/function' import { NodeHelpers } from 'gatsby-node-helpers' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { HTMLSerializer, LinkResolver, diff --git a/packages/gatsby-plugin-prismic-previews/src/lib/refineFieldValue.ts b/packages/gatsby-plugin-prismic-previews/src/lib/refineFieldValue.ts index ec1488db..6161d968 100644 --- a/packages/gatsby-plugin-prismic-previews/src/lib/refineFieldValue.ts +++ b/packages/gatsby-plugin-prismic-previews/src/lib/refineFieldValue.ts @@ -1,7 +1,8 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as RE from 'fp-ts/ReaderEither' import { Refinement } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { FIELD_VALUE_TYPE_PATH_MISMATCH_MSG } from '../constants' import { sprintf } from './sprintf' diff --git a/packages/gatsby-plugin-prismic-previews/src/lib/serializeTypePathsNodes.ts b/packages/gatsby-plugin-prismic-previews/src/lib/serializeTypePathsNodes.ts index 15e70ef7..ca52869c 100644 --- a/packages/gatsby-plugin-prismic-previews/src/lib/serializeTypePathsNodes.ts +++ b/packages/gatsby-plugin-prismic-previews/src/lib/serializeTypePathsNodes.ts @@ -1,9 +1,10 @@ -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as R from 'fp-ts/Record' import * as S from 'fp-ts/Semigroup' import * as A from 'fp-ts/Array' import { pipe } from 'fp-ts/function' +import * as gatsbyPrismic from '../../../gatsby-source-prismic/src' + import { serializePath } from './serializePath' export const serializeTypePathNodes = ( diff --git a/packages/gatsby-plugin-prismic-previews/src/on-post-bootstrap.ts b/packages/gatsby-plugin-prismic-previews/src/on-post-bootstrap.ts index 5c394d1c..662dd28e 100644 --- a/packages/gatsby-plugin-prismic-previews/src/on-post-bootstrap.ts +++ b/packages/gatsby-plugin-prismic-previews/src/on-post-bootstrap.ts @@ -1,5 +1,4 @@ import * as gatsby from 'gatsby' -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as path from 'path' import * as RTE from 'fp-ts/ReaderTaskEither' import * as TE from 'fp-ts/TaskEither' @@ -8,6 +7,8 @@ import * as E from 'fp-ts/Either' import { constVoid, pipe } from 'fp-ts/function' import { createNodeHelpers, NodeHelpers } from 'gatsby-node-helpers' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + import { GLOBAL_TYPE_PREFIX, TYPE_PATHS_MISSING_NODE_MSG, diff --git a/packages/gatsby-plugin-prismic-previews/src/plugin-options-schema.ts b/packages/gatsby-plugin-prismic-previews/src/plugin-options-schema.ts index 5b3ff5f9..0f7197f9 100644 --- a/packages/gatsby-plugin-prismic-previews/src/plugin-options-schema.ts +++ b/packages/gatsby-plugin-prismic-previews/src/plugin-options-schema.ts @@ -1,11 +1,8 @@ import * as gatsby from 'gatsby' import * as prismic from 'ts-prismic' import * as fs from 'fs/promises' -import { - DEFAULT_IMGIX_PARAMS, - DEFAULT_LANG, - DEFAULT_PLACEHOLDER_IMGIX_PARAMS, -} from 'gatsby-source-prismic' + +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' import { DEFAULT_PROMPT_FOR_ACCESS_TOKEN, DEFAULT_TOOLBAR } from './constants' import { WriteTypePathsToFilesystemArgs } from './types' @@ -26,10 +23,10 @@ export const pluginOptionsSchema: NonNullable< ), graphQuery: Joi.string(), fetchLinks: Joi.array().items(Joi.string().required()), - lang: Joi.string().default(DEFAULT_LANG), - imageImgixParams: Joi.object().default(DEFAULT_IMGIX_PARAMS), + lang: Joi.string().default(gatsbyPrismic.DEFAULT_LANG), + imageImgixParams: Joi.object().default(gatsbyPrismic.DEFAULT_IMGIX_PARAMS), imagePlaceholderImgixParams: Joi.object().default( - DEFAULT_PLACEHOLDER_IMGIX_PARAMS, + gatsbyPrismic.DEFAULT_PLACEHOLDER_IMGIX_PARAMS, ), typePrefix: Joi.string(), toolbar: Joi.string().valid('new', 'legacy').default(DEFAULT_TOOLBAR), diff --git a/packages/gatsby-plugin-prismic-previews/src/types.ts b/packages/gatsby-plugin-prismic-previews/src/types.ts index 26c1edd8..791ccb91 100644 --- a/packages/gatsby-plugin-prismic-previews/src/types.ts +++ b/packages/gatsby-plugin-prismic-previews/src/types.ts @@ -1,9 +1,10 @@ import * as gatsby from 'gatsby' import * as gatsbyImgix from 'gatsby-plugin-imgix' -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as prismic from 'ts-prismic' import * as PrismicDOM from 'prismic-dom' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + export type Mutable = { -readonly [P in keyof T]: T[P] } diff --git a/packages/gatsby-plugin-prismic-previews/src/useMergePrismicPreviewData.ts b/packages/gatsby-plugin-prismic-previews/src/useMergePrismicPreviewData.ts index 1015c581..c88d3596 100644 --- a/packages/gatsby-plugin-prismic-previews/src/useMergePrismicPreviewData.ts +++ b/packages/gatsby-plugin-prismic-previews/src/useMergePrismicPreviewData.ts @@ -2,9 +2,10 @@ import * as React from 'react' import * as R from 'fp-ts/Record' import * as O from 'fp-ts/Option' import { pipe } from 'fp-ts/function' -import { PREVIEWABLE_NODE_ID_FIELD } from 'gatsby-source-prismic' import { ValueOf } from 'type-fest' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + import { isPlainObject } from './lib/isPlainObject' import { camelCase } from './lib/camelCase' @@ -19,9 +20,9 @@ const findAndReplacePreviewables = ( // _previewable, then we need to check every property inside for something // that does. if (isPlainObject(nodeOrLeaf)) { - const previewableValue = nodeOrLeaf[PREVIEWABLE_NODE_ID_FIELD] as - | string - | undefined + const previewableValue = nodeOrLeaf[ + gatsbyPrismic.PREVIEWABLE_NODE_ID_FIELD + ] as string | undefined if (previewableValue && nodes[previewableValue]) { return nodes[previewableValue] } diff --git a/packages/gatsby-plugin-prismic-previews/src/usePrismicPreviewBootstrap.ts b/packages/gatsby-plugin-prismic-previews/src/usePrismicPreviewBootstrap.ts index 3c5e7f41..060af2dd 100644 --- a/packages/gatsby-plugin-prismic-previews/src/usePrismicPreviewBootstrap.ts +++ b/packages/gatsby-plugin-prismic-previews/src/usePrismicPreviewBootstrap.ts @@ -7,10 +7,10 @@ import * as IO from 'fp-ts/IO' import * as A from 'fp-ts/Array' import { constVoid, pipe } from 'fp-ts/function' import { createNodeHelpers, NodeHelpers } from 'gatsby-node-helpers' -import { GLOBAL_TYPE_PREFIX } from 'gatsby-source-prismic' -import * as gatsbyPrismic from 'gatsby-source-prismic' import md5 from 'tiny-hashes/md5' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + import { BuildTypePathsStoreFilenameEnv } from './lib/buildTypePathsStoreFilename' import { fetchTypePathsStore } from './lib/fetchTypePaths' import { getCookie } from './lib/getCookie' @@ -268,12 +268,12 @@ export const usePrismicPreviewBootstrap = ( md5(JSON.stringify(input)), nodeHelpers: createNodeHelpers({ typePrefix: [ - GLOBAL_TYPE_PREFIX, + gatsbyPrismic.GLOBAL_TYPE_PREFIX, contextState.pluginOptions.typePrefix, ] .filter(Boolean) .join(' '), - fieldPrefix: GLOBAL_TYPE_PREFIX, + fieldPrefix: gatsbyPrismic.GLOBAL_TYPE_PREFIX, createNodeId: (input: string) => md5(input), createContentDigest: (input: string | UnknownRecord) => md5(JSON.stringify(input)), diff --git a/packages/gatsby-plugin-prismic-previews/test/on-post-bootstrap.test.ts b/packages/gatsby-plugin-prismic-previews/test/on-post-bootstrap.test.ts index d6c663f3..e75bffb4 100644 --- a/packages/gatsby-plugin-prismic-previews/test/on-post-bootstrap.test.ts +++ b/packages/gatsby-plugin-prismic-previews/test/on-post-bootstrap.test.ts @@ -6,7 +6,7 @@ import { createPluginOptions } from './__testutils__/createPluginOptions' import { onPostBootstrap } from '../src/gatsby-node' -test('saves serialized typepaths to filesystem', async (t) => { +test.only('saves serialized typepaths to filesystem', async (t) => { const gatsbyContext = createGatsbyContext() const pluginOptions = createPluginOptions(t) @@ -32,7 +32,7 @@ test('saves serialized typepaths to filesystem', async (t) => { t.true( (pluginOptions.writeTypePathsToFilesystem as sinon.SinonStub).calledWith({ - publicPath: 'public/static/9e387d94c04ebf0e369948edd9c66d2b.json', + publicPath: 'public/static/3e66cce7662062ad5137e62e8bb62096.json', serializedTypePaths, }), ) diff --git a/packages/gatsby-plugin-prismic-previews/test/useMergePrismicPreviewData.test.ts b/packages/gatsby-plugin-prismic-previews/test/useMergePrismicPreviewData.test.ts index b38e6123..6d5b03c9 100644 --- a/packages/gatsby-plugin-prismic-previews/test/useMergePrismicPreviewData.test.ts +++ b/packages/gatsby-plugin-prismic-previews/test/useMergePrismicPreviewData.test.ts @@ -1,6 +1,5 @@ import test from 'ava' import * as mswNode from 'msw/node' -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as prismic from 'ts-prismic' import * as cookie from 'es-cookie' import { renderHook, act } from '@testing-library/react-hooks' @@ -8,6 +7,8 @@ import { createNodeHelpers } from 'gatsby-node-helpers' import md5 from 'tiny-hashes/md5' import browserEnv from 'browser-env' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + import { clearAllCookies } from './__testutils__/clearAllCookies' import { createAPIQueryMockedRequest } from './__testutils__/createAPIQueryMockedRequest' import { createGatsbyContext } from './__testutils__/createGatsbyContext' diff --git a/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap-field-proxies.test.ts b/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap-field-proxies.test.ts index d2eba325..14e9aaf1 100644 --- a/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap-field-proxies.test.ts +++ b/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap-field-proxies.test.ts @@ -2,12 +2,13 @@ import test, { ExecutionContext } from 'ava' import * as mswNode from 'msw/node' import * as sinon from 'sinon' import * as gatsby from 'gatsby' -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as prismic from 'ts-prismic' import * as cookie from 'es-cookie' import { renderHook, act } from '@testing-library/react-hooks' import browserEnv from 'browser-env' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + import { clearAllCookies } from './__testutils__/clearAllCookies' import { createAPIQueryMockedRequest } from './__testutils__/createAPIQueryMockedRequest' import { createGatsbyContext } from './__testutils__/createGatsbyContext' diff --git a/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap.test.ts b/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap.test.ts index 3e673d6c..1bfe2d52 100644 --- a/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap.test.ts +++ b/packages/gatsby-plugin-prismic-previews/test/usePrismicPreviewBootstrap.test.ts @@ -1,7 +1,6 @@ import test from 'ava' import * as msw from 'msw' import * as mswNode from 'msw/node' -import * as gatsbyPrismic from 'gatsby-source-prismic' import * as prismic from 'ts-prismic' import * as cookie from 'es-cookie' import { renderHook, act } from '@testing-library/react-hooks' @@ -9,6 +8,8 @@ import { createNodeHelpers } from 'gatsby-node-helpers' import md5 from 'tiny-hashes/md5' import browserEnv from 'browser-env' +import * as gatsbyPrismic from '../../gatsby-source-prismic/src' + import { clearAllCookies } from './__testutils__/clearAllCookies' import { createGatsbyContext } from './__testutils__/createGatsbyContext' import { createPluginOptions } from './__testutils__/createPluginOptions'