shopify-cli 2.15.6 → 2.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756d40b258dafcaa9e3fd02305cbc3eb4bc1416b5711f22543c9b6221c4bd888
-  data.tar.gz: 476eea5325f671f2e3a1337700356f895792c1e4b2568dc56e38c58b4d1e93d5
+  metadata.gz: e3acc31975c1b9d6478fe3f5d39ebf4ca0550b5956dc22dd4710103ae77bb0b4
+  data.tar.gz: 2cbf01bd46b9d3d175b6b4f534f28b52ce69972125169a243788d922a68bf19a
 SHA512:
-  metadata.gz: 11bee20d53a3809978a2cf37a7f4ed3e759f0edd7d53ac8ec9e08dad76c1bd3ed8fcbf66262dc686d7bf929fec256685189facaf1255c2f51c2f566757b7ae29
-  data.tar.gz: 8cb0d2cb3d2edf801f752b74ed8534816180e257d3a1afef8fb0b13ffa5a3a85388bd6bb71df04d0c42bf450cedd1008e473f36cf48722435eea912645dcb1e9
+  metadata.gz: 7999265576034095a1114c3a29a2ab9bbaee62bac8c29b26b79d2c724b8be1dbc045e0da7c94a1863e465545bd7be32851f2f36ae1b020a269346d4417c0008c
+  data.tar.gz: e5affc3532841d156305192ad2aa775065a9571a7bbf8ee6ab7b56d7f5d62c7a30407cf25e658bb99283d8429eb1b009ff406651fa7915c9e2a07508923be993

data/.github/CODEOWNERS

@@ -4,7 +4,7 @@
 /lib/project_types/script/ @shopify/scripts-platform
 /test/project_types/script/ @shopify/scripts-platform
 
-/lib/project_types/theme/ @shopify/theme-platform-dev-experience
-/lib/shopify_cli/theme/ @shopify/theme-platform-dev-experience
-/test/project_types/theme/ @shopify/theme-platform-dev-experience
-/test/shopify-cli/theme/ @shopify/theme-platform-dev-experience
+/lib/project_types/theme/ @shopify/theme-developer-tools
+/lib/shopify_cli/theme/ @shopify/theme-developer-tools
+/test/project_types/theme/ @shopify/theme-developer-tools
+/test/shopify-cli/theme/ @shopify/theme-developer-tools

data/.github/workflows/shopify.yml

@@ -44,39 +44,6 @@ jobs:
 
       - name: Run Tests
         run: bundle exec rake test
-  acceptance_tests:
-    name: Acceptance Tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        version:
-          - 3.0.2
-        os:
-          - ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set Git configuration
-        run: |
-          git config --global user.email "development-lifecycle@shopify.com"
-          git config --global user.name "Development Lifecycle"
-
-      - name: Set up Ruby ${{ matrix.version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.version }}
-          bundler-cache: true
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: "14.9.0"
-
-      - uses: docker-practice/actions-setup-docker@master
-
-      - name: Install Dependencies
-        run: bundle install
-
-      - name: Run Tests
-        run: bundle exec cucumber
   rubocop:
     name: Rubocop
     runs-on: ${{ matrix.os }}

data/CHANGELOG.md

@@ -2,10 +2,44 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.17.0 - 2022-05-12
+
+### Added
+* [#2262](https://github.com/Shopify/shopify-cli/pull/2262): Add `capabilities` permissions to checkout extensions config
+* [#2292](https://github.com/Shopify/shopify-cli/pull/2292): Add support for App Bridge create/details URLs for scripts
+
+### Fixed
+* [#2287](https://github.com/Shopify/shopify-cli/pull/2287): Fix `Encoding::UndefinedConversionError` on `theme serve` and `theme pull`
+* [#2310](https://github.com/Shopify/shopify-cli/pull/2310): Fix live-reload to be resilient and no longer raise an error when a locale file is invalid
+* [#2297](https://github.com/Shopify/shopify-cli/pull/2297): Only show update message when the new version is higher
+* [#2270](https://github.com/Shopify/shopify-cli/pull/2270): Use ignore filter regex in watcher class
+
+### Changed
+* [#2299](https://github.com/Shopify/shopify-cli/pull/2299): Improve the unauthorized API errors when doing theme development
+
+## Version 2.16.1 - 2022-04-26
+
+### Fixed
+* [#2279](https://github.com/Shopify/shopify-cli/pull/2279): Fix logout when there are theme permission issues
+* [#2285](https://github.com/Shopify/shopify-cli/pull/2285): Fix extension loading for extension connect
+* [#2284](https://github.com/Shopify/shopify-cli/pull/2284): Fix version check for Windows
+
+## Version 2.16.0 - 2022-04-25
+
+### Fixed
+* [#2274](https://github.com/Shopify/shopify-cli/pull/2274): Fix broken `shopify extension register` and `shopify extension push`
+
+### Added
+* [#2189](https://github.com/Shopify/shopify-cli/pull/2189): Retrieve latest CLI version in the background
+* [#2263](https://github.com/Shopify/shopify-cli/pull/2263): Add `POS UI Extension` to support third party developers to extend POS smart grid functionality using native retail components. 
+
+### Changed
+* [#2272](https://github.com/Shopify/shopify-cli/pull/2272): Changed interactive apps list scope for extension create|register|connect commands
+
 ## Version 2.15.6 - 2022-04-12
 
 ### Fixed
-* [#2246](https://github.com/Shopify/shopify-cli/pull/2246): Fix callback urls for app serve
+* [#2246](https://github.com/Shopify/shopify-cli/pull/2246): Fix callback urls for app serve 
 
 ## Version 2.15.5 - 2022-04-08
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.15.6)
+    shopify-cli (2.17.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.10.1)
@@ -101,7 +101,7 @@ GEM
     mocha (1.13.0)
     multi_test (0.1.2)
     multipart-post (2.1.1)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     octokit (4.22.0)
@@ -165,7 +165,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.3.8)
+  bundler (~> 2.3.11)
   byebug
   colorize (~> 0.8.1)
   cucumber (~> 7.0)
@@ -187,4 +187,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.8
+   2.3.11

data/Tests.dockerfile

@@ -6,7 +6,7 @@ FROM cimg/ruby:2.7.5
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
 
-RUN gem update bundler
+RUN gem install bundler -v 2.3.11
 
 WORKDIR /usr/src/app
 

data/ext/shopify-extensions/version

@@ -1 +1 @@
-v0.3.0
+v0.4.0

data/lib/graphql/find_organization_with_apps.graphql

@@ -0,0 +1,20 @@
+query FindOrg($id: ID!) {
+  organizations(id: $id, first: 1) {
+    nodes {
+      id
+      businessName
+      website
+      apps(first: 500) {
+        nodes {
+          id
+          title
+          apiKey
+          apiSecretKeys {
+            secret
+          }
+          appType
+        }
+      }
+    }
+  }
+}

data/lib/project_types/extension/cli.rb

@@ -63,6 +63,8 @@ module Extension
       autoload :Build, Project.project_filepath("tasks/execute_commands/build")
       autoload :Create, Project.project_filepath("tasks/execute_commands/create")
       autoload :Serve, Project.project_filepath("tasks/execute_commands/serve")
+      autoload :OutdatedExtensionDetection,
+        Project.project_filepath("tasks/execute_commands/outdated_extension_detection")
 
       class << self
         def build(*args)
@@ -120,6 +122,7 @@ module Extension
     module ServerConfig
       autoload :Base, Project.project_filepath("models/server_config/base")
       autoload :App, Project.project_filepath("models/server_config/app")
+      autoload :Capabilities, Project.project_filepath("models/server_config/capabilities")
       autoload :Development, Project.project_filepath("models/server_config/development")
       autoload :DevelopmentEntries, Project.project_filepath("models/server_config/development_entries")
       autoload :DevelopmentRenderer, Project.project_filepath("models/server_config/development_renderer")

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

@@ -4,8 +4,6 @@ require "shopify_cli"
 module Extension
   class Command
     class Build < ExtensionCommand
-      hidden_feature
-
       prerequisite_task ensure_project_type: :extension
 
       YARN_BUILD_COMMAND = %w(build)

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

@@ -59,7 +59,13 @@ module Extension
           root_dir: form.directory_name,
           template: form.template,
           type: form.type.identifier.downcase,
+          context: @ctx,
         )
+          .then { |output| @ctx.puts(output) }
+          .unwrap do |error|
+            raise ShopifyCLI::Abort, error.message unless error.nil?
+          end
+
         @ctx.chdir(form.directory_name)
         write_env_file(form)
       rescue => error

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

@@ -14,6 +14,9 @@ module Extension
         parser.on("--resourceUrl=RESOURCE_URL", "Provide a resource URL") do |resource_url|
           flags[:resource_url] = resource_url
         end
+        parser.on("-p", "--port=PORT", "Specify the port to use") do |port|
+          flags[:port] = port.to_i
+        end
       end
 
       class RuntimeConfiguration
@@ -22,13 +25,14 @@ module Extension
         property :tunnel_url, accepts: String, default: nil
         property :resource_url, accepts: String, default: nil
         property! :tunnel_requested, accepts: [true, false], reader: :tunnel_requested?, default: true
-        property! :port, accepts: (1...(2**16)), default: DEFAULT_PORT
+        property :port, accepts: (1...(2**16))
       end
 
       def call(_args, _command_name)
         config = RuntimeConfiguration.new(
           tunnel_requested: tunnel_requested?,
-          resource_url: options.flags[:resource_url]
+          resource_url: options.flags[:resource_url],
+          port: options.flags[:port]
         )
 
         ShopifyCLI::Result
@@ -51,10 +55,11 @@ module Extension
       end
 
       def find_available_port(runtime_configuration)
+        return runtime_configuration unless runtime_configuration.port.nil?
         return runtime_configuration unless specification_handler.choose_port?(@ctx)
 
         chosen_port = Tasks::ChooseNextAvailablePort
-          .call(from: runtime_configuration.port)
+          .call(from: DEFAULT_PORT)
           .unwrap { |_error| @ctx.abort(@ctx.message("serve.no_available_ports_found")) }
         runtime_configuration.tap { |c| c.port = chosen_port }
       end

data/lib/project_types/extension/features/argo.rb

@@ -24,11 +24,6 @@ module Extension
       end
 
       def config(context, include_renderer_version: true)
-        js_system = ShopifyCLI::JsSystem.new(ctx: context)
-        if js_system.package_manager == "yarn"
-          run_yarn_install(context, js_system)
-          run_yarn_run_script(context, js_system)
-        end
         filepath = File.join(context.root, SCRIPT_PATH)
         context.abort(context.message("features.argo.missing_file_error")) unless File.exist?(filepath)
 
@@ -50,32 +45,6 @@ module Extension
       def renderer_package(context)
         Tasks::FindPackageFromJson.call(renderer_package_name, context: context)
       end
-
-      private
-
-      def run_yarn_install(context, js_system)
-        _result, error, status = js_system.call(
-          yarn: YARN_INSTALL_COMMAND + YARN_INSTALL_PARAMETERS,
-          npm: [],
-          capture_response: true
-        )
-
-        context.abort(
-          context.message("features.argo.dependencies.yarn_install_error", error)
-        ) unless status.success?
-      end
-
-      def run_yarn_run_script(context, js_system)
-        _result, error, status = js_system.call(
-          yarn: YARN_RUN_COMMAND + YARN_RUN_SCRIPT_NAME,
-          npm: [],
-          capture_response: true
-        )
-
-        context.abort(
-          context.message("features.argo.dependencies.yarn_run_script_error", error)
-        ) unless status.success?
-      end
     end
   end
 end

data/lib/project_types/extension/features/argo_config.rb

@@ -11,7 +11,6 @@ module Extension
 
           return {} unless File.size?(file_name)
 
-          require "yaml" # takes 20ms, so deferred as late as possible.
           begin
             config = YAML.load_file(file_name)
 

data/lib/project_types/extension/features/argo_serve.rb

@@ -9,7 +9,7 @@ module Extension
       property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
       property :argo_runtime, accepts: -> (runtime) { runtime.class < Features::Runtimes::Base }
       property! :context, accepts: ShopifyCLI::Context
-      property! :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property! :port, accepts: Integer
       property  :tunnel_url, accepts: String, default: nil
       property! :js_system, accepts: ->(jss) { jss.respond_to?(:call) }, default: ShopifyCLI::JsSystem
       property :resource_url, accepts: String, default: nil

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

@@ -194,6 +194,29 @@ module Extension
         "{{command:%1$s extension connect}} " \
         "or run {{command:%1$s extension register}} to register a new extension.",
         module_not_found: "Unable to find module %s. Ensure your dependencies are up-to-date and try again.",
+        development_server_binary_not_found: {
+          title: "Development Server Binary Missing",
+          message: <<~ERROR,
+            The extension development server binary could not be found!
+
+            If you're running a development version of the CLI, please run `rake extensions:install` to install it.
+            Otherwise, please file a bug report via https://github.com/Shopify/shopify-cli/issues/new.
+          ERROR
+        },
+        outdated_extensions: {
+          unknown: <<~TEXT.strip,
+            Please refer to the documentation for more information on how to upgrade your extension:
+            https://shopify.dev/apps/app-extensions
+          TEXT
+          checkout_ui_extension: <<~TEXT.strip,
+            Please update your package.json as follows:
+            * Replace the development dependency @shopify/checkout-ui-extensions-run
+              with @shopify/shopify-cli-extensions
+            * Remove the start and server script
+            * Add a develop script: shopify-cli-extensions develop
+            * Change the build script to: shopify-cli-extensions build
+          TEXT
+        },
       },
       warnings: {
         resource_url_auto_generation_failed: "{{*}} {{yellow:Warning:}} Unable to auto generate " \

data/lib/project_types/extension/models/development_server.rb

@@ -27,7 +27,8 @@ module Extension
       end
 
       def create(server_config)
-        CLI::Kit::System.capture3(executable, "create", "-", stdin_data: server_config.to_yaml)
+        output, _ = CLI::Kit::System.capture2e(executable, "create", "-", stdin_data: server_config.to_yaml)
+        output
       rescue StandardError => error
         raise error
       end

data/lib/project_types/extension/models/development_server_requirements.rb

@@ -10,11 +10,17 @@ module Extension
         "checkout_post_purchase",
         "product_subscription",
         "beacon_extension",
+        "pos_ui_extension",
       ]
 
       class << self
         def supported?(type)
-          binary_installed? && type_supported?(type) && type_enabled?(type)
+          if type_supported?(type) && type_enabled?(type)
+            return true if binary_installed?
+            warn_about_missing_binary
+          end
+
+          false
         end
 
         def beta_enabled?
@@ -25,15 +31,29 @@ module Extension
           SUPPORTED_EXTENSION_TYPES.include?(type.downcase)
         end
 
+        # Some types are enabled unconditionally; others require beta_enabled
+        def type_enabled?(type)
+          beta_enabled? || "checkout_ui_extension" == type.downcase
+        end
+
         private
 
         def binary_installed?
           Models::DevelopmentServer.new.executable_installed?
         end
 
-        # Some types are enabled unconditionally; others require beta_enabled
-        def type_enabled?(type)
-          beta_enabled? || "checkout_ui_extension" == type.downcase
+        def warn_about_missing_binary
+          CLI::UI::Frame.open(message("errors.development_server_binary_not_found.title"), color: :yellow) do
+            context.puts(message("errors.development_server_binary_not_found.message"))
+          end
+        end
+
+        def message(key)
+          context.message(key)
+        end
+
+        def context
+          @context ||= ShopifyCLI::Context.new
         end
       end
     end

data/lib/project_types/extension/models/npm_package.rb

@@ -8,9 +8,9 @@ module Extension
 
       property :name
       property :version
-      property :scripts, accepts: Hash
-      property :dependencies, accepts: Hash
-      property :dev_dependencies, accepts: Hash
+      property :scripts, accepts: Hash, default: -> { {} }
+      property :dependencies, accepts: Hash, default: -> { {} }
+      property :dev_dependencies, accepts: Hash, default: -> { {} }
 
       def initialize(**config)
         super(**config.select { |property_name, _| self.class.properties.key?(property_name) })
@@ -27,6 +27,18 @@ module Extension
         return nil unless name == other.name
         Semantic::Version.new(version) <=> Semantic::Version.new(other.version)
       end
+
+      def script?(name)
+        scripts.key?(name)
+      end
+
+      def dependency?(name)
+        dependencies.key?(name)
+      end
+
+      def dev_dependency?(name)
+        dev_dependencies.key?(name)
+      end
     end
   end
 end

data/lib/project_types/extension/models/server_config/capabilities.rb

@@ -0,0 +1,11 @@
+module Extension
+  module Models
+    module ServerConfig
+      class Capabilities < Base
+        include SmartProperties
+
+        property :network_access, accepts: [true, false], default: false
+      end
+    end
+  end
+end

data/lib/project_types/extension/models/server_config/development_renderer.rb

@@ -10,6 +10,7 @@ module Extension
           "@shopify/admin-ui-extensions",
           "@shopify/post-purchase-ui-extensions",
           "@shopify/checkout-ui-extensions",
+          "@shopify/retail-ui-extensions",
         ]
 
         property! :name, accepts: VALID_RENDERERS
@@ -20,9 +21,13 @@ module Extension
           when "product_subscription"
             new(name: "@shopify/admin-ui-extensions", version: "^1.0.1")
           when "checkout_ui_extension"
-            new(name: "@shopify/checkout-ui-extensions", version: "^0.14.0")
+            new(name: "@shopify/checkout-ui-extensions", version: "^0.15.0")
           when "checkout_post_purchase"
             new(name: "@shopify/post-purchase-ui-extensions", version: "^0.13.2")
+          when "pos_ui_extension"
+            new(name: "@shopify/retail-ui-extensions", version: "^0.1.0")
+          else
+            raise ArgumentError, "Unknown extension type: #{type}"
           end
         end
       end

data/lib/project_types/extension/models/server_config/extension.rb

@@ -10,11 +10,14 @@ module Extension
         property! :type, accepts: String
         property! :user, accepts: ServerConfig::User
         property! :development, accepts: ServerConfig::Development
+        property  :capabilities, accepts: ServerConfig::Capabilities
         property  :extension_points, accepts: Array
-        property  :version, accepts: String
         property  :title, accepts: String
+        property  :description, accepts: String
+        property  :version, accepts: String
+        property  :metafields, accepts: Array
 
-        def self.build(uuid: "", template:, type:, root_dir:)
+        def self.build(uuid: "", template:, type:, root_dir:, **args)
           renderer = ServerConfig::DevelopmentRenderer.find(type)
           entry = ServerConfig::DevelopmentEntries.find(template)
           new(
@@ -26,7 +29,11 @@ module Extension
               template: template,
               renderer: renderer,
               entries: entry
-            )
+            ),
+            capabilities: ServerConfig::Capabilities.new(
+              network_access: false
+            ),
+            metafields: args.delete(:metafields)
           )
         end
 

data/lib/project_types/extension/models/server_config/root.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "yaml"
-
 module Extension
   module Models
     module ServerConfig

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

@@ -15,7 +15,7 @@ module Extension
            (?<region>[a-zA-Z]{2}) # Optional region subtag
           )?
           \z}x
-        PERMITTED_CONFIG_KEYS = [:extension_points, :metafields, :name]
+        PERMITTED_CONFIG_KEYS = [:extension_points, :metafields, :name, :capabilities]
 
         def config(context)
           {

data/lib/project_types/extension/tasks/configure_features.rb

@@ -62,6 +62,10 @@ module Extension
             required_fields: [:shop],
             cli_package_name: "@shopify/checkout-ui-extensions-run",
           },
+          point_of_sale: {
+            git_template: "",
+            renderer_package_name: "@shopify/retail-ui-extensions",
+          },
         }
       end
     end

data/lib/project_types/extension/tasks/convert_server_config.rb

@@ -9,13 +9,14 @@ module Extension
       property! :api_key, accepts: String
       property! :context, accepts: ShopifyCLI::Context
       property! :hash, accepts: Hash
-      property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
+      property! :port, accepts: Integer
       property! :registration_uuid, accepts: String
       property  :resource_url, accepts: String
       property! :store, accepts: String
       property! :title, accepts: String
       property  :tunnel_url, accepts: String
       property! :type, accepts: String
+      property  :metafields, accepts: Array
 
       DEFAULT_BUILD_DIR = "build"
 
@@ -27,7 +28,6 @@ module Extension
         context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
 
         renderer = Models::ServerConfig::DevelopmentRenderer.find(type)
-
         extension = Models::ServerConfig::Extension.new(
           uuid: registration_uuid,
           type: type.upcase,
@@ -40,8 +40,12 @@ module Extension
             )
           ),
           extension_points: hash.dig("extension_points"),
-          version: version(renderer.name, context),
-          title: title
+          capabilities: Models::ServerConfig::Capabilities.new(
+            network_access: hash.dig("capabilities", "network_access") || false
+          ),
+          version: renderer ? version(renderer.name, context) : nil,
+          title: title,
+          metafields: metafields
         )
 
         unless resource_url.nil?

data/lib/project_types/extension/tasks/execute_commands/base.rb

@@ -6,7 +6,9 @@ module Extension
     module ExecuteCommands
       class Base
         include SmartProperties
+
         property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
+        property! :context, accepts: ShopifyCLI::Context
       end
     end
   end

data/lib/project_types/extension/tasks/execute_commands/build.rb

@@ -5,7 +5,8 @@ module Extension
   module Tasks
     module ExecuteCommands
       class Build < Base
-        property! :context, accepts: ShopifyCLI::Context
+        prepend OutdatedExtensionDetection
+
         property! :config_file_path, accepts: String
 
         def call

data/lib/project_types/extension/tasks/execute_commands/create.rb

@@ -11,9 +11,6 @@ module Extension
         def call
           ShopifyCLI::Result.success(generate_config)
             .then { |server_config| Models::DevelopmentServer.new.create(server_config) }
-            .unwrap do |error|
-              raise error unless error.nil?
-            end
         end
 
         private