shopify-cli 2.7.2 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15f9181fc2d774f3fcc0c7297881090097c32a873f5586a766a9f1af3ca4771
-  data.tar.gz: b05883edae91e131bbe30ea0fcf78fc7b7c31d775299ee37e7ce4b14b14f875a
+  metadata.gz: 3126bd5c9f4667732d248380f29b84fcac3bab1e3c944748b18dd3b0a639301d
+  data.tar.gz: 8c6ffbcf72d7360e227178f970c63a6041ee6c7f61b0ea22a9d6747f163f5b6b
 SHA512:
-  metadata.gz: fd64941e6aee6553c078d9cb52c9ff97d04f2975d396943cb94b009e862ea14e2be44632534786288fdc71075bea47337d474a63a87d889393ecb159848c5958
-  data.tar.gz: 24086b852a37609e95cc6a3f3c639b4d7b32c90b3b8b3db8154dd840f86f72b13b9c09b060e3f6da3dfeaa905e5a0c93c31c607c7ba7d7ea4d0029b80a90025e
+  metadata.gz: 2a21a55b5b258fa6c5037fff6652c43ba09a207e7f2b313b52a950b7a1d221e41d7edf719ce66c089200c1f2fba577e412fb985420c872ee83a4d40ef0cd05be
+  data.tar.gz: 338348f5e2220ef8b307e619981cc16985f012ecafc09c2d2eb232c2639ca65a11df12249f0d64fea5839b9015e1e31f0617eae84b82b4e530df587969b5fcc8

data/.github/CODEOWNERS

@@ -1,5 +1,5 @@
 *       @shopify/core-build-learn
 *       @shopify/development-lifecycle
 
-/lib/project_types/script/ @shopify/scripts-experience
-/test/project_types/script/ @shopify/scripts-experience
+/lib/project_types/script/ @shopify/scripts-platform
+/test/project_types/script/ @shopify/scripts-platform

data/.github/workflows/shopify.yml

@@ -19,7 +19,7 @@ jobs:
         version:
           - 3.0.2
           - 2.6.6
-          - 2.7.1
+          - 2.7.5
         os:
           - macos-10.15
           - macos-11

data/.gitignore

@@ -23,3 +23,4 @@ packaging/rpm/shopify-cli.spec
 ext/shopify-extensions/shopify-extensions
 ext/javy/bin
 .console_history
+TODO.md

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+2.7.5

data/CHANGELOG.md

@@ -1,4 +1,56 @@
 From version 2.6.0, the sections in this file adhere to the [keep a changelog](https://keepachangelog.com/en/1.0.0/) specification.
+
+## [Unreleased]
+
+## 2.9.0
+
+### Fixed
+* [#1922](https://github.com/Shopify/shopify-cli/pull/1922): Respect RUBY_BINDIR from Homebrew for installing gem
+* [#1906](https://github.com/Shopify/shopify-cli/pull/1906): Fix Ngrok incompatibility with some Apple ARM environments
+* [#1873](https://github.com/Shopify/shopify-cli/pull/1873): Fix partners ability to login to external shops.
+* [#1909](https://github.com/Shopify/shopify-cli/pull/1909): Fix `theme serve` on Safari
+
+### Added
+* [#1900](https://github.com/Shopify/shopify-cli/pull/1900): Add `-d`/`--development` flag to Shopify theme pull command
+* [#1896](https://github.com/Shopify/shopify-cli/pull/1896): Release Typescript options for payment_methods and shipping_methods scripts
+* [#1891](https://github.com/Shopify/shopify-cli/pull/1891): Allow for additional arguments in `shopify push script` on CI.
+* [#1877](https://github.com/Shopify/shopify-cli/pull/1877): Add theme (`-t`/`--theme=NAME_OR_ID`) parameter to `theme push`/`theme pull` commands
+* [#1871](https://github.com/Shopify/shopify-cli/pull/1871): Add a new `--live-reload` parameter to the `theme serve` command
+
+### Changed
+- [#1929](https://github.com/Shopify/shopify-cli/pull/1929): Rename `--registration-id` to `--extension-id` in `shopify extension push`.
+
+## Version 2.8.0
+### Fixed
+* [#1879](https://github.com/Shopify/shopify-cli/pull/1879): Disambiguate -s as store option
+
+## Version 2.7.4
+### Added
+* [#1825](https://github.com/Shopify/shopify-cli/pull/1825): Support passing the connection information through arguments
+
+### Fixed
+* [#1852](https://github.com/Shopify/shopify-cli/pull/1852): Fix `shopify --help` to include `extension` commands
+* [#1853](https://github.com/Shopify/shopify-cli/pull/1853): Fix javy installation failures from MacOS universal ruby installations
+* [#1851](https://github.com/Shopify/shopify-cli/pull/1851): Improve `shopify theme push --live` confirmation message to show current live theme
+* [#1850](https://github.com/Shopify/shopify-cli/pull/1850): Fix `shopify extension` commands timeout when organization has too many apps
+* [#1860](https://github.com/Shopify/shopify-cli/pull/1860): Fix `theme serve` hot reload when there are many tabs active
+
+## Version 2.7.3
+### Added
+* [#1826](https://github.com/Shopify/shopify-cli/pull/1826): Support using `script.config.yml` file for script configuration
+* [#1843](https://github.com/Shopify/shopify-cli/pull/1826): Support using javy on Apple ARM processors
+* [#1847](https://github.com/Shopify/shopify-cli/pull/1847): `shopify script connect` command.
+
+### Fixed
+* [#1811](https://github.com/Shopify/shopify-cli/pull/1811): Update theme-check to 1.9.0
+* [#1831](https://github.com/Shopify/shopify-cli/pull/1831): Ensure correct `ngrok` version is downloaded for Apple M1
+* [#1823](https://github.com/Shopify/shopify-cli/pull/1823): Indicate git is unavailable; don't error out
+* [#1807](https://github.com/Shopify/shopify-cli/pull/1807): Fix `--live` parameter, it should not imply `--allow-live` in the `theme push` command
+* [#1812](https://github.com/Shopify/shopify-cli/pull/1812): App creation with Rails 7
+* [#1821](https://github.com/Shopify/shopify-cli/pull/1821): Fix Shopify hosted fonts to load via the local preview URL
+* [#1830](https://github.com/Shopify/shopify-cli/pull/1830): Fix hot reload when users update many files "simultaneously"
+* [#1837](https://github.com/Shopify/shopify-cli/pull/1837): Fix `ShopifyCLI::Theme::DevServer::CdnFonts` class to support any font
+
 ## Version 2.7.2
 ### Fixed
 * [#1763](https://github.com/Shopify/shopify-cli/pull/1763): Fix: Tunnel --PORT parameter not working in Node.js app.

data/Codespace.dockerfile

@@ -1,7 +1,7 @@
 # This is a Docker image to test the CLI in UNIX environments other than macOS
 # Build the image: docker build . -t shopify-cli
 # Run tests: docker run -t --rm --volume "$(pwd):/usr/src/app" shopify-cli bundle exec rake test
-FROM cimg/ruby:2.7.1
+FROM cimg/ruby:2.7.5
 
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
@@ -29,7 +29,7 @@ RUN sudo apt-get install -y nodejs
 RUN sudo npm install --global yarn
 
 # Python is necessary to compile NPM packages with native extensions through node-gyp
-RUN sudo apt install python-minimal -y
+RUN sudo apt install python2-minimal -y
 
 # Install sqlite3
 RUN sudo apt-get install libsqlite3-dev -y

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.7.2)
+    shopify-cli (2.9.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.8.0)
+      theme-check (~> 1.9.0)
 
 GEM
   remote: https://rubygems.org/
@@ -81,7 +81,7 @@ GEM
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.0.3.1)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -119,7 +119,7 @@ GEM
     ruby-progressbar (1.11.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.8.0)
+    theme-check (1.9.0)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)

data/RELEASING.md

@@ -23,21 +23,22 @@
    ```
 
 9. Open a PR for the branch, get necessary approvals from code owners and merge into main branch. Note that the PR title will be the release note in Shipit, so make sure it mentions the release
-10. Deploy using Shipit
+10. Deploy to RubyGems using [Shipit](https://shipit.shopify.io/shopify/shopify-cli/rubygems)
 11. Update your `main` branch to the latest version
    ```
    $ git checkout main
    $ git pull
    ```
    
-12. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
+12. On local machine and _AFTER_ gem has been published to https://rubygems.org/gems/shopify-cli, run
    ```
    $ rake package
    ```
    This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
 
 13. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
-    * create a branch named `release_X_Y_Z_of_shopify-cli`
+    * update your `master` branch to the latest version: `git checkout master && git pull`
+    * create a new branch: `git checkout -b release_X_Y_Z_of_shopify-cli`
     * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-cli` repo (from the `rake package` step above)
     * commit the change and create a PR on the [Shopify Homebrew repository](https://github.com/Shopify/homebrew-shopify)
     * when PR is approved, merge into main branch

data/Tests.dockerfile

@@ -1,7 +1,7 @@
 # This is a Docker image to test the CLI in UNIX environments other than macOS
 # Build the image: docker build . -t shopify-cli
 # Run tests: docker run -t --rm --volume "$(pwd):/usr/src/app" shopify-cli bundle exec rake test
-FROM cimg/ruby:2.7.1
+FROM cimg/ruby:2.7.5
 
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
@@ -29,7 +29,7 @@ RUN sudo apt-get install -y nodejs
 RUN sudo npm install --global yarn
 
 # Python is necessary to compile NPM packages with native extensions through node-gyp
-RUN sudo apt install python-minimal -y
+RUN sudo apt install python2-minimal -y
 
 # Install sqlite3
 RUN sudo apt-get install libsqlite3-dev -y

data/dev.yml

@@ -6,12 +6,12 @@ env:
   SHOPIFY_CLI_DEVELOPMENT: "1"
 
 up:
-  - ruby: 2.7.1
+  - ruby: 2.7.5
   - homebrew:
       - dpkg:
-          version: 1.20.9
+          version: 1.21.1
       - rpm:
-          version: 4.16.1.3
+          version: 4.17.0
   - bundler
   - docker
 

data/ext/javy/hashes/javy-arm-macos-v0.1.0.gz.sha256

@@ -0,0 +1 @@
+16e1a74c06eff6e5be79253a8ee96a08a404e95be3479a6e384c8926bb736e43

data/ext/javy/hashes/javy-x86_64-linux-v0.1.0.gz.sha256

@@ -0,0 +1 @@
+53cb9d0e8a345d68f91512a28a7d2eab93463dc8650c7a044f03cbee1f7cac05

data/ext/javy/hashes/javy-x86_64-macos-v0.1.0.gz.sha256

@@ -0,0 +1 @@
+5e1ca88385206a653980139ab969efd80de11fd9b298dafe450d3ac27d6d0173

data/ext/javy/hashes/javy-x86_64-windows-v0.1.0.gz.sha256

@@ -0,0 +1 @@
+37f9b3f75b4ffca68b06656d6f90abfbac57597ee45fffb59b3a559b6b5de44e

data/ext/javy/javy.rb

@@ -1,11 +1,12 @@
-require "rbconfig"
 require "open-uri"
 require "zlib"
 require "open3"
+require "digest/sha2"
 
 module Javy
   ROOT = __dir__
-  BIN_FOLDER = File.join(ROOT, "bin")
+  BIN_FOLDER = File.join(ShopifyCLI.cache_dir, "javy", "bin")
+  HASH_FOLDER = File.join(ROOT, "hashes")
   VERSION = File.read(File.join(ROOT, "version")).strip
   TARGET = File.join(BIN_FOLDER, "javy-#{VERSION}")
 
@@ -17,14 +18,13 @@ module Javy
     end
 
     def build(source:, dest: nil)
-      ensure_installed
-
       optional_args = []
       optional_args += ["-o", dest] unless dest.nil?
 
       ShopifyCLI::Result
-        .wrap { exec(source, *optional_args) }
+        .wrap { ensure_installed }
         .call
+        .then { exec(source, *optional_args) }
     end
 
     private
@@ -45,7 +45,8 @@ module Javy
 
     def ensure_installed
       delete_outdated_installations
-      install unless Installer.installed?(target: target)
+      install.unwrap { |e| raise e } unless Installer.installed?(target: target)
+      true
     end
 
     def delete_outdated_installations
@@ -97,16 +98,25 @@ module Javy
         url: url
       ))
     end
+
+    def self.invalid_binary
+      new("Invalid Javy binary downloaded.")
+    end
   end
 
   Asset = Struct.new(:platform, :version, :owner, :repository, :basename, keyword_init: true) do
     def download(target:)
       FileUtils.mkdir_p(BIN_FOLDER)
 
+      source_file = url.open
+      validate_sha!(source_file)
+      source_file.seek(0)
+
       Dir.chdir(File.dirname(target)) do
         File.open(File.basename(target), "wb") do |target_file|
-          decompress(url.open, target_file)
+          decompress(source_file, target_file)
         end
+
         File.chmod(0755, target)
       end
 
@@ -143,11 +153,17 @@ module Javy
     ensure
       zlib.close
     end
+
+    def validate_sha!(source)
+      generated_hash = Digest::SHA256.hexdigest(source.read).strip
+      expected_hash = File.read(File.join(HASH_FOLDER, "#{filename}.sha256")).strip
+      raise InstallationError.invalid_binary unless generated_hash == expected_hash
+    end
   end
 
-  Platform = Struct.new(:ruby_config) do
-    def initialize(ruby_config = RbConfig::CONFIG)
-      super(ruby_config)
+  Platform = Struct.new(:ruby_platform) do
+    def initialize(ruby_platform = RUBY_PLATFORM)
+      super(ruby_platform)
     end
 
     def to_s
@@ -155,7 +171,7 @@ module Javy
     end
 
     def os
-      case ruby_config.fetch("host_os")
+      case ruby_platform
       when /linux/
         "linux"
       when /darwin/
@@ -166,9 +182,11 @@ module Javy
     end
 
     def cpu
-      case ruby_config.fetch("host_cpu")
-      when "x64", "x86_64"
+      case ruby_platform
+      when /x64/, /x86_64/
         "x86_64"
+      when /arm/
+        "arm"
       else
         raise InstallationError.cpu_unsupported
       end

data/lib/graphql/get_extension_registrations.graphql

@@ -0,0 +1,27 @@
+query GetExtensionRegistrations($api_key: String!, $type: String) {
+  app(apiKey: $api_key) {
+    id
+    title
+    apiKey
+    apiSecretKeys{
+      secret
+    }
+    appType
+    extensionRegistrations(specificationIdentifier: $type) {
+      id
+      type
+      uuid
+      title
+      draftVersion {
+        registrationId
+        context
+        lastUserInteractionAt
+        location
+        validationErrors { field message }
+        id
+        uuid
+        versionTag
+      }
+    }
+  }
+}

data/lib/project_types/extension/cli.rb

@@ -13,7 +13,6 @@ module Extension
   end
 
   class Command < ShopifyCLI::Command::ProjectCommand
-    hidden_feature
     autoload :ExtensionCommand, Project.project_filepath("commands/extension_command")
 
     subcommand :Create, "create", Project.project_filepath("commands/create")
@@ -41,7 +40,6 @@ module Extension
     autoload :FindNpmPackages, Project.project_filepath("tasks/find_npm_packages")
     autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
     autoload :GetProduct, Project.project_filepath("tasks/get_product")
-    autoload :RunExtensionCommand, Project.project_filepath("tasks/run_extension_command")
     autoload :MergeServerConfig, Project.project_filepath("tasks/merge_server_config")
     autoload :FindPackageFromJson, Project.project_filepath("tasks/find_package_from_json.rb")
     autoload :EnsureResourceUrl, Project.project_filepath("tasks/ensure_resource_url.rb")
@@ -53,6 +51,28 @@ module Extension
       autoload :ValidationErrorConverter, Project.project_filepath("tasks/converters/validation_error_converter")
       autoload :AppConverter, Project.project_filepath("tasks/converters/app_converter")
       autoload :ProductConverter, Project.project_filepath("tasks/converters/product_converter")
+      autoload :ExecuteCommands, Project.project_filepath("cli/execute_commands")
+    end
+
+    module ExecuteCommands
+      autoload :Base, Project.project_filepath("tasks/execute_commands/base")
+      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")
+
+      class << self
+        def build(*args)
+          Build.new(*args).call
+        end
+
+        def create(*args)
+          Create.new(*args).call
+        end
+
+        def serve(*args)
+          Serve.new(*args).call
+        end
+      end
     end
   end
 
@@ -121,4 +141,9 @@ module Extension
   autoload :ExtensionProjectKeys, Project.project_filepath("extension_project_keys")
   autoload :ExtensionProject, Project.project_filepath("extension_project")
   autoload :Errors, Project.project_filepath("errors")
+
+  module Loaders
+    autoload :Project, Extension::Project.project_filepath("loaders/project")
+    autoload :SpecificationHandler, Extension::Project.project_filepath("loaders/specification_handler")
+  end
 end

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

@@ -24,16 +24,16 @@ module Extension
       private
 
       def run_new_flow(project)
-        output = Tasks::RunExtensionCommand.new(
-          type: project.specification_identifier.downcase,
-          command: "build",
-          config_file_name: specification_handler.server_config_file,
-          context: @ctx,
-        ).call
-
-        @ctx.puts(output)
-      rescue => error
-        raise ShopifyCLI::Abort, error.message
+        Tasks::ExecuteCommands
+          .build(
+            context: @ctx,
+            config_file_path: specification_handler.server_config_path,
+            type: project.specification_identifier.downcase
+          )
+          .then { |output| @ctx.puts(output) }
+          .unwrap do |error|
+            raise ShopifyCLI::Abort, error.message unless error.nil?
+          end
       end
 
       def run_legacy_flow

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

@@ -53,12 +53,11 @@ module Extension
       end
 
       def use_new_create_flow(form)
-        Tasks::RunExtensionCommand.new(
+        Tasks::ExecuteCommands.create(
           root_dir: form.directory_name,
           template: form.template,
           type: form.type.identifier.downcase,
-          command: "create"
-        ).call
+        )
         @ctx.chdir(form.directory_name)
         write_env_file(form)
       rescue => error

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

@@ -3,17 +3,40 @@ require "shopify_cli"
 
 module Extension
   class Command
-    class Push < ExtensionCommand
+    class Push < ShopifyCLI::Command::SubCommand
       prerequisite_task ensure_project_type: :extension
 
+      options do |parser, flags|
+        parser.on("--api-key=API_KEY") { |api_key| flags[:api_key] = api_key.gsub('"', "") }
+        parser.on("--api-secret=API_SECRET") { |api_secret| flags[:api_secret] = api_secret.gsub('"', "") }
+        parser.on("--extension-id=EXTENSION_ID") do |registration_id|
+          flags[:registration_id] = registration_id.gsub('"', "")
+        end
+      end
+
       TIME_DISPLAY_FORMAT = "%B %d, %Y %H:%M:%S %Z"
 
       def call(args, name)
-        Command::Register.new(@ctx).call(args, name) unless project.registered?
+        project = Extension::Loaders::Project.load(
+          context: @ctx,
+          directory: Dir.pwd,
+          api_key: options.flags[:api_key],
+          api_secret: options.flags[:api_secret],
+          registration_id: options.flags[:registration_id]
+        )
+        specification_handler = Extension::Loaders::SpecificationHandler.load(project: project, context: @ctx)
+        register_if_necessary(project: project, args: args, name: name)
+
         Command::Build.new(@ctx).call(args, name) unless specification_handler.specification.options[:skip_build]
         CLI::UI::Frame.open(@ctx.message("push.frame_title")) do
-          updated_draft_version = update_draft
-          show_message(updated_draft_version)
+          updated_draft_version = update_draft(project: project, specification_handler: specification_handler)
+          show_message(updated_draft_version, project: project)
+        end
+      end
+
+      def register_if_necessary(project:, args:, name:)
+        if ShopifyCLI::Environment.interactive? && !project.registered?
+          Command::Register.new(@ctx).call(args, name)
         end
       end
 
@@ -23,11 +46,16 @@ module Extension
 
       private
 
-      def show_message(draft)
-        draft.validation_errors.empty? ? output_success_messages(draft) : output_validation_errors(draft)
+      def show_message(draft, project:)
+        if draft.validation_errors.empty?
+          output_success_messages(draft,
+            project: project)
+        else
+          output_validation_errors(draft)
+        end
       end
 
-      def output_success_messages(draft)
+      def output_success_messages(draft, project:)
         @ctx.puts(@ctx.message("push.success_confirmation", project.title, format_time(draft.last_user_interaction_at)))
         @ctx.puts(@ctx.message("push.success_info", draft.location))
       end
@@ -51,7 +79,7 @@ module Extension
         yield
       end
 
-      def update_draft
+      def update_draft(project:, specification_handler:)
         with_waiting_text do
           Tasks::UpdateDraft.call(
             context: @ctx,

data/lib/project_types/extension/extension_project.rb

@@ -74,7 +74,7 @@ module Extension
     end
 
     def registered?
-      property_present?("api_key") && property_present?("secret") && registration_id?
+      registration_id?
     end
 
     def title

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: 39351
+      property! :port, accepts: Integer, default: ShopifyCLI::Constants::Extension::DEFAULT_PORT
       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
@@ -95,15 +95,16 @@ module Extension
       end
 
       def new_serve_flow
-        Tasks::RunExtensionCommand.new(
+        Tasks::ExecuteCommands.serve(
           type: specification_handler.specification.identifier,
-          command: "serve",
           context: context,
+          config_file_path: specification_handler.server_config_path,
           port: port,
-          config_file_name: specification_handler.server_config_file,
           resource_url: resource_url,
           tunnel_url: tunnel_url
-        ).call
+        ).unwrap do |error|
+          raise error unless error.nil?
+        end
       end
 
       def supports_development_server?

data/lib/project_types/extension/forms/questions/ask_registration.rb

@@ -34,8 +34,12 @@ module Extension
         end
 
         def load_registrations(type)
-          ctx.puts(@ctx.message("connect.loading_extensions"))
-          registrations = Tasks::GetExtensions.call(context: ctx, type: type)
+          registrations = []
+          loading_extensions = @ctx.message("connect.loading_extensions")
+
+          CLI::UI::Spinner.spin(loading_extensions) do |_spinner|
+            registrations += Tasks::GetExtensions.call(context: ctx, type: type)
+          end
 
           registrations.empty? ? abort_no_registrations : registrations
         end

data/lib/project_types/extension/loaders/project.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Extension
+  module Loaders
+    module Project
+      def self.load(context:, directory:, api_key:, registration_id:, api_secret:)
+        env_overrides = {
+          "SHOPIFY_API_KEY" => api_key,
+          "SHOPIFY_API_SECRET" => api_secret,
+          "EXTENSION_ID" => registration_id,
+        }.compact
+        env =
+          begin
+            ShopifyCLI::Resources::EnvFile.read(directory, overrides: env_overrides)
+          rescue Errno::ENOENT
+            ShopifyCLI::Resources::EnvFile.from_hash(env_overrides)
+          end
+        # This is a somewhat uncomfortable hack we use because `Project::at` is
+        # a global cache and we can't rely on this class loading the project
+        # first. Long-term we should move away from that global cache.
+        project = ExtensionProject.at(directory)
+        project.env = env
+        project
+      rescue SmartProperties::InitializationError, SmartProperties::MissingValueError
+        context.abort(context.message("errors.missing_api_key"))
+      end
+    end
+  end
+end

data/lib/project_types/extension/loaders/specification_handler.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Extension
+  module Loaders
+    module SpecificationHandler
+      def self.load(project:, context:)
+        identifier = project.specification_identifier
+        Models::LazySpecificationHandler.new(identifier) do
+          specifications = Models::Specifications.new(
+            fetch_specifications: Tasks::FetchSpecifications.new(api_key: project.app.api_key, context: context)
+          )
+
+          unless specifications.valid?(identifier)
+            raise ShopifyCLI::Abort, context.message("errors.unknown_type", project.specification_identifier)
+          end
+
+          specifications[identifier]
+        end
+      end
+    end
+  end
+end