shopify-cli 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60163978b05868670c0b5535cc49060ba5f55c9e127d6f97232970751caeb4d8
-  data.tar.gz: b3993bcef0bd4d5488f4b4d7f3e8b6f219a0322279159a512a12cc3986f2e63a
+  metadata.gz: c9bf62139d7f6ea0c4e88417521bd981c28c0823950768c3350410f2c8666e35
+  data.tar.gz: a15af494f4dbbcb6e2b8c276e34fb1347e3142f59d5646e80370199ddc6d0bce
 SHA512:
-  metadata.gz: cd65b86469afbc40117f58257840588dea0fd07141e899ac9273e0eee9da4bcaef119c4df14921777d3ae88932fd053771392154658704294b59afd9656b00f8
-  data.tar.gz: 2d199c2d96954b9d2c666fc4822f845f1a176115eb90a28078af42ceaf0cf691b3b2e21896485afe4c42b2ec43e7c5af576ba18a86188bf01a22f7ff32ffb8f0
+  metadata.gz: f4dbceb0f0d41f605bb3be605e54eae58868d83e86fe7cd0476dc0193c7e2cf7369fa86a8d5d2a2070711f54dd03b02b2200bc844f02b42be9297178095f2106
+  data.tar.gz: 2c75055724e3fce904caca22f974f9cbc87bf10bfb9388f5227a227799f8b6c7e33aece62d7301cfde366d69fcc27832256e1da791e2dc4ca7f85d02f7c41191

data/.gitignore

@@ -21,3 +21,4 @@ packaging/rpm/build
 packaging/rpm/shopify-cli.spec
 .byebug_history
 ext/shopify-extensions/shopify-extensions
+.console_history

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 Unreleased
 ------
 
+Version 2.6.0
+------
+
+* [#1574](https://github.com/Shopify/shopify-cli/pull/1574): Hide LoadError for ${RUBY_MAJOR}/ffi_c.
+* [#1567](https://github.com/Shopify/shopify-cli/pull/1567): Add ability to set custom port for ngrok tunnel in node serve.
+* [#1584](https://github.com/Shopify/shopify-cli/issues/1584): Fixed extended help message not showing.
+* [#1566](https://github.com/Shopify/shopify-cli/pull/1566): Fix bug when running `npm | yarn list` for extension package resolution.
+* [#1524](https://github.com/Shopify/shopify-cli/pull/1524): Add automatic error-reporting.
+* [#1528](https://github.com/Shopify/shopify-cli/pull/1528): Bump theme-check version to 1.7
+* [#1566](https://github.com/Shopify/shopify-cli/pull/1566): Fix bug when running `npm | yarn list` for extension package resolution
+
 Version 2.5.0
 ------
 

data/Dockerfile

@@ -14,6 +14,4 @@ WORKDIR /usr/src/app
 COPY Gemfile Gemfile.lock ./
 COPY shopify-cli.gemspec  shopify-cli.gemspec
 COPY lib/shopify_cli/version.rb  lib/shopify_cli/version.rb
-COPY . .
-
 RUN bundle install

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.5.0)
+    shopify-cli (2.6.0)
+      bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.4.0)
+      theme-check (~> 1.7)
 
 GEM
   remote: https://rubygems.org/
@@ -12,10 +13,14 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.2)
+    bugsnag (6.23.0)
+      concurrent-ruby (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    crack (0.4.4)
+    concurrent-ruby (1.1.9)
+    crack (0.4.5)
+      rexml
     cucumber (7.0.0)
       builder (~> 3.2, >= 3.2.4)
       cucumber-core (~> 10.0, >= 10.0.1)
@@ -41,17 +46,17 @@ GEM
       cucumber-messages (~> 17.0, >= 17.0.1)
     cucumber-html-formatter (16.0.1)
       cucumber-messages (~> 17.0, >= 17.0.1)
-    cucumber-messages (17.1.0)
+    cucumber-messages (17.1.1)
     cucumber-tag-expressions (3.0.1)
     cucumber-wire (6.1.1)
       cucumber-core (~> 10.0, >= 10.0.1)
       cucumber-cucumber-expressions (~> 12.1, >= 12.1.2)
       cucumber-messages (~> 17.0, >= 17.0.1)
     diff-lcs (1.4.4)
-    fakefs (1.2.2)
-    ffi (1.15.3)
+    fakefs (1.3.2)
+    ffi (1.15.4)
     hashdiff (1.0.1)
-    liquid (5.0.1)
+    liquid (5.1.0)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -60,21 +65,21 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     mini_portile2 (2.6.1)
-    minitest (5.14.2)
+    minitest (5.14.4)
     minitest-fail-fast (0.1.0)
       minitest (~> 5)
-    minitest-reporters (1.4.2)
+    minitest-reporters (1.4.3)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    mocha (1.11.2)
+    mocha (1.13.0)
     multi_test (0.1.2)
-    nokogiri (1.12.4)
+    nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -86,7 +91,7 @@ GEM
     racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -112,9 +117,10 @@ GEM
     ruby-progressbar (1.11.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.4.0)
-      liquid (>= 5.0.1)
+    theme-check (1.7.2)
+      liquid (>= 5.1.0)
       nokogiri (>= 1.12)
+      parser (~> 3)
     timecop (0.9.2)
     unicode-display_width (2.0.0)
     webmock (3.9.3)

data/Rakefile

@@ -1,8 +1,13 @@
+ENV["SHOPIFY_CLI_TEST"] = "1"
+
 require_relative "bin/load_shopify"
+require_relative "utilities/utilities"
 require "rake/testtask"
 require "rubocop/rake_task"
 require "bundler/gem_tasks"
 require "shellwords"
+require "digest"
+require "open3"
 
 Rake::TestTask.new do |t|
   t.libs += %w(test)
@@ -15,26 +20,12 @@ desc "A set of tasks that run in Linux environments"
 namespace :linux do
   desc "Runs the test suite in a Linux Docker environment"
   task :test do
-    system("docker", "build", __dir__, "-t", "shopify-cli") || abort
-    system(
-      "docker", "run",
-      "-t", "--rm",
-      "--volume", "#{Shellwords.escape(__dir__)}:/usr/src/app",
-      "shopify-cli",
-      "bundle", "exec", "rake", "test"
-    ) || abort
+    Utilities::Docker.run_and_rm_container("bundle", "exec", "rake", "test")
   end
 
   desc "Runs the acceptance tests suite in a Linux Docker environment"
   task :features do
-    system("docker", "build", __dir__, "-t", "shopify-cli") || abort
-    system(
-      "docker", "run",
-      "-t", "--rm",
-      "--volume", "#{Shellwords.escape(__dir__)}:/usr/src/app",
-      "shopify-cli",
-      "bundle", "exec", "cucumber"
-    ) || abort
+    Utilities::Docker.run_and_rm_container("bundle", "exec", "cucumber")
   end
 end
 

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "load_shopify"
+require "irb"
+require "irb/completion"
+require "irb/ext/save-history"
+
+IRB.conf[:SAVE_HISTORY] = 100
+IRB.conf[:HISTORY_FILE] = File.expand_path("../../.console_history", __FILE__)
+IRB.start

data/bin/shopify

@@ -12,6 +12,8 @@ module Kernel
     raise if (name == "readline.so") && ShopifyCLI::Context.new.windows?
     # Special case for psych (yaml), which rescues this itself
     raise if name == "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
+    # Special case for ffi, which rescues this itself
+    raise if name == "#{RUBY_VERSION.split(".")[0, 2].join(".")}/ffi_c"
     STDERR.puts "[Note] You cannot use gems with Shopify CLI."
     STDERR.puts "[LoadError] #{e.message}"
     if ENV["DEBUG"]
@@ -29,6 +31,16 @@ end
 
 require_relative "./load_shopify"
 
-exit(ShopifyCLI::ErrorHandler.call do
-  ShopifyCLI::Core::EntryPoint.call(ARGV.dup)
-end)
+exit(proc do
+  begin
+    ShopifyCLI::ErrorHandler.call do
+      ShopifyCLI::Core::EntryPoint.call(ARGV.dup)
+    end
+  rescue StandardError => error
+    if ShopifyCLI::Environment.print_stacktrace?
+      raise error
+    else
+      1
+    end
+  end
+end.call)

data/dev.yml

@@ -2,6 +2,9 @@ name: dev
 type:
   - ruby
 
+env:
+  SHOPIFY_CLI_DEVELOPMENT: "1"
+
 up:
   - ruby: 2.7.1
   - homebrew:

data/ext/shopify-cli/extconf.rb

@@ -1,5 +1,6 @@
 require "rbconfig"
 require "fileutils"
+require "date"
 
 gem = File.expand_path("../../../", __FILE__)
 exe = File.join(gem, "bin", "shopify")
@@ -56,4 +57,5 @@ else
   MAKEFILE
 end
 
+File.write(installation_date_path, Time.now.to_i.to_s)
 File.write("Makefile", makefile_content)

data/lib/project_types/extension/cli.rb

@@ -42,6 +42,7 @@ module Extension
     autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
     autoload :GetProduct, Project.project_filepath("tasks/get_product")
     autoload :RunExtensionCommand, Project.project_filepath("tasks/run_extension_command")
+    autoload :LoadServerConfig, Project.project_filepath("tasks/load_server_config")
 
     module Converters
       autoload :RegistrationConverter, Project.project_filepath("tasks/converters/registration_converter")
@@ -49,6 +50,7 @@ module Extension
       autoload :ValidationErrorConverter, Project.project_filepath("tasks/converters/validation_error_converter")
       autoload :AppConverter, Project.project_filepath("tasks/converters/app_converter")
       autoload :ProductConverter, Project.project_filepath("tasks/converters/product_converter")
+      autoload :ServerConfigConverter, Project.project_filepath("tasks/converters/server_config_converter")
     end
   end
 

data/lib/project_types/extension/commands/build.rb

@@ -26,7 +26,8 @@ module Extension
       def run_new_flow(project)
         Tasks::RunExtensionCommand.new(
           type: project.specification_identifier.downcase,
-          command: "build"
+          command: "build",
+          config_file_name: specification_handler.server_config_file,
         ).call
 
         @ctx.puts(@ctx.message("build.build_success_message"))

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

@@ -44,7 +44,7 @@ module Extension
       def renderer_package(context)
         js_system = ShopifyCLI::JsSystem.new(ctx: context)
         Tasks::FindNpmPackages
-          .exactly_one_of(renderer_package_name, js_system: js_system)
+          .exactly_one_of(renderer_package_name, js_system: js_system, production_only: true)
           .unwrap { |err| raise err }
       rescue Extension::PackageResolutionFailed
         context.abort(

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

@@ -116,6 +116,7 @@ module Extension
           command: "serve",
           context: context,
           port: port,
+          config_file_name: specification_handler.server_config_file,
         ).call
       end
 

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

@@ -22,6 +22,10 @@ module Extension
         end
       end
 
+      def executable_installed?
+        File.exist?(executable)
+      end
+
       def create(server_config)
         CLI::Kit::System.capture3(executable, "create", "-", stdin_data: server_config.to_yaml)
       rescue StandardError => error

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

@@ -19,8 +19,7 @@ module Extension
         private
 
         def binary_installed?
-          extension_dir = File.join(ShopifyCLI::ROOT, "ext", "shopify-extensions")
-          File.exist?(File.join(extension_dir, UNIX_NAME)) || File.exist?(File.join(extension_dir, WINDOWS_NAME))
+          Models::DevelopmentServer.new.executable_installed?
         end
 
         def type_supported?(type)

data/lib/project_types/extension/models/specification_handlers/default.rb

@@ -103,6 +103,10 @@ module Extension
           raise NotImplementedError
         end
 
+        def server_config_file
+          "shopifile.yml"
+        end
+
         protected
 
         def argo

data/lib/project_types/extension/tasks/converters/server_config_converter.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    module Converters
+      module ServerConfigConverter
+        def self.from_hash(hash, type)
+          context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
+
+          project = ExtensionProject.current
+
+          extension = Models::ServerConfig::Extension.new(
+            uuid: project.registration_uuid,
+            type: type.upcase,
+            user: Models::ServerConfig::User.new,
+            development: Models::ServerConfig::Development.new(
+              build_dir: hash.dig("development", "build_dir"),
+              renderer: Models::ServerConfig::DevelopmentRenderer.find(type),
+              entries: Models::ServerConfig::DevelopmentEntries.new(
+                main: hash.dig("development", "entries", "main")
+              )
+            )
+          )
+
+          Models::ServerConfig::Root.new(extensions: [extension])
+        end
+      end
+    end
+  end
+end

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

@@ -84,11 +84,11 @@ module Extension
       end
 
       def yarn_list
-        production_only? ? %w[list --production] : %w[list]
+        production_only? ? %w[list --production --depth=0] : %w[list]
       end
 
       def npm_list
-        production_only? ? %w[list --prod --depth=1] : %w[list --depth=1]
+        production_only? ? %w[list --prod --depth=0] : %w[list]
       end
 
       def search_packages(packages, package_list)

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+require "shopify_cli"
+require "yaml"
+
+module Extension
+  module Tasks
+    class LoadServerConfig < ShopifyCLI::Task
+      include SmartProperties
+
+      class << self
+        def call(file_name:, type:)
+          config = YAML.load_file(file_name)
+          Tasks::Converters::ServerConfigConverter.from_hash(config, type)
+        rescue Psych::SyntaxError => e
+          raise(
+            ShopifyCLI::Abort,
+            ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -17,17 +17,17 @@ module Extension
         "serve",
       ]
 
-      property :root_dir, accepts: String
-      property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
-      property! :type, accepts: SUPPORTED_EXTENSION_TYPES
       property! :command, accepts: SUPPORTED_COMMANDS
+      property! :type, accepts: SUPPORTED_EXTENSION_TYPES
       property :context, accepts: ShopifyCLI::Context
+      property :config_file_name, accepts: String
       property :port, accepts: Integer, default: 39351
+      property :root_dir, accepts: String
+      property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
 
       def call
-        ShopifyCLI::Result
-          .call(&method(:build_extension))
-          .then(&method(:build_server_config))
+        ShopifyCLI::Result.success(config_file_exists?)
+          .then(&method(:load_or_build_server_config))
           .then(&method(:run_command))
           .unwrap do |error|
             raise error unless error.nil?
@@ -36,15 +36,31 @@ module Extension
 
       private
 
-      def build_extension
-        Models::ServerConfig::Extension.build(
+      def config_file_exists?
+        return false if config_file_name.nil?
+        project = ExtensionProject.current
+        File.exist?(File.join(project.directory, config_file_name))
+      end
+
+      def load_or_build_server_config(config_file_exists)
+        return load_server_config if config_file_exists
+        build_server_config
+      end
+
+      def load_server_config
+        Tasks::LoadServerConfig.call(
+          file_name: config_file_name,
+          type: type,
+        )
+      end
+
+      def build_server_config
+        extension = Models::ServerConfig::Extension.build(
           template: template,
           type: type,
           root_dir: root_dir,
         )
-      end
 
-      def build_server_config(extension)
         Models::ServerConfig::Root.new(port: port, extensions: [extension])
       end
 

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

@@ -9,6 +9,7 @@ module Node
         parser.on("--host=HOST") do |h|
           flags[:host] = h.gsub('"', "")
         end
+        parser.on("--port=PORT") { |port| flags[:port] = port }
       end
 
       def call(*)
@@ -29,11 +30,18 @@ module Node
 
         CLI::UI::Frame.open(@ctx.message("node.serve.running_server")) do
           env = project.env.to_h
-          env["PORT"] = ShopifyCLI::Tunnel::PORT.to_s
+          env["PORT"] = port.to_s
           @ctx.system("npm run dev", env: env)
         end
       end
 
+      def port
+        return ShopifyCLI::Tunnel::PORT.to_s unless options.flags.key?(:port)
+        port = options.flags[:port].to_i
+        @ctx.abort(@ctx.message("node.serve.error.invalid_port", options.flags[:port])) unless port > 0
+        port
+      end
+
       def self.help
         ShopifyCLI::Context.message("node.serve.help", ShopifyCLI::TOOL_NAME)
       end

data/lib/project_types/node/messages/messages.rb

@@ -119,10 +119,12 @@ module Node
           extended_help: <<~HELP,
             {{bold:Options:}}
               {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
+              {{cyan:--port=PORT}}: Use custom port.
           HELP
 
           error: {
             host_must_be_https: "HOST must be a HTTPS url.",
+            invalid_port: "%s is not a valid port.",
           },
 
           open_info: <<~MESSAGE,
@@ -154,6 +156,7 @@ module Node
           error: {
             token_argument_missing: "{{x}} {{red:auth requires a token argument}}\n\n",
           },
+
         },
 
         forms: {

data/lib/project_types/script/cli.rb

@@ -60,10 +60,11 @@ module Script
         autoload :AssemblyScriptTaskRunner,
           Project.project_filepath("layers/infrastructure/languages/assemblyscript_task_runner")
         autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/languages/project_creator")
-        autoload :RustProjectCreator,
-          Project.project_filepath("layers/infrastructure/languages/rust_project_creator.rb")
-        autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/languages/rust_task_runner")
         autoload :TaskRunner, Project.project_filepath("layers/infrastructure/languages/task_runner")
+        autoload :TypeScriptProjectCreator,
+          Project.project_filepath("layers/infrastructure/languages/typescript_project_creator.rb")
+        autoload :TypeScriptTaskRunner,
+          Project.project_filepath("layers/infrastructure/languages/typescript_task_runner.rb")
       end
 
       module ApiClients

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

@@ -10,6 +10,7 @@ module Script
         parser.on("--extension_point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
         parser.on("--extension-point=EP_NAME") { |ep_name| flags[:extension_point] = ep_name }
         parser.on("--language=LANGUAGE") { |language| flags[:language] = language }
+        parser.on("--branch=BRANCH") { |branch| flags[:branch] = branch }
         parser.on("--no-config-ui") { |no_config_ui| flags[:no_config_ui] = no_config_ui }
       end
 
@@ -24,6 +25,7 @@ module Script
         project = Layers::Application::CreateScript.call(
           ctx: @ctx,
           language: form.language,
+          sparse_checkout_branch: options.flags[:branch] || "master",
           script_name: form.name,
           extension_point_type: form.extension_point,
           no_config_ui: options.flags.key?(:no_config_ui)

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

@@ -1,43 +1,44 @@
 discount:
   deprecated: true
-  assemblyscript:
-    package: "@shopify/extension-point-as-discount"
-    sdk-version: "^9.0.0"
-    toolchain-version: "^5.0.0"
+  libraries:
+    assemblyscript:
+      package: "@shopify/extension-point-as-discount"
 unit_limit_per_order:
   beta: true
-  assemblyscript:
-    package: "@shopify/extension-point-as-unit-limit-per-order"
-    sdk-version: "^9.0.0"
-    toolchain-version: "^5.0.0"
+  libraries:
+    assemblyscript:
+      package: "@shopify/extension-point-as-unit-limit-per-order"
 payment_filter:
   deprecated: true
-  assemblyscript:
-    package: "@shopify/extension-point-as-payment-filter"
-    sdk-version: "^9.0.0"
-    toolchain-version: "^5.0.0"
-  rust:
-    beta: true
-    package: "https://github.com/Shopify/scripts-apis-rs"
+  libraries:
+    assemblyscript:
+      package: "@shopify/extension-point-as-payment-filter"
 shipping_filter:
   deprecated: true
-  assemblyscript:
-    package: "@shopify/extension-point-as-shipping-filter"
-    sdk-version: "^9.0.0"
-    toolchain-version: "^5.0.0"
+  libraries:
+    assemblyscript:
+      package: "@shopify/extension-point-as-shipping-filter"
 tax_filter:
   beta: true
-  assemblyscript:
-    package: "@shopify/extension-point-as-tax-filter"
-    sdk-version: "^9.0.0"
-    toolchain-version: "^5.0.0"
+  libraries:
+    assemblyscript:
+      repo: "https://github.com/Shopify/extension-points.git"
+      package: "@shopify/extension-point-as-tax-filter"
 payment_methods:
   domain: 'checkout'
-  assemblyscript:
-    package: "@shopify/scripts-checkout-apis"
-    toolchain-version: "^5.0.0"
+  libraries:
+    assemblyscript:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+      package: "@shopify/scripts-checkout-apis"
+    typescript:
+      beta: true
+      repo: "https://github.com/Shopify/scripts-apis-examples"
 shipping_methods:
   domain: 'checkout'
-  assemblyscript:
-    package: "@shopify/scripts-checkout-apis"
-    toolchain-version: "^5.0.0"
+  libraries:
+    assemblyscript:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+      package: "@shopify/scripts-checkout-apis"
+    typescript:
+      beta: true
+      repo: "https://github.com/Shopify/scripts-apis-examples"