shopify-cli 2.21.0 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8971e6497feaa24c2fd34b00c29208f44ffb4cd6405b1b1ec08324b41ade05ad
-  data.tar.gz: 111bbf0f53d8d57812916ee930773887e07163008bd04a1796312378148d70ea
+  metadata.gz: 4fdf2b1a1c6ff2b21a3adb26654fda425436a5660d27b487dd1473fc2530b02c
+  data.tar.gz: 572fa0ba305ec75391c3aac020f1bb72c0874a8d138c7b05da8aaf0fdba68719
 SHA512:
-  metadata.gz: f83037ed5100015bb76f76864af37bff6a735c61d43f1d7870f67441f45d565530e2ebe43537f1f0891a6eda67a2631604916359b678ab8a7d262576a576171d
-  data.tar.gz: 7dd3af12ba1f384d7232c48c5a6f2724a99917eeb598d61d9a01cb86be4d2f114142daf226dc4f58f8083b4f0f8937cbd7f55d9b9283272be4e5c8c6e257ae04
+  metadata.gz: bb78577fab62082d1fb27eacb1865a690c04a8985fea4af5684399e84a942d025e79b36792c1c382704231f8e73c67e71edd9cd055898de0aa48099b2d5dfb2e
+  data.tar.gz: 7e19eb12d7e1cfc5d22002bde244451f21277547180a13617f3211de1b657099e12b85efa46ce8f5649954336cd24c672c98e9ac807af00212f7ea921e57f37f

data/.github/workflows/shopify.yml

@@ -22,7 +22,6 @@ jobs:
           - 2.6.6
           - 2.7.5
         os:
-          - macos-10.15
           - macos-11
           - ubuntu-20.04
           - ubuntu-18.04

data/CHANGELOG.md

@@ -2,6 +2,12 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.22.0 - 2022-08-08
+
+### Fixed
+* [#2512](https://github.com/Shopify/shopify-cli/pull/2512): Add the `-t/--theme` parameter to the `shopify theme serve -h` message
+* [#2505](https://github.com/Shopify/shopify-cli/pull/2505): Show warning messages when `shopify theme push/pull` has errors
+
 ## Version 2.21.0 - 2022-08-03
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.21.0)
+    shopify-cli (2.22.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.3)

data/lib/project_types/theme/commands/pull.rb

@@ -52,7 +52,11 @@ module Theme
           CLI::UI::Frame.open(@ctx.message("theme.pull.pulling", theme.name, theme.id, theme.shop)) do
             UI::SyncProgressBar.new(syncer).progress(:download_theme!, delete: delete)
           end
-          @ctx.done(@ctx.message("theme.pull.done"))
+          if syncer.has_any_error?
+            @ctx.warn(@ctx.message("theme.pull.done_with_errors"))
+          else
+            @ctx.done(@ctx.message("theme.pull.done"))
+          end
         rescue ShopifyCLI::API::APIRequestNotFoundError
           @ctx.abort(@ctx.message("theme.pull.theme_not_found", "##{theme.id}"))
         ensure

data/lib/project_types/theme/commands/push.rb

@@ -63,20 +63,12 @@ module Theme
           syncer.start_threads
           if options.flags[:json]
             syncer.upload_theme!(delete: delete)
-            puts(JSON.generate(theme: theme.to_h))
           else
             CLI::UI::Frame.open(@ctx.message("theme.push.info.pushing", theme.name, theme.id, theme.shop)) do
               UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delete: delete)
             end
-
-            if options.flags[:publish]
-              theme.publish
-              @ctx.done(@ctx.message("theme.publish.done", theme.preview_url))
-            else
-              @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url))
-            end
           end
-          raise ShopifyCLI::AbortSilent if syncer.has_any_error?
+          push_completion_handler(theme, syncer.has_any_error?)
         ensure
           syncer.shutdown
         end
@@ -90,6 +82,23 @@ module Theme
 
       private
 
+      def push_completion_handler(theme, has_errors)
+        if options.flags[:json]
+          output = { theme: theme.to_h }
+          output[:warning] = "Theme pushed with errors." if has_errors
+
+          puts(JSON.generate(output))
+        elsif options.flags[:publish]
+          theme.publish
+          return @ctx.done(@ctx.message("theme.publish.done", theme.preview_url)) unless has_errors
+          @ctx.warn(@ctx.message("theme.publish.done_with_errors", theme.preview_url))
+        else
+          return @ctx.done(@ctx.message("theme.push.done", theme.preview_url, theme.editor_url)) unless has_errors
+          @ctx.warn(@ctx.message("theme.push.done_with_errors", theme.preview_url, theme.editor_url))
+        end
+        raise ShopifyCLI::AbortSilent if has_errors
+      end
+
       def find_theme(root, theme_id: nil, theme: nil, live: nil, development: nil, unpublished: nil, **_args)
         if theme_id
           @ctx.warn(@ctx.message("theme.push.deprecated_themeid"))

data/lib/project_types/theme/messages/messages.rb

@@ -43,6 +43,7 @@ module Theme
               Run without arguments to select theme from a list.
           HELP
           done: "Your theme is now live at %s",
+          done_with_errors: "{{warning:Your theme was published with errors and is now live at %s.}}",
           not_found: "Theme #%s does not exist",
           no_themes_error: "You don't have any theme to be published.",
           no_themes_resolution: "Try to create an unpublished theme with {{command:theme push -u -t <theme_name>}}.",
@@ -102,6 +103,15 @@ module Theme
               {{info:Customize this theme in the Theme Editor:}}
               {{underline:%s}}
           DONE
+          done_with_errors: <<~WARN,
+            {{yellow:Your theme was pushed with errors.}}
+
+              {{info:View your theme:}}
+              {{underline:%s}}
+
+              {{info:Customize this theme in the Theme Editor:}}
+              {{underline:%s}}
+          WARN
           name: "Theme name",
         },
         serve: {
@@ -112,14 +122,15 @@ module Theme
             Usage: {{command:%s theme serve [ ROOT ]}}
 
             Options:
-              {{command:--port=PORT}}         Local port to serve theme preview from.
-              {{command:--poll}}              Force polling to detect file changes.
-              {{command:--host=HOST}}         Set which network interface the web server listens on. The default value is 127.0.0.1.
-              {{command:--theme-editor-sync}} Synchronize Theme Editor updates in the local theme files.
-              {{command:--live-reload=MODE}}  The live reload mode switches the server behavior when a file is modified:
-                                  - {{command:hot-reload}} Hot reloads local changes to CSS and sections (default)
-                                  - {{command:full-page}}  Always refreshes the entire page
-                                  - {{command:off}}        Deactivate live reload
+              {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of the remote theme.
+              {{command:--port=PORT}}            Local port to serve theme preview from.
+              {{command:--poll}}                 Force polling to detect file changes.
+              {{command:--host=HOST}}            Set which network interface the web server listens on. The default value is 127.0.0.1.
+              {{command:--theme-editor-sync}}    Synchronize Theme Editor updates in the local theme files.
+              {{command:--live-reload=MODE}}     The live reload mode switches the server behavior when a file is modified:
+                                     - {{command:hot-reload}} Hot reloads local changes to CSS and sections (default)
+                                     - {{command:full-page}}  Always refreshes the entire page
+                                     - {{command:off}}        Deactivate live reload
           HELP
           reload_mode_is_not_valid: "The live reload mode `%s` is not valid.",
           try_a_valid_reload_mode: "Try a valid live reload mode: %s.",
@@ -318,7 +329,8 @@ module Theme
           HELP
           select: "Select a theme to pull from",
           pulling: "Pulling theme files from %s (#%s) on %s",
-          done: "Theme pulled successfully",
+          done: "Theme pulled successfully.",
+          done_with_errors: "{{warning:Your theme was pulled with errors.}}",
           deprecated_themeid: <<~WARN,
             {{warning:The {{command:-i, --themeid}} flag is deprecated. Use {{command:-t, --theme}} instead.}}
           WARN

data/lib/shopify_cli/resources/env_file.rb

@@ -30,7 +30,7 @@ module ShopifyCLI
         def parse(directory)
           File.read(path(directory))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
-            match = /\A([A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
+            match = /\A(#*\s*[A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
             if match
               key = match[1]
               output[key] = case match[2]

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.21.0"
+  VERSION = "2.22.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler