shopify-cli 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4c9bb44a8b7b750acbf3364201705d93dfb39ce9772976ba2af04183cfc5748
-  data.tar.gz: fa32248af15c17d01d80132b4caf42ea224edba35146098954f51b4453db50de
+  metadata.gz: 4a98682c26b1f02a7a24648c23bb987ceab5a70939e031957e80785c1068d849
+  data.tar.gz: bfddf7b2f92004d654a66fa8746619d724789c65da7b236e413857fd8705c65f
 SHA512:
-  metadata.gz: 3446d1a595e343f6566b7ec087c187d31518398ad57be75ff519a394133c75e4f0a5f8670d78913271091632d8ef9fdeef4fb1bb3c1b4ac5cb99d0bc12aef765
-  data.tar.gz: 48ad3c64a367e80facb7aecc393295fb8fa838949a51c7a71310c50a40e6bf2c648b57dbcaf53ade5e15af90ff911593e38865cbb8e2b8dce6b70a8918d83a03
+  metadata.gz: 33830ff754743290463c4744cd6e76c37fcf72f6119bcc8d43c9d5a752c3acaab7e9f0e9365f0b0083bae8be2b930d1c1a35affc508210e72998abc11b483d3b
+  data.tar.gz: e89c4a64ac97093c8973ccd482ca76b11f3852e29eb124904301c72f930cdce1774fabd1c1d1a3bdb775e065a7e27364a6bb7bbbdcf631c0587ee5e473f793b1

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.11.2
+### Fixed
+* [#2047](https://github.com/Shopify/shopify-cli/pull/2047): Fix the Homebrew installation
+* [#2019](https://github.com/Shopify/shopify-cli/pull/2019): Provide helpful link when nokogiri fails to load
+* [#2055](https://github.com/Shopify/shopify-cli/pull/2055): Remove unneeded Node requirements
+
 ## Version 2.11.1
 ### Fixed
 * [#1973](https://github.com/Shopify/shopify-cli/pull/1973): Fix `theme serve` to preview generated files (`*.css.liquid`)
@@ -12,6 +18,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 ## Version 2.11.0
 ### Fixed
 * [#2005](https://github.com/Shopify/shopify-cli/pull/2005): Fix PHP app serve on Windows environments
+* [#2020](https://github.com/Shopify/shopify-cli/pull/2020): Fix `theme pull` so that correct dev theme is used with `-d` option
 
 ### Added
 * [#1998](https://github.com/Shopify/shopify-cli/pull/1998): Add support for Rails 7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.11.1)
+    shopify-cli (2.11.2)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)

data/bin/shopify

@@ -14,6 +14,15 @@ module Kernel
     raise if name == "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
     # Special case for ffi, which rescues this itself
     raise if name == "#{RUBY_VERSION.split(".")[0, 2].join(".")}/ffi_c"
+    # Special case for nokogiri, which might install the wrong architecture
+    if name == "nokogiri/nokogiri"
+      STDERR.puts "[Note] Nokogiri is failing to load, which most likely means " \
+        "it is installed with the wrong architecture for your system. This link " \
+        "has instructions for how to install the correct version for your system: " \
+        "https://nokogiri.org/tutorials/installing_nokogiri.html"
+      STDERR.puts e.full_message
+      exit(1)
+    end
     STDERR.puts "[Note] You cannot use gems with Shopify CLI."
     STDERR.puts "[LoadError] #{e.message}"
     if ENV["DEBUG"]

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

@@ -8,9 +8,6 @@ module Extension
 
       prerequisite_task ensure_project_type: :extension
 
-      recommend_default_node_range
-      recommend_default_ruby_range
-
       YARN_BUILD_COMMAND = %w(build)
       NPM_BUILD_COMMAND = %w(run-script build)
 

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

@@ -4,7 +4,6 @@ require "theme_check"
 module Extension
   class Command
     class Check < ExtensionCommand
-      recommend_default_node_range
       recommend_default_ruby_range
 
       class CheckOptions < ShopifyCLI::Options

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

@@ -5,7 +5,6 @@ module Extension
     class Create < ShopifyCLI::Command::SubCommand
       prerequisite_task :ensure_authenticated
 
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

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

@@ -6,7 +6,6 @@ module Extension
     class Push < ShopifyCLI::Command::SubCommand
       prerequisite_task ensure_project_type: :extension
 
-      recommend_default_node_range
       recommend_default_ruby_range
 
       options do |parser, flags|

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

@@ -5,7 +5,6 @@ module Extension
     class Serve < ExtensionCommand
       prerequisite_task ensure_project_type: :extension
 
-      recommend_default_node_range
       recommend_default_ruby_range
 
       DEFAULT_PORT = 39351

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

@@ -6,10 +6,11 @@ module Extension
   module Models
     module SpecificationHandlers
       class ThemeAppExtension < Default
-        SUPPORTED_BUCKETS = %w(assets blocks snippets)
+        SUPPORTED_BUCKETS = %w(assets blocks snippets locales)
         BUNDLE_SIZE_LIMIT = 10 * 1024 * 1024 # 10MB
         LIQUID_SIZE_LIMIT = 100 * 1024 # 100kb
         SUPPORTED_ASSET_EXTS = %w(.jpg .js .css .png .svg)
+        SUPPORTED_LOCALE_EXTS = %w(.json)
 
         def create(directory_name, context, getting_started: false)
           context.root = File.join(context.root, directory_name)
@@ -89,6 +90,11 @@ module Extension
               raise Extension::Errors::InvalidFilenameError,
                 "Invalid filename: #{filename}; #{ext} is not supported"
             end
+          elsif dirname == "locales"
+            unless SUPPORTED_LOCALE_EXTS.include?(ext)
+              raise Extension::Errors::InvalidFilenameError,
+                "Invalid filename: #{filename}; Only #{SUPPORTED_LOCALE_EXTS.join(", ")} allowed in #{dirname}"
+            end
           elsif ext != ".liquid"
             raise Extension::Errors::InvalidFilenameError,
               "Invalid filename: #{filename}; Only .liquid allowed in #{dirname}"

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require "shopify_cli/theme/theme"
+require "shopify_cli/theme/development_theme"
 require "shopify_cli/theme/ignore_filter"
 require "shopify_cli/theme/include_filter"
 require "shopify_cli/theme/syncer"
@@ -73,7 +74,8 @@ module Theme
         end
 
         if development
-          return ShopifyCLI::Theme::Theme.development(@ctx, root: root)
+          dev_theme = ShopifyCLI::Theme::DevelopmentTheme.find(@ctx, root: root)
+          return dev_theme || @ctx.abort(@ctx.message("theme.pull.theme_not_found", dev_theme.name))
         end
 
         select_theme(root)

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

@@ -91,9 +91,7 @@ module Theme
         end
 
         if development
-          new_theme = ShopifyCLI::Theme::DevelopmentTheme.new(@ctx, root: root)
-          new_theme.ensure_exists!
-          return new_theme
+          return ShopifyCLI::Theme::DevelopmentTheme.find_or_create!(@ctx, root: root)
         end
 
         if unpublished

data/lib/shopify_cli/command.rb

@@ -100,8 +100,10 @@ module ShopifyCLI
       end
 
       def check_node_version
+        return unless @compatible_node_range
+
         context = Context.new
-        if @compatible_node_range && context.which("node").nil?
+        if context.which("node").nil?
           raise ShopifyCLI::Abort, context.message("core.errors.missing_node")
         end
 

data/lib/shopify_cli/constants.rb

@@ -65,7 +65,7 @@ module ShopifyCLI
       end
 
       module Node
-        FROM = "12.0.0"
+        FROM = "14.5.0"
         TO = "17.0.0"
       end
     end

data/lib/shopify_cli/messages/messages.rb

@@ -15,7 +15,7 @@ module ShopifyCLI
       },
       core: {
         errors: {
-          missing_node: "Node is necessary for this command and was not found in the environment.",
+          missing_node: "Node is required to continue. Install node here: https://nodejs.org/en/download.",
           option_parser: {
             invalid_option: "The option {{command:%s}} is not supported.",
             missing_argument: "The required argument {{command:%s}} is missing.",
@@ -42,7 +42,7 @@ module ShopifyCLI
             invalid_type: "The type %s is not supported. The only supported types are"\
               " {{command:[ rails | node | php ]}}",
             help: <<~HELP,
-            {{command:%s app create}}: Creates a ruby on rails app.
+            {{command:%s app create}}: Creates a new project in a subdirectory.
               Usage: {{command:%s app create [ rails | node | php ]}}
             HELP
             rails: {

data/lib/shopify_cli/theme/dev_server.rb

@@ -28,7 +28,7 @@ module ShopifyCLI
 
         def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false, mode: ReloadMode.default)
           @ctx = ctx
-          theme = DevelopmentTheme.new(ctx, root: root)
+          theme = DevelopmentTheme.find_or_create!(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
           @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter)
           watcher = Watcher.new(ctx, theme: theme, syncer: @syncer, ignore_filter: ignore_filter, poll: poll)
@@ -41,8 +41,6 @@ module ShopifyCLI
           stopped = false
           address = "http://#{host}:#{port}"
 
-          theme.ensure_exists!
-
           trap("INT") do
             stopped = true
             stop

data/lib/shopify_cli/theme/development_theme.rb

@@ -38,6 +38,8 @@ module ShopifyCLI
           @ctx.debug("Created temporary development theme: #{@id}")
           ShopifyCLI::DB.set(development_theme_id: @id)
         end
+
+        self
       end
 
       def exists?
@@ -63,6 +65,15 @@ module ShopifyCLI
         new(ctx).delete
       end
 
+      def self.find(ctx, root: nil)
+        dev_theme = new(ctx, root: root)
+        dev_theme.exists? ? dev_theme : nil
+      end
+
+      def self.find_or_create!(ctx, root: nil)
+        new(ctx, root: root).ensure_exists!
+      end
+
       private
 
       def generate_theme_name

data/lib/shopify_cli/theme/theme.rb

@@ -176,10 +176,6 @@ module ShopifyCLI
           find(ctx, root) { |attrs| attrs["role"] == "main" }
         end
 
-        def development(ctx, root: nil)
-          find(ctx, root) { |attrs| attrs["role"] == "development" }
-        end
-
         # Finds a Theme by its identifier
         #
         # #### Parameters

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.11.1"
+  VERSION = "2.11.2"
 end

metadata

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