@shopify/oxygen-cli 4.3.4-unstable.202403081555.0 → 4.3.4-unstable.202403111450.0

package/CHANGELOG.md

@@ -8,6 +8,8 @@
 - d792620: Update @types/node from 20.11.24 to 20.11.25
 - fa1829e: Update typescript from 5.3.3 to 5.4.2
 - b06c819: Update oclif from 4.5.0 to 4.5.2
+- e721e6c: Update vite from 5.1.5 to 5.1.6
+- 36071c8: Add ci-platform label to deployments
 
 ## 4.3.2
 

package/dist/deploy/metadata.js

@@ -71,6 +71,9 @@ function createLabels(metadata) {
     const label = `${labelKey}=${jsonString}`;
     labels.push(label);
   };
+  if (metadata.name !== "none") {
+    labels.push(`ci-platform=${JSON.stringify(metadata.name)}`);
+  }
   if (metadata.name !== "unknown") {
     const keyMapping2 = {
       attempt: "attempt",

package/dist/deploy/metadata.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/deploy/metadata.ts"],"names":["keyMapping"],"mappings":"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","sourcesContent":["import {ciPlatform, CIMetadata} from '@shopify/cli-kit/node/context/local';\nimport {getLatestGitCommit} from '@shopify/cli-kit/node/git';\nimport {Logger, outputWarn} from '@shopify/cli-kit/node/output';\n\nimport {maxLabelLength} from '../utils/utils.js';\n\nimport {DeploymentConfig, EnvironmentInput} from './types.js';\n\ntype Metadata = CIMetadata & {\n  commitDate?: string;\n  name?: string;\n};\n\nexport async function getMetadata(\n  config: DeploymentConfig,\n  logger: Logger,\n): Promise<Metadata> {\n  const ciInfo = ciPlatform();\n  let metadata: Metadata = {};\n\n  try {\n    const gitCommit = await getLatestGitCommit(config.rootPath);\n    const branch = (/HEAD -> ([^,]*)/.exec(gitCommit.refs) || [])[1];\n\n    metadata = {\n      actor: gitCommit.author_name,\n      branch,\n      commitDate: gitCommit.date,\n      commitSha: gitCommit.hash,\n      commitMessage: createCommitTitle(gitCommit.message),\n    };\n  } catch (error) {\n    outputWarn(\n      'Could not retrieve Git history, commit message will be unavailable.',\n      logger,\n    );\n  }\n\n  if (ciInfo.isCI && ciInfo.name !== 'unknown') {\n    metadata = {\n      ...metadata,\n      ...ciInfo.metadata,\n    };\n  }\n\n  return {\n    name: ciInfo.isCI ? ciInfo.name : 'none',\n    ...metadata,\n    actor: config.metadata.user ?? metadata.actor,\n    commitMessage: config.metadata.description ?? metadata.commitMessage,\n    commitSha: config.metadata.version ?? metadata.commitSha,\n    url: config.metadata.url ?? metadata.url,\n  };\n}\n\nfunction createCommitTitle(commitMessage: string): string {\n  let title = commitMessage.split(/\\r?\\n/)[0]?.trim() || '';\n  let jsonTitle = JSON.stringify(title);\n  let isTruncated = false;\n\n  while (jsonTitle.length > maxLabelLength) {\n    const lastSpaceIndex = title.lastIndexOf(' ', maxLabelLength - 3);\n    title = `${title.substring(\n      0,\n      lastSpaceIndex > -1 ? lastSpaceIndex : maxLabelLength - 3,\n    )}`.trimEnd();\n    isTruncated = true;\n    jsonTitle = JSON.stringify(title);\n  }\n\n  return isTruncated ? `${title}...` : title;\n}\n\nexport function getEnvironmentInput(\n  config: DeploymentConfig,\n  metadata: CIMetadata,\n): EnvironmentInput | undefined {\n  if (config.defaultEnvironment) {\n    return undefined;\n  }\n\n  const tag = config.environmentTag || metadata.branch;\n  return tag ? {tag} : undefined;\n}\n\nexport function createLabels(metadata: Metadata): string[] {\n  const labels: string[] = [];\n\n  const checkLabel = (labelKey: string, labelValue: string) => {\n    const jsonString = JSON.stringify(labelValue);\n    if (jsonString.length > maxLabelLength) {\n      throw new Error(\n        `Provided ${labelKey} metadata exceeds maximum length (max ${maxLabelLength} characters).`,\n      );\n    }\n    const label = `${labelKey}=${jsonString}`;\n    labels.push(label);\n  };\n\n  if (metadata.name !== 'unknown') {\n    const keyMapping = {\n      attempt: 'attempt',\n      run: 'runId',\n    };\n\n    for (const [key, value] of Object.entries(keyMapping)) {\n      const metadataKey = key as keyof Metadata;\n      if (metadata[metadataKey]) {\n        labels.push(\n          `${metadata.name}-${value}=${JSON.stringify(metadata[metadataKey])}`,\n        );\n      }\n    }\n  }\n\n  const keyMapping = {\n    actor: 'user',\n    branch: 'branch',\n    commitDate: 'commit-date',\n    commitMessage: 'description',\n    commitSha: 'version',\n    url: 'url',\n  };\n\n  for (const [key, value] of Object.entries(keyMapping)) {\n    const metadataKey = key as keyof Metadata;\n    if (metadata[metadataKey]) {\n      checkLabel(value, metadata[metadataKey]!);\n    }\n  }\n\n  return labels;\n}\n"]}
+{"version":3,"sources":["../../src/deploy/metadata.ts"],"names":["keyMapping"],"mappings":"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","sourcesContent":["import {ciPlatform, CIMetadata} from '@shopify/cli-kit/node/context/local';\nimport {getLatestGitCommit} from '@shopify/cli-kit/node/git';\nimport {Logger, outputWarn} from '@shopify/cli-kit/node/output';\n\nimport {maxLabelLength} from '../utils/utils.js';\n\nimport {DeploymentConfig, EnvironmentInput} from './types.js';\n\ntype Metadata = CIMetadata & {\n  commitDate?: string;\n  name?: string;\n};\n\nexport async function getMetadata(\n  config: DeploymentConfig,\n  logger: Logger,\n): Promise<Metadata> {\n  const ciInfo = ciPlatform();\n  let metadata: Metadata = {};\n\n  try {\n    const gitCommit = await getLatestGitCommit(config.rootPath);\n    const branch = (/HEAD -> ([^,]*)/.exec(gitCommit.refs) || [])[1];\n\n    metadata = {\n      actor: gitCommit.author_name,\n      branch,\n      commitDate: gitCommit.date,\n      commitSha: gitCommit.hash,\n      commitMessage: createCommitTitle(gitCommit.message),\n    };\n  } catch (error) {\n    outputWarn(\n      'Could not retrieve Git history, commit message will be unavailable.',\n      logger,\n    );\n  }\n\n  if (ciInfo.isCI && ciInfo.name !== 'unknown') {\n    metadata = {\n      ...metadata,\n      ...ciInfo.metadata,\n    };\n  }\n\n  return {\n    name: ciInfo.isCI ? ciInfo.name : 'none',\n    ...metadata,\n    actor: config.metadata.user ?? metadata.actor,\n    commitMessage: config.metadata.description ?? metadata.commitMessage,\n    commitSha: config.metadata.version ?? metadata.commitSha,\n    url: config.metadata.url ?? metadata.url,\n  };\n}\n\nfunction createCommitTitle(commitMessage: string): string {\n  let title = commitMessage.split(/\\r?\\n/)[0]?.trim() || '';\n  let jsonTitle = JSON.stringify(title);\n  let isTruncated = false;\n\n  while (jsonTitle.length > maxLabelLength) {\n    const lastSpaceIndex = title.lastIndexOf(' ', maxLabelLength - 3);\n    title = `${title.substring(\n      0,\n      lastSpaceIndex > -1 ? lastSpaceIndex : maxLabelLength - 3,\n    )}`.trimEnd();\n    isTruncated = true;\n    jsonTitle = JSON.stringify(title);\n  }\n\n  return isTruncated ? `${title}...` : title;\n}\n\nexport function getEnvironmentInput(\n  config: DeploymentConfig,\n  metadata: CIMetadata,\n): EnvironmentInput | undefined {\n  if (config.defaultEnvironment) {\n    return undefined;\n  }\n\n  const tag = config.environmentTag || metadata.branch;\n  return tag ? {tag} : undefined;\n}\n\nexport function createLabels(metadata: Metadata): string[] {\n  const labels: string[] = [];\n\n  const checkLabel = (labelKey: string, labelValue: string) => {\n    const jsonString = JSON.stringify(labelValue);\n    if (jsonString.length > maxLabelLength) {\n      throw new Error(\n        `Provided ${labelKey} metadata exceeds maximum length (max ${maxLabelLength} characters).`,\n      );\n    }\n    const label = `${labelKey}=${jsonString}`;\n    labels.push(label);\n  };\n\n  if (metadata.name !== 'none') {\n    labels.push(`ci-platform=${JSON.stringify(metadata.name)}`);\n  }\n\n  if (metadata.name !== 'unknown') {\n    const keyMapping = {\n      attempt: 'attempt',\n      run: 'runId',\n    };\n\n    for (const [key, value] of Object.entries(keyMapping)) {\n      const metadataKey = key as keyof Metadata;\n      if (metadata[metadataKey]) {\n        labels.push(\n          `${metadata.name}-${value}=${JSON.stringify(metadata[metadataKey])}`,\n        );\n      }\n    }\n  }\n\n  const keyMapping = {\n    actor: 'user',\n    branch: 'branch',\n    commitDate: 'commit-date',\n    commitMessage: 'description',\n    commitSha: 'version',\n    url: 'url',\n  };\n\n  for (const [key, value] of Object.entries(keyMapping)) {\n    const metadataKey = key as keyof Metadata;\n    if (metadata[metadataKey]) {\n      checkLabel(value, metadata[metadataKey]!);\n    }\n  }\n\n  return labels;\n}\n"]}

package/oclif.manifest.json

@@ -183,5 +183,5 @@
       ]
     }
   },
-  "version": "4.3.4-unstable.202403081555.0"
+  "version": "4.3.4-unstable.202403111450.0"
 }

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "4.3.4-unstable.202403081555.0",
+  "version": "4.3.4-unstable.202403111450.0",
   "type": "module",
   "scripts": {
     "build": "tsup --sourcemap --clean --config ./tsup.config.ts && oclif manifest",
@@ -60,7 +60,7 @@
     "oclif": "^4",
     "tsup": "^8.0.2",
     "typescript": "^5.4.2",
-    "vite": "^5.1.5",
+    "vite": "^5.1.6",
     "vitest": "^1.3.1"
   },
   "prettier": "@shopify/prettier-config",