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

Merge pull request #14498 from strapi/enhancement/cloud-hosting-tracking

Browse Source 
Add cloud hosting telemetry property
This commit is contained in:
Jean-Sébastien Herbaux 2022-10-01 01:39:33 +02:00 committed by GitHub
commit 02af04644a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/admin/server/controllers/admin.js
View File

@ -4,6 +4,7 @@ const path = require('path');
const execa = require('execa'); const execa = require('execa');
const _ = require('lodash'); const _ = require('lodash');
const { exists } = require('fs-extra'); const { exists } = require('fs-extra');
const { env } = require('@strapi/utils');
const { ValidationError } = require('@strapi/utils').errors; const { ValidationError } = require('@strapi/utils').errors;
const { isUsingTypeScript } = require('@strapi/typescript-utils'); const { isUsingTypeScript } = require('@strapi/typescript-utils');
// eslint-disable-next-line node/no-extraneous-require // eslint-disable-next-line node/no-extraneous-require
@ -93,11 +94,13 @@ module.exports = {
const useTypescriptOnAdmin = await isUsingTypeScript( const useTypescriptOnAdmin = await isUsingTypeScript(
path.join(strapi.dirs.app.root, 'src', 'admin') path.join(strapi.dirs.app.root, 'src', 'admin')
); );
const isHostedOnStrapiCloud = env('STRAPI_HOSTING', null) === 'strapi.cloud';
return { return {
data: { data: {
useTypescriptOnServer, useTypescriptOnServer,
useTypescriptOnAdmin, useTypescriptOnAdmin,
isHostedOnStrapiCloud,
}, },
}; };
}, },

2
packages/core/strapi/lib/services/metrics/sender.js
View File

@ -7,6 +7,7 @@ const isDocker = require('is-docker');
const fetch = require('node-fetch'); const fetch = require('node-fetch');
const ciEnv = require('ci-info'); const ciEnv = require('ci-info');
const { isUsingTypeScriptSync } = require('@strapi/typescript-utils'); const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
const { env } = require('@strapi/utils');
const ee = require('../../utils/ee'); const ee = require('../../utils/ee');
const machineID = require('../../utils/machine-id'); const machineID = require('../../utils/machine-id');
const stringifyDeep = require('./stringify-deep'); const stringifyDeep = require('./stringify-deep');
@ -54,6 +55,7 @@ module.exports = (strapi) => {
projectType: isEE ? 'Enterprise' : 'Community', projectType: isEE ? 'Enterprise' : 'Community',
useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath), useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath), useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
}; };
addPackageJsonStrapiMetadata(anonymousMetadata, strapi); addPackageJsonStrapiMetadata(anonymousMetadata, strapi);

1
packages/generators/app/lib/utils/usage.js
View File

@ -65,6 +65,7 @@ const getProperties = (scope, error) => ({
useYarn: scope.useYarn, useYarn: scope.useYarn,
useTypescriptOnServer: scope.useTypescript, useTypescriptOnServer: scope.useTypescript,
useTypescriptOnAdmin: scope.useTypescript, useTypescriptOnAdmin: scope.useTypescript,
isHostedOnStrapiCloud: process.env.STRAPI_HOSTING === 'strapi.cloud',
noRun: (scope.runQuickstartApp !== true).toString(), noRun: (scope.runQuickstartApp !== true).toString(),
}); });