shopify-cli 2.1.0 → 2.3.0

data/lib/project_types/script/messages/messages.rb

@@ -141,6 +141,9 @@ module Script
           web_assembly_binary_not_found_suggestion: "No WebAssembly binary found." \
             "Check that your build npm script outputs the generated binary to the root of the directory." \
             "Generated binary should match the script name: <script_name>.wasm",
+
+          script_upload_cause: "Fail to upload script.",
+          script_upload_help: "Try again.",
         },
 
         create: {

data/lib/project_types/script/ui/error_handler.rb

@@ -237,6 +237,11 @@ module Script
             cause_of_error: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found"),
             help_suggestion: ShopifyCli::Context.message("script.error.web_assembly_binary_not_found_suggestion"),
           }
+        when Layers::Infrastructure::Errors::ScriptUploadError
+          {
+            cause_of_error: ShopifyCli::Context.message("script.error.script_upload_cause"),
+            help_suggestion: ShopifyCli::Context.message("script.error.script_upload_help"),
+          }
         end
       end
     end

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

@@ -9,6 +9,10 @@ module Theme
       options do |parser, flags|
         parser.on("-n", "--nodelete") { flags[:nodelete] = true }
         parser.on("-i", "--themeid=ID") { |theme_id| flags[:theme_id] = theme_id }
+        parser.on("-x", "--ignore=PATTERN") do |pattern|
+          flags[:ignores] ||= []
+          flags[:ignores] << pattern
+        end
       end
 
       def call(args, _name)
@@ -29,6 +33,8 @@ module Theme
         end
 
         ignore_filter = ShopifyCli::Theme::IgnoreFilter.from_path(root)
+        ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
+
         syncer = ShopifyCli::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
         begin
           syncer.start_threads

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

@@ -15,6 +15,10 @@ module Theme
         parser.on("-j", "--json") { flags[:json] = true }
         parser.on("-a", "--allow-live") { flags[:allow_live] = true }
         parser.on("-p", "--publish") { flags[:publish] = true }
+        parser.on("-x", "--ignore=PATTERN") do |pattern|
+          flags[:ignores] ||= []
+          flags[:ignores] << pattern
+        end
       end
 
       def call(args, _name)
@@ -48,6 +52,8 @@ module Theme
         end
 
         ignore_filter = ShopifyCli::Theme::IgnoreFilter.from_path(root)
+        ignore_filter.add_patterns(options.flags[:ignores]) if options.flags[:ignores]
+
         syncer = ShopifyCli::Theme::Syncer.new(@ctx, theme: theme, ignore_filter: ignore_filter)
         begin
           syncer.start_threads

data/lib/project_types/theme/forms/select.rb

@@ -43,7 +43,7 @@ module Theme
         when "development"
           "blue"
         else
-          "grey"
+          "italic"
         end
 
         tags = ["{{#{color}:[#{theme.role}]}}"]

data/lib/shopify-cli/core/monorail.rb

@@ -46,7 +46,7 @@ module ShopifyCli
 
         # we only want to send Monorail events in production or when explicitly developing
         def enabled?
-          Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1"
+          (Context.new.system? || ENV["MONORAIL_REAL_EVENTS"] == "1") && !Context.new.ci?
         end
 
         def consented?
@@ -54,6 +54,7 @@ module ShopifyCli
         end
 
         def prompt_for_consent
+          return if Context.new.ci?
           return unless enabled?
           return if ShopifyCli::Config.get_section("analytics").key?("enabled")
           msg = Context.message("core.monorail.consent_prompt")

data/lib/shopify-cli/process_supervision.rb

@@ -59,10 +59,20 @@ module ShopifyCli
       def start(identifier, args)
         return for_ident(identifier) if running?(identifier)
 
-        # Windows doesn't support forking process without extra gems, so we resort to spawning a new child process -
-        # that means that it dies along with the original process if it is interrupted. On UNIX, we fork the process so
-        # that it doesn't have to be restarted on every run.
-        if Context.new.windows?
+        # Some systems don't support forking process without extra gems, so we resort to spawning a new child process -
+        # that means that it dies along with the original process if it is interrupted. If possible, we fork the process
+        # so that it doesn't have to be restarted on every run.
+        if Process.respond_to?(:fork)
+          fork do
+            pid_file = new(identifier, pid: Process.pid)
+            pid_file.write
+            STDOUT.reopen(pid_file.log_path, "w")
+            STDERR.reopen(pid_file.log_path, "w")
+            STDIN.reopen("/dev/null", "r")
+            Process.setsid
+            exec(*args)
+          end
+        else
           pid_file = new(identifier)
 
           # Make sure the file exists and is empty, otherwise Windows fails
@@ -77,16 +87,6 @@ module ShopifyCli
           pid_file.write
 
           Process.detach(pid)
-        else
-          fork do
-            pid_file = new(identifier, pid: Process.pid)
-            pid_file.write
-            STDOUT.reopen(pid_file.log_path, "w")
-            STDERR.reopen(pid_file.log_path, "w")
-            STDIN.reopen("/dev/null", "r")
-            Process.setsid
-            exec(*args)
-          end
         end
 
         sleep(0.1)

data/lib/shopify-cli/theme/dev_server/header_hash.rb

@@ -47,6 +47,10 @@ module ShopifyCli
           super(k) || super(@names[k.downcase])
         end
 
+        def fetch(k, default = nil)
+          self[k] || super(@names[k.downcase], default)
+        end
+
         def []=(k, v)
           canonical = k.downcase.freeze
           # .delete is expensive, don't invoke it unless necessary

data/lib/shopify-cli/theme/dev_server/proxy.rb

@@ -155,11 +155,16 @@ module ShopifyCli
           Time.now - @last_session_cookie_refresh >= SESSION_COOKIE_MAX_AGE
         end
 
+        def extract_secure_session_id_from_response_headers(headers)
+          return unless headers["set-cookie"]
+          headers["set-cookie"][SESSION_COOKIE_REGEXP, 1]
+        end
+
         def secure_session_id
           if secure_session_id_expired?
             @ctx.debug("Refreshing preview _secure_session_id cookie")
             response = request("HEAD", "/", query: { preview_theme_id: @theme.id })
-            @secure_session_id = response["set-cookie"][SESSION_COOKIE_REGEXP, 1]
+            @secure_session_id = extract_secure_session_id_from_response_headers(response)
             @last_session_cookie_refresh = Time.now
           end
 
@@ -179,6 +184,13 @@ module ShopifyCli
             response_headers["location"].gsub!(%r{(https://#{@theme.shop})}, "http://127.0.0.1:9292")
           end
 
+          new_session_id = extract_secure_session_id_from_response_headers(response_headers)
+          if new_session_id
+            @ctx.debug("New _secure_session_id cookie from response")
+            @secure_session_id = new_session_id
+            @last_session_cookie_refresh = Time.now
+          end
+
           response_headers
         end
 

data/lib/shopify-cli/theme/file.rb

@@ -17,12 +17,20 @@ module ShopifyCli
       end
 
       def read
-        path.read
+        if text?
+          path.read
+        else
+          path.read(mode: "rb")
+        end
       end
 
-      def write(*args)
+      def write(content)
         path.parent.mkpath unless path.parent.directory?
-        path.write(*args)
+        if text?
+          path.write(content)
+        else
+          path.write(content, 0, mode: "wb")
+        end
       end
 
       def delete

data/lib/shopify-cli/theme/ignore_filter.rb

@@ -59,6 +59,13 @@ module ShopifyCli
         @globs = globs
       end
 
+      def add_patterns(patterns)
+        regexes, globs = patterns_to_regexes_and_globs(patterns)
+
+        @regexes += regexes
+        @globs += globs
+      end
+
       def match?(path)
         path = path.to_s
 

data/lib/shopify-cli/theme/syncer.rb

@@ -256,7 +256,7 @@ module ShopifyCli
 
         attachment = body.dig("asset", "attachment")
         value = if attachment
-          file.write(Base64.decode64(attachment), 0, mode: "wb")
+          file.write(Base64.decode64(attachment))
         else
           file.write(body.dig("asset", "value"))
         end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "2.1.0"
+  VERSION = "2.3.0"
 end

data/shopify-cli.gemspec

@@ -44,5 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("minitest", "~> 5.0")
 
   spec.add_dependency("listen", "~> 3.5")
-  spec.add_dependency("theme-check", "~> 1.1")
+  spec.add_dependency("theme-check", "~> 1.2")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: |
   Shopify CLI helps you build Shopify apps faster. It quickly scaffolds Node.js
   and Ruby on Rails embedded apps. It also automates many common tasks in the
@@ -159,6 +159,7 @@ files:
 - lib/graphql/find_organization.graphql
 - lib/graphql/get_app_by_api_key.graphql
 - lib/graphql/get_app_urls.graphql
+- lib/graphql/get_variant_id.graphql
 - lib/graphql/update_dashboard_urls.graphql
 - lib/project_types/extension/cli.rb
 - lib/project_types/extension/commands/build.rb
@@ -182,6 +183,10 @@ files:
 - lib/project_types/extension/features/argo_setup.rb
 - lib/project_types/extension/features/argo_setup_step.rb
 - lib/project_types/extension/features/argo_setup_steps.rb
+- lib/project_types/extension/features/runtimes/admin.rb
+- lib/project_types/extension/features/runtimes/base.rb
+- lib/project_types/extension/features/runtimes/checkout_post_purchase.rb
+- lib/project_types/extension/features/runtimes/checkout_ui_extension.rb
 - lib/project_types/extension/forms/connect.rb
 - lib/project_types/extension/forms/create.rb
 - lib/project_types/extension/forms/questions/ask_app.rb
@@ -193,6 +198,7 @@ files:
 - lib/project_types/extension/models/app.rb
 - lib/project_types/extension/models/lazy_specification_handler.rb
 - lib/project_types/extension/models/npm_package.rb
+- lib/project_types/extension/models/product.rb
 - lib/project_types/extension/models/registration.rb
 - lib/project_types/extension/models/specification.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
@@ -206,6 +212,7 @@ files:
 - lib/project_types/extension/tasks/configure_features.rb
 - lib/project_types/extension/tasks/configure_options.rb
 - lib/project_types/extension/tasks/converters/app_converter.rb
+- lib/project_types/extension/tasks/converters/product_converter.rb
 - lib/project_types/extension/tasks/converters/registration_converter.rb
 - lib/project_types/extension/tasks/converters/validation_error_converter.rb
 - lib/project_types/extension/tasks/converters/version_converter.rb
@@ -215,6 +222,7 @@ files:
 - lib/project_types/extension/tasks/get_app.rb
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
+- lib/project_types/extension/tasks/get_product.rb
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb
@@ -248,8 +256,10 @@ files:
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/graphql/app_script_set.graphql
 - lib/project_types/script/graphql/app_script_update_or_create.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
+- lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
 - lib/project_types/script/layers/application/create_script.rb