Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

large update to 84+ #92

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+8,295 −6,304
Open

large update to 84+ #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3037e1
update translator only for now
r1tsuu Aug 17, 2024
7301d41
pre 1.3.0 translator
r1tsuu Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/better-localized-fields/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@
"prepublishOnly": "pnpm clean && pnpm build"
},
"devDependencies": {
"@payloadcms/next": "3.0.0-beta.61",
"@payloadcms/translations": "3.0.0-beta.61",
"@payloadcms/ui": "3.0.0-beta.61",
"@payloadcms/next": "3.0.0-beta.84",
"@payloadcms/translations": "3.0.0-beta.84",
"@payloadcms/ui": "3.0.0-beta.84",
"react": "19.0.0-rc-f994737d14-20240522",
"react-dom": "19.0.0-rc-f994737d14-20240522",
"payload": "3.0.0-beta.61",
"payload": "3.0.0-beta.84",
"@types/react": "npm:types-react@19.0.0-beta.2",
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2"
},
"peerDependencies": {
"@payloadcms/next": "^3.0.0-beta.61",
"@payloadcms/translations": "^3.0.0-beta.61",
"@payloadcms/ui": "^3.0.0-beta.61",
"@payloadcms/next": "^3.0.0-beta.84",
"@payloadcms/translations": "^3.0.0-beta.84",
"@payloadcms/ui": "^3.0.0-beta.84",
"flatley": "^5.2.0",
"payload": "^3.0.0-beta.61"
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down
8 changes: 4 additions & 4 deletions packages/better-use-as-title/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
"prepublishOnly": "pnpm clean && pnpm build"
},
"devDependencies": {
"@payloadcms/ui": "3.0.0-beta.61",
"@payloadcms/ui": "3.0.0-beta.84",
"@types/react": "npm:types-react@19.0.0-beta.2",
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"payload": "3.0.0-beta.61",
"payload": "3.0.0-beta.84",
"react": "19.0.0-rc-f994737d14-20240522",
"react-dom": "19.0.0-rc-f994737d14-20240522",
"typescript": "^5.5.2"
},
"peerDependencies": {
"@payloadcms/ui": "^3.0.0-beta.61",
"payload": "^3.0.0-beta.61"
"@payloadcms/ui": "^3.0.0-beta.84",
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cached-local-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
"prepublishOnly": "pnpm clean && pnpm build"
},
"devDependencies": {
"payload": "3.0.0-beta.61",
"payload": "3.0.0-beta.84",
"typescript": "^5.5.2"
},
"peerDependencies": {
"payload": "^3.0.0-beta.61"
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down
8 changes: 4 additions & 4 deletions packages/docs-reorder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
"zod": "^3.23.8"
},
"devDependencies": {
"@payloadcms/ui": "3.0.0-beta.61",
"@payloadcms/ui": "3.0.0-beta.84",
"@types/react": "npm:types-react@19.0.0-beta.2",
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"payload": "3.0.0-beta.61",
"payload": "3.0.0-beta.84",
"react-dom": "19.0.0-rc-f994737d14-20240522"
},
"peerDependencies": {
"@payloadcms/ui": "^3.0.0-beta.61",
"payload": "^3.0.0-beta.61"
"@payloadcms/ui": "^3.0.0-beta.84",
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down
4 changes: 2 additions & 2 deletions packages/fields-select/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
"prepublishOnly": "pnpm clean && pnpm build"
},
"devDependencies": {
"payload": "3.0.0-beta.61",
"payload": "3.0.0-beta.84",
"typescript": "^5.5.2"
},
"peerDependencies": {
"payload": "^3.0.0-beta.61"
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down
14 changes: 7 additions & 7 deletions packages/seo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@
"bson-objectid": "^2.0.4"
},
"devDependencies": {
"@payloadcms/translations": "3.0.0-beta.61",
"@payloadcms/ui": "3.0.0-beta.61",
"@payloadcms/translations": "3.0.0-beta.84",
"@payloadcms/ui": "3.0.0-beta.84",
"@types/react": "npm:types-react@19.0.0-beta.2",
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"openai": "^4.52.0",
"payload": "3.0.0-beta.61",
"payload": "3.0.0-beta.84",
"react": "19.0.0-rc-f994737d14-20240522",
"react-dom": "19.0.0-rc-f994737d14-20240522",
"typescript": "^5.5.2"
},
"peerDependencies": {
"@payloadcms/next": "^3.0.0-beta.61",
"@payloadcms/translations": "^3.0.0-beta.61",
"@payloadcms/ui": "^3.0.0-beta.61",
"@payloadcms/next": "^3.0.0-beta.84",
"@payloadcms/translations": "^3.0.0-beta.84",
"@payloadcms/ui": "^3.0.0-beta.84",
"openai": "^4.30.0",
"payload": "^3.0.0-beta.61"
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down
28 changes: 19 additions & 9 deletions packages/translator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@payload-enchants/translator",
"version": "1.2.2",
"version": "1.3.0-pre.0",
"private": false,
"bugs": "https://github.com/r1tsuu/payload-enchants/issues",
"repository": "https://github.com/r1tsuu/payload-enchants",
Expand Down Expand Up @@ -37,6 +37,11 @@
"import": "./src/resolvers/openAI.ts",
"require": "./src/resolvers/openAI.ts",
"types": "./src/resolvers/openAI.ts"
},
"./client": {
"import": "./src/exports/client.ts",
"require": "./src/exports/client.ts",
"types": "./src/exports/client.ts"
}
},
"files": [
Expand All @@ -56,19 +61,19 @@
"bson-objectid": "^2.0.4"
},
"devDependencies": {
"@payloadcms/translations": "3.0.0-beta.61",
"@payloadcms/ui": "3.0.0-beta.61",
"@payloadcms/translations": "3.0.0-beta.84",
"@payloadcms/ui": "3.0.0-beta.84",
"@types/react": "npm:types-react@19.0.0-beta.2",
"@types/react-dom": "npm:types-react-dom@19.0.0-beta.2",
"payload": "3.0.0-beta.61",
"react": "19.0.0-rc-f994737d14-20240522",
"react-dom": "19.0.0-rc-f994737d14-20240522",
"payload": "3.0.0-beta.84",
"react": "19.0.0-rc-06d0b89e-20240801",
"react-dom": "19.0.0-rc-06d0b89e-20240801",
"typescript": "^5.5.2"
},
"peerDependencies": {
"@payloadcms/translations": "^3.0.0-beta.61",
"@payloadcms/ui": "^3.0.0-beta.61",
"payload": "^3.0.0-beta.61"
"@payloadcms/translations": "^3.0.0-beta.84",
"@payloadcms/ui": "^3.0.0-beta.84",
"payload": "^3.0.0-beta.84"
},
"publishConfig": {
"exports": {
Expand Down Expand Up @@ -101,6 +106,11 @@
"import": "./dist/resolvers/openAI.js",
"require": "./dist/resolvers/openAI.js",
"types": "./dist/resolvers/openAI.d.ts"
},
"./client": {
"import": "./dist/exports/client.js",
"require": "./dist/exports/client.js",
"types": "./dist/exports/client.d.ts"
}
},
"main": "./dist/index.js",
Expand Down
13 changes: 8 additions & 5 deletions packages/translator/src/client/components/CustomButton/CustomButtonWithTranslator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,24 @@
import './styles.scss';

import { useConfig, useDocumentInfo } from '@payloadcms/ui';
import type { ReactNode } from 'react';

import type { TranslateResolver } from '../../../resolvers/types';
import { TranslatorProvider } from '../../providers/Translator/TranslatorProvider';
import { ResolverButton } from '../ResolverButton';
import { TranslatorModal } from '../TranslatorModal';
import { DefaultPublishButton } from '@payloadcms/ui';
import { DefaultSaveButton } from '@payloadcms/ui';

export const CustomButtonWithTranslator = ({ defaultButton }: { defaultButton: ReactNode }) => {
const config = useConfig();
export const CustomButtonWithTranslator = ({ type }: { type: 'publish' | 'save' }) => {
const { config } = useConfig();

const DefaultButton = type === 'publish' ? DefaultPublishButton : DefaultSaveButton;

const { globalSlug, id } = useDocumentInfo();

const resolvers = (config.admin?.custom?.translator?.resolvers as TranslateResolver[]) ?? [];

if (!id && !globalSlug) return defaultButton;
if (!id && !globalSlug) return <DefaultButton />;

return (
<TranslatorProvider>
Expand All @@ -26,7 +29,7 @@ export const CustomButtonWithTranslator = ({ defaultButton }: { defaultButton: R
{resolvers.map((resolver) => (
<ResolverButton key={resolver.key} resolver={resolver} />
))}
{defaultButton}
{<DefaultButton />}
</div>
</TranslatorProvider>
);
Expand Down
15 changes: 7 additions & 8 deletions packages/translator/src/client/components/CustomButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { DefaultPublishButton, DefaultSaveButton } from '@payloadcms/ui';
import { CustomPublishButton, CustomSaveButton } from 'payload';

import { CustomButtonWithTranslator } from './CustomButtonWithTranslator';

export const CustomButton = (type: 'publish' | 'save') => {
return () => {
const defaultButton = type === 'publish' ? <DefaultPublishButton /> : <DefaultSaveButton />;

return <CustomButtonWithTranslator defaultButton={defaultButton} />;
export const CustomButton = (type: 'publish' | 'save'): CustomSaveButton | CustomPublishButton => {
return {
path: `@payload-enchants/translator/client#CustomButtonWithTranslator`,
clientProps: {
type,
},
};
};
10 changes: 6 additions & 4 deletions packages/translator/src/client/providers/Translator/TranslatorProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ export const TranslatorProvider = ({ children }: { children: ReactNode }) => {
const locale = useLocale();

const {
admin: { custom },
localization,
routes: { api },
serverURL,
config: {
admin: { custom },
localization,
routes: { api },
serverURL,
},
} = useConfig();

const apiClient = createClient({ api, serverURL });
Expand Down
1 change: 1 addition & 0 deletions packages/translator/src/exports/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { CustomButtonWithTranslator } from '../client/components/CustomButton/CustomButtonWithTranslator';
6 changes: 4 additions & 2 deletions packages/translator/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable perfectionist/sort-named-exports */
import type { Plugin } from 'payload';
import type { Config, Plugin } from 'payload';
import { deepMerge } from 'payload/shared';

import { CustomButton } from './client/components/CustomButton';
Expand All @@ -15,7 +15,7 @@ export const translator: (pluginConfig: TranslatorConfig) => Plugin = (pluginCon
if (pluginConfig.disabled || !config.localization || config.localization.locales.length < 2)
return config;

return {
const updatedConfig: Config = {
...config,
admin: {
...(config.admin ?? {}),
Expand Down Expand Up @@ -85,5 +85,7 @@ export const translator: (pluginConfig: TranslatorConfig) => Plugin = (pluginCon
},
},
};

return updatedConfig;
};
};
Loading