RubyGems - shopify-cli - Versions diffs - 2.18.0 → 2.20.0 - Mend

shopify-cli 2.18.0 → 2.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (56) hide show

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

@@ -16,6 +16,8 @@ module Theme
         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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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/git.rb CHANGED Viewed

@@ -67,9 +67,14 @@ module ShopifyCLI
         if Dir.exist?(dest)
           ctx.abort(ctx.message("core.git.error.directory_exists"))
         else
+          repo, branch = repository.split("#")
           success_message = ctx.message("core.git.cloned", dest)
-          CLI::UI::Frame.open(ctx.message("core.git.cloning", repository, dest), success_text: success_message) do
-            clone_progress("clone", "--single-branch", repository, dest, ctx: ctx)
+          CLI::UI::Frame.open(ctx.message("core.git.cloning", repo, dest), success_text: success_message) do
+            if branch
+              clone_progress("clone", "--single-branch", "--branch", branch, repo, dest, ctx: ctx)
+            else
+              clone_progress("clone", "--single-branch", repo, dest, ctx: ctx)
+            end
           end
         end
       end

data/lib/shopify_cli/identity_auth/servlet.rb CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -285,7 +285,7 @@ module ShopifyCLI
         },
         extension: {
           push: {
-            beacon_extension: {
+            web_pixel_extension: {
               error: {
                 file_read_error: "There was a problem reading %s",
                 missing_config_key_error: "Configuration is missing key: %s",
@@ -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)

data/lib/shopify_cli/services/app/create/node_service.rb CHANGED Viewed

@@ -117,7 +117,7 @@ module ShopifyCLI
           end
           def build(name)
-            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-node.git", name)
+            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-template-node.git#cli_two", name)
             context.root = File.join(context.root, name)

data/lib/shopify_cli/services/app/create/php_service.rb CHANGED Viewed

@@ -74,7 +74,7 @@ module ShopifyCLI
           end
           def build(form)
-            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-php.git", form.name)
+            ShopifyCLI::Git.clone("https://github.com/Shopify/shopify-app-template-php.git#cli_two", form.name)
             context.root = File.join(context.root, form.name)
             context.chdir(context.root)

data/lib/shopify_cli/theme/dev_server/hot-reload-no-script.html ADDED Viewed

@@ -0,0 +1,27 @@
+<noscript>
+  <style type="text/css">
+    .shopify-cli-no-script-message {
+      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;
+      position: fixed;
+      z-index: 999;
+      font-weight: 500;
+      left: 0;
+      top: 0;
+      width: 100vw;
+      height: 100vh;
+      padding: 10rem 0;
+      color: #202223;
+      text-align: center;
+      background-color: #F6F6F7;
+    }
+  </style>
+  <div class="shopify-cli-no-script-message">
+    Shopify CLI requires JavaScript to work.
+    <br />
+    Activate JavaScript support or try a different browser.
+  </div>
+</noscript>

data/lib/shopify_cli/theme/dev_server/hot-reload.js CHANGED Viewed

@@ -1,3 +1,15 @@
+(() => {
+  function verifySSE() {
+    if (typeof (EventSource) === "undefined") {
+      console.error("[HotReload] Error: SSE features are not supported. Try a different browser.");
+    }
+  }
+  console.log("[HotReload] Initializing...");
+  verifySSE();
+})();
 (() => {
   function connect() {
     const eventSource = new EventSource('/hot-reload');
@@ -32,7 +44,7 @@
   function fetchDOMSections(name) {
     const domSections = sectionNamesByType(name).flatMap((n) => querySelectDOMSections(n));
     if (domSections.length > 0) {
       return domSections;
     }
@@ -40,11 +52,11 @@
     return querySelectDOMSections(name);
   }
-  function isFullPageReloadMode(){
+  function isFullPageReloadMode() {
     return reloadMode() === 'full-page';
   }
-  function isReloadModeActive(){
+  function isReloadModeActive() {
     return reloadMode() !== 'off';
   }
@@ -72,7 +84,7 @@
     // Hot reload cookie expires in 3 seconds
     date.setSeconds(date.getSeconds() + 3);
     var sections = files.join(',');
     var expires = date.toUTCString();

data/lib/shopify_cli/theme/dev_server/hot_reload.rb CHANGED Viewed

@@ -67,7 +67,9 @@ module ShopifyCLI
         def inject_hot_reload_javascript(body)
           hot_reload_js = ::File.read("#{__dir__}/hot-reload.js")
+          hot_reload_no_script = ::File.read("#{__dir__}/hot-reload-no-script.html")
           hot_reload_script = [
+            hot_reload_no_script,
             "<script>",
             params_js,
             hot_reload_js,

data/lib/shopify_cli/theme/dev_server.rb CHANGED Viewed

@@ -28,11 +28,12 @@ module ShopifyCLI
         attr_accessor :ctx
         def start(ctx, root, host: "127.0.0.1", theme: nil, port: 9292, poll: false, editor_sync: false,
-          mode: ReloadMode.default)
+          mode: ReloadMode.default, stable: false)
           @ctx = ctx
           theme = find_theme(root, theme)
           ignore_filter = IgnoreFilter.from_path(root)
-          @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter, overwrite_json: !editor_sync)
+          @syncer = Syncer.new(ctx, theme: theme, ignore_filter: ignore_filter, overwrite_json: !editor_sync,
+            stable: stable)
           watcher = Watcher.new(ctx, theme: theme, ignore_filter: ignore_filter, syncer: @syncer, poll: poll)
           remote_watcher = RemoteWatcher.to(theme: theme, syncer: @syncer)

data/lib/shopify_cli/theme/file.rb CHANGED Viewed

@@ -5,6 +5,7 @@ module ShopifyCLI
   module Theme
     class File < Struct.new(:path)
       attr_accessor :remote_checksum
+      attr_writer :warnings
       def initialize(path, root)
         super(Pathname.new(path))
@@ -104,6 +105,10 @@ module ShopifyCLI
         @relative_path.to_s
       end
+      def warnings
+        @warnings || []
+      end
       private
       def normalize_json(content)

data/lib/shopify_cli/theme/syncer/json_update_handler.rb CHANGED Viewed

@@ -8,16 +8,11 @@ module ShopifyCLI
     class Syncer
       module JsonUpdateHandler
         def enqueue_json_updates(files)
-          # Some files must be uploaded after the other ones
-          delayed_files = [
-            theme["config/settings_schema.json"],
-            theme["config/settings_data.json"],
-          ]
           # Update remote JSON files and delays `delayed_files` update
           files = files
             .select { |file| !ignore_file?(file) && file.exist? && checksums.file_has_changed?(file) }
             .sort_by { |file| delayed_files.include?(file) ? 1 : 0 }
+            .reject { |file| overwrite_json? && delayed_files.include?(file) }
           if overwrite_json?
             enqueue_updates(files)
@@ -27,6 +22,21 @@ module ShopifyCLI
           end
         end
+        def enqueue_delayed_files_updates
+          return unless overwrite_json?
+          # Update delayed files synchronously
+          delayed_files.each do |file|
+            update(file) if checksums.file_has_changed?(file)
+          end
+        end
+        def delayed_files
+          [
+            theme["config/settings_schema.json"],
+            theme["config/settings_data.json"],
+          ]
+        end
         private
         def handle_update_conflicts(files)

data/lib/shopify_cli/theme/syncer/operation.rb CHANGED Viewed

@@ -9,6 +9,7 @@ module ShopifyCLI
         COLOR_BY_STATUS = {
           error: :red,
           synced: :green,
+          warning: :yellow,
           fixed: :cyan,
         }
@@ -26,8 +27,8 @@ module ShopifyCLI
           as_message_with(status: :error)
         end
-        def as_synced_message
-          as_message_with(status: :synced)
+        def as_synced_message(color: :green)
+          as_message_with(status: :synced, color: color)
         end
         def as_fix_message
@@ -40,11 +41,11 @@ module ShopifyCLI
         private
-        def as_message_with(status:)
-          status_color = COLOR_BY_STATUS[status]
-          status_text = @ctx.message("theme.serve.operation.status.#{status}").ljust(6)
+        def as_message_with(status:, color: nil)
+          color ||= COLOR_BY_STATUS[status]
+          text = @ctx.message("theme.serve.operation.status.#{status}").ljust(6)
-          "#{timestamp} {{#{status_color}:#{status_text}}} {{>}} {{blue:#{self}}}"
+          "#{timestamp} {{#{color}:#{text}}} {{>}} {{blue:#{self}}}"
         end
         def timestamp

data/lib/shopify_cli/theme/syncer/unsupported_script_warning.rb ADDED Viewed

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+module ShopifyCLI
+  module Theme
+    class Syncer
+      class UnsupportedScriptWarning
+        attr_reader :ctx
+        def initialize(ctx, file)
+          @ctx = ctx
+          @file = file
+        end
+        def to_s
+          "\n\n#{occurrences} #{long_text}"
+        end
+        private
+        def occurrences
+          warnings.map { |w| occurrence(w) }.join("\n")
+        end
+        def occurrence(warning)
+          line_number = "{{blue: #{warning.line} |}}"
+          pointer = pointer_message(warning)
+          <<~OCCURRENCE
+            #{line_number} #{warning.line_content}
+            #{pointer}
+          OCCURRENCE
+        end
+        def long_text
+          lines_and_columns = warnings.map do |warning|
+            message("line_and_column", warning.line, warning.column)
+          end
+          message("unsupported_script_text", lines_and_columns.join)
+            .split("\n")
+            .reduce("") do |text, line|
+              # Add indentation in the long text to improve readability
+              line = " #{line}"
+              # Inline yellow (otherwise `CLI::UI::Frame` breaks multiline formatting)
+              line = "{{yellow:#{line}}}"
+              "#{text}#{line}\n"
+            end
+        end
+        def pointer_message(warning)
+          padding = warning.column + warning.line.to_s.size + 2
+          text = message("unsupported_script")
+          "{{yellow:#{" " * padding} ^ {{bold:#{text}}}}}"
+        end
+        def message(*args)
+          key = args.shift
+          @ctx.message("theme.serve.syncer.warnings.#{key}", *args)
+        end
+        def warnings
+          @warnings ||= @file.warnings.map { |w| Warning.new(@file, w) }
+        end
+        class Warning
+          attr_reader :line, :column
+          def initialize(file, warning_hash)
+            @file = file
+            @line = warning_hash["line"].to_i
+            @column = warning_hash["column"].to_i
+          end
+          def line_content
+            file_lines[line - 1]
+          end
+          private
+          def file_lines
+            @file_lines ||= @file.read.split("\n")
+          end
+        end
+      end
+    end
+  end
+end