ambiser
/
strapi-plugin-config-sync
mirror of https://github.com/boazpoolman/strapi-plugin-config-sync
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: merge conflicts

pull/126/head
Boaz Poolman 2024-05-08 20:50:28 +02:00
parent ab82a0dbf6 f8631f9685
commit 2a59690aae
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "strapi-plugin-config-sync", "name": "strapi-plugin-config-sync",
"version": "1.2.3", "version": "1.2.5",
"description": "Migrate your config data across environments using the CLI or Strapi admin panel.", "description": "Migrate your config data across environments using the CLI or Strapi admin panel.",
"strapi": { "strapi": {
"displayName": "Config Sync", "displayName": "Config Sync",

2
server/bootstrap.js
View File

@ -50,6 +50,8 @@ module.exports = async () => {
if (strapi.config.get('plugin::config-sync.importOnBootstrap')) { if (strapi.config.get('plugin::config-sync.importOnBootstrap')) {
if (strapi.server.app.env === 'development') { if (strapi.server.app.env === 'development') {
strapi.log.warn(logMessage(`You can't use the 'importOnBootstrap' setting in the development env.`)); strapi.log.warn(logMessage(`You can't use the 'importOnBootstrap' setting in the development env.`));
} else if (process.env.CONFIG_SYNC_CLI === 'true') {
strapi.log.warn(logMessage(`The 'importOnBootstrap' setting was ignored because Strapi was started from the config-sync CLI itself.`));
} else if (fs.existsSync(strapi.config.get('plugin::config-sync.syncDir'))) { } else if (fs.existsSync(strapi.config.get('plugin::config-sync.syncDir'))) {
await strapi.plugin('config-sync').service('main').importAllConfig(); await strapi.plugin('config-sync').service('main').importAllConfig();
} }

2
server/cli.js
View File

@ -15,6 +15,8 @@ const packageJSON = require('../package.json');
const program = new Command(); const program = new Command();
const getStrapiApp = async () => { const getStrapiApp = async () => {
process.env.CONFIG_SYNC_CLI = true;
try { try {
const tsUtils = require('@strapi/typescript-utils'); // eslint-disable-line const tsUtils = require('@strapi/typescript-utils'); // eslint-disable-line