Skip to content

Commit 9653c8f

Browse files
Merge branch 'main' into upgrade-changesets
2 parents 135ec13 + 2f165b5 commit 9653c8f

File tree

10 files changed

+3194
-1699
lines changed

10 files changed

+3194
-1699
lines changed

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
"@changesets/cli": "2.27.12",
4343
"@graphql-codegen/cli": "5.0.2",
4444
"@graphql-codegen/near-operation-file-preset": "3.0.0",
45-
"@nx/eslint-plugin": "19.3.0",
46-
"@nx/workspace": "19.3.0",
45+
"@nx/eslint-plugin": "19.8.14",
46+
"@nx/workspace": "19.8.14",
4747
"@octokit/core": "^4.2.4",
4848
"@octokit/rest": "20.1.1",
4949
"@shopify/eslint-plugin-cli": "file:packages/eslint-plugin-cli",
@@ -55,7 +55,7 @@
5555
"bugsnag-build-reporter": "^2.0.0",
5656
"commander": "^9.4.0",
5757
"cross-env": "^7.0.3",
58-
"esbuild": "0.24.0",
58+
"esbuild": "0.24.2",
5959
"eslint": "^8.48.0",
6060
"execa": "^7.2.0",
6161
"fast-glob": "3.3.3",
@@ -68,7 +68,7 @@
6868
"knip": "^5.10.0",
6969
"liquidjs": "10.20.1",
7070
"node-fetch": "^3.3.2",
71-
"nx": "19.3.0",
71+
"nx": "19.8.14",
7272
"oclif": "4.6.1",
7373
"octokit-plugin-create-pull-request": "^3.12.2",
7474
"pathe": "1.1.1",
@@ -77,7 +77,7 @@
7777
"rimraf": "^3.0.2",
7878
"tmp": "^0.2.1",
7979
"ts-node": "^10.9.1",
80-
"typescript": "5.7.2",
80+
"typescript": "5.7.3",
8181
"vitest": "^1.6.0"
8282
},
8383
"workspaces": {
@@ -102,7 +102,8 @@
102102
"whatwg-url": "14.0.0",
103103
"supports-hyperlinks": "3.1.0",
104104
"@shopify/cli-hydrogen>@shopify/cli-kit": "link:./packages/cli-kit",
105-
"@shopify/cli-hydrogen>@shopify/plugin-cloudflare": "link:./packages/plugin-cloudflare"
105+
"@shopify/cli-hydrogen>@shopify/plugin-cloudflare": "link:./packages/plugin-cloudflare",
106+
"nanoid": "3.3.8"
106107
},
107108
"knip": {
108109
"$schema": "https://unpkg.com/knip@5/schema.json",

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"camelcase-keys": "9.1.3",
6464
"chokidar": "3.6.0",
6565
"diff": "5.2.0",
66-
"esbuild": "0.24.0",
66+
"esbuild": "0.24.2",
6767
"express": "4.21.2",
6868
"graphql-request": "5.2.0",
6969
"h3": "0.7.21",

packages/app/src/cli/api/graphql/business-platform-organizations/generated/types.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ export type Scalars = {
2020
/** The ID for a ActionAudit. */
2121
ActionAuditID: {input: any; output: any}
2222
GlobalID: {input: string; output: string}
23+
/** The ID for a GovernmentIdentifier. */
24+
GovernmentIdentifierID: {input: any; output: any}
2325
/** The ID for a Group. */
2426
GroupID: {input: any; output: any}
2527
/** An ISO 8601-encoded date */

packages/app/src/cli/services/dev/processes/dev-session-status-manager.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import {EventEmitter} from 'events'
44
export interface DevSessionStatus {
55
isReady: boolean
66
previewURL?: string
7+
graphiqlURL?: string
78
}
89

9-
class DevSessionStatusManager extends EventEmitter {
10+
export class DevSessionStatusManager extends EventEmitter {
1011
private currentStatus: DevSessionStatus = {
1112
isReady: false,
1213
previewURL: undefined,
14+
graphiqlURL: undefined,
1315
}
1416

1517
updateStatus(status: Partial<DevSessionStatus>) {
@@ -29,6 +31,7 @@ class DevSessionStatusManager extends EventEmitter {
2931
this.currentStatus = {
3032
isReady: false,
3133
previewURL: undefined,
34+
graphiqlURL: undefined,
3235
}
3336
}
3437
}

0 commit comments

Comments
 (0)