shopify-cli 2.24.0 → 2.25.0

data/lib/shopify_cli/theme/syncer.rb

@@ -7,7 +7,6 @@ require "forwardable"
 
 require_relative "syncer/checksums"
 require_relative "syncer/error_reporter"
-require_relative "syncer/ignore_helper"
 require_relative "syncer/json_delete_handler"
 require_relative "syncer/json_update_handler"
 require_relative "syncer/merger"
@@ -15,6 +14,7 @@ require_relative "syncer/operation"
 require_relative "syncer/standard_reporter"
 require_relative "syncer/unsupported_script_warning"
 require_relative "theme_admin_api"
+require_relative "ignore_helper"
 require_relative "theme_admin_api_throttler"
 
 module ShopifyCLI
@@ -22,7 +22,7 @@ module ShopifyCLI
     class Syncer
       extend Forwardable
 
-      include IgnoreHelper
+      include ShopifyCLI::Theme::IgnoreHelper
       include JsonDeleteHandler
       include JsonUpdateHandler
 
@@ -367,10 +367,16 @@ module ShopifyCLI
       end
 
       def parse_api_errors(operation, exception)
-        parsed_body = if exception&.response&.is_a?(Hash)
-          exception&.response&.[](:body)
-        else
-          JSON.parse(exception&.response&.body)
+        parsed_body = {}
+
+        if exception.respond_to?(:response)
+          response = exception.response
+
+          parsed_body = if response&.is_a?(Hash)
+            response&.[](:body)
+          else
+            JSON.parse(response&.body)
+          end
         end
 
         errors = parsed_body.dig("errors") # either nil or another type

data/lib/shopify_cli/theme/theme.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "file"
+require_relative "root"
 require_relative "theme_admin_api"
 
 require "pathname"
@@ -9,12 +10,11 @@ module ShopifyCLI
   module Theme
     class InvalidThemeRole < StandardError; end
 
-    class Theme
+    class Theme < Root
       attr_reader :root, :id
 
       def initialize(ctx, root: nil, id: nil, name: nil, role: nil)
-        @ctx = ctx
-        @root = Pathname.new(root) if root
+        super(ctx, root: root)
         @id = id
         @name = name
         @role = role
@@ -24,48 +24,10 @@ module ShopifyCLI
         (glob(["**/*.liquid", "**/*.json"]) + static_asset_files).uniq
       end
 
-      def static_asset_files
-        glob("assets/*", raise_on_dir: true).reject(&:liquid?)
-      end
-
-      def liquid_files
-        glob("**/*.liquid")
-      end
-
-      def json_files
-        glob("**/*.json")
-      end
-
-      def glob(pattern, raise_on_dir: false)
-        root
-          .glob(pattern)
-          .select { |path| file?(path, raise_on_dir) }
-          .map { |path| File.new(path, root) }
-      end
-
       def theme_file?(file)
         theme_files.include?(self[file])
       end
 
-      def static_asset_file?(file)
-        static_asset_files.include?(self[file])
-      end
-
-      def static_asset_paths
-        static_asset_files.map(&:relative_path)
-      end
-
-      def [](file)
-        case file
-        when File
-          file
-        when Pathname
-          File.new(file, root)
-        when String
-          File.new(root.join(file), root)
-        end
-      end
-
       def shop
         api_client.get_shop_or_abort
       end
@@ -124,9 +86,7 @@ module ShopifyCLI
       end
 
       def delete
-        api_client.delete(
-          path: "themes/#{id}.json"
-        )
+        delete_theme
       end
 
       def publish
@@ -231,6 +191,12 @@ module ShopifyCLI
         @api_client ||= ThemeAdminAPI.new(@ctx)
       end
 
+      def delete_theme
+        api_client.delete(
+          path: "themes/#{id}.json"
+        )
+      end
+
       def load_info_from_api
         _status, body = api_client.get(
           path: "themes/#{id}.json"
@@ -241,14 +207,6 @@ module ShopifyCLI
 
         self
       end
-
-      def file?(path, raise_on_dir = false)
-        if raise_on_dir && ::File.directory?(path)
-          @ctx.abort(@ctx.message("theme.serve.error.invalid_subdirectory", path.to_s))
-        end
-
-        ::File.file?(path)
-      end
     end
   end
 end

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.24.0"
+  VERSION = "2.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-29 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,7 +127,6 @@ files:
 - ".github/workflows/cla.yml"
 - ".github/workflows/shopify.yml"
 - ".github/workflows/stale.yml"
-- ".github/workflows/triage.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -432,6 +431,7 @@ files:
 - lib/shopify_cli/environment.rb
 - lib/shopify_cli/exception_reporter.rb
 - lib/shopify_cli/feature.rb
+- lib/shopify_cli/file_system_listener.rb
 - lib/shopify_cli/form.rb
 - lib/shopify_cli/git.rb
 - lib/shopify_cli/github.rb
@@ -504,16 +504,22 @@ files:
 - lib/shopify_cli/theme/dev_server.rb
 - lib/shopify_cli/theme/dev_server/cdn_fonts.rb
 - lib/shopify_cli/theme/dev_server/certificate_manager.rb
+- lib/shopify_cli/theme/dev_server/errors.rb
 - lib/shopify_cli/theme/dev_server/header_hash.rb
-- lib/shopify_cli/theme/dev_server/hot-reload-no-script.html
-- lib/shopify_cli/theme/dev_server/hot-reload.js
+- lib/shopify_cli/theme/dev_server/hooks/file_change_hook.rb
 - lib/shopify_cli/theme/dev_server/hot_reload.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/remote_file_deleter.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/remote_file_reloader.rb
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/hot-reload-no-script.html
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/hot_reload.js
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/sse_client.js
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/theme.js
+- lib/shopify_cli/theme/dev_server/hot_reload/resources/theme_extension.js
+- lib/shopify_cli/theme/dev_server/hot_reload/script_injector.rb
 - lib/shopify_cli/theme/dev_server/hot_reload/sections_index.rb
 - lib/shopify_cli/theme/dev_server/local_assets.rb
 - lib/shopify_cli/theme/dev_server/proxy.rb
-- lib/shopify_cli/theme/dev_server/proxy/template_param_builder.rb
+- lib/shopify_cli/theme/dev_server/proxy_param_builder.rb
 - lib/shopify_cli/theme/dev_server/reload_mode.rb
 - lib/shopify_cli/theme/dev_server/remote_watcher.rb
 - lib/shopify_cli/theme/dev_server/remote_watcher/json_files_update_job.rb
@@ -521,11 +527,26 @@ files:
 - lib/shopify_cli/theme/dev_server/watcher.rb
 - lib/shopify_cli/theme/dev_server/web_server.rb
 - lib/shopify_cli/theme/development_theme.rb
+- lib/shopify_cli/theme/extension/app_extension.rb
+- lib/shopify_cli/theme/extension/dev_server.rb
+- lib/shopify_cli/theme/extension/dev_server/hooks/file_change_hook.rb
+- lib/shopify_cli/theme/extension/dev_server/hot_reload.rb
+- lib/shopify_cli/theme/extension/dev_server/hot_reload/script_injector.rb
+- lib/shopify_cli/theme/extension/dev_server/local_assets.rb
+- lib/shopify_cli/theme/extension/dev_server/proxy_param_builder.rb
+- lib/shopify_cli/theme/extension/dev_server/watcher.rb
+- lib/shopify_cli/theme/extension/host_theme.rb
+- lib/shopify_cli/theme/extension/syncer.rb
+- lib/shopify_cli/theme/extension/syncer/extension_serve_job.rb
+- lib/shopify_cli/theme/extension/syncer/operation.rb
+- lib/shopify_cli/theme/extension/ui/host_theme_progress_bar.rb
 - lib/shopify_cli/theme/file.rb
 - lib/shopify_cli/theme/filter/path_matcher.rb
 - lib/shopify_cli/theme/ignore_filter.rb
+- lib/shopify_cli/theme/ignore_helper.rb
 - lib/shopify_cli/theme/include_filter.rb
 - lib/shopify_cli/theme/mime_type.rb
+- lib/shopify_cli/theme/root.rb
 - lib/shopify_cli/theme/syncer.rb
 - lib/shopify_cli/theme/syncer/checksums.rb
 - lib/shopify_cli/theme/syncer/error_reporter.rb
@@ -534,7 +555,6 @@ files:
 - lib/shopify_cli/theme/syncer/forms/base_strategy_form.rb
 - lib/shopify_cli/theme/syncer/forms/select_delete_strategy.rb
 - lib/shopify_cli/theme/syncer/forms/select_update_strategy.rb
-- lib/shopify_cli/theme/syncer/ignore_helper.rb
 - lib/shopify_cli/theme/syncer/json_delete_handler.rb
 - lib/shopify_cli/theme/syncer/json_update_handler.rb
 - lib/shopify_cli/theme/syncer/merger.rb

data/.github/workflows/triage.yml

@@ -1,22 +0,0 @@
-name: Triage new issues to DTE oncall project board ("Needs triage" column)
-
-on:
-  issues:
-    types: [opened, reopened]
-
-jobs:
-  triage-issue:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Extract issue id
-      id: issue
-      run: echo "::set-output name=id::$(jq -r '.issue.id' < "$GITHUB_EVENT_PATH")"
-
-    - name: Create card
-      env:
-        TOKEN: ${{ secrets.ACTIONS_TOKEN }}
-      run: |
-        curl -s -X POST -u "$GITHUB_ACTOR:$TOKEN" --retry 3 \
-          -H 'Accept: application/vnd.github.inertia-preview+json' \
-          -d "{\"content_type\": \"Issue\", \"content_id\": ${{ steps.issue.outputs.id }}}" \
-          "https://api.github.com/projects/columns/10507989/cards"

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

@@ -1,194 +0,0 @@
-(() => {
-  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');
-
-    eventSource.onmessage = onMessage;
-
-    eventSource.onopen = () => console.log('[HotReload] SSE connected.');
-
-    eventSource.onclose = () => {
-      console.log('[HotReload] SSE closed. Attempting to reconnect...');
-
-      setTimeout(connect, 5000);
-    }
-
-    eventSource.onerror = () => eventSource.close();
-  }
-
-  function sectionNamesByType(type) {
-    const namespace = window.__SHOPIFY_CLI_ENV__;
-    return namespace.section_names_by_type[type] || [];
-  }
-
-  function reloadMode() {
-    const namespace = window.__SHOPIFY_CLI_ENV__;
-    return namespace.mode;
-  }
-
-  function querySelectDOMSections(idSuffix) {
-    const elements = document.querySelectorAll(`[id^='shopify-section'][id$='${idSuffix}']`);
-    return Array.from(elements);
-  }
-
-  function fetchDOMSections(name) {
-    const domSections = sectionNamesByType(name).flatMap((n) => querySelectDOMSections(n));
-
-    if (domSections.length > 0) {
-      return domSections;
-    }
-
-    return querySelectDOMSections(name);
-  }
-
-  function isFullPageReloadMode() {
-    return reloadMode() === 'full-page';
-  }
-
-  function isReloadModeActive() {
-    return reloadMode() !== 'off';
-  }
-
-  function isRefreshRequired(files) {
-    if (isFullPageReloadMode()) {
-      return true;
-    }
-    return files.some((file) => !isCssFile(file) && !isSectionFile(file));
-  }
-
-  function refreshFile(file) {
-    if (isCssFile(file)) {
-      reloadCssFile(file);
-      return;
-    }
-
-    if (isSectionFile(file)) {
-      reloadSection(file);
-      return;
-    }
-  }
-
-  function setHotReloadCookie(files) {
-    var date = new Date();
-
-    // Hot reload cookie expires in 3 seconds
-    date.setSeconds(date.getSeconds() + 3);
-
-    var sections = files.join(',');
-    var expires = date.toUTCString();
-
-    document.cookie = `hot_reload_sections=${sections}; expires=${expires}; path=/`;
-  }
-
-  function refreshPage(files) {
-    setHotReloadCookie(files);
-    console.log('[HotReload] Refreshing entire page');
-    window.location.reload();
-  }
-
-  function onMessage(message) {
-    const data = JSON.parse(message.data);
-    if (data.reload_page) {
-      refreshPage([]);
-      return;
-    }
-
-    handleUpdate(data);
-  }
-
-  function handleUpdate(data) {
-    var modifiedFiles = data.modified;
-
-    if (modifiedFiles === undefined) {
-      return;
-    }
-
-    if (isRefreshRequired(modifiedFiles)) {
-      refreshPage(modifiedFiles);
-    } else {
-      modifiedFiles.forEach(refreshFile);
-    }
-  }
-
-  function isCssFile(filename) {
-    return filename.endsWith('.css');
-  }
-
-  function reloadCssFile(filename) {
-    // Find a stylesheet link starting with /assets (locally-served only) containing the filename
-    let links = document.querySelectorAll(`link[href^="/assets"][href*="${filename}"][rel="stylesheet"]`);
-
-    if (!links.length) {
-      console.log(`[HotReload] Could not find link for stylesheet ${filename}`);
-    } else {
-      links.forEach(link => {
-        link.href = new URL(link.href).pathname + `?v=${Date.now()}`;
-        console.log(`[HotReload] Reloaded stylesheet ${filename}`);
-      })
-    }
-  }
-
-  function isSectionFile(filename) {
-    return new Section(filename).valid();
-  }
-
-  function reloadSection(filename) {
-    new Section(filename).refresh();
-  }
-
-  class Section {
-    constructor(filename) {
-      this.filename = filename;
-      this.name = filename.split('/').pop().replace('.liquid', '');
-      this.elements = fetchDOMSections(this.name);
-    }
-
-    valid() {
-      return this.filename.startsWith('sections/') && this.elements.length > 0;
-    }
-
-    async refreshElement(element) {
-
-      const sectionId = element.id.replace(/^shopify-section-/, '');
-      const url = new URL(window.location.href);
-
-      url.searchParams.append('section_id', sectionId);
-
-      const response = await fetch(url);
-
-      try {
-        if (response.headers.get('x-templates-from-params') == '1') {
-          const html = await response.text();
-          element.outerHTML = html;
-        } else {
-          window.location.reload();
-
-          console.log(`[HotReload] Hot-reloading not supported, fully reloading ${this.name} section`);
-        }
-
-      } catch (e) {
-        console.log(`[HotReload] Failed to reload ${this.name} section: ${e.message}`);
-      }
-    }
-
-    async refresh() {
-      console.log(`[HotReload] Reloaded ${this.name} sections`);
-      this.elements.forEach(this.refreshElement);
-    }
-  }
-
-  if (isReloadModeActive()) {
-    connect();
-  }
-})();

data/lib/shopify_cli/theme/syncer/ignore_helper.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-module ShopifyCLI
-  module Theme
-    class Syncer
-      module IgnoreHelper
-        def ignore_operation?(operation)
-          path = operation.file_path
-          ignore_path?(path)
-        end
-
-        def ignore_file?(file)
-          path = file.relative_path
-          ignore_path?(path)
-        end
-
-        def ignore_path?(path)
-          ignored_by_ignore_filter?(path) || ignored_by_include_filter?(path)
-        end
-
-        private
-
-        def ignored_by_ignore_filter?(path)
-          ignore_filter&.ignore?(path)
-        end
-
-        def ignored_by_include_filter?(path)
-          !!include_filter && !include_filter.match?(path)
-        end
-      end
-    end
-  end
-end