yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 02:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'features/deits' into deits/transfer-protocols

Browse Source
This commit is contained in:
Ben Irvin 2023-01-13 10:19:49 +01:00 committed by GitHub
commit 154e7be7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/core/admin/server/register.js
View File

@ -1,6 +1,6 @@
'use strict';
const { register: registerDataTransfer } = require('@strapi/data-transfer/lib/strapi');
const { register: registerDataTransferRoute } = require('@strapi/data-transfer/lib/strapi');
const registerAdminPanelRoute = require('./routes/serve-admin-panel');
const adminAuthStrategy = require('./strategies/admin');
@ -17,5 +17,10 @@ module.exports = ({ strapi }) => {
registerAdminPanelRoute({ strapi });
}
registerDataTransfer(strapi);
if (
process.env.STRAPI_EXPERIMENTAL === 'true' &&
process.env.STRAPI_DISABLE_REMOTE_DATA_TRANSFER !== 'true'
) {
registerDataTransferRoute(strapi);
}
};

2
packages/core/strapi/bin/strapi.js
View File

@ -263,7 +263,7 @@ program
.option('-s, --silent', `Run the generation silently, without any output`, false)
.action(getLocalScript('ts/generate-types'));
if (process.env.STRAPI_EXPERIMENTAL) {
if (process.env.STRAPI_EXPERIMENTAL === 'true') {
// `$ strapi transfer`
program
.command('transfer')