shopify-cli 1.11.0 → 2.0.0

data/RELEASING.md

@@ -2,9 +2,9 @@
 
 1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
 
-1. Make sure you're on the most recent `master`
+1. Make sure you're on the most recent `main`
    ```
-   $ git checkout master
+   $ git checkout main
    $ git pull
    ```
 
@@ -31,11 +31,33 @@
 
 1. Deploy using Shipit
 
-1. Check the "Actions" tab to see if the _Create Release_ workflow is successful. 
-   The workflow will automatically create a [release](https://github.com/Shopify/shopify-app-cli/releases) with the latest tag and `.deb`, `.rpm` assets attached.
+1. Update your `main` branch to the latest version
+   ```
+   $ git checkout main
+   $ git pull
+   ```
+
+1. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
+   ```
+   $ rake package
+   ```
+   This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
 
-2. Check the `Shopify/homebrew-shopify` repository for new PR `shopify-cli {version}`
-   * rename PR to `Packaging for release of v{version} of shopify-cli`
-   * when PR is approved, merge into main branch
+1. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
+    * create a branch named `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
 
+1. Go to [releases](https://github.com/Shopify/shopify-cli/releases) page of `Shopify/shopify-cli` repo and create a new release:
+    * use the tag created by Shipit (should be "vX.Y.Z")
+    * release title = "Version X.Y.Z"
+    * description should be
+      ```
+      Release of version X.Y.Z of Shopify CLI
 
+      Please refer to [CHANGELOG](https://github.com/Shopify/shopify-cli/blob/main/CHANGELOG.md) for details.
+      ```
+    * upload the `.deb` and `.rpm` files from `packaging/builds/X.Y.Z/` (generated in step 9)
+    * if it's a pre-release version, select the "This is a pre-release" checkbox
+    * and click "Publish release".

data/Rakefile

@@ -20,7 +20,7 @@ task :console do
 end
 
 namespace :rdoc do
-  repo = "https://github.com/Shopify/shopify-app-cli.wiki.git"
+  repo = "https://github.com/Shopify/shopify-cli.wiki.git"
   intermediate = "markdown_intermediate"
   file_to_doc = [
     "lib/shopify-cli/admin_api.rb",
@@ -29,6 +29,7 @@ namespace :rdoc do
     "lib/shopify-cli/git.rb",
     "lib/shopify-cli/heroku.rb",
     "lib/shopify-cli/js_deps.rb",
+    "lib/shopify-cli/lazy_delegator.rb",
     "lib/shopify-cli/method_object.rb",
     "lib/shopify-cli/partners_api.rb",
     "lib/shopify-cli/process_supervision.rb",
@@ -36,7 +37,6 @@ namespace :rdoc do
     "lib/shopify-cli/result.rb",
     "lib/shopify-cli/transform_data_structure.rb",
     "lib/shopify-cli/tunnel.rb",
-    "lib/shopify-cli/lazy_delegator.rb",
   ]
 
   task all: [:markdown, :wiki, :cleanup]

data/SECURITY.md

@@ -4,7 +4,7 @@
 
 ### New features
 
-New features will only be added to the master branch and will not be made available in point releases.
+New features will only be added to the main branch and will not be made available in point releases.
 
 ### Bug fixes
 

data/bin/load_shopify.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby --disable=gems
+#!/usr/bin/env ruby
 
 lib_path = File.expand_path("../../lib", __FILE__)
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)

data/bin/shopify

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby --disable=gems
+#!/usr/bin/env ruby
 
 module Kernel
   # make an alias of the original require
@@ -12,7 +12,7 @@ module Kernel
     raise if (name == "readline.so") && ShopifyCli::Context.new.windows?
     # Special case for psych (yaml), which rescues this itself
     raise if name == "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
-    STDERR.puts "[Note] You cannot use gems with Shopify App CLI."
+    STDERR.puts "[Note] You cannot use gems with Shopify CLI."
     STDERR.puts "[LoadError] #{e.message}"
     if ENV["DEBUG"]
       STDERR.puts e.backtrace
@@ -21,7 +21,7 @@ module Kernel
     STDERR.puts "       They are disabled."
     STDERR.puts "       Please don't modify the CLI locally."
     STDERR.puts "       If you would like to contribute to the CLI project, please refer to"
-    STDERR.puts "       https://github.com/Shopify/shopify-app-cli/blob/master/.github/CONTRIBUTING.md"
+    STDERR.puts "       https://github.com/Shopify/shopify-cli/blob/main/.github/CONTRIBUTING.md"
     STDERR.puts "\n"
     raise
   end

data/dev.yml

@@ -3,7 +3,7 @@ type:
   - ruby
 
 up:
-  - ruby: 2.5.1
+  - ruby: 2.7.1
   - bundler
   - node:
       version: 14.9.0

data/docs/app/node/index.md

@@ -1,4 +1,4 @@
 ---
-title: Getting started with Shopify App CLI
+title: Getting started with Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/getting-started
 ---

data/docs/app/rails/index.md

@@ -1,4 +1,4 @@
 ---
-title: Getting started with Shopify App CLI
+title: Getting started with Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/getting-started
 ---

data/docs/core/index.md

@@ -1,4 +1,4 @@
 ---
-title: Shopify App CLI core commands
+title: Shopify CLI core commands
 redirect_to: https://shopify.dev/tools/cli/reference
 ---

data/docs/getting-started/index.md

@@ -1,4 +1,4 @@
 ---
-title: Getting started with Shopify App CLI
+title: Getting started with Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/getting-started
 ---

data/docs/getting-started/install/index.md

@@ -1,4 +1,4 @@
 ---
-title: Install Shopify App CLI
+title: Install Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/installation
 ---

data/docs/getting-started/migrate/index.md

@@ -1,4 +1,4 @@
 ---
-title: Troubleshooting Shopify App CLI
+title: Troubleshooting Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/troubleshooting
 ---

data/docs/getting-started/uninstall/index.md

@@ -1,4 +1,4 @@
 ---
-title: Troubleshooting Shopify App CLI
+title: Troubleshooting Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/troubleshooting
 ---

data/docs/getting-started/upgrade/index.md

@@ -1,4 +1,4 @@
 ---
-title: Troubleshooting Shopify App CLI
+title: Troubleshooting Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/troubleshooting
 ---

data/docs/help/start-app/index.md

@@ -1,4 +1,4 @@
 ---
-title: Getting started with Shopify App CLI
+title: Getting started with Shopify CLI
 redirect_to: https://shopify.dev/tools/cli/getting-started
 ---

data/docs/index.md

@@ -1,4 +1,4 @@
 ---
-title: Shopify App CLI
+title: Shopify CLI
 redirect_to: https://shopify.dev/tools/cli
 ---

data/ext/shopify-cli/extconf.rb

@@ -4,11 +4,23 @@ require "fileutils"
 gem = File.expand_path("../../../", __FILE__)
 exe = File.join(gem, "bin", "shopify")
 
-if RUBY_PLATFORM.match(/mingw32/)
+# `--skip-cli-build` will be passed from the brew `shopify-cli.rb` formula, so
+# as to prevent this extension builder doing the script and sym-link creation;
+# the brew install process takes care of these itself - see
+# https://github.com/Shopify/homebrew-shopify/shopify-cli.rb
+if ARGV && ARGV[0]&.match(/skip-cli-build/)
+  makefile_content = <<~MAKEFILE
+    .PHONY: clean
+
+    clean: ;
+
+    install: ;
+  MAKEFILE
+elsif RUBY_PLATFORM.match(/mswin|mingw|cygwin/)
   bat_path = File.dirname(RbConfig.ruby)
   bat = "#{bat_path}\\shopify.bat"
 
-  script_content = "#{RbConfig.ruby} --disable=gems -I '#{gem}' '#{exe}' %*"
+  script_content = "#{RbConfig.ruby} -I '#{gem}' '#{exe}' %*"
 
   FileUtils.mkdir_p(bat_path)
   makefile_content = <<~MAKEFILE
@@ -27,7 +39,7 @@ else
 
   script_content = <<~SCRIPT
     #!/usr/bin/env bash
-    #{RbConfig.ruby} --disable=gems -I #{gem} #{exe} $@
+    #{RbConfig.ruby} -I #{gem} #{exe} $@
   SCRIPT
 
   File.write(script, script_content)
@@ -35,10 +47,10 @@ else
 
   makefile_content = <<~MAKEFILE
     .PHONY: clean install
-    
+
     clean:
     \t@sudo rm -f #{symlink}
-    
+
     install: clean
     \t@sudo ln -s #{script} #{symlink}
   MAKEFILE

data/install.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=sh disable=1012,1001
 \cat << 'EOF'
-This install method for Shopify App CLI is no longer supported.
+This install method for Shopify CLI is no longer supported.
 
 Please visit this page for complete instructions:
   https://shopify.dev/tools/cli/troubleshooting#migrate-from-a-legacy-version

data/lib/docgen/index_template.md.erb

@@ -1,5 +1,5 @@
-The Shopify App CLI has a set of core APIs that simplify the process of extending its functionality.
+The Shopify CLI has a set of core APIs that simplify the process of extending its functionality.
 
 <%- classes.each do |method| -%>
-- [<%= method.title %>](https://github.com/Shopify/shopify-app-cli/wiki/<%= method.filename %>)
+- [<%= method.title %>](https://github.com/Shopify/shopify-cli/wiki/<%= method.filename %>)
 <%- end -%>

data/lib/graphql/all_orgs_with_extensions.graphql

@@ -0,0 +1,37 @@
+query AllOrgs ($type: String) {
+  organizations {
+    nodes {
+      id
+      businessName
+      website
+      apps(first: 500) {
+        nodes {
+          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/graphql/find_organization.graphql

@@ -9,9 +9,10 @@ query FindOrg($id: ID!) {
           link
           shopDomain
           shopName
+          transferDisabled
+          convertableToPartnerTest
         }
       }
     }
   }
 }
-

data/lib/project_types/extension/cli.rb

@@ -5,14 +5,6 @@ module Extension
 
   class Project < ShopifyCli::ProjectType
     hidden_feature
-    title("App Extension")
-    creator("Extension::Commands::Create")
-
-    register_command("Extension::Commands::Build", "build")
-    register_command("Extension::Commands::Register", "register")
-    register_command("Extension::Commands::Push", "push")
-    register_command("Extension::Commands::Serve", "serve")
-    register_command("Extension::Commands::Tunnel", "tunnel")
 
     require Project.project_filepath("messages/messages")
     require Project.project_filepath("messages/message_loading")
@@ -20,15 +12,20 @@ module Extension
     register_messages(Extension::Messages::MessageLoading.load)
   end
 
-  module Commands
+  class Command < ShopifyCli::ProjectCommands
+    hidden_feature
     autoload :ExtensionCommand, Project.project_filepath("commands/extension_command")
-    autoload :Create, Project.project_filepath("commands/create")
-    autoload :Register, Project.project_filepath("commands/register")
-    autoload :Build, Project.project_filepath("commands/build")
-    autoload :Serve, Project.project_filepath("commands/serve")
-    autoload :Push, Project.project_filepath("commands/push")
-    autoload :Tunnel, Project.project_filepath("commands/tunnel")
+
+    subcommand :Create, "create", Project.project_filepath("commands/create")
+    subcommand :Register, "register", Project.project_filepath("commands/register")
+    subcommand :Info, "info", Project.project_filepath("commands/info")
+    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
+    subcommand :Build, "build", Project.project_filepath("commands/build")
+    subcommand :Serve, "serve", Project.project_filepath("commands/serve")
+    subcommand :Push, "push", Project.project_filepath("commands/push")
+    subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
   end
+  ShopifyCli::Commands.register("Extension::Command", "extension")
 
   module Tasks
     autoload :UserErrors, Project.project_filepath("tasks/user_errors")
@@ -38,8 +35,10 @@ module Extension
     autoload :UpdateDraft, Project.project_filepath("tasks/update_draft")
     autoload :FetchSpecifications, Project.project_filepath("tasks/fetch_specifications")
     autoload :ConfigureFeatures, Project.project_filepath("tasks/configure_features")
+    autoload :ConfigureOptions, Project.project_filepath("tasks/configure_options")
     autoload :ChooseNextAvailablePort, Project.project_filepath("tasks/choose_next_available_port")
     autoload :FindNpmPackages, Project.project_filepath("tasks/find_npm_packages")
+    autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
 
     module Converters
       autoload :RegistrationConverter, Project.project_filepath("tasks/converters/registration_converter")
@@ -54,10 +53,12 @@ module Extension
       autoload :AskApp, Project.project_filepath("forms/questions/ask_app")
       autoload :AskName, Project.project_filepath("forms/questions/ask_name")
       autoload :AskType, Project.project_filepath("forms/questions/ask_type")
+      autoload :AskRegistration, Project.project_filepath("forms/questions/ask_registration")
     end
 
     autoload :Create, Project.project_filepath("forms/create")
     autoload :Register, Project.project_filepath("forms/register")
+    autoload :Connect, Project.project_filepath("forms/connect")
   end
 
   module Features
@@ -75,6 +76,7 @@ module Extension
   module Models
     module SpecificationHandlers
       autoload :Default, Project.project_filepath("models/specification_handlers/default")
+      autoload :CheckoutArgoExtension, Project.project_filepath("models/specification_handlers/checkout_ui_extension")
     end
 
     autoload :App, Project.project_filepath("models/app")
@@ -89,4 +91,5 @@ module Extension
 
   autoload :ExtensionProjectKeys, Project.project_filepath("extension_project_keys")
   autoload :ExtensionProject, Project.project_filepath("extension_project")
+  autoload :Errors, Project.project_filepath("errors")
 end

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

@@ -2,10 +2,12 @@
 require "shopify_cli"
 
 module Extension
-  module Commands
+  class Command
     class Build < ExtensionCommand
       hidden_feature
 
+      prerequisite_task ensure_project_type: :extension
+
       YARN_BUILD_COMMAND = %w(build)
       NPM_BUILD_COMMAND = %w(run-script build)
 
@@ -19,10 +21,7 @@ module Extension
       end
 
       def self.help
-        <<~HELP
-          Build your extension to prepare for deployment.
-            Usage: {{command:#{ShopifyCli::TOOL_NAME} build}}
-        HELP
+        ShopifyCli::Context.new.message("build.help", ShopifyCli::TOOL_NAME)
       end
     end
   end

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module Extension
+  class Command
+    class Connect < ExtensionCommand
+      prerequisite_task :ensure_authenticated
+
+      def call(args, _)
+        with_connect_form(args) do |form|
+          ExtensionProject.write_env_file(
+            context: @ctx,
+            api_key: form.app.api_key,
+            api_secret: form.app.secret,
+            registration_id: form.registration.id,
+            registration_uuid: form.registration.uuid,
+            title: form.registration.title
+          )
+          @ctx.done(@ctx.message("connect.connected", form.app.title, form.registration.title))
+        end
+      end
+
+      def self.help
+        ShopifyCli::Context.new.message("connect.help", ShopifyCli::TOOL_NAME, ShopifyCli::TOOL_NAME)
+      end
+
+      private
+
+      def with_connect_form(args)
+        form = Forms::Connect.ask(@ctx, args, { type: specification_handler.identifier.downcase })
+        return @ctx.puts(self.class.help) if form.nil?
+
+        yield form
+      end
+    end
+  end
+end