shopify-cli 1.13.1 → 2.1.0

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

@@ -19,14 +19,14 @@ module Extension
       YARN_RUN_SCRIPT_NAME = %w(build).freeze
       private_constant :YARN_INSTALL_COMMAND, :YARN_INSTALL_PARAMETERS, :YARN_RUN_COMMAND, :YARN_RUN_SCRIPT_NAME
 
-      ARGO_CHECKOUT = "@shopify/argo-checkout"
-      ARGO_ADMIN = "@shopify/argo-admin"
-      ARGO_POST_PURCHASE = "@shopify/argo-post-purchase"
+      UI_EXTENSIONS_CHECKOUT = "@shopify/checkout-ui-extensions"
+      UI_EXTENSIONS_ADMIN = "@shopify/admin-ui-extensions"
+      UI_EXTENSIONS_POST_PURCHASE = "@shopify/post-purchase-ui-extensions"
 
       PACKAGE_NAMES = [
-        ARGO_CHECKOUT,
-        ARGO_ADMIN,
-        ARGO_POST_PURCHASE,
+        UI_EXTENSIONS_CHECKOUT,
+        UI_EXTENSIONS_ADMIN,
+        UI_EXTENSIONS_POST_PURCHASE,
       ].freeze
 
       def create(directory_name, identifier, context)

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

@@ -3,88 +3,44 @@ module Extension
     class ArgoRuntime
       include SmartProperties
 
-      ARGO_RUN_PACKAGE_NAME = "@shopify/argo-run"
-      ARGO_ADMIN_CLI_PACKAGE_NAME = "@shopify/argo-admin-cli"
-
-      ARGO_RUN_0_4_0 = Models::NpmPackage.new(name: "@shopify/argo-run", version: "0.4.0")
-      ARGO_ADMIN_CLI_0_9_0 = Models::NpmPackage.new(name: "@shopify/argo-admin-cli", version: "0.9.0")
-      ARGO_ADMIN_CLI_0_9_3 = Models::NpmPackage.new(name: "@shopify/argo-admin-cli", version: "0.9.3")
-      ARGO_ADMIN_CLI_0_11_0 = Models::NpmPackage.new(name: "@shopify/argo-admin-cli", version: "0.11.0")
+      UI_EXTENSIONS_CHECKOUT_RUN = "@shopify/checkout-ui-extensions-run"
+      UI_EXTENSIONS_ADMIN_RUN = "@shopify/admin-ui-extensions-run"
+
+      ADMIN_RUN_FLAGS = [
+        :api_key,
+        :name,
+        :port,
+        :public_url,
+        :renderer_version,
+        :shop,
+        :uuid,
+      ]
+
+      CHECKOUT_RUN_FLAGS = [
+        :port,
+        :public_url,
+      ]
 
       property! :renderer, accepts: Models::NpmPackage
       property! :cli, accepts: Models::NpmPackage
 
-      def accepts_port?
-        case cli
-        when admin?
-          cli >= ARGO_ADMIN_CLI_0_11_0
-        when checkout?
-          cli >= ARGO_RUN_0_4_0
-        end
-      end
-
-      def accepts_tunnel_url?
+      def supports?(flag)
         case cli
         when admin?
-          cli >= ARGO_ADMIN_CLI_0_11_0
+          ADMIN_RUN_FLAGS.include?(flag.to_sym)
         when checkout?
-          cli >= ARGO_RUN_0_4_0
-        end
-      end
-
-      def accepts_uuid?
-        case cli
-        when admin?
-          cli >= ARGO_ADMIN_CLI_0_11_0
-        else
-          false
-        end
-      end
-
-      def accepts_argo_version?
-        case cli
-        when admin?
-          cli >= ARGO_ADMIN_CLI_0_9_3
-        else
-          false
-        end
-      end
-
-      def accepts_shop?
-        case cli
-        when admin?
-          cli >= ARGO_ADMIN_CLI_0_11_0
-        else
-          false
-        end
-      end
-
-      def accepts_api_key?
-        case cli
-        when admin?
-          cli >= ARGO_ADMIN_CLI_0_11_0
-        else
-          false
-        end
-      end
-
-      def accepts_name?
-        case cli
-        when admin?
-          cli >= ARGO_ADMIN_CLI_0_9_0
-        else
-          false
+          CHECKOUT_RUN_FLAGS.include?(flag.to_sym)
         end
       end
 
       private
 
       def admin?
-        ->(cli) { cli.name == ARGO_ADMIN_CLI_PACKAGE_NAME }
+        ->(cli) { cli.name == UI_EXTENSIONS_ADMIN_RUN }
       end
 
       def checkout?
-        ->(cli) { cli.name == ARGO_RUN_PACKAGE_NAME }
+        ->(cli) { cli.name == UI_EXTENSIONS_CHECKOUT_RUN }
       end
     end
   end

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

@@ -3,25 +3,29 @@ module Extension
     class ArgoServe
       include SmartProperties
 
+      YARN_SERVE_COMMAND = %w(server)
+      NPM_SERVE_COMMAND = %w(run-script server)
+
       property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
       property! :argo_runtime, accepts: Features::ArgoRuntime
       property! :context, accepts: ShopifyCli::Context
       property! :port, accepts: Integer, default: 39351
-      property  :tunnel_url, accepts: String, default: ""
+      property  :tunnel_url, accepts: String, default: nil
+      property! :js_system, accepts: ->(jss) { jss.respond_to?(:call) }, default: ShopifyCli::JsSystem
 
       def call
         validate_env!
 
         CLI::UI::Frame.open(context.message("serve.frame_title")) do
-          success = call_js_system(yarn_command: yarn_serve_command, npm_command: npm_serve_command)
-          context.abort(context.message("serve.serve_failure_message")) unless success
+          next if start_server
+          context.abort(context.message("serve.serve_failure_message"))
         end
       end
 
       private
 
-      def call_js_system(yarn_command:, npm_command:)
-        ShopifyCli::JsSystem.call(context, yarn: yarn_command, npm: npm_command)
+      def start_server
+        js_system.call(context, yarn: yarn_serve_command, npm: npm_serve_command)
       end
 
       def specification
@@ -36,23 +40,12 @@ module Extension
         specification.features.argo.required_fields
       end
 
-      def serve_options
-        @options ||= Features::ArgoServeOptions.new(
-          argo_runtime: argo_runtime,
-          port: port,
-          context: context,
-          required_fields: required_fields,
-          renderer_package: renderer_package,
-          public_url: tunnel_url
-        )
-      end
-
       def yarn_serve_command
-        serve_options.yarn_serve_command
+        YARN_SERVE_COMMAND + options
       end
 
       def npm_serve_command
-        serve_options.npm_serve_command
+        NPM_SERVE_COMMAND  + ["--"] + options
       end
 
       def validate_env!
@@ -72,6 +65,20 @@ module Extension
 
         context.abort(context.message("serve.serve_missing_information"))
       end
+
+      def options
+        project = ExtensionProject.current
+
+        @serve_options ||= [].tap do |options|
+          options << "--port=#{port}" if argo_runtime.supports?(:port)
+          options << "--store=#{project.env.shop}" if argo_runtime.supports?(:shop)
+          options << "--apiKey=#{project.env.api_key}" if argo_runtime.supports?(:api_key)
+          options << "--rendererVersion=#{renderer_package.version}" if argo_runtime.supports?(:renderer_version)
+          options << "--uuid=#{project.registration_uuid}" if argo_runtime.supports?(:uuid)
+          options << "--publicUrl=#{tunnel_url}" if !tunnel_url.nil? && argo_runtime.supports?(:public_url)
+          options << "--name=#{project.title}" if argo_runtime.supports?(:name)
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Extension
+  module Forms
+    class Connect < ShopifyCli::Form
+      attr_reader :registration, :app
+
+      flag_arguments :type
+
+      class ExtensionProjectDetails
+        include SmartProperties
+
+        property :registration, accepts: Models::Registration
+        property :app, accepts: Models::App
+
+        def complete?
+          !!(registration && app)
+        end
+      end
+
+      def ask
+        ShopifyCli::Result.wrap(ExtensionProjectDetails.new)
+          .then(&Questions::AskRegistration.new(ctx: ctx, type: type))
+          .unwrap { |e| raise e }
+          .tap do |project_details|
+            ctx.abort(ctx.message("connect.incomplete_configuration")) unless project_details.complete?
+
+            self.registration = project_details.registration
+            self.app = project_details.app
+          end
+      end
+
+      def directory_name
+        name.strip.gsub(/( )/, "_").downcase
+      end
+
+      private
+
+      attr_writer :registration, :app
+    end
+  end
+end

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

@@ -11,17 +11,25 @@ module Extension
           default: -> { CLI::UI::Prompt.method(:ask) }
 
         def call(project_details)
-          project_details.name = ask_with_reprompt(
-            initial_value: name,
-            break_condition: -> (current_name) { Models::Registration.valid_title?(current_name) },
-            prompt_message: ctx.message("create.ask_name"),
-            reprompt_message: ctx.message("create.invalid_name", Models::Registration::MAX_TITLE_LENGTH)
-          )
+          if theme_app_extension?(project_details)
+            project_details.name = name || "theme-app-extension"
+          else
+            project_details.name = ask_with_reprompt(
+              initial_value: name,
+              break_condition: -> (current_name) { Models::Registration.valid_title?(current_name) },
+              prompt_message: ctx.message("create.ask_name"),
+              reprompt_message: ctx.message("create.invalid_name", Models::Registration::MAX_TITLE_LENGTH)
+            )
+          end
           project_details
         end
 
         private
 
+        def theme_app_extension?(project_details)
+          project_details&.type&.identifier == "THEME_APP_EXTENSION"
+        end
+
         def ask_with_reprompt(initial_value:, break_condition:, prompt_message:, reprompt_message:)
           value = initial_value
           reprompt = false

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Extension
+  module Forms
+    module Questions
+      class AskRegistration
+        include ShopifyCli::MethodObject
+
+        property! :ctx
+        property! :type
+        property! :prompt,
+          converts: :to_proc,
+          default: -> { CLI::UI::Prompt.method(:ask) }
+
+        def call(project_details)
+          project_details.tap(&method(:prompt_for_registration))
+        end
+
+        private
+
+        def prompt_for_registration(project_details)
+          apps_and_registrations = load_registrations(type)
+          app, registration = choose_interactively(apps_and_registrations)
+          project_details.app = app
+          project_details.registration = registration
+        end
+
+        def choose_interactively(apps_and_registrations)
+          prompt.call(ctx.message("connect.ask_registration")) do |handler|
+            apps_and_registrations.each do |(app, extension)|
+              handler.option("#{app.title} by #{app.business_name}: #{extension.title}") { [app, extension] }
+            end
+          end
+        end
+
+        def load_registrations(type)
+          ctx.puts(@ctx.message("connect.loading_extensions"))
+          registrations = Tasks::GetExtensions.call(context: ctx, type: type)
+
+          registrations.empty? ? abort_no_registrations : registrations
+        end
+
+        def abort_no_registrations
+          ctx.puts(@ctx.message("connect.no_extensions", type))
+          ctx.puts(@ctx.message("connect.learn_about_extensions"))
+          raise ShopifyCli::AbortSilent
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,21 @@ require "shopify_cli"
 module Extension
   module Messages
     MESSAGES = {
+      extension: {
+        help: <<~HELP,
+          Suite of commands for developing app extensions. See {{command:%1$s extension <command> --help}} for usage of each command.
+            Usage: {{command:%1$s extension [ %2$s ]}}
+        HELP
+      },
       create: {
+        help: <<~HELP,
+          Create a new app extension.
+            Usage: {{command:%s extension create <name>}}
+            Options:
+              {{command:--type=TYPE}} The type of extension you would like to create.
+              {{command:--name=NAME}} The name of your extension (50 characters).
+              {{command:--api-key=KEY}} The API key of your app.
+        HELP
         ask_name: "Extension name",
         invalid_name: "Extension name must be under %s characters",
         ask_type: "What type of extension are you creating?",
@@ -13,13 +27,13 @@ module Extension
         ready_to_start: <<~MESSAGE,
           {{v}} A new folder was generated at {{green:./%s}}.
           {{*}} You’re ready to start building {{green:%s}}!
-          Navigate to the new folder, then run {{command:shopify serve}} to start a local server.
+          Navigate to the new folder, then run {{command:shopify extension serve}} to start a local server.
         MESSAGE
         learn_more: <<~MESSAGE,
           {{*}} Once you're ready to version and publish your extension,
-          run {{command:shopify register}} to register this extension with one of your apps.
+          run {{command:shopify extension register}} to register this extension with one of your apps.
         MESSAGE
-        try_again: "{{*}} Fix the errors and run {{command:shopify create extension}} again.",
+        try_again: "{{*}} Fix the errors and run {{command:shopify extension create}} again.",
         errors: {
           directory_exists: "Directory ‘%s’ already exists. Please remove it or choose a new name for your project.",
         },
@@ -28,34 +42,69 @@ module Extension
         ask_app: "Which app would you like to register this extension with?",
         no_apps: "{{x}} You don’t have any apps.",
         learn_about_apps: "{{*}} Learn more about building apps at <https://shopify.dev/concepts/apps>, " \
-          "or try creating a new app using {{command:shopify create}}.",
-        loading_apps: "Loading your apps...",
+          "or try creating a new app using {{command:shopify [node|rails] create}}.",
+        loading_apps: "Loading your apps…",
         no_available_extensions: "{{x}} There are no available extensions for this app.",
       },
+      connect: {
+        connected: "Project now connected to {{green:%s: %s}}",
+        incomplete_configuration: "Cannot connect extension due to missing configuration information",
+        invalid_api_key: "The API key %s does not match any of your apps.",
+        ask_registration: "Which extension would you like to connect to?",
+        loading_extensions: "Loading your extensions…",
+        no_extensions: "{{x}} You don't have any extensions of type %s",
+        learn_about_extensions: "{{*}} Learn more about building extensions at <https://shopify.dev/concepts/apps>, " \
+          "or try creating a new extension using {{command:shopify extension create}}.",
+        help: <<~HELP,
+          {{command:%s extension connect}}: Connects an existing extension to Shopify CLI. Creates a config file.
+            Usage: {{command:%s extension connect}}
+        HELP
+      },
       build: {
-        frame_title: "Building extension with: %s...",
+        help: <<~HELP,
+          Build your extension to prepare for deployment.
+            Usage: {{command:%s extension build}}
+        HELP
+        frame_title: "Building extension with: %s…",
         build_failure_message: "Failed to build extension code.",
       },
       register: {
+        help: <<~HELP,
+          Register your local extension to a Shopify app
+              Usage: {{command:%s extension register}}
+              Options:
+                {{command:--api-key=API_KEY}} The API key used to register an app with the extension. This can be found on the app page on Partners Dashboard.
+        HELP
         frame_title: "Registering Extension",
-        waiting_text: "Registering with Shopify...",
+        waiting_text: "Registering with Shopify…",
         already_registered: "Extension is already registered.",
         confirm_info: "This will create a new extension registration for %s, which can’t be undone.",
         confirm_question: "Would you like to register this extension? (y/n)",
         confirm_abort: "Extension was not registered.",
         success: "{{v}} Registered {{green:%s}}.",
-        success_info: "{{*}} Run {{command:shopify push}} to push your extension to Shopify.",
+        success_info: "{{*}} Run {{command:shopify extension push}} to push your extension to Shopify.",
       },
       push: {
+        help: <<~HELP,
+          Push the current extension to Shopify.
+            Usage: {{command:%s extension push}}
+        HELP
         frame_title: "Pushing your extension to Shopify",
-        waiting_text: "Pushing code to Shopify...",
+        waiting_text: "Pushing code to Shopify…",
         pushed_with_errors: "{{x}} Code pushed to Shopify with errors on %s.",
-        push_with_errors_info: "{{*}} Fix these errors and run {{command:shopify push}} to revalidate your extension.",
+        push_with_errors_info: "{{*}} Fix these errors and run {{command:shopify extension push}} to " \
+          "revalidate your extension.",
         success_confirmation: "{{v}} Pushed {{green:%s}} to a draft on %s.",
         success_info: "{{*}} Visit %s to version and publish your extension.",
       },
       serve: {
-        frame_title: "Serving extension...",
+        help: <<~HELP,
+          Serve your extension in a local simulator for development.
+            Usage: {{command:%s extension serve}}
+            Options:
+            {{command:--tunnel=TUNNEL}} Establish an ngrok tunnel (default: false)
+        HELP
+        frame_title: "Serving extension…",
         no_available_ports_found: "No available ports found to run extension.",
         serve_failure_message: "Failed to run extension code.",
         serve_missing_information: "Missing shop or api_key.",
@@ -69,27 +118,31 @@ module Extension
         tunnel_running_at: "Tunnel running at: {{underline:%s}}",
         help: <<~HELP,
           Start or stop an http tunnel to your local development extension using ngrok.
-            Usage: {{command:%s tunnel [ auth | start | stop | status ]}}
+            Usage: {{command:%s extension tunnel [ auth | start | stop | status ]}}
         HELP
         extended_help: <<~HELP,
           {{bold:Subcommands:}}
 
             {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account.
             Visit https://dashboard.ngrok.com/signup to sign up.
-              Usage: {{command:%1$s tunnel auth <token>}}
+              Usage: {{command:%1$s extension tunnel auth <token>}}
 
             {{cyan:start}}: Starts an ngrok tunnel, will print the URL for an existing tunnel if already running.
-              Usage: {{command:%1$s tunnel start}}
+              Usage: {{command:%1$s extension tunnel start}}
               Options:
               {{command:--port=PORT}} Forward the ngrok subdomain to local port PORT. Defaults to %2$s.
 
             {{cyan:stop}}: Stops the ngrok tunnel.
-              Usage: {{command:%1$s tunnel stop}}
+              Usage: {{command:%1$s extension tunnel stop}}
 
             {{cyan:status}}: Output the current status of the ngrok tunnel.
-              Usage: {{command:%1$s tunnel status}}
+              Usage: {{command:%1$s extension tunnel status}}
         HELP
       },
+      check: {
+        help: "Check your extension for errors, suggestions, and best practices.",
+        unsupported: "{{red:%s projects are not supported for `extension check`}}",
+      },
       features: {
         argo: {
           missing_file_error: "Could not find built extension file.",
@@ -134,6 +187,21 @@ module Extension
       checkout_post_purchase: {
         name: "Checkout Post Purchase",
       },
+      theme_app_extension: {
+        name: "Theme App Extension",
+        tagline: "(limit 1 per app)",
+        overrides: {
+          register: {
+            confirm_info: "You can only create one %s extension per app, which can’t be undone.",
+          },
+          create: {
+            ready_to_start: <<~MESSAGE,
+              {{v}} A new folder was generated at {{green:./%s}}.
+              {{*}} You’re ready to start building {{green:%s}}!
+            MESSAGE
+          },
+        },
+      },
     }
   end
 end