shopify-cli 2.18.1 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bad168cdd878e04ba4bc934a9caa6bfd19ffba653564734395d0e53a20957a81
-  data.tar.gz: 2f45edbce9f20fe63472a26221a71ef4733ad6e9f951abe86f3b213a869b0cc4
+  metadata.gz: 2bab2227e665dd4dec8e90ca261705072971a838f85d19bcbb85d18ed1a1d5b0
+  data.tar.gz: 90e22472586a681a26974882b79ac3fd326fdcf696db2aa29201ab5d9a37c2b0
 SHA512:
-  metadata.gz: 14ced1d055b8aa918d0168aa0b91ba8e8a3093a99838868a630866b34af28f4547e55cf208dc6051ee4ef20426b5202badaa5b7ab2ac5c536a9e39030a4d1744
-  data.tar.gz: 37d84adeb8489f6596f2ed9bf1481ecc9060697a88fb10fcd5b59e8c20bf3e021c0502019c43b38fb0ec1e424b06ecd4f377ebb20a5517272a9e46cce2fcc1ff
+  metadata.gz: 24701865a98be1b3062ff7644fff3d35b61532803e96c39d84c7fae636b8205531e57e41641d1222dbd09275288e4dee2f2f94c837d58846212a0f4ed1643b28
+  data.tar.gz: 6e5c53ef75f07879d338692ce9271749002c13f8174a19fe3857b3396ec1512a2368770ec50bd24de2a0c9dc325dddb5b3547564c79cc360a40d1b19b35d2c50

data/.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -13,8 +13,9 @@ body:
     id: preflight_checks
     attributes:
       label: |-
-        Please confirm that you have:
+        Please confirm that you:
       options:
+        - label: Are working with Shopify CLI 2.0, not 3.0. (You can [open a 3.0 issue here](https://github.com/Shopify/cli/issues/new/choose).)
         - label: Searched [existing issues](https://github.com/Shopify/shopify-cli/issues) to see if your issue is a duplicate. (If you’ve found a duplicate issue, feel free to add additional information in a comment on it.)
           required: true
         - label: Reproduced the issue in [the latest CLI version](https://github.com/Shopify/shopify-cli/releases).

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,9 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Shopify Partners Community 🙌
+    url: https://www.shopify.com/partners/community#conversation
+    about: Connect with Shopify and other Shopify Partners through our online communities!
+  - name: Shopify CLI 3.0 issues 📝
+    url: https://www.github.com/Shopify/cli/issues/new/choose
+    about: |-
+      You're about to open an issue about Shopify CLI 2.0. Are you actually using our new CLI? If so, please create an issue there instead.

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/CHANGELOG.md

@@ -2,6 +2,26 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.20.1 - 2022-07-18
+
+### Fixed
+* [#2458](https://github.com/Shopify/shopify-cli/pull/2458): Fix shop URL in unauthorized error message
+* [#2459](https://github.com/Shopify/shopify-cli/pull/2459): Fix `.json` file ignore issues with `shopify theme push`
+* [#2460](https://github.com/Shopify/shopify-cli/pull/2460): Fix job retries for .json theme file dependencies and support wider range of asset API errors
+
+## Version 2.20.0 - 2022-07-11
+
+### Added
+* [#2368](https://github.com/Shopify/shopify-cli/pull/2368): Add performance enhancements to the `theme serve` and `theme push` commands
+* [#2437](https://github.com/Shopify/shopify-cli/pull/2437): Add support to the `warnings` field in the assets API
+* [#2446](https://github.com/Shopify/shopify-cli/pull/2446): Show a friendly message when developers use a browser without SSE support
+
+### Fixed
+* [#2418](https://github.com/Shopify/shopify-cli/pull/2418): Improve the help message of the `theme open -e/--editor` flag
+
+### Changed
+* [#2444](https://github.com/Shopify/shopify-cli/pull/2444): Expose the `-s` option in the help text of `login`, `switch` etc.
+
 ## Version 2.18.0 - 2022-05-30
 
 ### Added
@@ -12,6 +32,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 ### Fixed
 * [#2352](https://github.com/Shopify/shopify-cli/pull/2352): Provide better DX when dealing with empty theme selection
 * [#2347](https://github.com/Shopify/shopify-cli/pull/2347): Fix #2346 Heroku CLI installation for Apple silicon
+* [#2422](https://github.com/Shopify/shopify-cli/pull/2422): Add Shopify branding and styling to post-authentication browser page
 
 ## Version 2.17.0 - 2022-05-12
 
@@ -42,7 +63,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ### 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. 
+* [#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
@@ -50,7 +71,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 ## 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,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.18.1)
+    shopify-cli (2.20.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.10.1)
+      theme-check (~> 1.10.3)
 
 GEM
   remote: https://rubygems.org/
@@ -108,7 +108,7 @@ GEM
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.21.0)
-    parser (3.1.1.0)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -150,7 +150,7 @@ GEM
       faraday (> 0.8, < 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.10.2)
+    theme-check (1.10.3)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)

data/README.md

@@ -1,6 +1,5 @@
-<div align="center">
-  <img src="assets/logo.png" width="150"/>
-  <h1>Shopify CLI</h1>
+# Shopify CLI 2.0
+  
   <a href=""><img src="https://github.com/shopify/shopify-cli/workflows/CI/badge.svg" alt="Shopify"></a>
   <img src="https://img.shields.io/github/v/release/shopify/shopify-cli?include_prereleases&style=flat-square" alt="Latest Version">
   <img src="https://img.shields.io/github/forks/shopify/shopify-cli?style=flat-square" alt="GitHub forks">
@@ -11,12 +10,14 @@
   <a href="http://twitter.com/ShopifyDevs"><img src="https://img.shields.io/twitter/follow/ShopifyDevs?style=flat-square" alt="Twitter Followers"></a>
   <img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License">
   <img src="https://img.shields.io/badge/Powered%20by-Ruby-red" alt="Powered by Ruby">
-</div>
 
 
-Shopify CLI helps you build Shopify themes and apps. Use Shopify CLI to automate and enhance your local development workflow.
+Shopify CLI 2.0 is a command line to help you build on Shopify. It's available as a Ruby gem and can be run and installed on Mac, Linux, and Windows systems.
+
+## Note on Shopify CLI 2.0 versus Shopify CLI 3.0 ##
+
+Use 2.0 for developing themes. For developing apps and custom storefronts, we recommend using [Shopify CLI 3.0](https://github.com/Shopify/cli).
 
-Shopify CLI is available as a gem and can be run and installed on Mac, Linux and Windows systems.
 
 ## Installation 
 

data/dev.yml

@@ -13,7 +13,6 @@ up:
       - rpm:
           version: 4.17.0
   - bundler
-  - docker
 
 test:
   desc: "Run tests."

data/docs/users/installation.md

@@ -1,3 +1,3 @@
 # Installation
 
-The installation guide can be found here: https://shopify.dev/apps/tools/cli/installation
+The installation guide can be found here: https://shopify.dev/apps/tools/cli/cli-2#installing-shopify-cli-2-x

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

@@ -183,7 +183,7 @@ module Extension
       },
       errors: {
         unknown_type: "Unknown extension type %s. Valid extension types include: CHECKOUT_POST_PURCHASE, " \
-        "CHECKOUT_UI_EXTENSION, THEME_APP_EXTENSION, and PRODUCT_SUBSCRIPTION.",
+        "THEME_APP_EXTENSION, and PRODUCT_SUBSCRIPTION.",
         package_not_found: "`%s` package not found.",
         missing_push_options_ci: "The following are missing: %s. ",
         missing_push_options_ci_solution: "To add them to a CI environment:\n\t1. Run a connect command " \

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

@@ -15,7 +15,7 @@ module Extension
 
       class << self
         def supported?(type)
-          if type_supported?(type) && type_enabled?(type)
+          if type_supported?(type) && beta_enabled?
             return true if binary_installed?
             warn_about_missing_binary
           end
@@ -31,11 +31,6 @@ 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?

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

@@ -11,7 +11,10 @@ module Extension
           .query(context, "fetch_specifications", api_key: api_key)
           .dig("data", "extensionSpecifications")
         context.abort(context.message("tasks.errors.parse_error")) if response.nil?
-        response
+
+        response.reject do |line|
+          ::Extension::Features::Runtimes::CheckoutUiExtension::IDENTIFIERS.include?(line["identifier"].upcase)
+        end
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Script
         project = Layers::Application::CreateScript.call(
           ctx: @ctx,
           language: options.flags[:language]&.downcase || "wasm",
-          sparse_checkout_branch: options.flags[:branch] || "master",
+          sparse_checkout_branch: options.flags[:branch] || "main",
           title: form.title,
           extension_point_type: form.extension_point,
         )

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

@@ -4,57 +4,57 @@ payment_methods:
     typescript:
       beta: true
       package: "@shopify/scripts-checkout-apis"
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     rust:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
 payment_customization:
   beta: true
   domain: 'checkout'
   libraries:
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     rust:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
 shipping_methods:
   domain: 'checkout'
   libraries:
     typescript:
       beta: true
       package: "@shopify/scripts-checkout-apis"
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     rust:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
 product_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     rust:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
 order_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     rust:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
 shipping_discounts:
   beta: true
   domain: 'discounts'
   libraries:
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
     rust:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"
 shipping_rates_consolidation:
   beta: true
   domain: 'checkout'
   libraries:
     wasm:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
+      repo: "https://github.com/Shopify/function-examples"

data/lib/project_types/script/forms/ask_app.rb

@@ -7,11 +7,6 @@ module Script
 
       def ask
         apps = @xargs.fetch(:apps)
-
-        unless @xargs[:acting_as_shopify_organization]
-          apps = apps.select { |app| app["appType"] == "custom" }
-        end
-
         raise Errors::NoExistingAppsError if apps.empty?
 
         @app =

data/lib/project_types/script/layers/domain/metadata.rb

@@ -4,12 +4,11 @@ module Script
   module Layers
     module Domain
       class Metadata
-        attr_reader :schema_major_version, :schema_minor_version, :use_msgpack
+        attr_reader :schema_major_version, :schema_minor_version
 
-        def initialize(schema_major_version, schema_minor_version, use_msgpack)
+        def initialize(schema_major_version, schema_minor_version)
           @schema_major_version = schema_major_version
           @schema_minor_version = schema_minor_version
-          @use_msgpack = use_msgpack
         end
 
         class << self
@@ -17,7 +16,6 @@ module Script
             err_tag = nil
             metadata_hash = JSON.parse(metadata_json)
 
-            use_msgpack = !!metadata_hash.dig("flags", "use_msgpack")
             schema_versions = metadata_hash["schemaVersions"] || {}
 
             version = schema_versions.values.first || {}
@@ -35,7 +33,7 @@ module Script
               err_tag = "script.error.metadata_schema_versions_missing_minor"
             end
 
-            Metadata.new(schema_major_version, schema_minor_version, use_msgpack)
+            Metadata.new(schema_major_version, schema_minor_version)
           rescue JSON::ParserError
             err_tag = "script.error.metadata_validation_cause"
           ensure

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

@@ -90,7 +90,7 @@ module Script
             )
           elsif (errors = user_errors.filter { |err| err["tag"] == "input_query_validation_error" }).any?
             raise Errors::InvalidInputQueryErrors, errors.map { |err| err["message"] }
-          elsif user_errors.find { |err| %w(not_use_msgpack_error schema_version_argument_error).include?(err["tag"]) }
+          elsif user_errors.find { |err| %w(schema_version_argument_error).include?(err["tag"]) }
             raise Domain::Errors::MetadataValidationError
           elsif user_errors.find { |err| err["tag"] == "invalid_app_bridge_create_path" }
             raise Errors::InvalidAppBridgePathError, "create"

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

@@ -28,6 +28,7 @@ module Theme
         parser.on("-j", "--json") { flags[:json] = true }
         parser.on("-a", "--allow-live") { flags[:allow_live] = true }
         parser.on("-p", "--publish") { flags[:publish] = true }
+        parser.on("-s", "--stable") { flags[:stable] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
           flags[:includes] |= pattern
@@ -56,7 +57,8 @@ module Theme
 
         syncer = ShopifyCLI::Theme::Syncer.new(@ctx, theme: theme,
           include_filter: include_filter,
-          ignore_filter: ignore_filter)
+          ignore_filter: ignore_filter,
+          stable: options.flags[:stable])
         begin
           syncer.start_threads
           if options.flags[:json]

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

@@ -17,6 +17,7 @@ module Theme
         parser.on("--poll") { flags[:poll] = true }
         parser.on("--live-reload=MODE") { |mode| flags[:mode] = as_reload_mode(mode) }
         parser.on("--theme-editor-sync") { flags[:editor_sync] = true }
+        parser.on("--stable") { flags[:stable] = true }
         parser.on("-t", "--theme=NAME_OR_ID") { |theme| flags[:theme] = theme }
       end
 

data/lib/project_types/theme/messages/messages.rb

@@ -11,11 +11,13 @@ module Theme
         unauthorized_error: <<~EOD,
           You can't use Shopify CLI with development stores if you only have Partner staff member access. If you want to use Shopify CLI to work on a development store, then you should be the store owner or create a staff account on the store.
 
-          If you're the store owner, then you need to log in to the store directly using the store URL at least once (for example, using %s.myshopify.com/admin) before you log in using Shopify CLI. Logging in to the Shopify admin directly connects the development store with your Shopify login.
+          If you're the store owner, then you need to log in to the store directly using the store URL at least once (for example, using %s/admin) before you log in using Shopify CLI. Logging in to the Shopify admin directly connects the development store with your Shopify login.
         EOD
         ensure_user_try_this: <<~ENSURE_USER,
           Check if your user is activated, has permission to edit themes at the store, and try to re-login.
         ENSURE_USER
+        stable_flag_suggestion: "If the current command isn't working as expected," \
+          " we suggest re-running the command with the {{command: --stable}} flag",
         init: {
           help: <<~HELP,
             {{command:%s theme init}}: Clones a Git repository to use as a starting point for building a new theme.
@@ -179,6 +181,41 @@ module Theme
                 exit: "Exit",
               },
             },
+            warnings: {
+              unsupported_script: "unsupported script",
+              unsupported_script_text: <<~UNSUPPORTED_SCRIPT,
+
+                {{underline:Unsupported external checkout script}}
+
+                You have a code snippet on your storefront that violates
+                Shopify's Terms of Service. This script removes Shopify's
+                ability to protect your store against fraudulent orders,
+                could steal customer data and may cause customers to be
+                charged the wrong amount.
+
+                %s
+                By proceeding, you're acknowledging that you understand the
+                risks and will not hold Shopify liable for any problems that
+                occur due to the use of an external checkout, including:
+
+                - Discounts
+                - Shipping rules
+                - Multi-currency rules
+                - Variant selection
+                - Orders and fulfillment workflows
+                - Shopify Fraud Protection
+                - Payment settings
+                - Cart
+
+                You also acknowledge that you will not be able to reliably
+                get support for those features from Shopify because you are
+                violating Shopify's terms of service and that your account
+                may become suspended as a result.
+              UNSUPPORTED_SCRIPT
+              line_and_column: <<~LINE_AND_COLUMN,
+                - Line: %s Column: %s
+              LINE_AND_COLUMN
+            },
           },
           error: {
             address_binding_error: "Couldn't bind to localhost."\
@@ -309,7 +346,7 @@ module Theme
               {{command:-t, --theme=NAME_OR_ID}} Theme ID or name of your theme.
               {{command:-l, --live}}             Open your live theme.
               {{command:-d, --development}}      Open your development theme.
-              {{command:-e, --editor}}           Open the editor to the specified/selected theme.
+              {{command:-e, --editor}}           Open the theme editor for the specified theme in the browser.
           HELP
         },
         list: {

data/lib/shopify_cli/assets/post_auth_page/index.html.erb

@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Shopify CLI</title>
+    <style><%= locals[:css] %></style>
+    <link rel="icon" href="data:image/svg+xml;charset=UTF-8,%3c?xml version='1.0' encoding='utf-8'?%3e%3c!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --%3e%3csvg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 109.5 124.5' style='enable-background:new 0 0 109.5 124.5;' xml:space='preserve'%3e%3cstyle type='text/css'%3e .st0%7bfill:%2395BF47;%7d .st1%7bfill:%235E8E3E;%7d .st2%7bfill:%23FFFFFF;%7d %3c/style%3e%3cg%3e%3cpath class='st0' d='M95.9,23.9c-0.1-0.6-0.6-1-1.1-1c-0.5,0-9.3-0.2-9.3-0.2s-7.4-7.2-8.1-7.9c-0.7-0.7-2.2-0.5-2.7-0.3 c0,0-1.4,0.4-3.7,1.1c-0.4-1.3-1-2.8-1.8-4.4c-2.6-5-6.5-7.7-11.1-7.7c0,0,0,0,0,0c-0.3,0-0.6,0-1,0.1c-0.1-0.2-0.3-0.3-0.4-0.5 c-2-2.2-4.6-3.2-7.7-3.1c-6,0.2-12,4.5-16.8,12.2c-3.4,5.4-6,12.2-6.8,17.5c-6.9,2.1-11.7,3.6-11.8,3.7c-3.5,1.1-3.6,1.2-4,4.5 c-0.3,2.5-9.5,73-9.5,73l76.4,13.2l33.1-8.2C109.5,115.8,96,24.5,95.9,23.9z M67.2,16.8c-1.8,0.5-3.8,1.2-5.9,1.8 c0-3-0.4-7.3-1.8-10.9C64,8.6,66.2,13.7,67.2,16.8z M57.2,19.9c-4,1.2-8.4,2.6-12.8,3.9c1.2-4.7,3.6-9.4,6.4-12.5 c1.1-1.1,2.6-2.4,4.3-3.2C56.9,11.6,57.3,16.5,57.2,19.9z M49.1,4c1.4,0,2.6,0.3,3.6,0.9C51.1,5.8,49.5,7,48,8.6 c-3.8,4.1-6.7,10.5-7.9,16.6c-3.6,1.1-7.2,2.2-10.5,3.2C31.7,18.8,39.8,4.3,49.1,4z'/%3e%3cg%3e%3cpath class='st1' d='M94.8,22.9c-0.5,0-9.3-0.2-9.3-0.2s-7.4-7.2-8.1-7.9c-0.3-0.3-0.6-0.4-1-0.5l0,109.7l33.1-8.2 c0,0-13.5-91.3-13.6-92C95.8,23.3,95.3,22.9,94.8,22.9z'/%3e%3cpath class='st2' d='M58,39.9l-3.8,14.4c0,0-4.3-2-9.4-1.6c-7.5,0.5-7.5,5.2-7.5,6.4c0.4,6.4,17.3,7.8,18.3,22.9 c0.7,11.9-6.3,20-16.4,20.6c-12.2,0.8-18.9-6.4-18.9-6.4l2.6-11c0,0,6.7,5.1,12.1,4.7c3.5-0.2,4.8-3.1,4.7-5.1 c-0.5-8.4-14.3-7.9-15.2-21.7c-0.7-11.6,6.9-23.4,23.7-24.4C54.7,38.2,58,39.9,58,39.9z'/%3e%3c/g%3e%3c/g%3e%3c/svg%3e" sizes="any" type="image/svg+xml">
+  </head>
+
+  <% if successful %>
+    <body class="body-success">
+      <div class="app-success">
+        <div class="container">
+          <h1><%= locals[:message] %></h1>
+          <p>You can close this tab and return to your terminal.</p>
+        </div>
+      </div>
+    </body>
+  <% else %>
+    <body class="body-error">
+      <div class="app-error">
+        <div class="container">
+          <h1>Something went wrong!</h1>
+          <p><%= locals[:message] %></p>
+          <br>
+          <br>
+          <p>Return to your terminal and try running the previous command again.</p>
+        </div>
+      </div>
+    </body>
+  <% end %>
+</html>

data/lib/shopify_cli/assets/post_auth_page/style.css

@@ -0,0 +1,58 @@
+html {
+  font-family: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif;
+  text-size-adjust: 100%;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+body {
+  font-size: 26px;
+  line-height: normal;
+  margin: 0;
+  padding: 0;
+}
+
+button, input, optgroup, select, textarea {
+  font-family: inherit;
+}
+
+h1 {
+  font-weight: 600;
+  font-size: 1em;
+}
+
+p {
+  font-weight: 400;
+}
+
+.body-success {
+  color: #F6F6F7;
+}
+
+.body-error {
+  color: #202223;
+}
+
+.app-success {
+  width: 100vw;
+  height: 100vh;
+  background-color: #054A49;
+  display: flex;
+}
+
+.app-error {
+  width: 100vw;
+  height: 100vh;
+  background-color: #F6F6F7;
+  display: flex;
+}
+
+.container {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  padding-left: 7.5em;
+}

data/lib/shopify_cli/identity_auth/servlet.rb

@@ -1,20 +1,8 @@
 module ShopifyCLI
   class IdentityAuth
     class Servlet < WEBrick::HTTPServlet::AbstractServlet
-      TEMPLATE = %{<!DOCTYPE html>
-        <html>
-        <head>
-          <title>%{title}</title>
-        </head>
-        <body>
-          <h1 style="color: #%{color};">%{message}</h1>
-          %{autoclose}
-        </body>
-        </html>
-      }
-      AUTOCLOSE_TEMPLATE = %{
-        <script>window.close();</script>
-      }
+      ERB_FILENAME = File.join(ROOT, "lib/shopify_cli/assets/post_auth_page/index.html.erb")
+      CSS_FILENAME = File.join(ROOT, "lib/shopify_cli/assets/post_auth_page/style.css")
 
       def initialize(server, identity_auth, token)
         super
@@ -46,14 +34,10 @@ module ShopifyCLI
         locals = {
           status: status,
           message: message,
-          color: successful ? "black" : "red",
-          title: Context.message(
-            successful ? "core.identity_auth.servlet.authenticated" : "core.identity_auth.servlet.not_authenticated"
-          ),
-          autoclose: successful ? AUTOCLOSE_TEMPLATE : "",
+          css: File.read(CSS_FILENAME),
         }
         response.status = status
-        response.body = format(TEMPLATE, locals)
+        response.body = ERB.new(File.read(ERB_FILENAME)).result(binding)
       end
     end
   end

data/lib/shopify_cli/messages/messages.rb

@@ -449,7 +449,7 @@ module ShopifyCLI
         login: {
           help: <<~HELP,
             Log in to the Shopify CLI by authenticating with a store or partner organization
-              Usage: {{command:%s login [--store STORE]}}
+              Usage: {{command:%s login [--store/-s STORE]}}
           HELP
           invalid_shop: <<~MESSAGE,
             Invalid store provided (%s). Please provide the store in the following format: my-store.myshopify.com
@@ -476,7 +476,7 @@ module ShopifyCLI
         switch: {
           help: <<~HELP,
             Switch between development stores in your partner organization
-              Usage: {{command:%s switch [--store STORE]}}
+              Usage: {{command:%s switch [--store/-s STORE]}}
           HELP
           disabled_as_shopify_org: "Can't switch development stores logged in as {{green:Shopify partners org}}",
           success: "Switched development store to {{green:%s}}",
@@ -498,11 +498,9 @@ module ShopifyCLI
             "{{i}} Authentication required. Login to the URL below with your %s credentials to continue.",
 
           servlet: {
-            success_response: "Authenticated successfully. You may now close this page.",
+            success_response: "You've successfuly logged into the Shopify CLI!",
             invalid_request_response: "Invalid request: %s",
-            invalid_state_response: "Anti-forgery state token does not match the initial request.",
-            authenticated: "Authenticated successfully",
-            not_authenticated: "Failed to authenticate",
+            invalid_state_response: "The anti-forgery state token does not match the initial request.",
           },
           login_prompt: "Please ensure you've logged in with {{command:%s login}} and try again",
           token_authentication: "%s environment variable. We'll authenticate using its value as a token.",
@@ -589,7 +587,7 @@ module ShopifyCLI
           HELP
 
           error: {
-            no_shop: "No store found. Please run {{command:%s login --store STORE}} to login to a specific store",
+            no_shop: "No store found. Please run {{command:%s login --store/-s STORE}} to login to a specific store",
           },
 
           customer: {
@@ -820,7 +818,7 @@ module ShopifyCLI
           not_logged_in: <<~MESSAGE,
             It doesn't appear that you're logged in. You must log into a partner organization or a store staff account.
 
-            If trying to log into a store staff account, please use {{command:%s login --store STORE}} to log in.
+            If trying to log into a store staff account, please use {{command:%s login --store/-s STORE}} to log in.
           MESSAGE
           logged_in_shop_only: <<~MESSAGE,
             Logged into store {{green:%s}} as staff (no partner organizations available for this login)