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

Merge branch 'master' into features/i18n

Browse Source
This commit is contained in:
Alexandre Bodin 2021-04-21 13:02:12 +02:00
commit 4a0448e5bf
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/strapi-plugin-sentry/package.json
View File

@ -11,15 +11,15 @@
"@sentry/node": "6.2.5" "@sentry/node": "6.2.5"
}, },
"author": { "author": {
"name": "A Strapi developer", "name": "Strapi team",
"email": "", "email": "hi@strapi.io",
"url": "" "url": "https://strapi.io"
}, },
"maintainers": [ "maintainers": [
{ {
"name": "A Strapi developer", "name": "Strapi team",
"email": "", "email": "hi@strapi.io",
"url": "" "url": "https://strapi.io"
} }
], ],
"engines": { "engines": {

12
packages/strapi-plugin-upload/package.json
View File

@ -43,15 +43,15 @@
"uuid": "^3.2.1" "uuid": "^3.2.1"
}, },
"author": { "author": {
"name": "A Strapi developer", "name": "Strapi team",
"email": "", "email": "hi@strapi.io",
"url": "" "url": "https://strapi.io"
}, },
"maintainers": [ "maintainers": [
{ {
"name": "A Strapi developer", "name": "Strapi team",
"email": "", "email": "hi@strapi.io",
"url": "" "url": "https://strapi.io"
} }
], ],
"engines": { "engines": {

10
packages/strapi/lib/Strapi.js
View File

@ -256,9 +256,15 @@ class Strapi {
} }
} }
// Emit started event. // Get database clients
const databaseClients = _.map(this.config.get('connections'), _.property('settings.client')); 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') { if (cb && typeof cb === 'function') {
cb(); cb();

1
packages/strapi/lib/core/app-configuration/index.js
View File

@ -83,6 +83,7 @@ module.exports = (dir, initialConfig = {}) => {
installedPlugins: getPrefixedDeps('strapi-plugin', pkgJSON), installedPlugins: getPrefixedDeps('strapi-plugin', pkgJSON),
installedMiddlewares: getPrefixedDeps('strapi-middleware', pkgJSON), installedMiddlewares: getPrefixedDeps('strapi-middleware', pkgJSON),
installedHooks: getPrefixedDeps('strapi-hook', pkgJSON), installedHooks: getPrefixedDeps('strapi-hook', pkgJSON),
installedProviders: getPrefixedDeps('strapi-provider', pkgJSON),
}; };
const baseConfig = { const baseConfig = {