From 8b35fff2b6c6f4e945390a067b8fca3beb08444b Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 29 Apr 2025 14:23:58 +0200 Subject: [PATCH 1/4] fix lint issue --- packages/core/src/mcp-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/mcp-server.ts b/packages/core/src/mcp-server.ts index 56c53010b58a..bd3d83795d1c 100644 --- a/packages/core/src/mcp-server.ts +++ b/packages/core/src/mcp-server.ts @@ -6,8 +6,8 @@ import { } from './semanticAttributes'; import { startSpan, withActiveSpan } from './tracing'; import type { Span } from './types-hoist/span'; -import { logger } from './utils-hoist/logger'; import { getActiveSpan } from './utils/spanUtils'; +import { logger } from './utils-hoist/logger'; interface MCPTransport { // The first argument is a JSON RPC message From 3accf9e7c80c175c2748bb11923f44e8489598e4 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 29 Apr 2025 14:12:21 +0200 Subject: [PATCH 2/4] test(e2e): Pin `@shopify/mini-oxygen` to 3.2.0 to fix build error --- .../e2e-tests/test-applications/remix-hydrogen/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-packages/e2e-tests/test-applications/remix-hydrogen/package.json b/dev-packages/e2e-tests/test-applications/remix-hydrogen/package.json index 742cd1526beb..48f0becca3f7 100644 --- a/dev-packages/e2e-tests/test-applications/remix-hydrogen/package.json +++ b/dev-packages/e2e-tests/test-applications/remix-hydrogen/package.json @@ -36,7 +36,7 @@ "@sentry-internal/test-utils": "link:../../../test-utils", "@shopify/cli": "^3.74.1", "@shopify/hydrogen-codegen": "^0.3.1", - "@shopify/mini-oxygen": "^3.1.1", + "@shopify/mini-oxygen": "3.2.0", "@shopify/oxygen-workers-types": "^4.1.2", "@shopify/prettier-config": "^1.1.2", "@tailwindcss/vite": "4.0.0-alpha.17", From 95143b9094cab2021250bf134b3a390c4b43af5d Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 29 Apr 2025 14:28:40 +0200 Subject: [PATCH 3/4] start ci pls From e963e42d5f5beefcb153f8cdd31afd6fb81e56ce Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 29 Apr 2025 15:37:24 +0200 Subject: [PATCH 4/4] another try