Skip to content

Commit

Permalink
refactor(sanity): refer to exports by name
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuslundgard committed Oct 4, 2022
1 parent 97fda78 commit 1b8194f
Show file tree
Hide file tree
Showing 121 changed files with 237 additions and 230 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import path from 'path'
import {Worker, isMainThread} from 'worker_threads'
import readPkgUp from 'read-pkg-up'
import type {CliCommandContext, CliV3CommandContext} from '@sanity/cli'
import {createSchema} from '../../../../core'
import type {
ResolvedGraphQLAPI,
ResolvedSourceProperties,
SchemaDefinitionish,
TypeResolvedGraphQLAPI,
} from './types'
import {createSchema} from 'sanity'

export async function getGraphQLAPIs(cliContext: CliCommandContext): Promise<ResolvedGraphQLAPI[]> {
if (!isModernCliConfig(cliContext)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import oneline from 'oneline'
import {isPlainObject} from 'lodash'
import type {Schema} from '@sanity/types'
import type {CliV3CommandContext, GraphQLAPIConfig} from '@sanity/cli'
import {Workspace} from '../../../core'
import type {SchemaDefinitionish, TypeResolvedGraphQLAPI} from '../actions/graphql/types'
import {getStudioConfig} from '../util/getStudioConfig'
import {Workspace} from 'sanity'

if (isMainThread || !parentPort) {
throw new Error('This module must be run as a worker thread')
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/_internal/cli/util/getStudioConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
import fs from 'fs'
import path from 'path'
import {first} from 'rxjs/operators'
import {resolveConfig, Config, Workspace} from '../../../core'
import {mockBrowserEnvironment} from './mockBrowserEnvironment'
import {resolveConfig, Config, Workspace} from 'sanity'

const candidates = [
'sanity.config.js',
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/core/components/IntentButton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Button, ButtonProps} from '@sanity/ui'
import React, {HTMLProps} from 'react'
import {IntentLink, IntentLinkProps} from '../../router'
import {IntentLink, IntentLinkProps} from 'sanity/router'

/**
* @beta
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/core/config/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import type {
RenderItemCallback,
RenderPreviewCallback,
} from '../form'
import type {Router, RouterState} from '../../router'
import type {InitialValueTemplateItem, Template, TemplateResponse} from '../templates'
import type {StudioTheme} from '../theme'
import {PreviewProps} from '../components'
import {AuthStore} from '../store'
import {DocumentActionComponent, DocumentBadgeComponent} from './document'
import {StudioComponents, StudioComponentsPluginOptions} from './components'
import type {Router, RouterState} from 'sanity/router'

/**
* @alpha
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import {
import React, {forwardRef, MouseEvent, ReactElement, useCallback, useMemo, useRef} from 'react'
import {useId} from '@reach/auto-id'
import {ObjectSchemaType} from '@sanity/types'
import {IntentLink} from '../../../../../router'
import {RenderPreviewCallback} from '../../../types'
import {is} from '../../../utils/is'
import {FIXME} from '../../../../FIXME'
import {IntentLink} from 'sanity/router'

interface BlockObjectPreviewProps {
focused: boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import {uuid} from '@sanity/uuid'
import {useId} from '@reach/auto-id'
import styled from 'styled-components'
import {FormField, FormFieldValidationStatus} from '../../components/formField'
import {IntentLink} from '../../../../router'
import {set, setIfMissing, unset} from '../../patch'
import {AlertStrip} from '../../components/AlertStrip'
import {RowWrapper} from '../arrays/ArrayOfObjectsInput/item/components/RowWrapper'
Expand All @@ -62,6 +61,7 @@ import {PreviewReferenceValue} from './PreviewReferenceValue'
import {CreateButton} from './CreateButton'
import {ReferenceAutocomplete} from './ReferenceAutocomplete'
import {AutocompleteContainer} from './AutocompleteContainer'
import {IntentLink} from 'sanity/router'

const StyledPreviewCard = styled(PreviewCard)`
/* this is a hack to avoid layout jumps while previews are loading
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import {set, setIfMissing, unset} from '../../patch'
import {AlertStrip} from '../../components/AlertStrip'
import {Alert} from '../../components/Alert'
import {useOnClickOutside} from '../../hooks/useOnClickOutside'
import {IntentLink} from '../../../../router'
import {ChangeIndicator, PreviewCard} from '../../../components'
import {EMPTY_ARRAY, getPublishedId, isNonNullable} from '../../../util'
import {FIXME} from '../../../FIXME'
Expand All @@ -51,6 +50,7 @@ import {PreviewReferenceValue} from './PreviewReferenceValue'
import {CreateButton} from './CreateButton'
import {ReferenceAutocomplete} from './ReferenceAutocomplete'
import {AutocompleteContainer} from './AutocompleteContainer'
import {IntentLink} from 'sanity/router'

const StyledPreviewCard = styled(PreviewCard)`
/* this is a hack to avoid layout jumps while previews are loading
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {LayerProvider, studioTheme, ThemeProvider, ToastProvider} from '@sanity/
import {of} from 'rxjs'
import {noop} from 'lodash'
import {Reference} from '@sanity/types'
import {RouterProvider, route} from '../../../../../router'
import {ReferenceInput} from '../ReferenceInput'
import {ReferenceInfo, ReferenceInputProps} from '../types'
import {RouterProvider, route} from 'sanity/router'

const EMPTY_SEARCH = () => of([])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Card, Text, Flex} from '@sanity/ui'
import {Asset as AssetType, SanityDocument} from '@sanity/types'
import {useSchema} from '../../../hooks'
import {SanityPreview} from '../../../preview'
import {IntentLink} from '../../../../router'
import {IntentLink} from 'sanity/router'

export const DocumentList = ({
asset,
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/core/studio/StudioLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import React, {
} from 'react'
import styled from 'styled-components'
import {useHotModuleReload} from 'use-hot-module-reload'
import {RouteScope, useRouter} from '../../router'
import {NoToolsScreen} from './screens/NoToolsScreen'
import {ToolNotFoundScreen} from './screens/ToolNotFoundScreen'
import {useWorkspace} from './workspace'
import {RouteScope, useRouter} from 'sanity/router'

const SearchFullscreenPortalCard = styled(Card)`
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React, {useCallback, useMemo, useState} from 'react'
import {Dialog, Grid, Button, Flex, Box, Tooltip, Spinner, Text} from '@sanity/ui'
import styled from 'styled-components'
import {ComposeIcon} from '@sanity/icons'
import {IntentLink} from '../../../../router'
import {useSource} from '../../source'
import {useColorScheme} from '../../colorScheme'
import {TemplatePermissionsResult, useTemplatePermissions} from '../../../store'
import {DefaultPreview, InsufficientPermissionsMessage} from '../../../components'
import {IntentLink} from 'sanity/router'

const DocumentButton = styled(Button)`
text-decoration: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import styled from 'styled-components'
import {isDev} from '../../../environment'
import {useWorkspace} from '../../workspace'
import {useColorScheme} from '../../colorScheme'
import {RouterState, useRouterState, useStateLink} from '../../../../router'
import {useWorkspaces} from '../../workspaces'
import {NavbarContext} from '../../StudioLayout'
import {UserMenu} from './userMenu'
Expand All @@ -28,6 +27,7 @@ import {ChangelogButton} from './changelog'
import {WorkspaceMenuButton} from './workspace'
import {ConfigIssuesButton} from './configIssues/ConfigIssuesButton'
import {LogoButton} from './LogoButton'
import {RouterState, useRouterState, useStateLink} from 'sanity/router'

const RootLayer = styled(Layer)`
min-height: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import * as PathUtils from '@sanity/util/paths'
import {Box, Card, Flex, MenuItem, Text} from '@sanity/ui'
import {LinkIcon} from '@sanity/icons'
import styled from 'styled-components'
import {IntentLink} from '../../../../../router'
import {GlobalPresence} from '../../../../store'
import {UserAvatar} from '../../../../components'
import {IntentLink} from 'sanity/router'

const AvatarCard = styled(Card)`
background: transparent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import {Inline, Label, ResponsivePaddingProps} from '@sanity/ui'
import React, {forwardRef, useMemo} from 'react'
import {IntentLink} from '../../../../../router'
import React, {ReactNode, useMemo} from 'react'
import {useSchema} from '../../../../hooks'
import {useDocumentPresence} from '../../../../store'
import {SanityPreview} from '../../../../preview'
import {DocumentPreviewPresence} from '../../../../presence'
import {getPublishedId} from '../../../../util'
import {PreviewCard} from '../../../../components/PreviewCard'
import {FIXME} from '../../../../FIXME'
import {IntentLink} from 'sanity/router'

interface SearchItemProps extends ResponsivePaddingProps {
onClick?: () => void
Expand All @@ -28,19 +29,18 @@ export function SearchItem(props: SearchItemProps) {
[documentId, documentType]
)

const LinkComponent = useMemo(
const Link = useMemo(
() =>
// eslint-disable-next-line @typescript-eslint/no-shadow
forwardRef(function LinkComponent(linkProps, ref: React.ForwardedRef<HTMLAnchorElement>) {
return <IntentLink {...linkProps} intent="edit" params={params} tabIndex={-1} ref={ref} />
}),
function LinkComponent(linkProps: {children?: ReactNode}) {
return <IntentLink {...linkProps} intent="edit" params={params} tabIndex={-1} />
},
[params]
)

if (!schemaType) return null

return (
<PreviewCard data-as="a" as={LinkComponent as any} onClick={onClick} {...restProps} radius={2}>
<PreviewCard data-as="a" as={Link as FIXME} onClick={onClick} {...restProps} radius={2}>
<SanityPreview
layout="default"
schemaType={schemaType}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {forwardRef, useMemo} from 'react'
import {StateLink, useRouterState} from '../../../../../router'
import {StateLink, useRouterState} from 'sanity/router'

export interface ToolLinkProps {
children: React.ReactNode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import {
} from '@sanity/ui'
import React, {useMemo} from 'react'
import styled from 'styled-components'
import {useRouter} from '../../../../../router'
import {useActiveWorkspace} from '../../../activeWorkspaceMatcher'
import {useColorScheme} from '../../../colorScheme'
import {useWorkspaces} from '../../../workspaces'
import {workspacesDocsUrl} from './constants'
import {useWorkspaceAuthStates} from './hooks'
import {WorkspacePreview} from './WorkspacePreview'
import {useRouter} from 'sanity/router'

const StyledMenu = styled(Menu)`
max-width: 350px;
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/core/studio/router/helpers.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {Tool} from '../../config'
import {RouterState, Router} from '../../../router'
import {isRecord} from '../../util/isRecord'
import {RouterEvent, RouterStateEvent} from './types'
import {getOrderedTools} from './util/getOrderedTools'
import {RouterState, Router} from 'sanity/router'

function resolveUrlStateWithDefaultTool(tools: Tool[], state: Record<string, unknown> | null) {
const orderedTools = getOrderedTools(tools)
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/core/studio/router/router.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Tool} from '../../config'
import {route, Router} from '../../../router'
import {route, Router} from 'sanity/router'

export function createRouter(opts: {basePath?: string; tools: Tool[]}): Router {
const {basePath = '/', tools} = opts
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/core/studio/router/routerEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import {EMPTY, Observable, of} from 'rxjs'
import {distinctUntilChanged, filter, map, mergeScan, shareReplay} from 'rxjs/operators'
import {History, Location} from 'history'
import {Tool} from '../../config'
import {Router} from '../../../router'
import {decodeUrlState, isNonNullable, resolveDefaultState, resolveIntentState} from './helpers'
import {RouterEvent} from './types'
import {Router} from 'sanity/router'

interface RouterEventStreamOptions {
unstable_history: History
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import {History} from 'history'
import {ErrorBoundary} from '@sanity/ui'
import {createHookFromObservableFactory} from '../../util'
import {ConfigResolutionError, Tool, Source, Workspace} from '../../config'
import {Router, RouterProvider, RouterState} from '../../../router'
import {createRouter, createRouterEventStream} from '../router'
import {useActiveWorkspace} from '../activeWorkspaceMatcher'
import {WorkspaceProvider} from '../workspace'
import {SourceProvider} from '../source'
import {Router, RouterProvider, RouterState} from 'sanity/router'
// TODO: work on error handler
// import {flattenErrors} from './flattenErrors'

Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/desk/DeskToolProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {useMemo, useState} from 'react'
import {useConfigContextFromSource, useSource} from '../core'
import {DeskToolContext} from './DeskToolContext'
import {createStructureBuilder, DefaultDocumentNodeResolver} from './structureBuilder'
import {StructureResolver, UnresolvedPaneNode} from './types'
import {useConfigContextFromSource, useSource} from 'sanity'

export interface DeskToolProviderProps {
structure?: StructureResolver
Expand Down
8 changes: 4 additions & 4 deletions packages/sanity/src/desk/__workshop__/DocumentStateStory.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import {Box, Code, Stack, Button, Dialog} from '@sanity/ui'
import React, {useMemo, useState, useCallback, useEffect} from 'react'
import {DeskToolProvider} from '../DeskToolProvider'
import {DocumentPaneProvider} from '../panes'
import {DocumentPaneNode} from '../types'
import {
DocumentActionComponent,
DocumentActionDescription,
Expand All @@ -11,10 +14,7 @@ import {
useSource,
useUnique,
useValidationStatus,
} from '../../core'
import {DeskToolProvider} from '../DeskToolProvider'
import {DocumentPaneProvider} from '../panes'
import {DocumentPaneNode} from '../types'
} from 'sanity'

export default function InitialValueStory() {
const documentId = 'test'
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/desk/components/DocTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {SanityDocumentLike} from '@sanity/types'
import React from 'react'
import {useSchema, unstable_useDocumentPreview as useDocumentPreview} from '../../core'
import {useSchema, unstable_useDocumentPreview as useDocumentPreview} from 'sanity'

export interface DocTitleProps {
document: SanityDocumentLike
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/desk/components/DraftStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from 'react'
import {EditIcon} from '@sanity/icons'
import {PreviewValue, SanityDocument} from '@sanity/types'
import {Box, Text, Tooltip} from '@sanity/ui'
import {TextWithTone} from '../../core'
import {TimeAgo} from './TimeAgo'
import {TextWithTone} from 'sanity'

export function DraftStatus(props: {document?: PreviewValue | Partial<SanityDocument> | null}) {
const {document} = props
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/desk/components/IntentButton.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Button} from '@sanity/ui'
import React, {forwardRef, useMemo} from 'react'
import {IntentLink} from '../../router'
import {PaneMenuItem} from '../types'
import {IntentLink} from 'sanity/router'

type RouterIntent = NonNullable<PaneMenuItem['intent']>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import {Box, Card, Container, Flex, Stack, Text} from '@sanity/ui'
import {WarningOutlineIcon} from '@sanity/icons'
import {useSource} from '../../core'
import {useSource} from 'sanity'

export function MissingDocumentTypesMessage() {
const {name: sourceName} = useSource()
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/desk/components/MissingSchemaType.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {WarningOutlineIcon} from '@sanity/icons'
import {PreviewValue, SanityDocument} from '@sanity/types'
import React from 'react'
import {GeneralPreviewLayoutKey, SanityDefaultPreview} from '../../core'
import {GeneralPreviewLayoutKey, SanityDefaultPreview} from 'sanity'

export interface MissingSchemaTypeProps {
layout?: GeneralPreviewLayoutKey
Expand Down
2 changes: 1 addition & 1 deletion packages/sanity/src/desk/components/PublishedStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React from 'react'
import {PublishIcon} from '@sanity/icons'
import {PreviewValue, SanityDocument} from '@sanity/types'
import {Box, Text, Tooltip} from '@sanity/ui'
import {TextWithTone} from '../../core'
import {TimeAgo} from './TimeAgo'
import {TextWithTone} from 'sanity'

export function PublishedStatus(props: {document?: PreviewValue | Partial<SanityDocument> | null}) {
const {document} = props
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {EditIcon} from '@sanity/icons'
import {Box, Card, Flex, Stack, Text} from '@sanity/ui'
import React, {useCallback, useMemo} from 'react'
import {useSchema, SanityPreview} from '../../core'
import {useRouter} from '../../router'
import {useRouter} from 'sanity/router'
import {useSchema, SanityPreview} from 'sanity'

export interface ReferringDocumentsListProps {
documents: Record<string, any>[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
type DocumentActionDescription,
type DocumentActionProps,
GetHookCollectionState,
} from '../../core'
} from 'sanity'

/** @internal */
export interface Action<Args, Description> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
type DocumentBadgeProps,
type EditStateFor,
GetHookCollectionState,
} from '../../core'
} from 'sanity'

/** @internal */
export interface Badge<Args, Description> {
Expand Down

0 comments on commit 1b8194f

Please sign in to comment.