Skip to content

Commit 544e4c2

Browse files
Merge branch 'main' into upgrade-oclif
2 parents b1a00b8 + 1dadff0 commit 544e4c2

File tree

17 files changed

+2712
-2147
lines changed

17 files changed

+2712
-2147
lines changed

.github/dependabot.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,33 @@ updates:
1717
- dependency-name: "*"
1818
update-types: ["version-update:semver-major"]
1919
groups:
20+
oclif:
21+
patterns:
22+
- "oclif"
23+
- "@oclif/*"
24+
nx:
25+
patterns:
26+
- "nx"
27+
- "@nx/*"
28+
esbuild:
29+
patterns:
30+
- "esbuild"
31+
babel:
32+
patterns:
33+
- "@babel/*"
34+
typescript:
35+
patterns:
36+
- "typescript"
2037
minor_versions:
2138
dependency-type: "production"
2239
update-types:
2340
- 'minor'
2441
- 'patch'
2542
exclude-patterns:
26-
- "oclif"
27-
- "@oclif/*"
28-
- "nx"
29-
- "@nx/*"
3043
- "ink"
31-
- "typescript"
32-
- "esbuild"
3344
- "react"
34-
- "@babel/*"
35-
- "javy-cli"
3645
development_dependencies:
3746
dependency-type: "development"
3847
update-types:
3948
- 'minor'
4049
- 'patch'
41-
oclif:
42-
patterns:
43-
- "oclif"
44-
- "@oclif/*"
45-
nx:
46-
patterns:
47-
- "nx"
48-
- "@nx/*"

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Contributors documentation
44

5-
This page contains resources for people interested in contributing to this repository or developing a [plugin](./plugins.md)](./plugins.md).
5+
This page contains resources for people interested in contributing to this repository or developing a [plugin](./plugins.md).
66

77
## CLI
88

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"private": true,
33
"type": "module",
4+
"packageManager": "[email protected]",
45
"scripts": {
56
"build-api-docs": "nx run-many --target=build-api-docs --all --skip-nx-cache",
67
"build-dev-docs": "pnpm shopify docs generate && sh ./bin/docs/build-dev-docs.sh",
@@ -41,8 +42,8 @@
4142
"@changesets/cli": "2.26.2",
4243
"@graphql-codegen/cli": "5.0.2",
4344
"@graphql-codegen/near-operation-file-preset": "3.0.0",
44-
"@nx/eslint-plugin": "19.3.0",
45-
"@nx/workspace": "19.3.0",
45+
"@nx/eslint-plugin": "19.8.14",
46+
"@nx/workspace": "19.8.14",
4647
"@octokit/core": "^4.2.4",
4748
"@octokit/rest": "20.1.1",
4849
"@shopify/eslint-plugin-cli": "file:packages/eslint-plugin-cli",
@@ -54,7 +55,7 @@
5455
"bugsnag-build-reporter": "^2.0.0",
5556
"commander": "^9.4.0",
5657
"cross-env": "^7.0.3",
57-
"esbuild": "0.24.0",
58+
"esbuild": "0.24.2",
5859
"eslint": "^8.48.0",
5960
"execa": "^7.2.0",
6061
"fast-glob": "3.3.3",
@@ -67,7 +68,7 @@
6768
"knip": "^5.10.0",
6869
"liquidjs": "10.20.1",
6970
"node-fetch": "^3.3.2",
70-
"nx": "19.3.0",
71+
"nx": "19.8.14",
7172
"oclif": "4.11.3",
7273
"octokit-plugin-create-pull-request": "^3.12.2",
7374
"pathe": "1.1.1",
@@ -76,7 +77,7 @@
7677
"rimraf": "^3.0.2",
7778
"tmp": "^0.2.1",
7879
"ts-node": "^10.9.1",
79-
"typescript": "5.7.2",
80+
"typescript": "5.7.3",
8081
"vitest": "^1.6.0"
8182
},
8283
"workspaces": {

packages/app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@shopify/app",
33
"version": "3.74.0",
4+
"packageManager": "[email protected]",
45
"description": "Utilities for loading, building, and publishing apps.",
56
"homepage": "https://github.com/shopify/cli#readme",
67
"private": true,
@@ -62,7 +63,7 @@
6263
"camelcase-keys": "9.1.3",
6364
"chokidar": "3.6.0",
6465
"diff": "5.2.0",
65-
"esbuild": "0.24.0",
66+
"esbuild": "0.24.2",
6667
"express": "4.21.2",
6768
"graphql-request": "5.2.0",
6869
"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/cli-kit/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@shopify/cli-kit",
33
"version": "3.74.0",
4+
"packageManager": "[email protected]",
45
"private": false,
56
"description": "A set of utilities, interfaces, and models that are common across all the platform features",
67
"keywords": [

packages/cli/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@shopify/cli",
33
"version": "3.74.0",
4+
"packageManager": "[email protected]",
45
"private": false,
56
"description": "A CLI tool to build for the Shopify platform",
67
"keywords": [
@@ -103,7 +104,7 @@
103104
},
104105
"dependencies": {
105106
"@ast-grep/napi": "0.33.0",
106-
"esbuild": "0.24.0"
107+
"esbuild": "0.24.2"
107108
},
108109
"devDependencies": {
109110
"@oclif/core": "3.26.5",

packages/create-app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@shopify/create-app",
33
"version": "3.74.0",
4+
"packageManager": "[email protected]",
45
"private": false,
56
"description": "A CLI tool to create a new Shopify app.",
67
"keywords": [
@@ -55,7 +56,7 @@
5556
]
5657
},
5758
"dependencies": {
58-
"esbuild": "0.24.0"
59+
"esbuild": "0.24.2"
5960
},
6061
"devDependencies": {
6162
"@shopify/cli-kit": "3.74.0",

packages/eslint-plugin-cli/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@shopify/eslint-plugin-cli",
33
"version": "3.47.2",
4+
"packageManager": "[email protected]",
45
"description": "Shopify CLI's ESLint rules and configs.",
56
"keywords": [
67
"eslint",
@@ -15,7 +16,7 @@
1516
"license": "MIT",
1617
"author": "Shopify Inc.",
1718
"dependencies": {
18-
"@babel/core": "7.26.0",
19+
"@babel/core": "7.26.7",
1920
"@shopify/eslint-plugin": "42.1.0",
2021
"@typescript-eslint/eslint-plugin": "7.13.1",
2122
"@typescript-eslint/parser": "7.18.0",

packages/features/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@shopify/features",
33
"version": "0.12.0",
4+
"packageManager": "[email protected]",
45
"private": true,
56
"type": "module",
67
"scripts": {

0 commit comments

Comments
 (0)