shopify-cli 2.2.0 → 2.4.0

data/lib/shopify-cli/partners_api.rb

@@ -8,16 +8,6 @@ module ShopifyCli
   class PartnersAPI < API
     autoload :Organizations, "shopify-cli/partners_api/organizations"
 
-    # Defines the environment variable that this API looks for to operate on local
-    # services. If you set this environment variable in your shell then the partners
-    # API will operate on your local instance
-    #
-    # #### Example
-    #
-    #  SHOPIFY_APP_CLI_LOCAL_PARTNERS=1 shopify create
-    #
-    LOCAL_DEBUG = "SHOPIFY_APP_CLI_LOCAL_PARTNERS"
-
     class << self
       ##
       # issues a graphql query or mutation to the Shopify Partners Dashboard CLI Schema.
@@ -59,11 +49,11 @@ module ShopifyCli
         ctx.puts(ctx.message("core.partners_api.error.account_not_found", ShopifyCli::TOOL_NAME))
       end
 
-      def partners_url_for(organization_id, api_client_id, local_debug)
+      def partners_url_for(organization_id, api_client_id)
         if ShopifyCli::Shopifolk.acting_as_shopify_organization?
           organization_id = "internal"
         end
-        "#{partners_endpoint(local_debug)}/#{organization_id}/apps/#{api_client_id}"
+        "https://#{Environment.partners_domain}/#{organization_id}/apps/#{api_client_id}"
       end
 
       private
@@ -72,7 +62,7 @@ module ShopifyCli
         new(
           ctx: ctx,
           token: access_token(ctx),
-          url: "#{endpoint}/api/cli/graphql",
+          url: "https://#{Environment.partners_domain}/api/cli/graphql",
         )
       end
 
@@ -83,20 +73,6 @@ module ShopifyCli
         end
       end
 
-      def endpoint
-        return "https://partners.shopify.com" if ENV[LOCAL_DEBUG].nil?
-        "https://partners.myshopify.io/"
-      end
-
-      def partners_endpoint(local_debug)
-        domain = if local_debug
-          "partners.myshopify.io"
-        else
-          "partners.shopify.com"
-        end
-        "https://#{domain}"
-      end
-
       def auth_failure_info(ctx, error)
         if error.response
           headers = %w(www-authenticate x-request-id)

data/lib/shopify-cli/process_supervision.rb

@@ -59,10 +59,20 @@ module ShopifyCli
       def start(identifier, args)
         return for_ident(identifier) if running?(identifier)
 
-        # Windows doesn't support forking process without extra gems, so we resort to spawning a new child process -
-        # that means that it dies along with the original process if it is interrupted. On UNIX, we fork the process so
-        # that it doesn't have to be restarted on every run.
-        if Context.new.windows?
+        # Some systems don't support forking process without extra gems, so we resort to spawning a new child process -
+        # that means that it dies along with the original process if it is interrupted. If possible, we fork the process
+        # so that it doesn't have to be restarted on every run.
+        if Process.respond_to?(:fork)
+          fork do
+            pid_file = new(identifier, pid: Process.pid)
+            pid_file.write
+            STDOUT.reopen(pid_file.log_path, "w")
+            STDERR.reopen(pid_file.log_path, "w")
+            STDIN.reopen("/dev/null", "r")
+            Process.setsid
+            exec(*args)
+          end
+        else
           pid_file = new(identifier)
 
           # Make sure the file exists and is empty, otherwise Windows fails
@@ -77,16 +87,6 @@ module ShopifyCli
           pid_file.write
 
           Process.detach(pid)
-        else
-          fork do
-            pid_file = new(identifier, pid: Process.pid)
-            pid_file.write
-            STDOUT.reopen(pid_file.log_path, "w")
-            STDERR.reopen(pid_file.log_path, "w")
-            STDIN.reopen("/dev/null", "r")
-            Process.setsid
-            exec(*args)
-          end
         end
 
         sleep(0.1)

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

@@ -47,6 +47,10 @@ module ShopifyCli
           super(k) || super(@names[k.downcase])
         end
 
+        def fetch(k, default = nil)
+          self[k] || super(@names[k.downcase], default)
+        end
+
         def []=(k, v)
           canonical = k.downcase.freeze
           # .delete is expensive, don't invoke it unless necessary

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

@@ -34,11 +34,10 @@ module ShopifyCli
           files = (modified + added).reject { |file| @ignore_filter&.ignore?(file) }
             .map { |file| @theme[file].relative_path }
 
-          @streams.broadcast(JSON.generate(
-            modified: files,
-          ))
-
-          @ctx.debug("[HotReload] Modified #{files.join(", ")}")
+          unless files.empty?
+            @streams.broadcast(JSON.generate(modified: files))
+            @ctx.debug("[HotReload] Modified #{files.join(", ")}")
+          end
         end
 
         private

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

@@ -155,11 +155,16 @@ module ShopifyCli
           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
+
         def secure_session_id
           if secure_session_id_expired?
             @ctx.debug("Refreshing preview _secure_session_id cookie")
             response = request("HEAD", "/", query: { preview_theme_id: @theme.id })
-            @secure_session_id = response["set-cookie"][SESSION_COOKIE_REGEXP, 1]
+            @secure_session_id = extract_secure_session_id_from_response_headers(response)
             @last_session_cookie_refresh = Time.now
           end
 
@@ -179,6 +184,13 @@ module ShopifyCli
             response_headers["location"].gsub!(%r{(https://#{@theme.shop})}, "http://127.0.0.1:9292")
           end
 
+          new_session_id = extract_secure_session_id_from_response_headers(response_headers)
+          if new_session_id
+            @ctx.debug("New _secure_session_id cookie from response")
+            @secure_session_id = new_session_id
+            @last_session_cookie_refresh = Time.now
+          end
+
           response_headers
         end
 

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

@@ -6,13 +6,24 @@ require "securerandom"
 
 module ShopifyCli
   module Theme
+    API_NAME_LIMIT = 50
+
     class DevelopmentTheme < Theme
       def id
         ShopifyCli::DB.get(:development_theme_id)
       end
 
       def name
-        ShopifyCli::DB.get(:development_theme_name) || generate_theme_name
+        existing_name = ShopifyCli::DB.get(:development_theme_name)
+        # Up to version 2.3.0 (included) generated names stored locally
+        # could have more than 50 characters and the API rejected them.
+        # This code ensures we update the name for those users to ensure
+        # the name stays under the limit.
+        if existing_name.nil? || existing_name.length > API_NAME_LIMIT
+          generate_theme_name
+        else
+          existing_name
+        end
       end
 
       def role
@@ -58,7 +69,10 @@ module ShopifyCli
         hostname = Socket.gethostname.split(".").shift
         hash = SecureRandom.hex(3)
 
-        theme_name = "Development (#{hash}-#{hostname})"
+        theme_name = "Development ()"
+        hostname_character_limit = API_NAME_LIMIT - theme_name.length - hash.length - 1
+        identifier = "#{hash}-#{hostname[0, hostname_character_limit]}"
+        theme_name = "Development (#{identifier})"
 
         ShopifyCli::DB.set(development_theme_name: theme_name)
 

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

@@ -17,12 +17,20 @@ module ShopifyCli
       end
 
       def read
-        path.read
+        if text?
+          path.read
+        else
+          path.read(mode: "rb")
+        end
       end
 
-      def write(*args)
+      def write(content)
         path.parent.mkpath unless path.parent.directory?
-        path.write(*args)
+        if text?
+          path.write(content)
+        else
+          path.write(content, 0, mode: "wb")
+        end
       end
 
       def delete

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

@@ -59,6 +59,13 @@ module ShopifyCli
         @globs = globs
       end
 
+      def add_patterns(patterns)
+        regexes, globs = patterns_to_regexes_and_globs(patterns)
+
+        @regexes += regexes
+        @globs += globs
+      end
+
       def match?(path)
         path = path.to_s
 

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

@@ -256,7 +256,7 @@ module ShopifyCli
 
         attachment = body.dig("asset", "attachment")
         value = if attachment
-          file.write(Base64.decode64(attachment), 0, mode: "wb")
+          file.write(Base64.decode64(attachment))
         else
           file.write(body.dig("asset", "value"))
         end

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "2.2.0"
+  VERSION = "2.4.0"
 end

data/lib/shopify_cli.rb

@@ -94,6 +94,8 @@ module ShopifyCli
     )
   end
 
+  autoload :Constants, "shopify-cli/constants"
+  autoload :Environment, "shopify-cli/environment"
   autoload :AdminAPI, "shopify-cli/admin_api"
   autoload :API, "shopify-cli/api"
   autoload :Command, "shopify-cli/command"
@@ -132,7 +134,7 @@ module ShopifyCli
   Context.load_messages(ShopifyCli::Messages::MESSAGES)
 
   def self.cache_dir
-    cache_dir = if ENV.key?("RUNNING_SHOPIFY_CLI_TESTS")
+    cache_dir = if Environment.running_tests?
       TEMP_DIR
     elsif ENV["LOCALAPPDATA"].nil?
       File.join(File.expand_path(ENV.fetch("XDG_CACHE_HOME", "~/.cache")), TOOL_NAME)
@@ -147,7 +149,7 @@ module ShopifyCli
   end
 
   def self.tool_config_path
-    if ENV.key?("RUNNING_SHOPIFY_CLI_TESTS")
+    if Environment.running_tests?
       TEMP_DIR
     elsif ENV["APPDATA"].nil?
       File.join(File.expand_path(ENV.fetch("XDG_CONFIG_HOME", "~/.config")), TOOL_NAME)

data/shopify-cli.gemspec

@@ -39,10 +39,10 @@ Gem::Specification.new do |spec|
   # `/usr/local/bin/shopify` to that script, in order to "lock" the Ruby used to
   # a single Ruby (useful for debugging in multi-Ruby environments)
 
-  spec.add_development_dependency("bundler", "~> 2.1.4")
+  spec.add_development_dependency("bundler", "~> 2.2.2")
   spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")
   spec.add_development_dependency("minitest", "~> 5.0")
 
-  spec.add_dependency("listen", "~> 3.5")
-  spec.add_dependency("theme-check", "~> 1.1")
+  spec.add_dependency("listen", "~> 3.7.0")
+  spec.add_dependency("theme-check", "~> 1.4.0")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,28 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: theme-check
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.4.0
 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
@@ -105,7 +105,7 @@ files:
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/probots.yml"
-- ".github/workflows/build.yml"
+- ".github/workflows/shopify.yml"
 - ".github/workflows/triage.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -114,6 +114,8 @@ files:
 - ".tmp/.gitkeep"
 - ".tmp/sv/.gitkeep"
 - CHANGELOG.md
+- CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -139,6 +141,9 @@ files:
 - docs/help/start-app/index.md
 - docs/index.md
 - ext/shopify-cli/extconf.rb
+- ext/shopify-extensions/extconf.rb
+- ext/shopify-extensions/shopify_extensions.rb
+- ext/shopify-extensions/version
 - install.sh
 - lib/docgen/class_template.md.erb
 - lib/docgen/index_template.md.erb
@@ -192,14 +197,24 @@ files:
 - lib/project_types/extension/forms/questions/ask_app.rb
 - lib/project_types/extension/forms/questions/ask_name.rb
 - lib/project_types/extension/forms/questions/ask_registration.rb
+- lib/project_types/extension/forms/questions/ask_template.rb
 - lib/project_types/extension/forms/questions/ask_type.rb
 - lib/project_types/extension/messages/message_loading.rb
 - lib/project_types/extension/messages/messages.rb
 - lib/project_types/extension/models/app.rb
+- lib/project_types/extension/models/development_server.rb
+- lib/project_types/extension/models/development_server_requirements.rb
 - lib/project_types/extension/models/lazy_specification_handler.rb
 - lib/project_types/extension/models/npm_package.rb
 - lib/project_types/extension/models/product.rb
 - lib/project_types/extension/models/registration.rb
+- lib/project_types/extension/models/server_config/base.rb
+- lib/project_types/extension/models/server_config/development.rb
+- lib/project_types/extension/models/server_config/development_entries.rb
+- lib/project_types/extension/models/server_config/development_renderer.rb
+- lib/project_types/extension/models/server_config/extension.rb
+- lib/project_types/extension/models/server_config/root.rb
+- lib/project_types/extension/models/server_config/user.rb
 - lib/project_types/extension/models/specification.rb
 - lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb
 - lib/project_types/extension/models/specification_handlers/checkout_ui_extension.rb
@@ -223,6 +238,7 @@ files:
 - lib/project_types/extension/tasks/get_apps.rb
 - lib/project_types/extension/tasks/get_extensions.rb
 - lib/project_types/extension/tasks/get_product.rb
+- lib/project_types/extension/tasks/run_extension_command.rb
 - lib/project_types/extension/tasks/update_draft.rb
 - lib/project_types/extension/tasks/user_errors.rb
 - lib/project_types/node/cli.rb
@@ -256,8 +272,10 @@ files:
 - lib/project_types/script/config/extension_points.yml
 - lib/project_types/script/errors.rb
 - lib/project_types/script/forms/create.rb
+- lib/project_types/script/graphql/app_script_set.graphql
 - lib/project_types/script/graphql/app_script_update_or_create.graphql
 - lib/project_types/script/graphql/get_app_scripts.graphql
+- lib/project_types/script/graphql/module_upload_url_generate.graphql
 - lib/project_types/script/graphql/script_service_proxy.graphql
 - lib/project_types/script/layers/application/build_script.rb
 - lib/project_types/script/layers/application/create_script.rb
@@ -270,6 +288,7 @@ files:
 - lib/project_types/script/layers/domain/push_package.rb
 - lib/project_types/script/layers/domain/script_json.rb
 - lib/project_types/script/layers/domain/script_project.rb
+- lib/project_types/script/layers/infrastructure/api_clients.rb
 - lib/project_types/script/layers/infrastructure/command_runner.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
@@ -282,6 +301,7 @@ files:
 - lib/project_types/script/layers/infrastructure/push_package_repository.rb
 - lib/project_types/script/layers/infrastructure/script_project_repository.rb
 - lib/project_types/script/layers/infrastructure/script_service.rb
+- lib/project_types/script/layers/infrastructure/script_uploader.rb
 - lib/project_types/script/messages/messages.rb
 - lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.rb
@@ -322,6 +342,7 @@ files:
 - lib/shopify-cli/commands/version.rb
 - lib/shopify-cli/commands/whoami.rb
 - lib/shopify-cli/connect.rb
+- lib/shopify-cli/constants.rb
 - lib/shopify-cli/context.rb
 - lib/shopify-cli/core.rb
 - lib/shopify-cli/core/entry_point.rb
@@ -330,6 +351,7 @@ files:
 - lib/shopify-cli/core/help_resolver.rb
 - lib/shopify-cli/core/monorail.rb
 - lib/shopify-cli/db.rb
+- lib/shopify-cli/environment.rb
 - lib/shopify-cli/feature.rb
 - lib/shopify-cli/form.rb
 - lib/shopify-cli/git.rb

data/.github/workflows/build.yml

@@ -1,28 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Ruby ${{ matrix.version }}
-    runs-on: macos-latest
-    strategy:
-      matrix:
-        version:
-          - 3.0.0
-          - 2.6.6
-          - 2.7.1
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Ruby ${{ matrix.version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.version }}
-          bundler-cache: true
-
-      - name: Install Dependencies
-        run: bundle install
-
-      - name: Run Tests
-        run: bundle exec rake