@cedarjs/telemetry 5.0.6-rc.4 → 5.0.7-next.186

package/dist/index.js

@@ -1,22 +1 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var index_exports = {};
-module.exports = __toCommonJS(index_exports);
-__reExport(index_exports, require("./telemetry.js"), module.exports);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  ...require("./telemetry.js")
-});
+export * from "./telemetry.js";

package/dist/scripts/invoke.js

@@ -1,5 +1,4 @@
-"use strict";
-var import_sendTelemetry = require("../sendTelemetry.js");
+import { sendTelemetry } from "../sendTelemetry.js";
 (async function() {
-  await (0, import_sendTelemetry.sendTelemetry)();
+  await sendTelemetry();
 })();

package/dist/sendTelemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendTelemetry.d.ts","sourceRoot":"","sources":["../src/sendTelemetry.ts"],"names":[],"mappings":"AAaA,UAAU,qBAAqB;IAC7B,IAAI,EAAE;QACJ,SAAS,EAAE,MAAM,EAAE,CAAA;QACnB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,EAAE,MAAM,EAAE,CAAA;KACpB,CAAA;IACD,CAAC,EAAE;QACD,SAAS,EAAE,MAAM,EAAE,CAAA;QACnB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,EAAE,CAAA;QACnB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,MAAM,EAAE;QACN,SAAS,CAAC,EAAE,KAAK,CAAA;QACjB,OAAO,EAAE,MAAM,EAAE,CAAA;QACjB,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,IAAI,EAAE;QACJ,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;QACpB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,EAAE,MAAM,EAAE,CAAA;KACpB,CAAA;CACF;AA+ED,eAAO,MAAM,YAAY,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,qBAAqB,EAAE,GAAG,MAAM,EAAE,CAAC,WAyCjE,CAAA;AAiGD,eAAO,MAAM,aAAa,qBAsCzB,CAAA"}
+{"version":3,"file":"sendTelemetry.d.ts","sourceRoot":"","sources":["../src/sendTelemetry.ts"],"names":[],"mappings":"AAcA,UAAU,qBAAqB;IAC7B,IAAI,EAAE;QACJ,SAAS,EAAE,MAAM,EAAE,CAAA;QACnB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,EAAE,MAAM,EAAE,CAAA;KACpB,CAAA;IACD,CAAC,EAAE;QACD,SAAS,EAAE,MAAM,EAAE,CAAA;QACnB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,QAAQ,EAAE;QACR,SAAS,EAAE,MAAM,EAAE,CAAA;QACnB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,MAAM,EAAE;QACN,SAAS,CAAC,EAAE,KAAK,CAAA;QACjB,OAAO,EAAE,MAAM,EAAE,CAAA;QACjB,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,IAAI,EAAE;QACJ,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;QACpB,OAAO,CAAC,EAAE,KAAK,CAAA;QACf,UAAU,EAAE,MAAM,EAAE,CAAA;QACpB,SAAS,EAAE,MAAM,EAAE,CAAA;KACpB,CAAA;CACF;AA8ED,eAAO,MAAM,YAAY,GACvB,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,qBAAqB,EAAE,GAAG,MAAM,EAAE,CAAC,WAyCjE,CAAA;AA2GD,eAAO,MAAM,aAAa,qBAsCzB,CAAA"}

package/dist/sendTelemetry.js

@@ -1,47 +1,14 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var sendTelemetry_exports = {};
-__export(sendTelemetry_exports, {
-  sanitizeArgv: () => sanitizeArgv,
-  sendTelemetry: () => sendTelemetry
-});
-module.exports = __toCommonJS(sendTelemetry_exports);
-var import_node_fs = __toESM(require("node:fs"));
-var import_os = __toESM(require("os"));
-var import_path = __toESM(require("path"));
-var import_fetch = require("@whatwg-node/fetch");
-var import_ci_info = __toESM(require("ci-info"));
-var import_envinfo = __toESM(require("envinfo"));
-var import_systeminformation = __toESM(require("systeminformation"));
-var import_uuid = require("uuid");
-var import_project_config = require("@cedarjs/project-config");
-var import_RWProject = require("@cedarjs/structure/dist/model/RWProject");
+import fs from "node:fs";
+import os from "os";
+import path from "path";
+import { fetch } from "@whatwg-node/fetch";
+import ci from "ci-info";
+import envinfo from "envinfo";
+import system from "systeminformation";
+import { v4 as uuidv4 } from "uuid";
+import yargsParser from "yargs/yargs";
+import { getRawConfig, getPaths } from "@cedarjs/project-config";
+import { RWProject } from "@cedarjs/structure/dist/model/RWProject";
 const SENSITIVE_ARG_POSITIONS = {
   exec: {
     positions: [1],
@@ -67,7 +34,7 @@ const SENSITIVE_ARG_POSITIONS = {
 };
 const getInfo = async (presets = {}) => {
   const info = JSON.parse(
-    await import_envinfo.default.run(
+    await envinfo.run(
       {
         System: ["OS", "Shell"],
         Binaries: ["Node", "Yarn", "npm"],
@@ -83,9 +50,9 @@ const getInfo = async (presets = {}) => {
   } else if (shell?.path.match("\\")) {
     info.System.Shell.name = info.System.Shell.path.split("\\").pop();
   }
-  const cpu = await import_systeminformation.default.cpu();
-  const mem = await import_systeminformation.default.mem();
-  const experiments = Object.keys((0, import_project_config.getRawConfig)()["experimental"] || {});
+  const cpu = await system.cpu();
+  const mem = await system.mem();
+  const experiments = Object.keys(getRawConfig()["experimental"] || {});
   return {
     os: info.System?.OS?.split(" ")[0],
     osVersion: info.System?.OS?.split(" ")[1],
@@ -96,8 +63,6 @@ const getInfo = async (presets = {}) => {
     vsCodeVersion: info.IDEs?.VSCode?.version,
     cedarVersion: presets.cedarVersion || info.npmPackages?.["@cedarjs/core"]?.installed,
     system: `${cpu.physicalCores}.${Math.round(mem.total / 1073741824)}`,
-    webBundler: "vite",
-    // Hardcoded as this is now the only supported bundler
     experiments
   };
 };
@@ -134,7 +99,7 @@ const sanitizeArgv = (argv) => {
 const buildPayload = async () => {
   let payload = {};
   const processArgv = [...process.argv];
-  if (import_os.default.type() === "Windows_NT") {
+  if (os.type() === "Windows_NT") {
     const argvIndex = processArgv.findIndex((arg) => arg === "--argv") + 1;
     let argvFormatted = argvIndex !== 0 ? processArgv[argvIndex] : null;
     if (argvFormatted) {
@@ -144,23 +109,28 @@ const buildPayload = async () => {
       processArgv[argvIndex] = argvFormatted;
     }
   }
-  const argv = require("yargs/yargs")(processArgv.slice(2)).parse();
-  const command = argv.argv ? sanitizeArgv(JSON.parse(argv.argv)) : "";
+  const rawArgv = yargsParser(processArgv.slice(2)).parseSync();
+  const argvFlag = typeof rawArgv.argv === "string" ? rawArgv.argv : void 0;
+  const typeFlag = typeof rawArgv.type === "string" ? rawArgv.type : void 0;
+  const durationFlag = typeof rawArgv.duration === "string" ? rawArgv.duration : void 0;
+  const rwVersionFlag = typeof rawArgv.rwVersion === "string" ? rawArgv.rwVersion : void 0;
+  const errorFlag = typeof rawArgv.error === "string" ? rawArgv.error : void 0;
+  const command = argvFlag ? sanitizeArgv(JSON.parse(argvFlag)) : "";
   payload = {
-    type: argv.type || "command",
+    type: typeFlag || "command",
     command,
-    duration: argv.duration ? parseInt(argv.duration) : null,
+    duration: durationFlag ? parseInt(durationFlag) : null,
     uid: uniqueId(),
-    ci: import_ci_info.default.isCI,
+    ci: ci.isCI,
     cedarCi: !!process.env.CEDAR_CI,
     NODE_ENV: process.env.NODE_ENV || null,
-    ...await getInfo({ cedarVersion: argv.rwVersion, command })
+    ...await getInfo({ cedarVersion: rwVersionFlag, command })
   };
-  if (argv.error) {
+  if (errorFlag) {
     payload.type = "error";
-    payload.error = argv.error.split("\n")[0].replace(/(\/[@\-\.\w]+)/g, "[path]");
+    payload.error = errorFlag.split("\n")[0].replace(/(\/[@\-\.\w]+)/g, "[path]");
   }
-  const project = new import_RWProject.RWProject();
+  const project = new RWProject();
   const routes = project.getRouter().routes;
   const prerenderedRoutes = routes.filter((route) => route.hasPrerender);
   payload = {
@@ -171,25 +141,25 @@ const buildPayload = async () => {
   return payload;
 };
 function uniqueId() {
-  const telemetryCachePath = import_path.default.join(
-    (0, import_project_config.getPaths)().generated.base,
+  const telemetryCachePath = path.join(
+    getPaths().generated.base,
     "telemetry.txt"
   );
   const now = Date.now();
   const expires = now - 24 * 60 * 60 * 1e3;
   let uuid;
-  if (!import_node_fs.default.existsSync(telemetryCachePath) || import_node_fs.default.statSync(telemetryCachePath).mtimeMs < expires) {
-    uuid = (0, import_uuid.v4)();
+  if (!fs.existsSync(telemetryCachePath) || fs.statSync(telemetryCachePath).mtimeMs < expires) {
+    uuid = uuidv4();
     try {
-      if (!import_node_fs.default.existsSync(import_path.default.dirname(telemetryCachePath))) {
-        import_node_fs.default.mkdirSync(import_path.default.dirname(telemetryCachePath), { recursive: true });
+      if (!fs.existsSync(path.dirname(telemetryCachePath))) {
+        fs.mkdirSync(path.dirname(telemetryCachePath), { recursive: true });
       }
-      import_node_fs.default.writeFileSync(telemetryCachePath, uuid);
+      fs.writeFileSync(telemetryCachePath, uuid);
     } catch {
       console.error("\nCould not create telemetry.txt file\n");
     }
   } else {
-    uuid = import_node_fs.default.readFileSync(telemetryCachePath).toString();
+    uuid = fs.readFileSync(telemetryCachePath).toString();
   }
   return uuid;
 }
@@ -201,7 +171,7 @@ const sendTelemetry = async () => {
     if (verboseTelemetry) {
       console.info("Cedar Telemetry Payload", payload);
     }
-    const response = await (0, import_fetch.fetch)(telemetryUrl, {
+    const response = await fetch(telemetryUrl, {
       method: "post",
       body: JSON.stringify(payload),
       headers: { "Content-Type": "application/json" }
@@ -218,8 +188,7 @@ const sendTelemetry = async () => {
     }
   }
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   sanitizeArgv,
   sendTelemetry
-});
+};

package/dist/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAmDA,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EAAE,EACd,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,iBAuB9B,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,MAAM,MAAM,EAAE,EAAE,OAAO,GAAG,kBAS9D,CAAA;AAGD,eAAO,MAAM,mBAAmB,qBAS/B,CAAA"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAsDA,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EAAE,EACd,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,iBAuB9B,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,MAAM,MAAM,EAAE,EAAE,OAAO,GAAG,kBAS9D,CAAA;AAGD,eAAO,MAAM,mBAAmB,qBAS/B,CAAA"}

package/dist/telemetry.js

@@ -1,43 +1,8 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var telemetry_exports = {};
-__export(telemetry_exports, {
-  errorTelemetry: () => errorTelemetry,
-  telemetryMiddleware: () => telemetryMiddleware,
-  timedTelemetry: () => timedTelemetry
-});
-module.exports = __toCommonJS(telemetry_exports);
-var import_child_process = require("child_process");
-var import_os = __toESM(require("os"));
-var import_path = __toESM(require("path"));
+import { spawn } from "child_process";
+import os from "os";
+import path from "path";
 const spawnProcess = (...args) => {
-  const isWindows = import_os.default.type() === "Windows_NT";
+  const isWindows = os.type() === "Windows_NT";
   const execPath = isWindows ? `"${process.execPath}"` : process.execPath;
   const spawnOptions = isWindows ? {
     stdio: process.env.CEDAR_VERBOSE_TELEMETRY || process.env.REDWOOD_VERBOSE_TELEMETRY ? ["ignore", "inherit", "inherit"] : "ignore",
@@ -51,11 +16,14 @@ const spawnProcess = (...args) => {
     detached: process.env.CEDAR_VERBOSE_TELEMETRY || process.env.REDWOOD_VERBOSE_TELEMETRY ? false : true,
     windowsHide: true
   };
-  const scriptArgs = [import_path.default.join(__dirname, "scripts", "invoke.js"), ...args];
+  const scriptArgs = [
+    path.join(import.meta.dirname, "scripts", "invoke.js"),
+    ...args
+  ];
   if (isWindows) {
-    (0, import_child_process.spawn)([execPath, ...scriptArgs].join(" "), [], spawnOptions).unref();
+    spawn([execPath, ...scriptArgs].join(" "), [], spawnOptions).unref();
   } else {
-    (0, import_child_process.spawn)(process.execPath, scriptArgs, spawnOptions).unref();
+    spawn(process.execPath, scriptArgs, spawnOptions).unref();
   }
 };
 const timedTelemetry = async (argv, options, func) => {
@@ -87,9 +55,8 @@ const telemetryMiddleware = async () => {
   }
   spawnProcess("--argv", JSON.stringify(process.argv));
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   errorTelemetry,
   telemetryMiddleware,
   timedTelemetry
-});
+};

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@cedarjs/telemetry",
-  "version": "5.0.6-rc.4",
+  "version": "5.0.7-next.186",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
     "directory": "packages/telemetry"
   },
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "node build.mts && yarn build:types",
+    "build": "node build.mts",
     "build:pack": "yarn pack -o cedarjs-telemetry.tgz",
-    "build:types": "tsc --build --verbose",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "vitest run",
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "5.0.6-rc.4",
-    "@cedarjs/structure": "5.0.6-rc.4",
+    "@cedarjs/project-config": "5.0.7-next.186",
+    "@cedarjs/structure": "5.0.7-next.186",
     "@whatwg-node/fetch": "0.10.13",
     "ci-info": "4.4.0",
     "envinfo": "7.21.0",
@@ -35,7 +35,7 @@
     "@types/envinfo": "7.8.4",
     "@types/yargs": "17.0.35",
     "typescript": "5.9.3",
-    "vitest": "3.2.6"
+    "vitest": "4.1.10"
   },
   "engines": {
     "node": ">=24"