shopify-cli 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3d1792a9f0fef3212722391bc41ac2cba899f60b65c61d75c624fb61aef1dc
-  data.tar.gz: 4927100649c20fbedd270715ff5e34fe89138548c2355f8fdff68ed19bdc6ce4
+  metadata.gz: e891dd1947743de4abbd7ef4e2c7e40a60e313eed78e33e5813c1fbb72369b22
+  data.tar.gz: 2af5852d53518d1089fabd4420cc6a432bccf99585d935812f8c347d9ad42d45
 SHA512:
-  metadata.gz: 9cdddb7dc42cb7df1baa92baea6da019b180092aa54d40185a72a8f0552d1f894bf896fedc007ded724023bdce163a13fb16d7e8eb4f11554aafc19fbdedf318
-  data.tar.gz: 61e74dc5788edc4653902bf2a42ddc8ca9da3535bc4b1779a0ed73b475940c423a61374e6f5eb18c5e635115ea86634b29c0ebf3f081bce28cb7fec2fd4071cd
+  metadata.gz: 02fa4e4ed76dc0576474246772e332d7a21d0242807ceb407244a0af8dfe3c21c9e1eced54283a11ed304c0ae74ae81becc040c7f9c0242c9b35e8171f3182a4
+  data.tar.gz: 5c587408bffbb49a09c087f2810b5b65b754de6fb2c3c8c158996446198817c7e2c0a21143544d7e7bc8ef74e4407fd4389d805ed298432c64656d202745fe86

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Unreleased
 ------
 
+Version 2.0.2
+-------------
+* [#1305](https://github.com/Shopify/shopify-cli/pull/1305): Fix `Uninitialized constant Net::WriteTimeout` error
+* [#1319](https://github.com/Shopify/shopify-cli/pull/1319): Fix `theme pull` not pulling some files
+* [#1321](https://github.com/Shopify/shopify-cli/pull/1321): Fix error when pulling images with `theme pull`
+* [#1322](https://github.com/Shopify/shopify-cli/pull/1322): Fix error when running `shopify theme language-server --help`
+* [#1324](https://github.com/Shopify/shopify-cli/pull/1324): Fix issue [#1308](https://github.com/Shopify/shopify-cli/issues/1308) where a non-English language on Partner Account breaks how CLI determines latest API version.
+* [#1343](https://github.com/Shopify/shopify-cli/pull/1343): Fix inconsistent use of periods vs ellipsis in messages. This replaces periods with ellipsis.
+
 Version 2.0.1
 -------------
 * [#1295](https://github.com/Shopify/shopify-cli/pull/1295): Ignore files at the root of a theme app extension project

data/Gemfile.lock

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

data/README.md

@@ -101,9 +101,11 @@ Run:
 
 To start the server. The server includes hot reload for CSS & Sections.
 
+**Note:** Shopify CLI is the recommended and officially supported tool for developing themes and creating CI/CD workflows. Please refer to the [Theme Kit Migration Guide](https://github.com/Shopify/shopify-cli/blob/main/THEMEKIT_MIGRATION.md) for details.
+
 ### Contributing
 
-Shopify CLI is an [open source tool](https://github.com/Shopify/shopify-cli/blob/main/.github/LICENSE.md) and everyone is welcome to help the community by [contributing](https://github.com/Shopify/shopify-cli/blob/main/.github/CONTRIBUTING.md) to the project.
+Shopify CLI is an [open source tool](https://github.com/Shopify/shopify-cli/blob/main/LICENSE) and everyone is welcome to help the community by [contributing](https://github.com/Shopify/shopify-cli/blob/main/.github/CONTRIBUTING.md) to the project.
 
 ### Where to get help
 

data/THEMEKIT_MIGRATION.md

@@ -0,0 +1,18 @@
+# Theme Kit Migration
+
+Shopify CLI is the recommended and officially supported tool for developing Themes and creating CI/CD workflows.
+
+This guide shows how to achieve equivalent flows with the new version of the CLI.
+
+## Equivalent commands
+
+| Theme Kit Command | Shopify CLI Equivalent | Objective |
+|---|---|---|
+|`theme deploy`|`shopify theme push`| Deploy a local (to the CLI) version of the Theme in the current working directory to a remote store.|
+|`theme new`|`shopify theme init`| Scaffold a new theme. In the case of the CLI it clones Dawn to be used as a reference Theme. Alternatively, it's possible to simply clone Dawn `git clone git@github.com:Shopify/dawn.git` and use it with the CLI.
+|`theme download`|`shopify theme pull`| Download your remote theme files.|
+|`theme watch` & `theme open` | `shopify theme serve` | Start a theme server to locally preview changes with CSS & Section hot reload enabled|
+|-| `shopify theme check`| Run the Theme Check linter on your theme codebase.|
+|-|`shopify theme publish`| Set a remote theme as the live theme.|
+|-|`shopify theme package`|Pack your Theme as a zip file ready for distribution and submission to the Theme Store.|
+|`theme remove`| `shopify theme delete`| Theme kit removes files from the Theme whereas Shopify CLI will remotely destroy the specified theme.|

data/lib/graphql/api_versions.graphql

@@ -1,6 +1,6 @@
 query {
   publicApiVersions {
     handle
-    displayName
+    supported
   }
 }

data/lib/project_types/extension/extension_project.rb

@@ -15,7 +15,13 @@ module Extension
       end
 
       def write_env_file(
-        context:, title:, api_key: "", api_secret: "", registration_id: nil, registration_uuid: nil
+        context:,
+        title:,
+        api_key: "",
+        api_secret: "",
+        registration_id: nil,
+        registration_uuid: nil,
+        resource_url: nil
       )
         ShopifyCli::Resources::EnvFile.new(
           api_key: api_key,
@@ -24,6 +30,7 @@ module Extension
             ExtensionProjectKeys::TITLE_KEY => title,
             ExtensionProjectKeys::REGISTRATION_ID_KEY => registration_id,
             ExtensionProjectKeys::REGISTRATION_UUID_KEY => registration_uuid || generate_temporary_uuid,
+            ExtensionProjectKeys::RESOURCE_URL_KEY => resource_url,
           }.compact
         ).write(context)
 
@@ -71,6 +78,10 @@ module Extension
       get_extra_field(ExtensionProjectKeys::REGISTRATION_UUID_KEY)
     end
 
+    def resource_url
+      get_extra_field(ExtensionProjectKeys::RESOURCE_URL_KEY)
+    end
+
     def reload
       @env = nil
     end

data/lib/project_types/extension/extension_project_keys.rb

@@ -7,5 +7,6 @@ module Extension
     REGISTRATION_UUID_KEY = "EXTENSION_UUID"
     SPECIFICATION_IDENTIFIER_KEY = "EXTENSION_TYPE"
     TITLE_KEY = "EXTENSION_TITLE"
+    RESOURCE_URL_KEY = "EXTENSION_RESOURCE_URL"
   end
 end

data/lib/project_types/extension/messages/messages.rb

@@ -43,7 +43,7 @@ module Extension
         no_apps: "{{x}} You don’t have any apps.",
         learn_about_apps: "{{*}} Learn more about building apps at <https://shopify.dev/concepts/apps>, " \
           "or try creating a new app using {{command:shopify [node|rails] create}}.",
-        loading_apps: "Loading your apps...",
+        loading_apps: "Loading your apps…",
         no_available_extensions: "{{x}} There are no available extensions for this app.",
       },
       connect: {
@@ -51,7 +51,7 @@ module Extension
         incomplete_configuration: "Cannot connect extension due to missing configuration information",
         invalid_api_key: "The API key %s does not match any of your apps.",
         ask_registration: "Which extension would you like to connect to?",
-        loading_extensions: "Loading your extensions...",
+        loading_extensions: "Loading your extensions…",
         no_extensions: "{{x}} You don't have any extensions of type %s",
         learn_about_extensions: "{{*}} Learn more about building extensions at <https://shopify.dev/concepts/apps>, " \
           "or try creating a new extension using {{command:shopify extension create}}.",
@@ -65,7 +65,7 @@ module Extension
           Build your extension to prepare for deployment.
             Usage: {{command:%s extension build}}
         HELP
-        frame_title: "Building extension with: %s...",
+        frame_title: "Building extension with: %s…",
         build_failure_message: "Failed to build extension code.",
       },
       register: {
@@ -76,7 +76,7 @@ module Extension
                 {{command:--api-key=API_KEY}} The API key used to register an app with the extension. This can be found on the app page on Partners Dashboard.
         HELP
         frame_title: "Registering Extension",
-        waiting_text: "Registering with Shopify...",
+        waiting_text: "Registering with Shopify…",
         already_registered: "Extension is already registered.",
         confirm_info: "This will create a new extension registration for %s, which can’t be undone.",
         confirm_question: "Would you like to register this extension? (y/n)",
@@ -90,7 +90,7 @@ module Extension
             Usage: {{command:%s extension push}}
         HELP
         frame_title: "Pushing your extension to Shopify",
-        waiting_text: "Pushing code to Shopify...",
+        waiting_text: "Pushing code to Shopify…",
         pushed_with_errors: "{{x}} Code pushed to Shopify with errors on %s.",
         push_with_errors_info: "{{*}} Fix these errors and run {{command:shopify extension push}} to " \
           "revalidate your extension.",
@@ -104,7 +104,7 @@ module Extension
             Options:
             {{command:--tunnel=TUNNEL}} Establish an ngrok tunnel (default: false)
         HELP
-        frame_title: "Serving extension...",
+        frame_title: "Serving extension…",
         no_available_ports_found: "No available ports found to run extension.",
         serve_failure_message: "Failed to run extension code.",
         serve_missing_information: "Missing shop or api_key.",

data/lib/project_types/node/messages/messages.rb

@@ -129,7 +129,7 @@ module Node
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}
           MESSAGE
-          running_server: "Running server...",
+          running_server: "Running server…",
         },
 
         tunnel: {

data/lib/project_types/rails/messages/messages.rb

@@ -17,7 +17,7 @@ module Rails
           checking_installation_path: "Checking path %s for gem %s",
           installed: "Installed %s gem",
           installed_debug: "%s installed: %s",
-          installing: "Installing %s gem...",
+          installing: "Installing %s gem…",
           setting_gem_home: "GEM_HOME being set to %s",
           setting_gem_path: "GEM_PATH being set to %s",
         },
@@ -62,15 +62,15 @@ module Rails
             open_new_shell: "{{*}} {{yellow:After installing %s, please open a new Command Prompt or PowerShell " \
               "window to continue.}}",
           },
-          installing_bundler: "Installing bundler...",
-          generating_app: "Generating new rails app project in %s...",
-          adding_shopify_gem: "{{v}} Adding shopify_app gem...",
+          installing_bundler: "Installing bundler…",
+          generating_app: "Generating new rails app project in %s…",
+          adding_shopify_gem: "{{v}} Adding shopify_app gem…",
           node_version: "node %s",
           yarn_version: "yarn %s",
-          running_bundle_install: "Running bundle install...",
-          running_generator: "Running shopify_app generator...",
-          running_migrations: "Running migrations...",
-          running_webpacker_install: "Running webpacker:install...",
+          running_bundle_install: "Running bundle install…",
+          running_generator: "Running shopify_app generator…",
+          running_migrations: "Running migrations…",
+          running_webpacker_install: "Running webpacker:install…",
         },
 
         deploy: {
@@ -89,18 +89,18 @@ module Rails
               Deploy the current Rails project to Heroku
               Usage: {{command:%s rails deploy heroku}}
             HELP
-            downloading: "Downloading Heroku CLI...",
+            downloading: "Downloading Heroku CLI…",
             downloaded: "Downloaded Heroku CLI",
-            installing: "Installing Heroku CLI...",
+            installing: "Installing Heroku CLI…",
             installed: "Installed Heroku CLI",
             authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
-            authenticating: "Authenticating with Heroku...",
+            authenticating: "Authenticating with Heroku…",
             authenticated: "{{v}} Authenticated with Heroku",
-            deploying: "Deploying to Heroku...",
+            deploying: "Deploying to Heroku…",
             deployed: "{{v}} Deployed to Heroku",
             db_check: {
-              validating: "Validating application...",
-              checking: "Checking database type...",
+              validating: "Validating application…",
+              checking: "Checking database type…",
               validated: "Database type \"%s\" validated for platform \"Heroku\"",
               problem: "A problem was encountered while checking your database type.",
               sqlite: <<~SQLITE,
@@ -110,7 +110,7 @@ module Rails
               SQLITE
             },
             git: {
-              checking: "Checking git repo...",
+              checking: "Checking git repo…",
               initialized: "Git repo initialized",
               what_branch: "What branch would you like to deploy?",
               branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
@@ -119,10 +119,10 @@ module Rails
               no_apps_found: "No existing Heroku app found. What would you like to do?",
               name: "What is your Heroku app’s name?",
               select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app %s...",
+              selecting: "Selecting Heroku app %s…",
               selected: "{{v}} Heroku app {{green:%s}} selected",
               create: "Create a new Heroku app",
-              creating: "Creating new Heroku app...",
+              creating: "Creating new Heroku app…",
               created: "{{v}} New Heroku app created",
             },
           },
@@ -180,7 +180,7 @@ module Rails
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}
           MESSAGE
-          running_server: "Running server...",
+          running_server: "Running server…",
         },
 
         tunnel: {

data/lib/project_types/script/graphql/app_script_update_or_create.graphql

@@ -9,9 +9,9 @@ mutation AppScriptUpdateOrCreate(
   $schemaMinorVersion: String,
   $useMsgpack: Boolean,
   $uuid: String,
-  $configurationUi: Boolean,
-  $scriptJsonVersion: String,
-  $configurationDefinition: String,
+  $configurationUi: Boolean!,
+  $scriptJsonVersion: String!,
+  $configurationDefinition: String!,
 ) {
   appScriptUpdateOrCreate(
     extensionPointName: $extensionPointName

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

@@ -90,7 +90,7 @@ module Theme
             Uploads the current theme as a development theme to the connected store, then prints theme editor and preview URLs to your terminal. While running, changes will push to the store in real time.
             Usage: {{command:%s theme serve}}
           HELP
-          serve: "Viewing theme...",
+          serve: "Viewing theme…",
           open_fail: "Couldn't open the theme",
         },
         check: {
@@ -134,9 +134,9 @@ module Theme
         },
         language_server: {
           help: <<~HELP,
-            {{command:%s theme language-server}}: Start a Language Server Protocol server.
+            {{command:%1$s theme language-server}}: Start a Language Server Protocol server.
 
-            Usage: {{command:%s theme language-server}}
+            Usage: {{command:%1$s theme language-server}}
           HELP
         },
         pull: {

data/lib/shopify-cli/admin_api.rb

@@ -134,8 +134,12 @@ module ShopifyCli
         )
         CLI::Kit::Util.begin do
           versions = client.query("api_versions")["data"]["publicApiVersions"]
-          latest = versions.find { |version| version["displayName"].include?("Latest") }
-          latest["handle"]
+          # return the most recent supported version
+          versions
+            .select { |version| version["supported"] }
+            .map { |version| version["handle"] }
+            .sort
+            .reverse[0]
         end.retry_after(API::APIRequestUnauthorizedError, retries: 1) do
           ShopifyCli::IdentityAuth.new(ctx: ctx).reauthenticate
         end

data/lib/shopify-cli/api.rb

@@ -81,7 +81,7 @@ module ShopifyCli
         else
           raise APIRequestUnexpectedError.new("#{response.code}\n#{response.body}", response: response)
         end
-      rescue Net::OpenTimeout, Net::ReadTimeout, Net::WriteTimeout, Errno::ETIMEDOUT, Timeout::Error
+      rescue Errno::ETIMEDOUT, Timeout::Error
         raise APIRequestTimeoutError.new("Timeout")
       end.retry_after(APIRequestRetriableError, retries: 3) do |e|
         sleep(1) if e.is_a?(APIRequestThrottledError)
@@ -108,7 +108,7 @@ module ShopifyCli
       {
         "User-Agent" => "Shopify CLI; v=#{ShopifyCli::VERSION}",
         "Sec-CH-UA" => "Shopify CLI; v=#{ShopifyCli::VERSION} sha=#{ShopifyCli.sha}",
-        "Sec-CH-UA-PLATFORM" => ctx.os,
+        "Sec-CH-UA-PLATFORM" => ctx.os.to_s,
       }.tap do |headers|
         headers["X-Shopify-Cli-Employee"] = "1" if Shopifolk.acting_as_shopify_organization?
       end.merge(auth_headers(token))

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

@@ -90,7 +90,7 @@ module ShopifyCli
           {
             schema_id: INVOCATIONS_SCHEMA,
             payload: {
-              project_type: Project.current_project_type.to_s,
+              project_type: project_type_from_dir_or_cmd(commands[0]).to_s,
               command: commands.join(" "),
               args: args.join(" "),
               time_start: start_time,
@@ -104,7 +104,7 @@ module ShopifyCli
               is_employee: ShopifyCli::Shopifolk.acting_as_shopify_organization?,
             }.tap do |payload|
               payload[:api_key] = metadata.delete(:api_key)
-              payload[:partner_id] = metadata.delete(:organization_id)
+              payload[:partner_id] = metadata.delete(:organization_id) || ShopifyCli::DB.get(:organization_id)
               if Project.has_current?
                 project = Project.current(force_reload: true)
                 payload[:api_key] = project.env&.api_key
@@ -114,6 +114,10 @@ module ShopifyCli
             end,
           }
         end
+
+        def project_type_from_dir_or_cmd(command)
+          Project.current_project_type || (command unless ShopifyCli::Commands.core_command?(command)) || nil
+        end
       end
     end
   end

data/lib/shopify-cli/messages/messages.rb

@@ -28,7 +28,7 @@ module ShopifyCli
         },
 
         env_file: {
-          saving_header: "writing %s file...",
+          saving_header: "writing %s file…",
           saving: "writing %s file",
           saved: "%s saved to project root",
         },
@@ -69,7 +69,7 @@ module ShopifyCli
             no_commits_made: "No git commits have been made. Please make at least one commit.",
           },
 
-          cloning: "Cloning %s into %s...",
+          cloning: "Cloning %s into %s…",
           cloned: "{{v}} Cloned into %s",
         },
 
@@ -103,9 +103,9 @@ module ShopifyCli
             install_error: "An error occurred while installing dependencies",
           },
 
-          installing: "Installing dependencies with %s...",
+          installing: "Installing dependencies with %s…",
           installed: "Dependencies installed",
-          npm_installing_deps: "Installing %d dependencies...",
+          npm_installing_deps: "Installing %d dependencies…",
           npm_installed_deps: "%d npm dependencies installed",
         },
 
@@ -257,7 +257,7 @@ module ShopifyCli
             count_help: "Number of resources to generate",
           },
 
-          populating: "Populating %d %ss...",
+          populating: "Populating %d %ss…",
 
           completion_message: <<~COMPLETION_MESSAGE,
             Successfully added %d %s to {{green:%s}}
@@ -345,7 +345,7 @@ module ShopifyCli
           confirm_store: {
             prompt: "You are currently logged into {{green:%s}}. Do you want to proceed using this store?",
             confirmation: "Proceeding using {{green:%s}}",
-            cancelling: "Cancelling ...",
+            cancelling: "Cancelling…",
           },
           ensure_env: {
             organization_select: "To which partner organization does this project belong?",
@@ -414,7 +414,9 @@ module ShopifyCli
               "please make sure %s exists within %s before trying again",
           },
 
+          installing: "Installing ngrok…",
           not_running: "{{green:x}} ngrok tunnel not running",
+          prereq_command_location: "%s @ %s",
           signup_suggestion: <<~MESSAGE,
             {{*}} To avoid tunnels that timeout, it is recommended to signup for a free ngrok
             account at {{underline:https://ngrok.com/signup}}. After you signup, install your
@@ -423,9 +425,8 @@ module ShopifyCli
           start: "{{v}} ngrok tunnel running at {{underline:%s}}",
           start_with_account: "{{v}} ngrok tunnel running at {{underline:%s}}, with account %s",
           stopped: "{{green:x}} ngrok tunnel stopped",
-          timed_out: "{{x}} ngrok tunnel has timed out, restarting ...",
+          timed_out: "{{x}} ngrok tunnel has timed out, restarting…",
           will_timeout: "{{*}} This tunnel will timeout in {{red:%s}}",
-          prereq_command_location: "%s @ %s",
         },
 
         version: {

data/lib/shopify-cli/packager.rb

@@ -16,7 +16,7 @@ module ShopifyCli
 
       puts "\nBuilding Debian package"
 
-      puts "Generating metadata files..."
+      puts "Generating metadata files…"
       Dir.glob("#{debian_dir}/*").each { |file| File.delete(file) }
 
       metadata_files = %w(control preinst prerm)
@@ -28,7 +28,7 @@ module ShopifyCli
         File.open(file_path, "w", 0775) { |f| f.write(file_contents) }
       end
 
-      puts "Building package..."
+      puts "Building package…"
       Dir.chdir(root_dir)
       raise "Failed to build package" unless system("dpkg-deb", "-b", "shopify-cli")
 
@@ -49,14 +49,14 @@ module ShopifyCli
       spec_path = File.join(root_dir, "shopify-cli.spec")
       puts "\nBuilding RPM package"
 
-      puts "Generating spec file..."
+      puts "Generating spec file…"
       File.delete(spec_path) if File.exist?(spec_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.spec.base"))
       spec_contents = spec_contents.gsub("SHOPIFY_CLI_VERSION", ShopifyCli::VERSION)
       File.write(spec_path, spec_contents)
 
-      puts "Building package..."
+      puts "Building package…"
       Dir.chdir(root_dir)
       system("rpmbuild", "-bb", File.basename(spec_path))
 
@@ -72,7 +72,7 @@ module ShopifyCli
       build_path = File.join(BUILDS_DIR, "shopify-cli.rb")
       puts "\nBuilding Homebrew package"
 
-      puts "Generating formula..."
+      puts "Generating formula…"
       File.delete(build_path) if File.exist?(build_path)
 
       spec_contents = File.read(File.join(root_dir, "shopify-cli.base.rb"))

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

@@ -87,7 +87,7 @@ module ShopifyCli
         end
 
         def stop
-          @ctx.puts("Stopping ...")
+          @ctx.puts("Stopping…")
           @app.close
           @syncer.shutdown
           WebServer.shutdown

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

@@ -72,7 +72,7 @@ module ShopifyCli
         def replace_asset_urls(body)
           replaced_body = body.join.gsub(ASSET_REGEX) do |match|
             path = Pathname.new(Regexp.last_match[1])
-            if @theme.asset_paths.include?(path)
+            if @theme.static_asset_paths.include?(path)
               "/#{path}"
             else
               match

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

@@ -20,9 +20,9 @@ module ShopifyCli
         path.read
       end
 
-      def write(content)
+      def write(*args)
         path.parent.mkpath unless path.parent.directory?
-        path.write(content)
+        path.write(*args)
       end
 
       def delete

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

@@ -149,7 +149,7 @@ module ShopifyCli
         # Process lower-priority files in the background
 
         # Assets are served locally, so can be uploaded in the background
-        enqueue_updates(@theme.asset_files)
+        enqueue_updates(@theme.static_asset_files)
 
         unless delay_low_priority_files
           wait!(&block)
@@ -254,8 +254,12 @@ module ShopifyCli
 
         update_checksums(body)
 
-        value = body.dig("asset", "value") || Base64.decode64(body.dig("asset", "attachment"))
-        file.write(value)
+        attachment = body.dig("asset", "attachment")
+        value = if attachment
+          file.write(Base64.decode64(attachment), 0, mode: "wb")
+        else
+          file.write(body.dig("asset", "value"))
+        end
 
         response
       end
@@ -277,7 +281,7 @@ module ShopifyCli
 
       def update_checksums(api_response)
         api_response.values.flatten.each do |asset|
-          if asset["key"] && asset["checksum"]
+          if asset["key"]
             @checksums[asset["key"]] = asset["checksum"]
           end
         end
@@ -310,7 +314,7 @@ module ShopifyCli
 
       def backoff_if_near_limit!(used, limit)
         if used > limit - @threads.size
-          @ctx.debug("Near API call limit, waiting 2 sec ...")
+          @ctx.debug("Near API call limit, waiting 2 sec…")
           @backoff_mutex.synchronize { sleep 2 }
         end
       end

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

@@ -20,11 +20,11 @@ module ShopifyCli
       end
 
       def theme_files
-        glob(["**/*.liquid", "**/*.json", "assets/*"])
+        glob(["**/*.liquid", "**/*.json", "assets/*"]).uniq
       end
 
-      def asset_files
-        glob("assets/*")
+      def static_asset_files
+        glob("assets/*").reject(&:liquid?)
       end
 
       def liquid_files
@@ -43,8 +43,8 @@ module ShopifyCli
         theme_files.include?(self[file])
       end
 
-      def asset_paths
-        asset_files.map(&:relative_path)
+      def static_asset_paths
+        static_asset_files.map(&:relative_path)
       end
 
       def [](file)

data/lib/shopify-cli/tunnel.rb

@@ -149,7 +149,7 @@ module ShopifyCli
       check_prereq_command(ctx, "curl")
       check_prereq_command(ctx, ctx.linux? ? "unzip" : "tar")
       spinner = CLI::UI::SpinGroup.new
-      spinner.add("Installing ngrok...") do
+      spinner.add(ctx.message("core.tunnel.installing")) do
         zip_dest = File.join(ShopifyCli.cache_dir, "ngrok.zip")
         unless File.exist?(zip_dest)
           ctx.system("curl", "-o", zip_dest, DOWNLOAD_URLS[ctx.os], chdir: ShopifyCli.cache_dir)

data/lib/shopify-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,6 +121,7 @@ files:
 - RELEASING.md
 - Rakefile
 - SECURITY.md
+- THEMEKIT_MIGRATION.md
 - bin/load_shopify.rb
 - bin/shopify
 - dev.yml