diff --git a/package.json b/package.json index 5ee12ac8..74b95081 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "scripts": { "dev": "next dev", "build": "npm-run-all build-tracker build-geo build-db build-app", - "start": "next start", + "start": "npm-run-all telemetry start-app", + "start-app": "next start", "start-env": "node -r dotenv/config scripts/start-env.js", "build-app": "next build", "build-tracker": "rollup -c rollup.tracker.config.js", @@ -25,7 +26,7 @@ "build-mysql-client": "dotenv prisma generate -- --schema=./prisma/schema.mysql.prisma", "build-postgresql-schema": "dotenv prisma db pull -- --schema=./prisma/schema.postgresql.prisma", "build-postgresql-client": "dotenv prisma generate -- --schema=./prisma/schema.postgresql.prisma", - "postbuild": "node scripts/postbuild.js", + "init": "node scripts/init.js", "copy-db-schema": "node scripts/copy-db-schema.js", "generate-lang": "npm-run-all extract-lang merge-lang", "extract-lang": "formatjs extract \"{pages,components}/**/*.js\" --out-file build/messages.json", @@ -36,6 +37,7 @@ "download-country-names": "node scripts/download-country-names.js", "download-language-names": "node scripts/download-language-names.js", "change-password": "node scripts/change-password.js", + "telemetry": "node scripts/telemetry.js", "lint": "next lint --quiet", "prepare": "husky install" }, diff --git a/scripts/postbuild.js b/scripts/postbuild.js deleted file mode 100644 index 6372bd65..00000000 --- a/scripts/postbuild.js +++ /dev/null @@ -1,10 +0,0 @@ -require('dotenv').config(); -const sendTelemetry = require('./telemetry'); - -async function run() { - if (!process.env.DISABLE_TELEMETRY) { - await sendTelemetry(); - } -} - -run(); diff --git a/scripts/telemetry.js b/scripts/telemetry.js index 2f3a1aa0..3714ff35 100644 --- a/scripts/telemetry.js +++ b/scripts/telemetry.js @@ -1,3 +1,4 @@ +require('dotenv').config(); const fs = require('fs-extra'); const path = require('path'); const os = require('os'); @@ -26,13 +27,14 @@ async function sendTelemetry() { await fs.writeJSON(dest, { version: pkg.version }); const payload = { - umami: pkg.version, + version: pkg.version, node: process.version, platform: os.platform(), arch: os.arch(), os: `${os.type()} (${os.version()})`, - isDocker: isDocker(), - isCI, + docker: isDocker(), + ci: isCI, + upgrade: json.version || false, }; await retry( @@ -51,4 +53,10 @@ async function sendTelemetry() { } } -module.exports = sendTelemetry; +async function run() { + if (!process.env.DISABLE_TELEMETRY) { + await sendTelemetry(); + } +} + +run();