Check for uncommited changes, write JSON output in CI

Shopify · Nov 15, 2023 · 5be8092 · 5be8092
1 parent 2bff9fc
commit 5be8092
Show file tree

Hide file tree

Showing 11 changed files with 319 additions and 75 deletions.
diff --git a/.changeset/slimy-sloths-nail.md b/.changeset/slimy-sloths-nail.md
@@ -0,0 +1,18 @@
+---
+'@shopify/cli-hydrogen': minor
+---
+
+The `deploy` command now displays an error if there are uncommited changes in a project's Git repository. If you'd like to go ahead with the deployment regardless, you can use the new `force` flag.
+When deploying with uncommited changes, we use a default description in the form of `<sha> with additional changes` (where `<sha>` represents the hash of the last commit). This description will be visible in the Shopify Admin for the deployment, and the `metadata-description` flag can be used to specify a different description.
+
+In CI environments, the `deploy` command now creates a file "h2_deploy_output.log" file in the current working directory, for successful deployments. This file holds a JSON object with the URL of the deployment. This can be useful for scripting purposes, where consequent steps in your CI workflow require the deployment URL. The flag `--no-json-output` can be used to prevent this behaviour. In the future, we may add further keys to the JSON object.
+
+Updated internal dependencies for bug resolution.
+Please update the `@shopify/cli` dependency in your app to avoid duplicated subdependencies:
+
+```diff
+  "dependencies": {
+-   "@shopify/cli": "3.50.2",
++   "@shopify/cli": "3.51.0",
+  }
+```
diff --git a/examples/customer-api/package.json b/examples/customer-api/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@remix-run/react": "2.1.0",
     "@remix-run/server-runtime": "2.1.0",
-    "@shopify/cli": "3.50.2",
+    "@shopify/cli": "3.51.0",
     "@shopify/cli-hydrogen": "^6.0.0",
     "@shopify/hydrogen": "^2023.10.0",
     "@shopify/remix-oxygen": "^2.0.0",

diff --git a/examples/express/package.json b/examples/express/package.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@remix-run/dev": "2.1.0",
     "@remix-run/eslint-config": "2.1.0",
-    "@shopify/cli": "3.50.2",
+    "@shopify/cli": "3.51.0",
     "@shopify/cli-hydrogen": "^6.0.2",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.17",

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/oclif.manifest.json b/packages/cli/oclif.manifest.json
@@ -171,6 +171,14 @@
           "required": false,
           "multiple": false
         },
+        "force": {
+          "name": "force",
+          "type": "boolean",
+          "char": "f",
+          "description": "Allows a deployment to proceed if there are uncommited changes in the Git repository.",
+          "required": false,
+          "allowNo": false
+        },
         "path": {
           "name": "path",
           "type": "option",
@@ -199,6 +207,13 @@
           "required": false,
           "multiple": false
         },
+        "metadata-description": {
+          "name": "metadata-description",
+          "type": "option",
+          "description": "Description of the changes in the deployment. Defaults to the commit message of the latest commit if there are no uncommited changes.",
+          "required": false,
+          "multiple": false
+        },
         "metadata-url": {
           "name": "metadata-url",
           "type": "option",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -35,10 +35,10 @@
     "@ast-grep/napi": "0.11.0",
     "@graphql-codegen/cli": "5.0.0",
     "@oclif/core": "2.11.7",
-    "@shopify/cli-kit": "3.50.2",
+    "@shopify/cli-kit": "3.51.0",
     "@shopify/hydrogen-codegen": "^0.1.0",
     "@shopify/mini-oxygen": "^2.2.3",
-    "@shopify/oxygen-cli": "2.6.1",
+    "@shopify/oxygen-cli": "2.6.2",
     "ansi-escapes": "^6.2.0",
     "diff": "^5.1.0",
     "fs-extra": "^11.1.0",