@cedarjs/telemetry 5.0.7-next.338 → 5.0.7-rc.3

package/dist/index.js

@@ -1 +1,22 @@
-export * from "./telemetry.js";
+"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")
+});

package/dist/scripts/invoke.js

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

package/dist/sendTelemetry.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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"}

package/dist/sendTelemetry.js

@@ -1,14 +1,47 @@
-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";
+"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");
 const SENSITIVE_ARG_POSITIONS = {
   exec: {
     positions: [1],
@@ -34,7 +67,7 @@ const SENSITIVE_ARG_POSITIONS = {
 };
 const getInfo = async (presets = {}) => {
   const info = JSON.parse(
-    await envinfo.run(
+    await import_envinfo.default.run(
       {
         System: ["OS", "Shell"],
         Binaries: ["Node", "Yarn", "npm"],
@@ -50,9 +83,9 @@ const getInfo = async (presets = {}) => {
   } else if (shell?.path.match("\\")) {
     info.System.Shell.name = info.System.Shell.path.split("\\").pop();
   }
-  const cpu = await system.cpu();
-  const mem = await system.mem();
-  const experiments = Object.keys(getRawConfig()["experimental"] || {});
+  const cpu = await import_systeminformation.default.cpu();
+  const mem = await import_systeminformation.default.mem();
+  const experiments = Object.keys((0, import_project_config.getRawConfig)()["experimental"] || {});
   return {
     os: info.System?.OS?.split(" ")[0],
     osVersion: info.System?.OS?.split(" ")[1],
@@ -63,6 +96,8 @@ 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
   };
 };
@@ -99,7 +134,7 @@ const sanitizeArgv = (argv) => {
 const buildPayload = async () => {
   let payload = {};
   const processArgv = [...process.argv];
-  if (os.type() === "Windows_NT") {
+  if (import_os.default.type() === "Windows_NT") {
     const argvIndex = processArgv.findIndex((arg) => arg === "--argv") + 1;
     let argvFormatted = argvIndex !== 0 ? processArgv[argvIndex] : null;
     if (argvFormatted) {
@@ -109,28 +144,23 @@ const buildPayload = async () => {
       processArgv[argvIndex] = argvFormatted;
     }
   }
-  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)) : "";
+  const argv = require("yargs/yargs")(processArgv.slice(2)).parse();
+  const command = argv.argv ? sanitizeArgv(JSON.parse(argv.argv)) : "";
   payload = {
-    type: typeFlag || "command",
+    type: argv.type || "command",
     command,
-    duration: durationFlag ? parseInt(durationFlag) : null,
+    duration: argv.duration ? parseInt(argv.duration) : null,
     uid: uniqueId(),
-    ci: ci.isCI,
+    ci: import_ci_info.default.isCI,
     cedarCi: !!process.env.CEDAR_CI,
     NODE_ENV: process.env.NODE_ENV || null,
-    ...await getInfo({ cedarVersion: rwVersionFlag, command })
+    ...await getInfo({ cedarVersion: argv.rwVersion, command })
   };
-  if (errorFlag) {
+  if (argv.error) {
     payload.type = "error";
-    payload.error = errorFlag.split("\n")[0].replace(/(\/[@\-\.\w]+)/g, "[path]");
+    payload.error = argv.error.split("\n")[0].replace(/(\/[@\-\.\w]+)/g, "[path]");
   }
-  const project = new RWProject();
+  const project = new import_RWProject.RWProject();
   const routes = project.getRouter().routes;
   const prerenderedRoutes = routes.filter((route) => route.hasPrerender);
   payload = {
@@ -141,25 +171,25 @@ const buildPayload = async () => {
   return payload;
 };
 function uniqueId() {
-  const telemetryCachePath = path.join(
-    getPaths().generated.base,
+  const telemetryCachePath = import_path.default.join(
+    (0, import_project_config.getPaths)().generated.base,
     "telemetry.txt"
   );
   const now = Date.now();
   const expires = now - 24 * 60 * 60 * 1e3;
   let uuid;
-  if (!fs.existsSync(telemetryCachePath) || fs.statSync(telemetryCachePath).mtimeMs < expires) {
-    uuid = uuidv4();
+  if (!import_node_fs.default.existsSync(telemetryCachePath) || import_node_fs.default.statSync(telemetryCachePath).mtimeMs < expires) {
+    uuid = (0, import_uuid.v4)();
     try {
-      if (!fs.existsSync(path.dirname(telemetryCachePath))) {
-        fs.mkdirSync(path.dirname(telemetryCachePath), { recursive: true });
+      if (!import_node_fs.default.existsSync(import_path.default.dirname(telemetryCachePath))) {
+        import_node_fs.default.mkdirSync(import_path.default.dirname(telemetryCachePath), { recursive: true });
       }
-      fs.writeFileSync(telemetryCachePath, uuid);
+      import_node_fs.default.writeFileSync(telemetryCachePath, uuid);
     } catch {
       console.error("\nCould not create telemetry.txt file\n");
     }
   } else {
-    uuid = fs.readFileSync(telemetryCachePath).toString();
+    uuid = import_node_fs.default.readFileSync(telemetryCachePath).toString();
   }
   return uuid;
 }
@@ -171,7 +201,7 @@ const sendTelemetry = async () => {
     if (verboseTelemetry) {
       console.info("Cedar Telemetry Payload", payload);
     }
-    const response = await fetch(telemetryUrl, {
+    const response = await (0, import_fetch.fetch)(telemetryUrl, {
       method: "post",
       body: JSON.stringify(payload),
       headers: { "Content-Type": "application/json" }
@@ -188,7 +218,8 @@ const sendTelemetry = async () => {
     }
   }
 };
-export {
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
   sanitizeArgv,
   sendTelemetry
-};
+});

package/dist/telemetry.d.ts

@@ -1,17 +1,3 @@
-/**
- * Quotes a single argument for a Windows shell command string.
- *
- * On Windows we spawn with `shell: true` and a command string, so every
- * argument is re-parsed by the shell. Without quoting, anything containing a
- * space is split: a project at `C:\Users\Ada Lovelace\app` makes node try to
- * load `C:\Users\Ada`, and the process dies with MODULE_NOT_FOUND. The JSON
- * payloads passed below need it too, since they contain double quotes.
- *
- * Follows the usual Windows argument-encoding rules: backslashes immediately
- * before a double quote are doubled, the quote itself is escaped, and trailing
- * backslashes are doubled so they can't escape the closing quote.
- */
-export declare function quoteForWindowsShell(arg: string): string;
 export declare const timedTelemetry: (argv: string[], options: Record<string, unknown>, func: (...args: any[]) => any) => Promise<any>;
 export declare const errorTelemetry: (argv: string[], error: any) => Promise<void>;
 export declare const telemetryMiddleware: () => Promise<void>;

package/dist/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAuB/C;AAsDD,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":"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"}

package/dist/telemetry.js

@@ -1,25 +1,44 @@
-import { spawn } from "child_process";
-import os from "os";
-import path from "path";
-function quoteForWindowsShell(arg) {
-  let quoted = '"';
-  let backslashes = 0;
-  for (const char of arg) {
-    if (char === "\\") {
-      backslashes += 1;
-      continue;
-    }
-    if (char === '"') {
-      quoted += "\\".repeat(backslashes * 2 + 1) + '"';
-    } else {
-      quoted += "\\".repeat(backslashes) + char;
-    }
-    backslashes = 0;
+"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 quoted + "\\".repeat(backslashes * 2) + '"';
-}
+  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"));
 const spawnProcess = (...args) => {
-  const isWindows = os.type() === "Windows_NT";
+  const isWindows = import_os.default.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",
     // The following options run the process in the background without a console window, even though they don't look like they would.
@@ -32,15 +51,11 @@ const spawnProcess = (...args) => {
     detached: process.env.CEDAR_VERBOSE_TELEMETRY || process.env.REDWOOD_VERBOSE_TELEMETRY ? false : true,
     windowsHide: true
   };
-  const scriptArgs = [
-    path.join(import.meta.dirname, "scripts", "invoke.js"),
-    ...args
-  ];
+  const scriptArgs = [import_path.default.join(__dirname, "scripts", "invoke.js"), ...args];
   if (isWindows) {
-    const command = [process.execPath, ...scriptArgs].map(quoteForWindowsShell).join(" ");
-    spawn(command, [], spawnOptions).unref();
+    (0, import_child_process.spawn)([execPath, ...scriptArgs].join(" "), [], spawnOptions).unref();
   } else {
-    spawn(process.execPath, scriptArgs, spawnOptions).unref();
+    (0, import_child_process.spawn)(process.execPath, scriptArgs, spawnOptions).unref();
   }
 };
 const timedTelemetry = async (argv, options, func) => {
@@ -72,9 +87,9 @@ const telemetryMiddleware = async () => {
   }
   spawnProcess("--argv", JSON.stringify(process.argv));
 };
-export {
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
   errorTelemetry,
-  quoteForWindowsShell,
   telemetryMiddleware,
   timedTelemetry
-};
+});

package/package.json

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