shopify-cli 2.15.6 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756d40b258dafcaa9e3fd02305cbc3eb4bc1416b5711f22543c9b6221c4bd888
-  data.tar.gz: 476eea5325f671f2e3a1337700356f895792c1e4b2568dc56e38c58b4d1e93d5
+  metadata.gz: 26f358d4694d7c5dd9b64208107c69def6144f79ee55ba2536c138a14ca81ea7
+  data.tar.gz: f1dccbffeece205fb67601a3510a351073ea61ff45e2c1276679a1604a489c2d
 SHA512:
-  metadata.gz: 11bee20d53a3809978a2cf37a7f4ed3e759f0edd7d53ac8ec9e08dad76c1bd3ed8fcbf66262dc686d7bf929fec256685189facaf1255c2f51c2f566757b7ae29
-  data.tar.gz: 8cb0d2cb3d2edf801f752b74ed8534816180e257d3a1afef8fb0b13ffa5a3a85388bd6bb71df04d0c42bf450cedd1008e473f36cf48722435eea912645dcb1e9
+  metadata.gz: e208397e4a7ed51e65a651b567c535d23bcbd90f5587a518c69bb1aa70f67efa9cd21bce69a5eda57e005d427456776ab76543938f8188be2a262c421935ac52
+  data.tar.gz: '083e6f590ccdb81cc43f9c1200bceca765c5242d7b701a872311b49f10184fb62723df553df74f76f7e311343e814038a360821dc434ffa46a83c9907ff881e4'

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,22 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## 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.16.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

@@ -2,7 +2,6 @@
 
 require "pathname"
 require "json"
-require "yaml"
 
 module Extension
   class PackageResolutionFailed < RuntimeError; end
@@ -63,6 +62,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)

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/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/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/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/root.rb

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

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

@@ -40,7 +40,7 @@ module Extension
             )
           ),
           extension_points: hash.dig("extension_points"),
-          version: version(renderer.name, context),
+          version: renderer ? version(renderer.name, context) : nil,
           title: title
         )
 

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

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

@@ -0,0 +1,53 @@
+module Extension
+  module Tasks
+    module ExecuteCommands
+      module OutdatedExtensionDetection
+        class OutdatedCheck
+          include ShopifyCLI::MethodObject
+
+          property! :type, accepts: Models::DevelopmentServerRequirements.method(:type_supported?)
+          property! :context, accepts: ShopifyCLI::Context
+          property! :project, accepts: ShopifyCLI::Project, default: -> { ShopifyCLI::Project.current }
+
+          def call
+            return false if valid?(parse_package)
+            context.abort(upgrade_instructions)
+          end
+
+          private
+
+          def upgrade_instructions
+            case type
+            when "checkout_ui_extension"
+              context.message("errors.outdated_extensions.checkout_ui_extension")
+            else
+              context.message("errors.outdated_extensions.unknown")
+            end
+          end
+
+          def parse_package
+            File.open(Pathname(project.directory).join("package.json")) do |file|
+              Models::NpmPackage.parse(file)
+            end
+          end
+
+          def valid?(package)
+            case type
+            when "checkout_ui_extension"
+              package.dev_dependency?("@shopify/shopify-cli-extensions") &&
+                package.script?("build") &&
+                package.script?("develop")
+            else
+              true
+            end
+          end
+        end
+
+        def call(*)
+          return super unless Models::DevelopmentServerRequirements.supported?(type)
+          OutdatedCheck.call(type: type, context: context).then { super }
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,8 @@ module Extension
   module Tasks
     module ExecuteCommands
       class Serve < Base
-        property! :context, accepts: ShopifyCLI::Context
+        prepend OutdatedExtensionDetection
+
         property! :config_file_path, accepts: String
         property  :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
         property  :resource_url, accepts: String

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

@@ -5,20 +5,17 @@ module Extension
   module Tasks
     class GetApps < ShopifyCLI::Task
       def call(context:)
-        organizations = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(context)
-        apps_from_organizations(organizations)
+        org_id = ShopifyCLI::DB.get(:organization_id)
+        return [] unless org_id
+
+        organization = ShopifyCLI::PartnersAPI::Organizations.fetch_with_apps(context, id: org_id)
+        apps_owned_by_organization(organization)
       end
 
       private
 
-      def apps_from_organizations(organizations)
-        organizations.flat_map do |organization|
-          apps_owned_by_organization(organization)
-        end
-      end
-
       def apps_owned_by_organization(organization)
-        return [] unless organization.key?("apps") && organization["apps"].any?
+        return [] unless organization&.dig("apps")
 
         organization["apps"].map do |app|
           Converters::AppConverter.from_hash(app, organization)

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

@@ -5,28 +5,29 @@ module Extension
   module Tasks
     class GetExtensions < ShopifyCLI::Task
       def call(context:, type:)
-        organizations = ShopifyCLI::PartnersAPI::Organizations.fetch_with_extensions(context, type)
-        extensions_from_organizations(organizations, context: context)
+        org_id = ShopifyCLI::DB.get(:organization_id)
+        return [] unless org_id
+
+        organization = ShopifyCLI::PartnersAPI::Organizations.fetch_with_extensions(context, type, id: org_id)
+        return [] unless organization_with_apps?(organization)
+        extensions_owned_by_organization(organization, context: context)
       end
 
       private
 
-      def extensions_from_organizations(organizations, context:)
-        organizations.flat_map do |organization|
-          extensions_owned_by_organization(organization, context: context)
-        end
-      end
-
       def extensions_owned_by_organization(organization, context:)
-        return [] unless organization.key?("apps") && organization["apps"].any?
-
         organization["apps"].flat_map do |app|
-          app["extensionRegistrations"].map do |registration|
+          registrations = app["extensionRegistrations"] || []
+          registrations.map do |registration|
             [Converters::AppConverter.from_hash(app, organization),
              Converters::RegistrationConverter.from_hash(context, registration)]
           end
         end
       end
+
+      def organization_with_apps?(organization)
+        organization&.key?("apps") && organization["apps"].any?
+      end
     end
   end
 end

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "shopify_cli"
-require "yaml"
 require "pathname"
 
 module Extension

data/lib/project_types/script/config/extension_points.yml

@@ -7,6 +7,8 @@ payment_methods:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
+    rust:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
   libraries:

data/lib/project_types/script/layers/application/connect_app.rb

@@ -21,7 +21,7 @@ module Script
               if partner_proxy_bypass
                 stubbed_org
               else
-                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_with_app(ctx)
+                orgs = ShopifyCLI::PartnersAPI::Organizations.fetch_all_with_apps(ctx)
                 Forms::AskOrg.ask(ctx, orgs, nil).org
               end
 

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

@@ -137,8 +137,6 @@ module Script
           end
         end
 
-        class ProjectCreatorNotFoundError < ScriptProjectError; end
-
         class SystemCallFailureError < ScriptProjectError
           attr_reader :out, :cmd
           def initialize(out:, cmd:)
@@ -157,7 +155,6 @@ module Script
         end
 
         class ScriptProjectAlreadyExistsError < ScriptProjectError; end
-        class TaskRunnerNotFoundError < ScriptProjectError; end
         class BuildScriptNotFoundError < ScriptProjectError; end
 
         class WebAssemblyBinaryNotFoundError < ScriptProjectError

data/lib/project_types/script/layers/infrastructure/languages/project_creator.rb

@@ -26,8 +26,9 @@ module Script
               "wasm" => WasmProjectCreator,
             }
 
-            raise Errors::ProjectCreatorNotFoundError unless project_creators[language]
-            project_creators[language].new(
+            project_creator = project_creators[language] || WasmProjectCreator
+
+            project_creator.new(
               ctx: ctx,
               type: type,
               project_name: project_name,

data/lib/project_types/script/layers/infrastructure/languages/task_runner.rb

@@ -13,8 +13,8 @@ module Script
               "wasm" => WasmTaskRunner,
             }
 
-            raise Errors::TaskRunnerNotFoundError unless task_runners[language]
-            task_runners[language].new(ctx)
+            task_runner = task_runners[language] || WasmTaskRunner
+            task_runner.new(ctx)
           end
 
           def initialize(ctx)

data/lib/shopify_cli/admin_api.rb

@@ -98,6 +98,8 @@ module ShopifyCLI
       end
 
       def get_shop_or_abort(ctx)
+        env_store = Environment.store
+        return env_store unless env_store.nil?
         ctx.abort(
           ctx.message("core.populate.error.no_shop", ShopifyCLI::TOOL_NAME)
         ) unless ShopifyCLI::DB.exists?(:shop)
@@ -119,7 +121,8 @@ module ShopifyCLI
       end
 
       def access_token(ctx, shop)
-        ShopifyCLI::DB.get(:shopify_exchange_token) do
+        env_token = Environment.admin_auth_token
+        env_token || ShopifyCLI::DB.get(:shopify_exchange_token) do
           authenticate(ctx, shop)
           ShopifyCLI::DB.get(:shopify_exchange_token)
         end

data/lib/shopify_cli/constants.rb

@@ -53,9 +53,11 @@ module ShopifyCLI
 
       # Authentication
       AUTH_TOKEN = "SHOPIFY_CLI_AUTH_TOKEN"
+      ADMIN_AUTH_TOKEN = "SHOPIFY_CLI_ADMIN_AUTH_TOKEN"
 
       # Monorail
       MONORAIL_REAL_EVENTS = "MONORAIL_REAL_EVENTS"
+      STORE = "SHOPIFY_CLI_STORE"
     end
 
     module SupportedVersions

data/lib/shopify_cli/context.rb

@@ -17,6 +17,7 @@ module ShopifyCLI
     GEM_LATEST_URI = URI.parse("https://rubygems.org/api/v1/versions/shopify-cli/latest.json")
     VERSION_CHECK_SECTION = "versioncheck"
     LAST_CHECKED_AT_FIELD = "last_checked_at"
+    LATEST_VERSION_FIELD = "latest_version"
     VERSION_CHECK_INTERVAL = 86400
 
     class << self
@@ -619,11 +620,13 @@ module ShopifyCLI
     #            : nil otherwise
     #
     def new_version
-      if (time_of_last_check + VERSION_CHECK_INTERVAL) < (now = Time.now.to_i)
-        update_time_of_last_check(now)
-        latest_version = retrieve_latest_gem_version
-        latest_version unless latest_version == ShopifyCLI::VERSION
+      if (time_of_last_check + VERSION_CHECK_INTERVAL) < (Time.now.to_i)
+        fork do
+          retrieve_latest_gem_version
+        end
       end
+      latest_version = ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, default: ShopifyCLI::VERSION)
+      latest_version unless latest_version == ShopifyCLI::VERSION
     end
 
     # Returns file extension depending on OS
@@ -669,17 +672,15 @@ module ShopifyCLI
     def retrieve_latest_gem_version
       response = Net::HTTP.get_response(GEM_LATEST_URI)
       latest = JSON.parse(response.body)
-      latest["version"]
+      ShopifyCLI::Config.set(VERSION_CHECK_SECTION, LATEST_VERSION_FIELD, latest["version"])
     rescue
       nil
+    ensure
+      ShopifyCLI::Config.set(VERSION_CHECK_SECTION, LAST_CHECKED_AT_FIELD, Time.now.to_i)
     end
 
     def time_of_last_check
       (val = ShopifyCLI::Config.get(VERSION_CHECK_SECTION, LAST_CHECKED_AT_FIELD)) ? val.to_i : 0
     end
-
-    def update_time_of_last_check(time)
-      ShopifyCLI::Config.set(VERSION_CHECK_SECTION, LAST_CHECKED_AT_FIELD, time)
-    end
   end
 end

data/lib/shopify_cli/environment.rb

@@ -166,6 +166,14 @@ module ShopifyCLI
       env_variables[Constants::EnvironmentVariables::AUTH_TOKEN]
     end
 
+    def self.admin_auth_token(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::ADMIN_AUTH_TOKEN]
+    end
+
+    def self.store(env_variables: ENV)
+      env_variables[Constants::EnvironmentVariables::STORE]
+    end
+
     def self.env_variable_truthy?(variable_name, env_variables: ENV)
       TRUTHY_ENV_VARIABLE_VALUES.include?(env_variables[variable_name.to_s])
     end

data/lib/shopify_cli/partners_api/app_extensions.rb

@@ -8,19 +8,19 @@ module ShopifyCLI
   class PartnersAPI
     class AppExtensions
       class << self
-        def fetch_apps_extensions(ctx, orgs, type)
-          jobs = apps(orgs).map { |app| AppExtensions::Job.new(ctx, app, type) }
+        def fetch_apps_extensions(ctx, org, type)
+          jobs = apps(org).map { |app| AppExtensions::Job.new(ctx, app, type) }
 
           consume_jobs!(jobs)
           patch_apps_with_extensions!(jobs)
 
-          orgs
+          org
         end
 
         private
 
-        def apps(orgs)
-          orgs.flat_map { |org| org["apps"] }
+        def apps(org)
+          (org && org["apps"]) || []
         end
 
         def consume_jobs!(jobs)

data/lib/shopify_cli/partners_api/organizations.rb

@@ -18,7 +18,7 @@ module ShopifyCLI
           org
         end
 
-        def fetch_with_app(ctx)
+        def fetch_all_with_apps(ctx)
           resp = PartnersAPI.query(ctx, "all_orgs_with_apps")
           (resp&.dig("data", "organizations", "nodes") || []).map do |org|
             org["stores"] = (org.dig("stores", "nodes") || [])
@@ -27,9 +27,17 @@ module ShopifyCLI
           end
         end
 
-        def fetch_with_extensions(ctx, type)
-          orgs = fetch_with_app(ctx)
-          AppExtensions.fetch_apps_extensions(ctx, orgs, type)
+        def fetch_with_apps(ctx, id:)
+          resp = PartnersAPI.query(ctx, "find_organization_with_apps", id: id)
+          organization = resp&.dig("data", "organizations", "nodes")&.first
+          return unless organization
+
+          organization.tap { organization["apps"] = (organization.dig("apps", "nodes") || []) }
+        end
+
+        def fetch_with_extensions(ctx, type, id:)
+          organization = fetch_with_apps(ctx, id: id)
+          AppExtensions.fetch_apps_extensions(ctx, organization, type)
         end
       end
     end

data/lib/shopify_cli/tasks/ensure_env.rb

@@ -25,7 +25,7 @@ module ShopifyCLI
         if Shopifolk.check && wants_to_run_against_shopify_org?
           Shopifolk.act_as_shopify_organization
         end
-        orgs = PartnersAPI::Organizations.fetch_with_app(@ctx)
+        orgs = PartnersAPI::Organizations.fetch_all_with_apps(@ctx)
         org_id = if orgs.count == 1
           orgs.first["id"]
         else

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

@@ -44,7 +44,7 @@ module ShopifyCLI
 
         def serve_file(path_info)
           path = @theme.root.join(path_info[1..-1])
-          if path.file? && path.readable? && @theme.theme_file?(path)
+          if path.file? && path.readable? && @theme.static_asset_file?(path)
             [
               200,
               {

data/lib/shopify_cli/theme/theme.rb

@@ -47,6 +47,10 @@ module ShopifyCLI
         theme_files.include?(self[file])
       end
 
+      def static_asset_file?(file)
+        static_asset_files.include?(self[file])
+      end
+
       def static_asset_paths
         static_asset_files.map(&:relative_path)
       end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.15.6"
+  VERSION = "2.16.0"
 end

data/shopify-cli.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib", "vendor"]
   spec.executables << "shopify"
 
-  spec.add_development_dependency("bundler", "~> 2.3.8")
+  spec.add_development_dependency("bundler", "~> 2.3.11")
   spec.add_development_dependency("rake", "~> 12.3", ">= 12.3.3")
   spec.add_development_dependency("minitest", "~> 5.0")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.15.6
+  version: 2.16.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.8
+        version: 2.3.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,7 @@ files:
 - lib/graphql/extension_update_draft.graphql
 - lib/graphql/fetch_specifications.graphql
 - lib/graphql/find_organization.graphql
+- lib/graphql/find_organization_with_apps.graphql
 - lib/graphql/get_app_by_api_key.graphql
 - lib/graphql/get_app_urls.graphql
 - lib/graphql/get_extension_registrations.graphql
@@ -275,6 +276,7 @@ files:
 - lib/project_types/extension/tasks/execute_commands/base.rb
 - lib/project_types/extension/tasks/execute_commands/build.rb
 - lib/project_types/extension/tasks/execute_commands/create.rb
+- lib/project_types/extension/tasks/execute_commands/outdated_extension_detection.rb
 - lib/project_types/extension/tasks/execute_commands/serve.rb
 - lib/project_types/extension/tasks/fetch_specifications.rb
 - lib/project_types/extension/tasks/find_npm_packages.rb
@@ -538,7 +540,7 @@ files:
 - lib/shopify_cli/tunnel.rb
 - lib/shopify_cli/utilities.rb
 - lib/shopify_cli/version.rb
-- shipit.yml
+- shipit.rubygems.yml
 - shopify-cli.gemspec
 - shopify-dev
 - utilities/constants.rb