diff --git a/packages/next/src/utilities/meta.ts b/packages/next/src/utilities/meta.ts index 7cfdb8224d..49e030d86d 100644 --- a/packages/next/src/utilities/meta.ts +++ b/packages/next/src/utilities/meta.ts @@ -1,7 +1,7 @@ import type { Metadata } from 'next' import type { SanitizedConfig } from 'payload/types' -import { payloadFavicon, payloadOgImage } from '@payloadcms/ui' +import { payloadFavicon, payloadOgImage } from '@payloadcms/ui/assets' export const meta = async (args: { config: SanitizedConfig diff --git a/packages/next/src/withPayload.js b/packages/next/src/withPayload.js index f640caf0bf..5d38bf6aec 100644 --- a/packages/next/src/withPayload.js +++ b/packages/next/src/withPayload.js @@ -1,11 +1,5 @@ -const path = require('path') - /** @type {import('next').NextConfig} */ const withPayload = (nextConfig = {}) => { - const aliases = { - 'payload-config': path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH), - } - return { ...nextConfig, experimental: { @@ -24,13 +18,6 @@ const withPayload = (nextConfig = {}) => { 'pino', 'pino-pretty', ], - turbo: { - ...(nextConfig?.experimental?.turbo || {}), - resolveAlias: { - ...(nextConfig?.experimental?.turbo?.resolveAlias || {}), - ...aliases, - }, - }, }, webpack: (webpackConfig, webpackOptions) => { const incomingWebpackConfig = @@ -59,7 +46,6 @@ const withPayload = (nextConfig = {}) => { ...(incomingWebpackConfig?.resolve || {}), alias: { ...(incomingWebpackConfig?.resolve?.alias || {}), - ...aliases, }, fallback: { ...(incomingWebpackConfig?.resolve?.fallback || {}), diff --git a/packages/ui/src/@types/assets.d.ts b/packages/ui/src/@types/assets.d.ts new file mode 100644 index 0000000000..7cca990e90 --- /dev/null +++ b/packages/ui/src/@types/assets.d.ts @@ -0,0 +1,22 @@ +declare module '*.svg' { + import React = require('react') + + export const ReactComponent: React.SFC> + const src: string + export default src +} + +declare module '*.jpg' { + const content: string + export default content +} + +declare module '*.png' { + const content: string + export default content +} + +declare module '*.json' { + const content: string + export default content +} diff --git a/packages/ui/src/exports/index.ts b/packages/ui/src/exports/index.ts index 197177e0d4..110029ee74 100644 --- a/packages/ui/src/exports/index.ts +++ b/packages/ui/src/exports/index.ts @@ -7,4 +7,3 @@ export * from './templates' export * from './graphics' export * from './icons' export * from './types' -export * from './assets'