shopify-cli 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a580fc4c23a82fc147e126d1f2cc4b057e5194e75e9c3045e2fa26c97f3d88da
-  data.tar.gz: 7cd7c21a2bac85a9f0bd3809acfb2ae7389f99be65e34e4411cb4fc4bc6235e8
+  metadata.gz: 39a23d6414281b45d36b3508a09f88b629300733e5a3177ce9923905ce26e0ee
+  data.tar.gz: 38483662a8c42d1463f1b157262a2cec3cf8c4fda0cb5ccfa74a207a3687be33
 SHA512:
-  metadata.gz: 8ef4d2ddcb62c393d7ad69fca6cbdfd577926522fcafe6f172f3370cc4a55d8bf3db68f8fc154dbb6c483b38f718df7991e43c773801c27e1f7a055e3cd0ed1b
-  data.tar.gz: 94d84b3588aeb62ee53f49593e486e268d58a112d73cdae15e2212dbb4a356ba736ff5e5adf31db4d979e83d7e1a8f56650911b0aab89837ef251f73ce6926b4
+  metadata.gz: 58b6b7aa28665cf1107c83ffa6f553eb4cca1661ff8d66d3ef47c9a4d9a3edb46a73e8f38bb5f0f6976699a4a94b58d408e11c2622718be1a554575048c844c3
+  data.tar.gz: e060cfe1fc4c2917f096b9c0c48f9562f441fb005b6669c1ad93ac8c0a6121ae8c2fac0759fd8f591f4700b0c717f993286b67911cfa133d5cab605a600d69c8

data/CHANGELOG.md

@@ -2,6 +2,10 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.10.1
+### Fixed
+* [#1985](https://github.com/Shopify/shopify-cli/pull/1985): Revert "Fix CORS (Cross-origin resource sharing) errors (#1952)"
+
 ## Version 2.10.0
 ### Fixed
 * [#1937](https://github.com/Shopify/shopify-cli/pull/1937): Fix `theme pull` to no longer add empty lines on Windows

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.10.0)
+    shopify-cli (2.10.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
       theme-check (~> 1.9.0)

data/lib/project_types/script/graphql/app_script_set.graphql

@@ -11,6 +11,7 @@ mutation AppScriptSet(
   $configurationDefinition: String!,
   $moduleUploadUrl: String!,
   $library: LibraryInput,
+  $inputQuery: String,
 ) {
   appScriptSet(
     uuid: $uuid
@@ -25,6 +26,7 @@ mutation AppScriptSet(
     configurationDefinition: $configurationDefinition,
     moduleUploadUrl: $moduleUploadUrl,
     library: $library,
+    inputQuery: $inputQuery,
 ) {
     userErrors {
       field

data/lib/project_types/script/layers/application/build_script.rb

@@ -12,7 +12,6 @@ module Script
                   Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
                     script_project: script_project,
                     script_content: task_runner.build,
-                    compiled_type: task_runner.compiled_type,
                     metadata: task_runner.metadata,
                     library: library,
                   )

data/lib/project_types/script/layers/application/push_script.rb

@@ -30,7 +30,6 @@ module Script
             UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing")) do |p_ctx, spinner|
               package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                 script_project: script_project,
-                compiled_type: task_runner.compiled_type,
                 metadata: task_runner.metadata,
                 library: library,
               )
@@ -47,6 +46,7 @@ module Script
                 script_config: package.script_config,
                 module_upload_url: module_upload_url,
                 library: package.library,
+                input_query: script_project.input_query,
               )
               if ShopifyCLI::Environment.interactive?
                 script_project_repo.update_env(uuid: uuid)

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

@@ -9,7 +9,6 @@ module Script
           :extension_point_type,
           :script_config,
           :script_content,
-          :compiled_type,
           :metadata,
           :library
 
@@ -18,7 +17,6 @@ module Script
           uuid:,
           extension_point_type:,
           script_content:,
-          compiled_type: nil,
           metadata:,
           script_config:,
           library:
@@ -27,7 +25,6 @@ module Script
           @uuid = uuid
           @extension_point_type = extension_point_type
           @script_content = script_content
-          @compiled_type = compiled_type
           @metadata = metadata
           @script_config = script_config
           @library = library

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

@@ -16,6 +16,7 @@ module Script
         property! :language, accepts: String
 
         property :script_config, accepts: ScriptConfig
+        property :input_query, accepts: String
 
         def initialize(*)
           super

data/lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb

@@ -21,10 +21,6 @@ module Script
             bytecode
           end
 
-          def compiled_type
-            "wasm"
-          end
-
           def install_dependencies
             check_node_version!
 

data/lib/project_types/script/layers/infrastructure/languages/typescript_task_runner.rb

@@ -22,10 +22,6 @@ module Script
             bytecode
           end
 
-          def compiled_type
-            "wasm"
-          end
-
           def install_dependencies
             check_node_version!
 

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

@@ -7,8 +7,8 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
 
-        def create_push_package(script_project:, script_content:, compiled_type:, metadata:, library:)
-          build_file_path = file_path(script_project.id, compiled_type)
+        def create_push_package(script_project:, script_content:, metadata:, library:)
+          build_file_path = file_path(script_project.id)
           write_to_path(build_file_path, script_content)
 
           Domain::PushPackage.new(
@@ -16,15 +16,14 @@ module Script
             uuid: script_project.uuid,
             extension_point_type: script_project.extension_point_type,
             script_content: script_content,
-            compiled_type: compiled_type,
             metadata: metadata,
             script_config: script_project.script_config,
             library: library
           )
         end
 
-        def get_push_package(script_project:, compiled_type:, metadata:, library:)
-          build_file_path = file_path(script_project.id, compiled_type)
+        def get_push_package(script_project:, metadata:, library:)
+          build_file_path = file_path(script_project.id)
           raise Domain::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
 
           script_content = ctx.binread(build_file_path)
@@ -46,8 +45,8 @@ module Script
           ctx.binwrite(path, content)
         end
 
-        def file_path(path_to_script, compiled_type)
-          "#{path_to_script}/build/script.#{compiled_type}"
+        def file_path(path_to_script)
+          "#{path_to_script}/build/script.wasm"
         end
       end
     end

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

@@ -10,6 +10,7 @@ module Script
         property :initial_directory, accepts: String
 
         MUTABLE_ENV_VALUES = %i(uuid)
+        INPUT_QUERY_PATH = "input.graphql"
 
         def create_project_directory
           raise Infrastructure::Errors::ScriptProjectAlreadyExistsError, directory if ctx.dir_exist?(directory)
@@ -38,13 +39,7 @@ module Script
             language: language
           )
 
-          Domain::ScriptProject.new(
-            id: ctx.root,
-            env: project.env,
-            script_name: script_name,
-            extension_point_type: extension_point_type,
-            language: language
-          )
+          build_script_project(script_config: nil)
         end
 
         def get
@@ -56,7 +51,8 @@ module Script
             script_name: script_name,
             extension_point_type: extension_point_type,
             language: language,
-            script_config: script_config_repository.get!
+            script_config: script_config_repository.get!,
+            input_query: read_input_query,
           )
         end
 
@@ -68,14 +64,7 @@ module Script
             end
           end
 
-          Domain::ScriptProject.new(
-            id: ctx.root,
-            env: project.env,
-            script_name: script_name,
-            extension_point_type: extension_point_type,
-            language: language,
-            script_config: script_config_repository.get!,
-          )
+          build_script_project
         end
 
         def create_env(api_key:, secret:, uuid:)
@@ -87,19 +76,19 @@ module Script
             }
           ).write(ctx)
 
-          Domain::ScriptProject.new(
-            id: ctx.root,
-            env: project.env,
-            script_name: script_name,
-            extension_point_type: extension_point_type,
-            language: language,
-            script_config: script_config_repository.get!,
-          )
+          build_script_project
         end
 
         def update_script_config(title:)
           script_config = script_config_repository.update!(title: title)
+          build_script_project(script_config: script_config)
+        end
+
+        private
 
+        def build_script_project(
+          script_config: script_config_repository.get!
+        )
           Domain::ScriptProject.new(
             id: ctx.root,
             env: project.env,
@@ -110,8 +99,6 @@ module Script
           )
         end
 
-        private
-
         def change_directory(directory:)
           ctx.chdir(directory)
         end
@@ -173,6 +160,10 @@ module Script
           end
         end
 
+        def read_input_query
+          ctx.read(INPUT_QUERY_PATH) if ctx.file_exist?(INPUT_QUERY_PATH)
+        end
+
         class ScriptConfigRepository
           include SmartProperties
           property! :ctx, accepts: ShopifyCLI::Context

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

@@ -19,7 +19,8 @@ module Script
           metadata:,
           script_config:,
           module_upload_url:,
-          library:
+          library:,
+          input_query: nil
         )
           query_name = "app_script_set"
           variables = {
@@ -38,6 +39,7 @@ module Script
               language: library[:language],
               version: library[:version],
             },
+            inputQuery: input_query,
           }
           resp_hash = make_request(query_name: query_name, variables: variables)
           user_errors = resp_hash["data"]["appScriptSet"]["userErrors"]

data/lib/shopify_cli/theme/dev_server/cdn_fonts.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "cdn/cdn_helper"
-
 module ShopifyCLI
   module Theme
     module DevServer
       class CdnFonts
-        include Cdn::CdnHelper
-
         FONTS_PATH = "/fonts"
         FONTS_CDN = "https://fonts.shopifycdn.com"
         FONTS_REGEX = %r{#{FONTS_CDN}}
@@ -21,7 +17,7 @@ module ShopifyCLI
           path = env["PATH_INFO"]
 
           # Serve from fonts CDN
-          return serve_font(env, path) if path.start_with?(FONTS_PATH)
+          return serve_font(env) if path.start_with?(FONTS_PATH)
 
           # Proxy the request, and replace the URLs in the response
           status, headers, body = @app.call(env)
@@ -31,11 +27,35 @@ module ShopifyCLI
 
         private
 
-        def serve_font(env, path)
-          query = env["QUERY_STRING"]
+        def serve_font(env)
+          parameters = %w(PATH_INFO QUERY_STRING REQUEST_METHOD rack.input)
+          path, query, method, body_stream = *env.slice(*parameters).values
+
           uri = fonts_cdn_uri(path, query)
 
-          proxy_request(env, uri, @theme)
+          response = Net::HTTP.start(uri.host, 443, use_ssl: true) do |http|
+            req_class = Net::HTTP.const_get(method.capitalize)
+            req = req_class.new(uri)
+            req.initialize_http_header(fonts_cdn_headers)
+            req.body_stream = body_stream
+            http.request(req)
+          end
+
+          [
+            response.code.to_s,
+            {
+              "Content-Type" => response.content_type,
+              "Content-Length" => response.content_length.to_s,
+            },
+            [response.body],
+          ]
+        end
+
+        def fonts_cdn_headers
+          {
+            "Referer" => "https://#{@theme.shop}",
+            "Transfer-Encoding" => "chunked",
+          }
         end
 
         def fonts_cdn_uri(path, query)

data/lib/shopify_cli/theme/dev_server/local_assets.rb

@@ -11,10 +11,6 @@ module ShopifyCLI
             @path = path
           end
 
-          def join
-            @path.read
-          end
-
           # Naive implementation. Only used in unit tests.
           def each
             yield @path.read

data/lib/shopify_cli/theme/dev_server.rb

@@ -3,7 +3,6 @@ require_relative "development_theme"
 require_relative "ignore_filter"
 require_relative "syncer"
 
-require_relative "dev_server/cdn_assets"
 require_relative "dev_server/cdn_fonts"
 require_relative "dev_server/hot_reload"
 require_relative "dev_server/header_hash"
@@ -38,7 +37,6 @@ module ShopifyCLI
           @app = Proxy.new(ctx, theme: theme, syncer: @syncer)
           @app = CdnFonts.new(@app, theme: theme)
           @app = LocalAssets.new(ctx, @app, theme: theme)
-          @app = CdnAssets.new(@app, theme: theme)
           @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, mode: mode, ignore_filter: ignore_filter)
           stopped = false
           address = "http://#{host}:#{port}"

data/lib/shopify_cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCLI
-  VERSION = "2.10.0"
+  VERSION = "2.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -458,8 +458,6 @@ files:
 - lib/shopify_cli/tasks/select_org_and_shop.rb
 - lib/shopify_cli/tasks/update_dashboard_urls.rb
 - lib/shopify_cli/theme/dev_server.rb
-- lib/shopify_cli/theme/dev_server/cdn/cdn_helper.rb
-- lib/shopify_cli/theme/dev_server/cdn_assets.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/header_hash.rb

data/lib/shopify_cli/theme/dev_server/cdn/cdn_helper.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-
-module ShopifyCLI
-  module Theme
-    module DevServer
-      module Cdn
-        module CdnHelper
-          def proxy_request(env, uri, theme)
-            response = Net::HTTP.start(uri.host, 443, use_ssl: true) do |http|
-              req_class = Net::HTTP.const_get(method(env))
-
-              req = req_class.new(uri)
-              req.initialize_http_header(req_headers(theme))
-              req.body_stream = req_body(env)
-
-              http.request(req)
-            end
-
-            [
-              response.code.to_s,
-              {
-                "Content-Type" => response.content_type,
-                "Content-Length" => response.content_length.to_s,
-              },
-              [response.body],
-            ]
-          end
-
-          private
-
-          def method(env)
-            env["REQUEST_METHOD"].capitalize
-          end
-
-          def req_body(env)
-            env["rack.input"]
-          end
-
-          def req_headers(theme)
-            {
-              "Referer" => "https://#{theme.shop}",
-              "Transfer-Encoding" => "chunked",
-            }
-          end
-        end
-      end
-    end
-  end
-end

data/lib/shopify_cli/theme/dev_server/cdn_assets.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "cdn/cdn_helper"
-require_relative "local_assets"
-
-module ShopifyCLI
-  module Theme
-    module DevServer
-      class CdnAssets
-        include Cdn::CdnHelper
-
-        ASSETS_PROXY_PATH = "/cdn_asset"
-        ASSETS_CDN = "//cdn.shopify.com"
-        ASSETS_CDN_REGEX = %r{(https?:)?#{ASSETS_CDN}}
-        ASSETS_SOURCE_MAP_REGEX = /\/[\/|\*]# sourceMappingURL\=(\/.*)/
-
-        def initialize(app, theme:)
-          @app = app
-          @theme = theme
-        end
-
-        def call(env)
-          path = env["PATH_INFO"]
-
-          # Serve assets from CDN
-          return serve_asset(env, path) if path.start_with?(ASSETS_PROXY_PATH)
-
-          # Proxy the request, and replace the URLs in the response
-          status, headers, body = @app.call(env)
-          body = replace_asset_urls(body)
-          [status, headers, body]
-        end
-
-        private
-
-        def serve_asset(env, path)
-          path = path.gsub(%r{^#{ASSETS_PROXY_PATH}}, "")
-          query = env["QUERY_STRING"]
-          uri = asset_cdn_uri(path, query)
-
-          status, headers, body = proxy_request(env, uri, @theme)
-
-          [status, headers, replace_source_map_url(body)]
-        end
-
-        def asset_cdn_uri(path, query)
-          uri = URI.join("https:#{ASSETS_CDN}", path)
-          uri.query = query.split("&").last
-          uri
-        end
-
-        def replace_asset_urls(body)
-          [body.join.gsub(ASSETS_CDN_REGEX, ASSETS_PROXY_PATH)]
-        end
-
-        def replace_source_map_url(body)
-          body_content = body.join
-          map_regex_match = body_content.match(ASSETS_SOURCE_MAP_REGEX)
-          return body if map_regex_match.nil?
-
-          map_url = map_regex_match[1]
-          return body if map_url.nil?
-
-          [body_content.gsub(map_url, "#{ASSETS_PROXY_PATH}#{map_url}")]
-        end
-      end
-    end
-  end
-end