mirror of
https://github.com/strapi/strapi.git
synced 2025-11-01 18:33:55 +00:00
Merge branch 'master' into features/i18n
This commit is contained in:
commit
4a0448e5bf
@ -11,15 +11,15 @@
|
||||
"@sentry/node": "6.2.5"
|
||||
},
|
||||
"author": {
|
||||
"name": "A Strapi developer",
|
||||
"email": "",
|
||||
"url": ""
|
||||
"name": "Strapi team",
|
||||
"email": "hi@strapi.io",
|
||||
"url": "https://strapi.io"
|
||||
},
|
||||
"maintainers": [
|
||||
{
|
||||
"name": "A Strapi developer",
|
||||
"email": "",
|
||||
"url": ""
|
||||
"name": "Strapi team",
|
||||
"email": "hi@strapi.io",
|
||||
"url": "https://strapi.io"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
|
||||
@ -43,15 +43,15 @@
|
||||
"uuid": "^3.2.1"
|
||||
},
|
||||
"author": {
|
||||
"name": "A Strapi developer",
|
||||
"email": "",
|
||||
"url": ""
|
||||
"name": "Strapi team",
|
||||
"email": "hi@strapi.io",
|
||||
"url": "https://strapi.io"
|
||||
},
|
||||
"maintainers": [
|
||||
{
|
||||
"name": "A Strapi developer",
|
||||
"email": "",
|
||||
"url": ""
|
||||
"name": "Strapi team",
|
||||
"email": "hi@strapi.io",
|
||||
"url": "https://strapi.io"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
|
||||
@ -256,9 +256,15 @@ class Strapi {
|
||||
}
|
||||
}
|
||||
|
||||
// Emit started event.
|
||||
// Get database clients
|
||||
const databaseClients = _.map(this.config.get('connections'), _.property('settings.client'));
|
||||
await this.telemetry.send('didStartServer', { database: databaseClients });
|
||||
|
||||
// Emit started event.
|
||||
await this.telemetry.send('didStartServer', {
|
||||
database: databaseClients,
|
||||
plugins: this.config.installedPlugins,
|
||||
providers: this.config.installedProviders,
|
||||
});
|
||||
|
||||
if (cb && typeof cb === 'function') {
|
||||
cb();
|
||||
|
||||
@ -83,6 +83,7 @@ module.exports = (dir, initialConfig = {}) => {
|
||||
installedPlugins: getPrefixedDeps('strapi-plugin', pkgJSON),
|
||||
installedMiddlewares: getPrefixedDeps('strapi-middleware', pkgJSON),
|
||||
installedHooks: getPrefixedDeps('strapi-hook', pkgJSON),
|
||||
installedProviders: getPrefixedDeps('strapi-provider', pkgJSON),
|
||||
};
|
||||
|
||||
const baseConfig = {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user