yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-19 13:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:strapi/strapi into features/data-transfer

Browse Source
This commit is contained in:
Convly 2023-02-22 17:05:36 +01:00
commit fcfb8f6e00
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/strapi/lib/commands/builders/admin.js
View File

@ -49,7 +49,6 @@ module.exports = async ({ buildDestDir, forceBuild = true, optimization, srcDir
}) })
.then(() => { .then(() => {
console.log('Admin UI built successfully'); console.log('Admin UI built successfully');
process.exit(0);
}) })
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);

6
packages/plugins/i18n/server/services/localizations.js
View File

@ -2,7 +2,7 @@
const { prop, isNil, isEmpty, isArray } = require('lodash/fp'); const { prop, isNil, isEmpty, isArray } = require('lodash/fp');
const { forEachAsync } = require('@strapi/utils'); const { mapAsync } = require('@strapi/utils');
const { getService } = require('../utils'); const { getService } = require('../utils');
const isDialectMySQL = () => strapi.db.dialect.client === 'mysql'; const isDialectMySQL = () => strapi.db.dialect.client === 'mysql';
@ -41,7 +41,7 @@ const syncLocalizations = async (entry, { model }) => {
}; };
// MySQL/MariaDB can cause deadlocks here if concurrency higher than 1 // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
await forEachAsync(entry.localizations, (localization) => updateLocalization(localization.id), { await mapAsync(entry.localizations, (localization) => updateLocalization(localization.id), {
concurrency: isDialectMySQL() ? 1 : Infinity, concurrency: isDialectMySQL() ? 1 : Infinity,
}); });
} }
@ -68,7 +68,7 @@ const syncNonLocalizedAttributes = async (entry, { model }) => {
}; };
// MySQL/MariaDB can cause deadlocks here if concurrency higher than 1 // MySQL/MariaDB can cause deadlocks here if concurrency higher than 1
await forEachAsync(entry.localizations, (localization) => updateLocalization(localization.id), { await mapAsync(entry.localizations, (localization) => updateLocalization(localization.id), {
concurrency: isDialectMySQL() ? 1 : Infinity, concurrency: isDialectMySQL() ? 1 : Infinity,
}); });
} }