@sanity/cli 3.58.0 → 3.59.0

package/lib/cli.js

@@ -5,7 +5,6 @@ require("node:os");
 require("node:path");
 require("chalk");
 require("./_chunks-cjs/loadEnv.js");
-require("node-machine-id");
 var cli = require("./_chunks-cjs/cli.js");
 require("./_chunks-cjs/getCliConfig.js");
 exports.runCli = cli.runCli;

package/lib/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}
+{"version":3,"file":"cli.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;"}

package/lib/index.d.mts

@@ -431,7 +431,6 @@ export declare type SinglePrompt =
     })
 
 export declare interface TelemetryUserProperties {
-  deviceId: string
   runtime: string
   runtimeVersion: string
   cliVersion: string

package/lib/index.d.ts

@@ -431,7 +431,6 @@ export declare type SinglePrompt =
     })
 
 export declare interface TelemetryUserProperties {
-  deviceId: string
   runtime: string
   runtimeVersion: string
   cliVersion: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.58.0",
+  "version": "3.59.0",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -57,10 +57,10 @@
   },
   "dependencies": {
     "@babel/traverse": "^7.23.5",
-    "@sanity/client": "^6.21.3",
-    "@sanity/codegen": "3.58.0",
+    "@sanity/client": "^6.22.0",
+    "@sanity/codegen": "3.59.0",
     "@sanity/telemetry": "^0.7.7",
-    "@sanity/util": "3.58.0",
+    "@sanity/util": "3.59.0",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -68,7 +68,6 @@
     "esbuild-register": "^3.5.0",
     "get-it": "^8.6.5",
     "groq-js": "^1.13.0",
-    "node-machine-id": "^1.1.12",
     "pkg-dir": "^5.0.0",
     "prettier": "^3.3.0",
     "semver": "^7.3.5",
@@ -77,12 +76,13 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@repo/package.config": "3.58.0",
+    "@repo/package.config": "3.59.0",
+    "@repo/test-config": "3.59.0",
     "@rexxars/gitconfiglocal": "^3.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.58.0",
+    "@sanity/types": "3.59.0",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -135,5 +135,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "63e101bd68bfcb4e04be616c99da64e99cb11354"
+  "gitHead": "30c046b2eb514875bfe900f56ea564b385eaca1d"
 }

package/src/actions/init-project/initProject.ts

@@ -594,26 +594,31 @@ export default async function initSanity(
 
   trace.log({step: 'importTemplateDataset', selectedOption: shouldImport ? 'yes' : 'no'})
 
-  // Bootstrap Sanity, creating required project files, manifests etc
-  await bootstrapTemplate(templateOptions, context)
-
-  // update that files were initialized locally; do not halt flow for request
-  apiClient({api: {projectId: projectId}})
-    .request<SanityProject>({uri: `/projects/${projectId}`})
-    .then((project: SanityProject) => {
-      if (!project?.metadata?.cliInitializedAt) {
-        return apiClient({api: {projectId}}).request({
-          method: 'PATCH',
-          uri: `/projects/${projectId}`,
-          body: {metadata: {cliInitializedAt: new Date().toISOString()}},
-        })
-      }
-      return Promise.resolve()
-    })
-    .catch(() => {
-      // Non-critical update
-      debug('Failed to update cliInitializedAt metadata')
-    })
+  const [_, bootstrapPromise] = await Promise.allSettled([
+    // record template files attempted to be created locally
+    apiClient({api: {projectId: projectId}})
+      .request<SanityProject>({uri: `/projects/${projectId}`})
+      .then((project: SanityProject) => {
+        if (!project?.metadata?.cliInitializedAt) {
+          return apiClient({api: {projectId}}).request({
+            method: 'PATCH',
+            uri: `/projects/${projectId}`,
+            body: {metadata: {cliInitializedAt: new Date().toISOString()}},
+          })
+        }
+        return Promise.resolve()
+      })
+      .catch(() => {
+        // Non-critical update
+        debug('Failed to update cliInitializedAt metadata')
+      }),
+    // Bootstrap Sanity, creating required project files, manifests etc
+    bootstrapTemplate(templateOptions, context),
+  ])
+
+  if (bootstrapPromise.status === 'rejected' && bootstrapPromise.reason instanceof Error) {
+    throw bootstrapPromise.reason
+  }
 
   let pkgManager: PackageManager
 

package/src/cli.ts

@@ -5,7 +5,6 @@ import path from 'node:path'
 
 import chalk from 'chalk'
 import dotenv from 'dotenv'
-import {machineId} from 'node-machine-id'
 import resolveFrom from 'resolve-from'
 
 import {CliCommand} from './__telemetry__/cli.telemetry'
@@ -85,7 +84,6 @@ export async function runCli(cliRoot: string, {cliVersion}: {cliVersion: string}
   )
 
   telemetry.updateUserProperties({
-    deviceId: await machineId(),
     runtimeVersion: process.version,
     runtime: detectRuntime(),
     cliVersion: pkg.version,

package/src/commands/projects/listProjectsCommand.ts

@@ -37,9 +37,9 @@ const listProjectsCommand: CliCommandDefinition = {
 
     const projects = await client.projects.list()
     const ordered = sortBy(
-      projects.map(({displayName, id, members = [], studioHost = '', createdAt}) => {
-        const studio = studioHost ? `https://${studioHost}.sanity.studio` : 'Not deployed'
-        return [id, members.length, displayName, studio, createdAt].map(String)
+      projects.map(({displayName, id, members = [], createdAt}) => {
+        const manage = `https://www.sanity.io/manage/project/${id}`
+        return [id, members.length, displayName, manage, createdAt].map(String)
       }),
       [headings.indexOf(flags.sort)],
     )

package/src/types.ts

@@ -94,7 +94,6 @@ export interface CliBaseCommandContext {
 }
 
 export interface TelemetryUserProperties {
-  deviceId: string
   runtime: string
   runtimeVersion: string
   cliVersion: string