shopify-cli 2.32.1 → 2.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cedba2d3c1257478768278fcf18b239d18d49b56dd11ce9cb4eb60810f9bd46c
-  data.tar.gz: 252212433092e2df2f821782a58b57f8864bac936d04cac6f51a74a1891b3e59
+  metadata.gz: b36bc404542b0e83792be77e63389a35c2d28d453390b6f5de47b83e18e104ca
+  data.tar.gz: 6ceadf801362de66172f8b59d3d39c7cf608a419f08c5ede5eef2d8143092b57
 SHA512:
-  metadata.gz: c8d241e1d4353e2dd8e750fb81b47f936a9c35e7117e785ca50444acbf918956925a04657229b2afd84e8bad930d7bdd9cfe5cd0e67f6cf055f6899f91f27d0a
-  data.tar.gz: b3eb6d62f7fbc3c566161a8a1c09ed5d7679eda82a81eb0622fe7cc7ef9af391677f8281795fbff40ddec5b63fc529381165de02a91103fc851e96b2baa84d7c
+  metadata.gz: ae5a1f3ba940cdd89f0edb5ee914b53d1269238fdabc7d25bc5b43754825b74cbc2134cd5835194a4438e5be27e1f861227550bff4c9156e1de6cef9574e1b1a
+  data.tar.gz: 48e9d6c4477ae2a441d56e3cb4554aded9fe8829726c2b72ab5d51224908f340ed67153905242b5d90b5166034f0cff1d38d7f29d8c8340f8222251f804c5510

data/CHANGELOG.md

@@ -2,6 +2,17 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.33.1 - 2023-01-09
+
+### Fixed
+* [#2706](https://github.com/Shopify/shopify-cli/pull/2706): Delete checksum after file deletion
+
+## Version 2.33.0 - 2022-12-19
+
+### Added
+* [#2681](https://github.com/Shopify/shopify-cli/pull/2681): Enable Theme Access passwords for theme serve
+* [#2701](https://github.com/Shopify/shopify-cli/pull/2701): Update theme-check to 1.12.1 (introduce intelligent code completion)
+
 ## Version 2.32.1 - 2022-12-05
 
 ### Fixed

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.32.1)
+    shopify-cli (2.33.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.11.0)
+      theme-check (~> 1.12.1)
 
 GEM
   remote: https://rubygems.org/
@@ -101,14 +101,14 @@ GEM
     mocha (1.13.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.21.0)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -117,7 +117,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    racc (1.6.0)
+    racc (1.6.1)
     rack (2.2.3.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -150,7 +150,7 @@ GEM
       faraday (> 0.8, < 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.11.0)
+    theme-check (1.12.1)
       liquid (>= 5.4.0)
       nokogiri (>= 1.12)
       parser (~> 3)

data/RELEASING.md

@@ -1,5 +1,24 @@
 ## Releasing Shopify CLI
 
+This page contains instructions for CLI 2.0. If you are looking for instructions for CLI 3.0, please visit the [CLI 3.0 documentation](https://github.com/Shopify/cli/blob/main/docs/release.md).
+
+### Automated process
+
+We release the CLI with a series of Rake tasks run locally, interspersed with PR-based checkpoints. The steps are:
+
+1. `export GITHUB_ACCESS_TOKEN=$(dev github print-auth | grep Password | awk '{print $NF}')`
+2. `rake "release:prepare[2.x.x]"` (where 2.x.x is the version being released)
+3. PR to shopify-cli will open in your browser. Sanity-check and merge.
+4. Trigger [Shipit](https://shipit.shopify.io/shopify/shopify-cli/rubygems) on your version commit to release on RubyGems
+5. `rake release:package`
+6. Homebrew PR will open in your browser. Sanity-check and merge.
+7. Release will also be opened in your browser, check that it includes debian and rpm files.
+8. Go through all the [PRs labeled with includes-post-release-steps](https://github.com/Shopify/shopify-cli/issues?q=label%3Aincludes-post-release-steps+is%3Aclosed) and follow the post-release steps described in those PRs. Delete the labels afterward.
+
+In case the automation goes wrong, try with the manual instructions.
+
+### Manual process
+
 1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
 2. Make sure you're on the most recent `main`
    ```
@@ -50,4 +69,4 @@
     * upload the `.deb` and `.rpm` files from `packaging/builds/X.Y.Z/` (generated in step 9)
     * if it's a pre-release version, select the "This is a pre-release" checkbox
     * and click "Publish release".
-15. Go through all the PR [labeled with `includes-post-release-steps`](https://github.com/Shopify/shopify-cli/labels/includes-post-release-steps) and follow the post-release steps described in those PRs. Delete the labels afterward.
+15. Go through all the PR [labeled with `includes-post-release-steps`](https://github.com/Shopify/shopify-cli/labels/includes-post-release-steps) and follow the post-release steps described in those PRs. Delete the labels afterward.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "stringio"
 require "time"
 require "cgi"
@@ -20,6 +21,7 @@ module ShopifyCLI
         "transfer-encoding",
         "upgrade",
         "content-security-policy",
+        "content-length",
       ]
 
       class Proxy
@@ -54,14 +56,14 @@ module ShopifyCLI
               "POST", env["PATH_INFO"],
               headers: headers,
               query: query,
-              form_data: form_data.merge(replace_templates).merge(_method: env["REQUEST_METHOD"]),
+              form_data: form_data.merge(replace_templates).merge(_method: env["REQUEST_METHOD"])
             )
           else
             request(
               env["REQUEST_METHOD"], env["PATH_INFO"],
               headers: headers,
               query: query,
-              body_stream: (env["rack.input"] if has_body?(headers)),
+              body_stream: (env["rack.input"] if has_body?(headers))
             )
           end
 
@@ -97,7 +99,7 @@ module ShopifyCLI
 
         def bearer_token
           Environment.storefront_renderer_auth_token ||
-          ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token) ||
+            ShopifyCLI::DB.get(:storefront_renderer_production_exchange_token) ||
             raise(KeyError, "storefront_renderer_production_exchange_token missing")
         end
 
@@ -152,11 +154,13 @@ module ShopifyCLI
 
         def secure_session_id_expired?
           return true unless @secure_session_id && @last_session_cookie_refresh
+
           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
 
@@ -173,7 +177,7 @@ module ShopifyCLI
 
         def get_response_headers(response, env)
           response_headers = normalize_headers(
-            response.respond_to?(:headers) ? response.headers : response.to_hash
+            response.respond_to?(:headers) ? response.headers : response.to_hash,
           )
           # According to https://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-14#section-7.1.3.1Acc
           # should remove hop-by-hop header fields
@@ -196,6 +200,16 @@ module ShopifyCLI
 
         def request(method, path, headers: nil, query: [], form_data: nil, body_stream: nil)
           uri = URI.join("https://#{shop}", path)
+
+          if Environment.theme_access_password?
+            headers = headers ? headers.slice("ACCEPT", "CONTENT-TYPE", "CONTENT-LENGTH", "Cookie") : {}
+            headers.merge!({
+              "X-Shopify-Access-Token" => Environment.admin_auth_token,
+              "X-Shopify-Shop" => shop,
+            })
+            uri = URI.join("https://#{ThemeAccessAPI::BASE_URL}", "cli/sfr#{path}")
+          end
+
           uri.query = URI.encode_www_form(query + [[:_fd, 0], [:pb, 0]])
 
           @ctx.debug("Proxying #{method} #{uri}")

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

@@ -20,6 +20,12 @@ module ShopifyCLI
           file.checksum != checksum_by_key[file.relative_path]
         end
 
+        def delete(file)
+          checksums_mutex.synchronize do
+            checksum_by_key.delete(to_key(file))
+          end
+        end
+
         def keys
           checksum_by_key.keys
         end

data/lib/shopify_cli/theme/syncer.rb

@@ -348,6 +348,8 @@ module ShopifyCLI
           }),
         )
 
+        checksums.delete(file) if checksums.has?(file)
+
         response
       end
 

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.32.1"
+  VERSION = "2.33.1"
 end

data/shopify-cli.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   # Whereas if we were to have "~> 1.9", that version would still be satisfied and thus not upgraded.
   # Both shopify-cli and theme-check gems are owned and developed by Shopify.
   # These gems are currently being actively developed and it's easiest to update them together.
-  spec.add_dependency("theme-check", "~> 1.11.0")
+  spec.add_dependency("theme-check", "~> 1.12.1")
 
   spec.extensions = ["ext/shopify-extensions/extconf.rb"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.32.1
+  version: 2.33.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
 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