shopify-cli 2.34.0 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd29ef210f31fc605f44e4ecc7402157b79ab92091aa247a2025576a87e7159b
-  data.tar.gz: bf8c1081b70e4c97d5dabd6ed54818b5e6fada2787ebc51cb5406791af9e5982
+  metadata.gz: ade7adf91cbeb9a2dd8a02b15189641ccefc1b936f6a7f1621018c6bbd9b6197
+  data.tar.gz: 2a260ea255710a59c3062189561a367a6a97738c4c29d8d2df4aae75d9a28ad0
 SHA512:
-  metadata.gz: e941e27b0d6a5faf0bf210f21cb0fd8d86bcc1bfc142e4e57ba44f6918fdc44664c6d82d32f605a3a1aa047119242014e1c4b324031212fdc849c7361c0e29fa
-  data.tar.gz: '09b978061cecd114d072d17df1667601f0275fb6a28f42219a3ba359b44cde4c7becb63d65a6ec6e686eeeedbdf54f29ca911cfb7eaf3b19d116d3a816740f78'
+  metadata.gz: 8472b9e1cf6c57b9f469d75c1df4f8aaf4b6942746a6cb20b20b67853d8a7f64775f236074251fbb344d20e7befaee54334f85ad69f30fd1d381cebab2da7986
+  data.tar.gz: 29cb2ad9e92906a3e0cec7903d2ed1a072b81133a0a623492c9210a9795257648a768221c6955b3eaa302b949ee44ecf61a37b24cfaed165aae7b654a1625788

data/CHANGELOG.md

@@ -2,6 +2,26 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.36.0 - 2023-05-03
+
+### Fixed
+* [#2735](https://github.com/Shopify/shopify-cli/pull/2735): Remove theme directory confirmation during tests and make confirmation dialogue respect `SHOPIFY_CLI_TTY` (from cli#1369)
+* [#2737](https://github.com/Shopify/shopify-cli/pull/2737): Do not inject hot-reload code into web-pixels-manager sandbox (from cli#1568)
+
+### Added
+* [#2735](https://github.com/Shopify/shopify-cli/pull/2735): Pass development theme from CLI 3’s to CLI 2’s local storage (from cli#1410)
+
+## Version 2.35.0 - 2023-02-22
+
+### Fixed
+* [#2721](https://github.com/Shopify/shopify-cli/pull/2721): Do not `replace_asset_urls` in font bodies
+* [#2729](https://github.com/Shopify/shopify-cli/pull/2729): Do not inject hot-reload code into web-pixels-manager sandbox (from cli#1370)
+* [#2731](https://github.com/Shopify/shopify-cli/pull/2731): The CLI should not report IO messages when the `--json` flag is passed
+
+### Added
+* [#2724](https://github.com/Shopify/shopify-cli/pull/2724): Introduce hidden `--overwrite-json` flag
+* [#2729](https://github.com/Shopify/shopify-cli/pull/2729): Introduce hidden `--generate_tmp_theme` flag (from cli#1264)
+
 ## Version 2.34.0 - 2023-01-11
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.34.0)
+    shopify-cli (2.36.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.14.0)
@@ -165,7 +165,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.3.11)
+  bundler (>= 2.3.11)
   byebug
   colorize (~> 0.8.1)
   cucumber (~> 7.0)

data/lib/project_types/extension/cli.rb

@@ -19,7 +19,6 @@ module Extension
   class Command < ShopifyCLI::Command::ProjectCommand
     autoload :ExtensionCommand, Project.project_filepath("commands/extension_command")
 
-    subcommand :Create, "create", Project.project_filepath("commands/create")
     subcommand :Register, "register", Project.project_filepath("commands/register")
     subcommand :Info, "info", Project.project_filepath("commands/info")
     subcommand :Connect, "connect", Project.project_filepath("commands/connect")

data/lib/project_types/extension/commands/serve.rb

@@ -20,6 +20,9 @@ module Extension
         parser.on("-T", "--theme=NAME_OR_ID", "Theme ID or name of the theme app extension host theme.") do |theme|
           flags[:theme] = theme
         end
+        parser.on("--generate-tmp-theme", "Populate host theme, created by CLI 3, with assets") do |generate_tmp_theme|
+          flags[:generate_tmp_theme] = generate_tmp_theme
+        end
         parser.on("--api-key=API_KEY", "Connect your extension and app by inserting your app's API key") do |api_key|
           flags[:api_key] = api_key.gsub('"', "")
         end
@@ -45,6 +48,7 @@ module Extension
         property! :tunnel_requested, accepts: [true, false], reader: :tunnel_requested?, default: true
         property :port, accepts: (1...(2**16))
         property :theme, accepts: String, default: nil
+        property :generate_tmp_theme, accepts: [true, false], reader: :generate_tmp_theme?, default: false
         property :api_key, accepts: String, default: nil
         property :api_secret, accepts: String, default: nil
         property :registration_id, accepts: String, default: nil
@@ -60,6 +64,7 @@ module Extension
           resource_url: options.flags[:resource_url],
           port: options.flags[:port],
           theme: options.flags[:theme],
+          generate_tmp_theme: generate_tmp_theme?,
           api_key: options.flags[:api_key],
           api_secret: options.flags[:api_secret],
           registration_id: options.flags[:registration_id],
@@ -103,6 +108,10 @@ module Extension
         tunnel.nil? || !!tunnel
       end
 
+      def generate_tmp_theme?
+        options.flags[:generate_tmp_theme] == true
+      end
+
       def find_available_port(runtime_configuration)
         return runtime_configuration unless runtime_configuration.port.nil?
         return runtime_configuration unless specification_handler.choose_port?(@ctx)
@@ -137,6 +146,7 @@ module Extension
           tunnel_url: runtime_configuration.tunnel_url,
           port: runtime_configuration.port,
           theme: runtime_configuration.theme,
+          generate_tmp_theme: runtime_configuration.generate_tmp_theme?,
           api_key: runtime_configuration.api_key,
           api_secret: runtime_configuration.api_secret,
           registration_id: runtime_configuration.registration_id,

data/lib/project_types/extension/models/specification_handlers/theme_app_extension.rb

@@ -78,7 +78,7 @@ module Extension
           root = options[:context]&.root
           project = options[:project]
           properties = options
-            .slice(:port, :theme)
+            .slice(:port, :theme, :generate_tmp_theme)
             .compact
             .merge({
               project: project,

data/lib/project_types/theme/commands/common/root_helper.rb

@@ -49,13 +49,14 @@ module Theme
         private
 
         def current_directory_confirmed?
-          raise "Current theme directory can't be confirmed during tests" if @ctx.testing?
+          return true if options.flags[:force]
 
+          @ctx.warn(@ctx.message("theme.current_directory_is_not_theme_directory"))
           Forms::ConfirmStore.ask(
             @ctx,
             [],
             title: @ctx.message("theme.confirm_current_directory"),
-            force: options.flags[:force],
+            force: !ShopifyCLI::Environment.interactive?,
           ).confirmed?
         end
 

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

@@ -35,12 +35,18 @@ module Theme
           flags[:ignores] |= pattern
         end
         parser.on("-f", "--force") { flags[:force] = true }
+        parser.on("--development-theme-id=DEVELOPMENT_THEME_ID") do |development_theme_id|
+          flags[:development_theme_id] = development_theme_id.to_i
+        end
       end
 
       def call(_args, name)
         root = root_value(options, name)
         return if exist_and_not_empty?(root) && !valid_theme_directory?(root)
 
+        development_theme_id = options.flags[:development_theme_id]
+        ShopifyCLI::DB.set(development_theme_id: development_theme_id) unless development_theme_id.nil?
+
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?

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

@@ -40,12 +40,18 @@ module Theme
           flags[:ignores] |= pattern
         end
         parser.on("-f", "--force") { flags[:force] = true }
+        parser.on("--development-theme-id=DEVELOPMENT_THEME_ID") do |development_theme_id|
+          flags[:development_theme_id] = development_theme_id.to_i
+        end
       end
 
       def call(_args, name)
         root = root_value(options, name)
         return unless valid_theme_directory?(root)
 
+        development_theme_id = options.flags[:development_theme_id]
+        ShopifyCLI::DB.set(development_theme_id: development_theme_id) unless development_theme_id.nil?
+
         delete = !options.flags[:nodelete]
         theme = find_theme(root, **options.flags)
         return if theme.nil?
@@ -67,6 +73,7 @@ module Theme
         begin
           syncer.start_threads
           if options.flags[:json]
+            syncer.standard_reporter.disable!
             syncer.upload_theme!(delete: delete)
           else
             CLI::UI::Frame.open(@ctx.message("theme.push.info.pushing", theme.name, theme.id, theme.shop)) do

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

@@ -35,6 +35,7 @@ module Theme
           flags[:ignores] |= pattern
         end
         parser.on("-f", "--force") { flags[:force] = true }
+        parser.on("--overwrite-json") { flags[:overwrite_json] = true }
       end
 
       def call(_args, name)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Theme
   module Messages
     MESSAGES = {
@@ -18,8 +19,9 @@ module Theme
         ENSURE_USER
         stable_flag_suggestion: "If the current command isn't working as expected," \
           " we suggest re-running the command with the {{command: --stable}} flag",
-        confirm_current_directory: "It doesn’t seem like you’re running this command in a theme directory. " \
-          "Are you sure you want to proceed?",
+        current_directory_is_not_theme_directory: "It doesn’t seem like you’re running this command" \
+          " in a theme directory.",
+        confirm_current_directory: "Are you sure you want to proceed?",
         init: {
           help: <<~HELP,
             {{command:%s theme init}}: Clones a Git repository to use as a starting point for building a new theme.

data/lib/shopify_cli/commands/app.rb

@@ -4,7 +4,6 @@ module ShopifyCLI
   module Commands
     class App < ShopifyCLI::Command
       subcommand :Connect, "connect", "shopify_cli/commands/app/connect"
-      subcommand :Create, "create", "shopify_cli/commands/app/create"
       subcommand :Deploy, "deploy", "shopify_cli/commands/app/deploy"
       subcommand :Open, "open", "shopify_cli/commands/app/open"
       subcommand :Serve, "serve", "shopify_cli/commands/app/serve"

data/lib/shopify_cli/messages/messages.rb

@@ -313,7 +313,7 @@ module ShopifyCLI
         },
         error_reporting: {
           unhandled_error: {
-            message: "{{x}} {{red:An unexpected error occured.}}",
+            message: "{{x}} {{red:An unexpected error occurred.}}",
             issue_message: "{{red:\tTo \e]8;;%s\e\\submit an issue\e]8;;\e\\"\
               " include the stack trace.}}",
             stacktrace_message: "{{red:\tTo print the stack trace, add the environment variable %s.}}",

data/lib/shopify_cli/theme/dev_server/hot_reload/script_injector.rb

@@ -25,7 +25,7 @@ module ShopifyCLI
               "</script>",
             ].join("\n")
 
-            body = body.join.gsub("</body>", "#{hot_reload_script}\n</body>")
+            body = body.join.sub("</body>", "#{hot_reload_script}\n</body>")
 
             [body]
           end

data/lib/shopify_cli/theme/dev_server/hot_reload.rb

@@ -16,12 +16,15 @@ module ShopifyCLI
         end
 
         def call(env)
-          if env["PATH_INFO"] == "/hot-reload"
+          path = env["PATH_INFO"]
+          if path == "/hot-reload"
             create_stream
           else
             status, headers, body = @app.call(env)
 
-            body = inject_hot_reload_javascript(body) if request_is_html?(headers)
+            if request_is_html?(headers) && leads_to_injectable_body?(path)
+              body = inject_hot_reload_javascript(body)
+            end
 
             [status, headers, body]
           end
@@ -43,6 +46,10 @@ module ShopifyCLI
           headers["content-type"]&.start_with?("text/html")
         end
 
+        def leads_to_injectable_body?(path)
+          path !~ /.+\/sandbox/
+        end
+
         def inject_hot_reload_javascript(body)
           @script_injector&.inject(body: body, dir: __dir__, mode: @mode)
         end

data/lib/shopify_cli/theme/dev_server/local_assets.rb

@@ -29,13 +29,14 @@ module ShopifyCLI
         end
 
         def call(env)
-          if env["PATH_INFO"].start_with?("/assets")
+          path_info = env["PATH_INFO"]
+          if path_info.start_with?("/assets")
             # Serve from disk
-            serve_file(env["PATH_INFO"])
+            serve_file(path_info)
           else
             # Proxy the request, and replace the URLs in the response
             status, headers, body = @app.call(env)
-            body = replace_asset_urls(body)
+            body = replace_asset_urls(body) unless path_info.start_with?("/fonts")
             [status, headers, body]
           end
         end
@@ -53,6 +54,10 @@ module ShopifyCLI
           end
 
           [replaced_body]
+        rescue ArgumentError => error
+          return [body.join] if error.message.include?("invalid byte sequence")
+
+          raise error
         end
 
         def serve_fail(status, body)

data/lib/shopify_cli/theme/dev_server.rb

@@ -41,6 +41,7 @@ module ShopifyCLI
           port: 9292,
           poll: false,
           editor_sync: false,
+          overwrite_json: false,
           stable: false,
           mode: ReloadMode.default,
           includes: nil,
@@ -55,6 +56,7 @@ module ShopifyCLI
             port,
             poll,
             editor_sync,
+            overwrite_json,
             stable,
             mode,
             includes,
@@ -78,6 +80,7 @@ module ShopifyCLI
         port,
         poll,
         editor_sync,
+        overwrite_json,
         stable,
         mode,
         includes,
@@ -91,6 +94,7 @@ module ShopifyCLI
         @port = port
         @poll = poll
         @editor_sync = editor_sync
+        @overwrite_json = overwrite_json
         @stable = stable
         @mode = mode
         @includes = includes
@@ -199,7 +203,7 @@ module ShopifyCLI
           theme: theme,
           include_filter: include_filter,
           ignore_filter: ignore_filter,
-          overwrite_json: !editor_sync,
+          overwrite_json: !editor_sync || @overwrite_json,
           stable: stable
         )
       end

data/lib/shopify_cli/theme/extension/dev_server.rb

@@ -26,12 +26,13 @@ module ShopifyCLI
         # Extensions
         ScriptInjector = ShopifyCLI::Theme::Extension::DevServer::HotReload::ScriptInjector
 
-        attr_accessor :project, :specification_handler
+        attr_accessor :project, :specification_handler, :generate_tmp_theme
 
         class << self
-          def start(ctx, root, port: 9292, theme: nil, project:, specification_handler:)
+          def start(ctx, root, port: 9292, theme: nil, generate_tmp_theme: false, project:, specification_handler:)
             instance.project = project
             instance.specification_handler = specification_handler
+            instance.generate_tmp_theme = generate_tmp_theme
 
             super(ctx, root, port: port, theme: theme)
           end
@@ -66,8 +67,10 @@ module ShopifyCLI
 
         def theme
           @theme ||= if theme_identifier
-            theme = ShopifyCLI::Theme::Theme.find_by_identifier(ctx, identifier: theme_identifier)
-            theme || ctx.abort(not_found_error_message)
+            theme = HostTheme.find_by_identifier(ctx, identifier: theme_identifier)
+            ctx.abort(not_found_error_message) unless theme
+            theme.generate_tmp_theme if generate_tmp_theme
+            theme
           else
             HostTheme.find_or_create!(ctx)
           end

data/lib/shopify_cli/theme/extension/host_theme.rb

@@ -61,20 +61,9 @@ module ShopifyCLI
           new(ctx, root: nil).ensure_exists!
         end
 
-        private
-
-        def generate_host_theme_name
-          hostname = Socket.gethostname.split(".").shift
-          hash = SecureRandom.hex(3)
-
-          theme_name = "App Ext. Host ()"
-          hostname_character_limit = API_NAME_LIMIT - theme_name.length - hash.length - 1
-          identifier = encode_identifier("#{hash}-#{hostname[0, hostname_character_limit]}")
-          theme_name = "App Ext. Host (#{identifier})"
-
-          ShopifyCLI::DB.set(host_theme_name: theme_name)
-
-          theme_name
+        def self.find_by_identifier(ctx, root: nil, identifier:)
+          ShopifyCLI::DB.set(host_theme_id: identifier)
+          find(ctx, root: root)
         end
 
         def generate_tmp_theme
@@ -98,6 +87,22 @@ module ShopifyCLI
             end
           end
         end
+
+        private
+
+        def generate_host_theme_name
+          hostname = Socket.gethostname.split(".").shift
+          hash = SecureRandom.hex(3)
+
+          theme_name = "App Ext. Host ()"
+          hostname_character_limit = API_NAME_LIMIT - theme_name.length - hash.length - 1
+          identifier = encode_identifier("#{hash}-#{hostname[0, hostname_character_limit]}")
+          theme_name = "App Ext. Host (#{identifier})"
+
+          ShopifyCLI::DB.set(host_theme_name: theme_name)
+
+          theme_name
+        end
       end
     end
   end

data/lib/shopify_cli/theme/syncer/standard_reporter.rb

@@ -5,7 +5,7 @@ module ShopifyCLI
     class Syncer
       ##
       # ShopifyCLI::Theme::Syncer::StdReporter allows disabling/enabling
-      # messages reported in the standard output (ShopifyCLI::Context#puts).
+      # messages reported in the standard error output (ShopifyCLI::Context#puts).
       #
       class StandardReporter
         attr_reader :ctx
@@ -24,7 +24,7 @@ module ShopifyCLI
         end
 
         def report(message)
-          ctx.puts(message) if @enabled
+          ctx.error(message) if @enabled
         end
       end
     end

data/lib/shopify_cli/theme/syncer.rb

@@ -33,7 +33,7 @@ module ShopifyCLI
         :union_merge, # - Union merges the local file content with the remote file content
       ]
 
-      attr_reader :ctx, :theme, :checksums, :error_checksums, :api_client, :pending
+      attr_reader :ctx, :theme, :checksums, :error_checksums, :api_client, :pending, :standard_reporter
       attr_accessor :include_filter, :ignore_filter
 
       def_delegators :@error_reporter, :has_any_error?

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.34.0"
+  VERSION = "2.36.0"
 end

data/shopify-cli.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "vendor"]
   spec.executables << "shopify"
 
-  spec.add_development_dependency("bundler", "~> 2.3.11")
+  spec.add_development_dependency("bundler", ">= 2.3.11")
   spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")
   spec.add_development_dependency("minitest", "~> 5.0")
 

data/vendor/deps/smart_properties/lib/smart_properties/property.rb

@@ -157,7 +157,7 @@ module SmartProperties
     rescue NoMethodError => error
       # BasicObject does not respond to #nil? by default, so we need to double
       # check if somebody implemented it and it fails internally or if the
-      # error occured because the method is actually not present. In the former
+      # error occurred because the method is actually not present. In the former
       # case, we want to raise the exception because there is something wrong
       # with the implementation of object#nil?. In the latter case we treat the
       # object as truthy because we don't know better.

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.34.0
+  version: 2.36.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.11
 - !ruby/object:Gem::Dependency
@@ -690,7 +690,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: Shopify CLI helps you build Shopify apps faster.