yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 23:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Ben Irvin 2023-03-27 10:48:47 +02:00
parent 205e5f9d55
commit 2621ea6325
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/data-transfer/src/strapi/remote/handlers/push.ts
View File

@ -439,7 +439,7 @@ export const createPushController = handlerControllerFactory<Partial<PushHandler
this.flow = createFlow(DEFAULT_TRANSFER_FLOW);
this.provider = createLocalStrapiDestinationProvider({
...params,
...params.options,
autoDestroy: false,
getStrapi: () => strapi,
});

6
packages/core/data-transfer/types/remote/protocol/client/commands.d.ts vendored
View File

@ -1,4 +1,5 @@
import type { ILocalStrapiDestinationProviderOptions } from '../../../../src/strapi/providers';
import type { TransferMethod } from '../../../../src/strapi/remote/constants';
export type CommandMessage = { type: 'command' } & (InitCommand | EndCommand | StatusCommand);
@ -12,7 +13,10 @@ export type GetCommandParams<T extends Command> = {
export type InitCommand = CreateCommand<
'init',
Pick<ILocalStrapiDestinationProviderOptions, 'strategy' | 'restore'>
{
options: Pick<ILocalStrapiDestinationProviderOptions, 'strategy' | 'restore'>;
transfer: TransferMethod;
}
>;
export type TransferKind = InitCommand['params']['transfer'];

2
packages/core/data-transfer/types/remote/protocol/client/transfer/pull.d.ts vendored
View File

@ -1,4 +1,4 @@
import type { IEntity, ILink, IConfiguration, IAsset } from '../../../../common-entities';
import type { IEntity, ILink, IConfiguration } from '../../../../common-entities';
import { CreateTransferMessage } from './utils';
export type TransferPullMessage = CreateTransferMessage<