Merge branch 'main' into dependabot-npm_and_yarn-oclif-4fdf4cbb6c

Author: isaacroldan

package.json

@@ -44,8 +44,8 @@
     "@graphql-codegen/near-operation-file-preset": "3.0.0",
     "@graphql-codegen/typed-document-node": "5.0.11",
     "@graphql-codegen/typescript-operations": "4.6.1",
-    "@nx/eslint-plugin": "21.1.2",
-    "@nx/workspace": "21.1.2",
+    "@nx/eslint-plugin": "21.5.2",
+    "@nx/workspace": "21.5.2",
     "@octokit/rest": "22.0.0",
     "@shopify/eslint-plugin-cli": "file:packages/eslint-plugin-cli",
     "@shopify/generate-docs": "0.15.6",
@@ -69,7 +69,7 @@
     "knip": "5.59.1",
     "liquidjs": "10.20.1",
     "node-fetch": "^3.3.2",
-    "nx": "21.1.2",
+    "nx": "21.5.2",
     "oclif": "4.22.22",
     "octokit-plugin-create-pull-request": "^3.12.2",
     "pathe": "1.1.1",

packages/app/src/cli/services/app-logs/dev/poll-app-logs.test.ts

@@ -61,6 +61,7 @@ const FUNCTION_PAYLOAD = {
   function_id: 'e57b4d31-2038-49ff-a0a1-1eea532414f7',
   logs: LOGS,
   fuel_consumed: 512436,
+  target: 'test.run',
   export: 'run',
 }
 const FAILURE_PAYLOAD = {
@@ -71,6 +72,7 @@ const FAILURE_PAYLOAD = {
   function_id: 'e57b4d31-2038-49ff-a0a1-1eea532414f7',
   logs: LOGS,
   error_type: FUNCTION_ERROR,
+  target: 'test.run',
   export: 'run',
 }
 

packages/app/src/cli/services/app-logs/logs-command/ui/components/Logs.test.tsx

@@ -86,6 +86,7 @@ const appLogFunctionRunOutputs = ({
     logs: LOGS,
     functionId: FUNCTION_ID,
     fuelConsumed: FUEL_CONSUMED,
+    target: 'test.run',
     errorMessage: 'errorMessage',
     errorType: 'errorType',
     inputQueryVariablesMetafieldValue: '{"key":"value"}',

packages/app/src/cli/services/app-logs/logs-command/ui/components/hooks/usePollAppLogs.test.tsx

@@ -37,6 +37,7 @@ const OUTPUT = {test: 'output'}
 const INPUT = {test: 'input'}
 const INPUT_BYTES = 10
 const OUTPUT_BYTES = 10
+const TARGET = 'test.run'
 
 const NETWORK_ACCESS_HTTP_REQUEST = {
   url: 'https://api.example.com/hello',
@@ -100,6 +101,7 @@ const POLL_APP_LOGS_FOR_LOGS_RESPONSE = {
         function_id: FUNCTION_ID,
         logs: LOGS,
         fuel_consumed: FUEL_CONSUMED,
+        target: TARGET,
       }),
       log_type: LOG_TYPE,
       cursor: RETURNED_CURSOR,

packages/app/src/cli/services/app-logs/types.ts

@@ -36,6 +36,7 @@ export class FunctionRunLog {
   logs: string
   functionId: string
   fuelConsumed: number
+  target: string
   errorMessage: string | null
   errorType: string | null
   inputQueryVariablesMetafieldValue: unknown
@@ -51,6 +52,7 @@ export class FunctionRunLog {
     logs,
     functionId,
     fuelConsumed,
+    target,
     errorMessage,
     errorType,
     inputQueryVariablesMetafieldValue,
@@ -65,6 +67,7 @@ export class FunctionRunLog {
     logs: string
     functionId: string
     fuelConsumed: number
+    target: string
     errorMessage: string | null
     errorType: string | null
     inputQueryVariablesMetafieldValue: unknown
@@ -79,6 +82,7 @@ export class FunctionRunLog {
     this.logs = logs
     this.functionId = functionId
     this.fuelConsumed = fuelConsumed
+    this.target = target
     this.errorMessage = errorMessage
     this.errorType = errorType
     this.inputQueryVariablesMetafieldValue = inputQueryVariablesMetafieldValue

packages/app/src/cli/services/app-logs/utils.ts

@@ -45,6 +45,7 @@ export function parseFunctionRunPayload(payload: string): FunctionRunLog {
     logs: parsedPayload.logs,
     functionId: parsedPayload.function_id,
     fuelConsumed: parsedPayload.fuel_consumed,
+    target: parsedPayload.target,
     errorMessage: parsedPayload.error_message,
     errorType: parsedPayload.error_type,
     inputQueryVariablesMetafieldValue: parsedIqvValue,