shopify-cli 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24c62bd5226aa12bbd9bd97097bc876669c5b0e1ce9186ec204c77c195ae123e
-  data.tar.gz: 0a35817ec758bfae2cace1cd28c1a4e1aa96357583926b17f14e31b05ae1b02a
+  metadata.gz: 8a3d1792a9f0fef3212722391bc41ac2cba899f60b65c61d75c624fb61aef1dc
+  data.tar.gz: 4927100649c20fbedd270715ff5e34fe89138548c2355f8fdff68ed19bdc6ce4
 SHA512:
-  metadata.gz: 01be89d86afb3e057b85e02a2d68332ae16b04a3b44349995a594ba78fbd5f8f6a02d0a7f0ffc5ee418c930036c0845ef1076d647233a3482893005ada91d86c
-  data.tar.gz: d018a62cdca9d060ccb110ee13f51064b718c792a20ae0a9f9b1eece38522572060b3cd338950385a0e17baed94ad10329f6519f6520788e81534d149c21cbf0
+  metadata.gz: 9cdddb7dc42cb7df1baa92baea6da019b180092aa54d40185a72a8f0552d1f894bf896fedc007ded724023bdce163a13fb16d7e8eb4f11554aafc19fbdedf318
+  data.tar.gz: 61e74dc5788edc4653902bf2a42ddc8ca9da3535bc4b1779a0ed73b475940c423a61374e6f5eb18c5e635115ea86634b29c0ebf3f081bce28cb7fec2fd4071cd

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Unreleased
 ------
 
+Version 2.0.1
+-------------
+* [#1295](https://github.com/Shopify/shopify-cli/pull/1295): Ignore files at the root of a theme app extension project
+* [#1296](https://github.com/Shopify/shopify-cli/pull/1296): Fix issue [#1294](https://github.com/Shopify/shopify-cli/issues/1294) regarding call to Windows `start` command with URL.
+* [#1298](https://github.com/Shopify/shopify-cli/pull/1298): Fix error in `theme serve` command
+* [#1301](https://github.com/Shopify/shopify-cli/pull/1301): Add `theme init` command
+
 Version 2.0.0
 -------------
 * Adds support for theme development

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.0.0)
+    shopify-cli (2.0.1)
       listen (~> 3.5)
       theme-check (~> 1.0)
 

data/RELEASING.md

@@ -15,6 +15,8 @@
 
 1. Update the version of Shopify CLI in `lib/shopify-cli/version.rb`
 
+1. Update the version of Shopify CLI at the top of `Gemfile.lock` (failing to do so causes the CI build to fail)
+
 1. Add an entry for the new release to `CHANGELOG.md`
 
 1. Commit the changes with a commit message like "Packaging for release X.Y.Z"

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

@@ -64,6 +64,9 @@ module Extension
 
         def validate(filename)
           dirname = File.dirname(filename)
+          # Skip files in the root of the directory tree
+          return false if dirname == "."
+
           unless SUPPORTED_BUCKETS.include?(dirname)
             raise Extension::Errors::InvalidFilenameError, "Invalid directory: #{dirname}"
           end

data/lib/project_types/script/layers/infrastructure/script_service.rb

@@ -75,19 +75,30 @@ module Script
         class ScriptServiceAPI < ShopifyCli::API
           property(:api_key, accepts: String)
 
+          LOCAL_INSTANCE_URL = "https://script-service.myshopify.io"
+
           def self.query(ctx, query_name, api_key: nil, variables: {})
             api_client(ctx, api_key).query(query_name, variables: variables)
           end
 
           def self.api_client(ctx, api_key)
+            instance_url = spin_instance_url || LOCAL_INSTANCE_URL
             new(
               ctx: ctx,
-              url: "https://script-service.myshopify.io/graphql",
+              url: "#{instance_url}/graphql",
               token: "",
               api_key: api_key
             )
           end
 
+          def self.spin_instance_url
+            workspace = ENV["SPIN_WORKSPACE"]
+            namespace = ENV["SPIN_NAMESPACE"]
+            return if workspace.nil? || namespace.nil?
+
+            "https://script-service.#{workspace}.#{namespace}.us.spin.dev"
+          end
+
           def auth_headers(*)
             tokens = { "APP_KEY" => api_key }.compact.to_json
             { "X-Shopify-Authenticated-Tokens" => tokens }
@@ -104,7 +115,7 @@ module Script
         private_constant(:PartnersProxyAPI)
 
         def script_service_request(query_name:, variables: nil, **options)
-          resp = if ENV["BYPASS_PARTNERS_PROXY"]
+          resp = if bypass_partners_proxy
             ScriptServiceAPI.query(ctx, query_name, variables: variables, **options)
           else
             proxy_through_partners(query_name: query_name, variables: variables, **options)
@@ -113,6 +124,10 @@ module Script
           resp
         end
 
+        def bypass_partners_proxy
+          !ENV["BYPASS_PARTNERS_PROXY"].nil?
+        end
+
         def proxy_through_partners(query_name:, variables: nil, **options)
           options[:variables] = variables.to_json if variables
           resp = PartnersProxyAPI.query(ctx, query_name, **options)

data/lib/project_types/theme/cli.rb

@@ -6,6 +6,7 @@ module Theme
   end
 
   class Command < ShopifyCli::ProjectCommands
+    subcommand :Init, "init", Project.project_filepath("commands/init")
     subcommand :Serve, "serve", Project.project_filepath("commands/serve")
     subcommand :Pull, "pull", Project.project_filepath("commands/pull")
     subcommand :Push, "push", Project.project_filepath("commands/push")

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Theme
+  class Command
+    class Init < ShopifyCli::SubCommand
+      options do |parser, flags|
+        parser.on("-u", "--clone-url URL") { |url| flags[:clone_url] = url }
+      end
+
+      DEFAULT_CLONE_URL = "https://github.com/Shopify/dawn.git"
+
+      def call(args, _name)
+        name = args.first || ask_name
+        clone_url = options.flags[:clone_url] || DEFAULT_CLONE_URL
+        clone(clone_url, name)
+      end
+
+      def self.help
+        ShopifyCli::Context.message("theme.init.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+
+      private
+
+      def ask_name
+        CLI::UI::Prompt.ask(@ctx.message("theme.init.ask_name"))
+      end
+
+      def clone(url, name)
+        ShopifyCli::Git.clone(url, name)
+
+        @ctx.root = File.join(@ctx.root, name)
+
+        begin
+          @ctx.rm_r(".git")
+          @ctx.rm_r(".github")
+        rescue Errno::ENOENT => e
+          @ctx.debug(e)
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,9 @@ module Theme
 
       def call(*)
         flags = options.flags.dup
-        ShopifyCli::Theme::DevServer.start(@ctx, ".", **flags)
+        ShopifyCli::Theme::DevServer.start(@ctx, ".", **flags) do |syncer|
+          UI::SyncProgressBar.new(syncer).progress(:upload_theme!, delay_low_priority_files: true)
+        end
       end
 
       def self.help

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

@@ -8,6 +8,17 @@ module Theme
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
 
+        init: {
+          help: <<~HELP,
+            {{command:%s theme init}}: Clones a Git repository to use as a starting point for building a new theme.
+
+              Usage: {{command:%s theme init [ NAME ]}}
+
+              Options:
+                {{command:-u, --clone-url=URL}} The Git URL to clone from. Defaults to Shopify's example theme, Dawn: https://github.com/Shopify/dawn.git
+          HELP
+          ask_name: "Theme name",
+        },
         publish: {
           confirmation: "This will change your live theme. Do you want to continue?",
           deploying: "Deploying theme",

data/lib/shopify-cli/context.rb

@@ -327,7 +327,7 @@ module ShopifyCli
         if linux? && which("xdg-open")
           system("xdg-open", uri.to_s)
         elsif windows?
-          system("start", uri.to_s)
+          system("start \"\" \"#{uri}\"")
         elsif mac?
           system("open", uri.to_s)
         else

data/lib/shopify-cli/http_request.rb

@@ -1,4 +1,5 @@
 require "net/http"
+require "openssl"
 
 module ShopifyCli
   class HttpRequest
@@ -24,8 +25,13 @@ module ShopifyCli
       end
 
       def request(uri, body, headers, req)
+        cert_store = OpenSSL::X509::Store.new
+        cert_store.set_default_paths
+
         http = ::Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
+        http.cert_store = cert_store
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ENV["SSL_VERIFY_NONE"]
 
         req.body = body unless body.nil?
         req["Content-Type"] = "application/json"

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

@@ -20,7 +20,7 @@ module ShopifyCli
       class << self
         attr_accessor :ctx
 
-        def start(ctx, root, port: 9292, silent: false)
+        def start(ctx, root, port: 9292)
           @ctx = ctx
           theme = DevelopmentTheme.new(ctx, root: root)
           ignore_filter = IgnoreFilter.from_path(root)
@@ -43,10 +43,10 @@ module ShopifyCli
           CLI::UI::Frame.open(@ctx.message("theme.serve.serve")) do
             ctx.print_task("Syncing theme ##{theme.id} on #{theme.shop}")
             @syncer.start_threads
-            if silent
-              @syncer.upload_theme!(delay_low_priority_files: true)
+            if block_given?
+              yield @syncer
             else
-              @syncer.upload_theme_with_progress_bar!(delay_low_priority_files: true)
+              @syncer.upload_theme!(delay_low_priority_files: true)
             end
 
             return if stopped

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -280,6 +280,7 @@ files:
 - lib/project_types/theme/cli.rb
 - lib/project_types/theme/commands/check.rb
 - lib/project_types/theme/commands/delete.rb
+- lib/project_types/theme/commands/init.rb
 - lib/project_types/theme/commands/language_server.rb
 - lib/project_types/theme/commands/package.rb
 - lib/project_types/theme/commands/publish.rb