shopify-cli 2.13.0 → 2.15.1

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

@@ -26,7 +26,6 @@ module Script
           )
 
             project_creators = {
-              "assemblyscript" => AssemblyScriptProjectCreator,
               "typescript" => TypeScriptProjectCreator,
               "wasm" => WasmProjectCreator,
             }

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

@@ -9,7 +9,6 @@ module Script
 
           def self.for(ctx, language)
             task_runners = {
-              "assemblyscript" => AssemblyScriptTaskRunner,
               "typescript" => TypeScriptTaskRunner,
               "wasm" => WasmTaskRunner,
             }

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

@@ -18,7 +18,8 @@ module Script
 
           def build
             compile
-            bytecode
+          rescue Errors::SystemCallFailureError => e
+            raise Errors::BuildError, e.out
           end
 
           def install_dependencies
@@ -95,15 +96,6 @@ module Script
             raise Errors::BuildScriptNotFoundError,
               "Build script not found" if build_script.nil?
           end
-
-          def bytecode
-            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(BYTECODE_FILE)
-
-            contents = ctx.binread(BYTECODE_FILE)
-            ctx.rm(BYTECODE_FILE)
-
-            contents
-          end
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Script
     module Infrastructure
       module Languages
         class WasmTaskRunner < TaskRunner
-          BYTECODE_FILE = "script.wasm"
+          BYTECODE_FILE = "build/index.wasm"
 
           def dependencies_installed?
             true

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

@@ -7,23 +7,6 @@ module Script
         include SmartProperties
         property! :ctx, accepts: ShopifyCLI::Context
 
-        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(
-            id: build_file_path,
-            uuid: script_project.uuid,
-            extension_point_type: script_project.extension_point_type,
-            title: script_project.title,
-            description: script_project.description,
-            script_content: script_content,
-            metadata: metadata,
-            script_config: script_project.script_config,
-            library: library
-          )
-        end
-
         def get_push_package(script_project:, metadata:, library:)
           build_file_path = file_path(script_project.id)
           raise Domain::Errors::PushPackageNotFoundError unless ctx.file_exist?(build_file_path)
@@ -44,13 +27,8 @@ module Script
 
         private
 
-        def write_to_path(path, content)
-          ctx.mkdir_p(File.dirname(path))
-          ctx.binwrite(path, content)
-        end
-
         def file_path(path_to_script)
-          "#{path_to_script}/build/script.wasm"
+          "#{path_to_script}/build/index.wasm"
         end
       end
     end

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

@@ -136,7 +136,7 @@ module Script
         end
 
         def default_language
-          "assemblyscript"
+          "wasm"
         end
 
         def validate_metadata!(extension_point_type, language)

data/lib/project_types/script/messages/messages.rb

@@ -135,8 +135,8 @@ module Script
             "\nbuild: npx shopify-scripts-toolchain-as build --src src/shopify_main.ts --binary build/<script_name>.wasm --metadata build/metadata.json -- --lib node_modules --optimize --use Date=",
 
           web_assembly_binary_not_found: "Wasm binary not found.",
-          web_assembly_binary_not_found_suggestion: "Check that there is a valid Wasm binary in the root directory" \
-          "Your Wasm binary should match the script name: <script_name>.wasm",
+          web_assembly_binary_not_found_suggestion: "Check that a valid Wasm binary is present. " \
+          "The Wasm binary's filepath must be 'build/index.wasm'.",
 
           project_config_not_found: "Internal error - Script can't be created because the project's config file is missing from the repository.",
 

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

@@ -15,6 +15,7 @@ module Theme
         sections
         snippets
         templates
+        release-notes.md
       ]
 
       def call(args, _name)

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

@@ -26,11 +26,11 @@ module Theme
         parser.on("-d", "--development") { flags[:development] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] += pattern
+          flags[:includes] |= pattern
         end
         parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] += pattern
+          flags[:ignores] |= pattern
         end
       end
 

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

@@ -30,11 +30,11 @@ module Theme
         parser.on("-p", "--publish") { flags[:publish] = true }
         parser.on("-o", "--only=PATTERN", Conversions::IncludeGlob) do |pattern|
           flags[:includes] ||= []
-          flags[:includes] += pattern
+          flags[:includes] |= pattern
         end
         parser.on("-x", "--ignore=PATTERN", Conversions::IgnoreGlob) do |pattern|
           flags[:ignores] ||= []
-          flags[:ignores] += pattern
+          flags[:ignores] |= pattern
         end
       end
 

data/lib/project_types/theme/conversions/base_glob.rb

@@ -10,8 +10,22 @@ module Theme
 
         def convert(parser)
           argv = parser.default_argv
-          option_index = argv.index { |v| options.include?(v) }
+          values = []
+
+          option_indexes(argv).each do |option_index|
+            values += option_values(argv, parser, option_index)
+          end
+
+          values
+        end
+
+        def options
+          raise "`#{self.class.name}#options` must be defined"
+        end
+
+        private
 
+        def option_values(argv, parser, option_index)
           return [] if option_index.nil?
 
           start_index = option_index + 1
@@ -26,12 +40,13 @@ module Theme
           values
         end
 
-        def options
-          raise "`#{self.class.name}#options` must be defined"
+        def option_indexes(argv)
+          argv
+            .each_with_index
+            .select { |item, _index| options.include?(item) }
+            .map(&:last)
         end
 
-        private
-
         def options_map(parser)
           map = {}
           parser.top.list.each do |option|

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

@@ -7,6 +7,8 @@ module Theme
           Suite of commands for developing Shopify themes. See {{command:%1$s theme <command> --help}} for usage of each command.
             Usage: {{command:%1$s theme [ %2$s ]}}
         HELP
+        ensure_user_error: "You are not authorized to edit themes on %s.",
+        ensure_user_try_this: "Make sure you are a user of that store, and allowed to edit themes.",
 
         init: {
           help: <<~HELP,
@@ -122,6 +124,13 @@ module Theme
           error: {
             address_binding_error: "Couldn't bind to localhost."\
               " To serve your theme, set a different address with {{command:%s theme serve --host=<address>}}",
+            invalid_subdirectory: <<~MESSAGE,
+              The presence of %s in the directory structure isn't supported.
+
+              Move any files to a parent folder, then delete unsupported subdirectories.
+
+              • Required directory structure: https://shopify.dev/themes/architecture#directory-structure-and-component-types
+            MESSAGE
           },
           serving: <<~SERVING,
 

data/lib/shopify_cli/changelog.rb

@@ -0,0 +1,76 @@
+require "shopify_cli/sed"
+
+module ShopifyCLI
+  class Changelog
+    CHANGELOG_FILE = File.join(ShopifyCLI::ROOT, "CHANGELOG.md")
+
+    def initialize
+      load(File.read(CHANGELOG_FILE))
+    end
+
+    def update_version!(new_version)
+      Sed.new.replace_inline(
+        CHANGELOG_FILE,
+        "## \\[Unreleased\\]",
+        "## [Unreleased]\\n\\n## Version #{new_version}"
+      )
+    end
+
+    def release_notes(version)
+      changes[version].map do |change_category, changes|
+        <<~CHANGES
+          ### #{change_category}
+          #{changes.map { |change| entry(**change) }.join("\n")}
+        CHANGES
+      end.join("\n")
+    end
+
+    def entry(pr_id:, desc:)
+      "* [##{pr_id}](https://github.com/Shopify/shopify-cli/pull/#{pr_id}): #{desc}"
+    end
+
+    private
+
+    def changes
+      @changes ||= Hash.new do |h, k|
+        h[k] = Hash.new do |h2, k2|
+          h2[k2] = []
+        end
+      end
+    end
+
+    def load(log)
+      state = :initial
+      change_category = nil
+      current_version = nil
+      @remainder = ""
+      log.each_line do |line|
+        case state
+        when :initial
+          next unless line.chomp == "\#\# [Unreleased]"
+          state = :unreleased
+          current_version = "Unreleased"
+        when :unreleased, :last_version
+          if /\A\#\#\# (?<category>\w+)/ =~ line
+            change_category = category
+          elsif %r{\A\* \[\#(?<pr_id>\d+)\]\(https://github.com/Shopify/shopify-cli/pull/\d+\): (?<desc>.+)\n} =~ line
+            changes[current_version][change_category] << { pr_id: pr_id, desc: desc }
+          elsif /\A\#\# Version (?<version>\d+\.\d+\.\d+)/ =~ line
+            current_version = version
+            state =
+              case state
+              when :unreleased
+                :last_version
+              else
+                :finished
+              end
+          elsif !line.match?(/\s*\n/)
+            raise "Unrecognized line: #{line.inspect}"
+          end
+        when :finished
+          @remainder << line
+        end
+      end
+    end
+  end
+end

data/lib/shopify_cli/command.rb

@@ -36,6 +36,13 @@ module ShopifyCLI
         end
       rescue OptionParser::InvalidOption => error
         arg = error.args.first
+        store_name = arg.match(/\A--(?<store_name>.*\.myshopify\.com)\z/)&.[](:store_name)
+        if store_name && !arg.match?(/\A--(store|shop)=/)
+          # Sometimes it may look like --invalidoption=https://storename.myshopify.com
+          store_name = store_name.sub(%r{\A(.*=)?(https?://)?}, "")
+          raise ShopifyCLI::Abort,
+            @ctx.message("core.errors.option_parser.invalid_option_store_equals", arg, store_name)
+        end
         raise ShopifyCLI::Abort, @ctx.message("core.errors.option_parser.invalid_option", arg)
       rescue OptionParser::MissingArgument => error
         arg = error.args.first
@@ -102,16 +109,10 @@ module ShopifyCLI
       def check_node_version
         return unless @compatible_node_range
 
-        context = Context.new
-        if context.which("node").nil?
-          raise ShopifyCLI::Abort, context.message("core.errors.missing_node")
-        end
-
         check_version(
           Environment.node_version,
           range: @compatible_node_range,
-          runtime: "Node",
-          context: context
+          runtime: "Node"
         )
       end
 

data/lib/shopify_cli/commands/app/deploy.rb

@@ -2,7 +2,6 @@ module ShopifyCLI
   module Commands
     class App
       class Deploy < ShopifyCLI::Command::AppSubCommand
-        subcommand :Heroku, "heroku", "shopify_cli/commands/app/deploy/heroku"
         prerequisite_task :ensure_git_dependency
 
         recommend_default_ruby_range

data/lib/shopify_cli/context.rb

@@ -103,7 +103,7 @@ module ShopifyCLI
     # any command run by the context.
     attr_accessor :env
 
-    def initialize(root: Dir.pwd, env: ($original_env || ENV).clone) # :nodoc:
+    def initialize(root: Dir.pwd, env: ($original_env || ENV).to_h) # :nodoc:
       self.root = root
       self.env = env
     end
@@ -164,7 +164,7 @@ module ShopifyCLI
 
     # will return true while tests are running, either locally or on CI
     def testing?
-      ci? || ENV["TEST"]
+      ci? || ENV["SHOPIFY_CLI_TEST"]
     end
 
     ##

data/lib/shopify_cli/core/entry_point.rb

@@ -5,7 +5,7 @@ module ShopifyCLI
     module EntryPoint
       class << self
         def call(args, ctx = Context.new)
-          if ctx.development?
+          if ctx.development? && !ctx.testing?
             ctx.warn(
               ctx.message("core.warning.development_version", File.join(ShopifyCLI::ROOT, "bin", ShopifyCLI::TOOL_NAME))
             )

data/lib/shopify_cli/core/monorail.rb

@@ -17,11 +17,7 @@ module ShopifyCLI
 
         def log(name, args, &block) # rubocop:disable Lint/UnusedMethodArgument
           command, command_name = Commands::Registry.lookup_command(name)
-          final_command = [command_name]
-          if command
-            subcommand, subcommand_name = command.subcommand_registry.lookup_command(args.first)
-            final_command << subcommand_name if subcommand
-          end
+          full_command = self.full_command(command, args, resolved_command: [command_name])
 
           start_time = now_in_milliseconds
           err = nil
@@ -35,9 +31,21 @@ module ShopifyCLI
             # If there's an error, we don't prompt from here and we let the exception
             # reporter do that.
             if report?(prompt: err.nil?)
-              send_event(start_time, final_command, args - final_command, err&.message)
+              send_event(start_time, full_command, args - full_command, err&.message)
+            end
+          end
+        end
+
+        def full_command(command, args, resolved_command:)
+          resolved_command = resolved_command.dup
+          if command
+            subcommand, subcommand_name = command.subcommand_registry.lookup_command(args.first)
+            resolved_command << subcommand_name if subcommand
+            if subcommand&.subcommand_registry
+              resolved_command = full_command(subcommand, args.drop(1), resolved_command: resolved_command)
             end
           end
+          resolved_command
         end
 
         private

data/lib/shopify_cli/environment.rb

@@ -12,23 +12,31 @@ module ShopifyCLI
     ]
 
     def self.ruby_version(context: Context.new)
-      out, err, stat = context.capture3('ruby -e "puts RUBY_VERSION"')
-      raise ShopifyCLI::Abort, err unless stat.success?
-      out = out.gsub('"', "")
-      ::Semantic::Version.new(out.chomp)
+      output, status = context.capture2e("ruby", "--version")
+      raise ShopifyCLI::Abort, context.message("core.errors.missing_ruby") unless status.success?
+      version = output.match(/ruby (\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
     end
 
     def self.node_version(context: Context.new)
-      out, err, stat = context.capture3("node", "--version")
-      raise ShopifyCLI::Abort, err unless stat.success?
-      out = out.gsub("v", "")
-      ::Semantic::Version.new(out.chomp)
+      output, status = context.capture2e("node", "--version")
+      raise ShopifyCLI::Abort, context.message("core.errors.missing_node") unless status.success?
+      version = output.match(/v(\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
     end
 
     def self.npm_version(context: Context.new)
-      out, err, stat = context.capture3("npm", "--version")
-      raise ShopifyCLI::Abort, err unless stat.success?
-      ::Semantic::Version.new(out.chomp)
+      output, status = context.capture2e("npm", "--version")
+      raise ShopifyCLI::Abort, context.message("core.errors.missing_npm") unless status.success?
+      version = output.match(/(\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
+    end
+
+    def self.rails_version(context: Context.new)
+      output, status = context.capture2e("rails", "--version")
+      context.abort(context.message("core.app.create.rails.error.install_failure", "rails")) unless status.success?
+      version = output.match(/Rails (\d+\.\d+\.\d+)/)[1]
+      ::Semantic::Version.new(version)
     end
 
     def self.interactive=(interactive)

data/lib/shopify_cli/exception_reporter.rb

@@ -46,6 +46,8 @@ module ShopifyCLI
       Bugsnag.notify(error) do |event|
         event.add_metadata(:device, metadata)
       end
+    rescue
+      nil
     end
 
     def self.report?(context:)

data/lib/shopify_cli/messages/messages.rb

@@ -15,9 +15,17 @@ module ShopifyCLI
       },
       core: {
         errors: {
-          missing_node: "Node is required to continue. Install node here: https://nodejs.org/en/download.",
+          missing_node: "Node.js is required to continue. Install Node.js here: https://nodejs.org/en/download.",
+          missing_npm: "npm is required to continue. Install npm here: https://www.npmjs.com/get-npm.",
+          missing_ruby: "Ruby is required to continue. Install Ruby here: https://www.ruby-lang.org/en/downloads.",
           option_parser: {
             invalid_option: "The option {{command:%s}} is not supported.",
+            invalid_option_store_equals: <<~MESSAGE,
+            The option {{command:%s}} isn't recognized.
+
+            Try this:
+            {{command:--store=%s}}.
+            MESSAGE
             missing_argument: "The required argument {{command:%s}} is missing.",
           },
         },
@@ -95,8 +103,6 @@ module ShopifyCLI
               HELP
               error: {
                 node_required: "node is required to create an app project. Download at https://nodejs.org/en/download.",
-                node_version_failure: "Failed to get the current node version. Please make sure it is installed as " \
-                  "per the instructions at https://nodejs.org/en.",
                 npm_required: "npm is required to create an app project. Download at https://www.npmjs.com/get-npm.",
                 npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
                   "the instructions at https://www.npmjs.com/get-npm.",
@@ -131,8 +137,6 @@ module ShopifyCLI
                     {{underline:https://getcomposer.org/download/}}
                   COMPOSER
                 npm_required: "npm is required to create an app project. Download at https://www.npmjs.com/get-npm.",
-                npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
-                  "the instructions at https://www.npmjs.com/get-npm.",
                 app_setup: "Failed to set up the app",
               },
 
@@ -283,6 +287,8 @@ module ShopifyCLI
               localization: {
                 error: {
                   bundle_too_large: "Total size of all locale files must be less than %s.",
+                  duplicate_locale_code: "Duplicate locale found: `%s`; locale codes"\
+                    " should be unique and are case insensitive.",
                   file_empty: "Locale file `%s` is empty.",
                   file_too_large: "Locale file `%s` too large; size must be less than %s.",
                   invalid_file_extension: "Invalid locale filename: `%s`; only .json files are allowed.",

data/lib/shopify_cli/packager.rb

@@ -81,7 +81,7 @@ module ShopifyCLI
       puts "Grabbing sha256 checksum from Rubygems.org"
       require "digest/sha2"
       require "open-uri"
-      gem_checksum = open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCLI::VERSION}.gem") do |io|
+      gem_checksum = URI.open("https://rubygems.org/downloads/shopify-cli-#{ShopifyCLI::VERSION}.gem") do |io|
         Digest::SHA256.new.hexdigest(io.read)
       end
 

data/lib/shopify_cli/release.rb

@@ -0,0 +1,94 @@
+require "shopify_cli/sed"
+require "shopify_cli/changelog"
+require "octokit"
+
+module ShopifyCLI
+  class Release
+    def initialize(new_version, github_access_token)
+      @new_version = new_version
+      @changelog = ShopifyCLI::Changelog.new
+      @github = Octokit::Client.new(access_token: github_access_token)
+    end
+
+    def prepare!
+      ensure_updated_main
+      create_release_branch
+      update_changelog
+      update_versions_in_files
+      commit
+      pr = create_pr
+      system("open #{pr["html_url"]}")
+    end
+
+    private
+
+    attr_reader :new_version, :changelog, :github
+
+    def ensure_updated_main
+      current_branch = %x(git branch --show-current)
+      unless current_branch == "main"
+        raise "Must be on the main branch to package a release!"
+      end
+      unless system("git pull")
+        raise "git pull failed, cannot be sure there aren't new commits!"
+      end
+    end
+
+    def create_release_branch
+      puts "Checking out release branch"
+      unless system("git checkout -b #{release_branch_name}")
+        puts "Cannot check out release branch!"
+      end
+    end
+
+    def update_changelog
+      if release_notes.empty?
+        puts "No unreleased CHANGELOG updates found!"
+      else
+        puts "Updating CHANGELOG"
+        changelog.update_version!(new_version)
+      end
+    end
+
+    def update_versions_in_files
+      version_file = File.join(ShopifyCLI::ROOT, "lib/shopify_cli/version.rb")
+      puts "Updating version.rb"
+      ShopifyCLI::Sed.new.replace_inline(version_file, ShopifyCLI::VERSION, new_version)
+      gemfile_lock = File.join(ShopifyCLI::ROOT, "Gemfile.lock")
+      puts "Updating Gemfile.lock"
+      ShopifyCLI::Sed.new.replace_inline(
+        gemfile_lock,
+        "shopify-cli (#{ShopifyCLI::VERSION})",
+        "shopify-cli (#{new_version})",
+      )
+    end
+
+    def commit
+      puts "Committing"
+      unless system("git commit -am 'Packaging for release v#{new_version}'")
+        puts "Commit failed!"
+      end
+      unless system("git push -u origin #{release_branch_name}")
+        puts "Failed to push branch!"
+      end
+    end
+
+    def create_pr
+      github.create_pull_request(
+        "Shopify/shopify-cli",
+        "main",
+        release_branch_name,
+        "Packaging for release v#{new_version}",
+        release_notes
+      ).tap { |results| puts "Created PR ##{results["number"]}" }
+    end
+
+    def release_branch_name
+      @release_branch_name ||= "release_#{new_version.split(".").join("_")}"
+    end
+
+    def release_notes
+      @release_notes ||= changelog.release_notes("Unreleased")
+    end
+  end
+end

data/lib/shopify_cli/result.rb

@@ -181,6 +181,13 @@ module ShopifyCLI
         self
       end
 
+      ##
+      # returns the value this success represents
+      #
+      def unwrap!
+        value
+      end
+
       ##
       # returns the success value and ignores the fallback value that was either
       # provided as a method argument or by passing a block. However, the caller
@@ -339,6 +346,13 @@ module ShopifyCLI
         raise ArgumentError, "expected either a fallback value or a block" unless (args.length == 1) ^ block
         block ? block.call(@error) : args.pop
       end
+
+      ##
+      # raises the error this failure represents
+      #
+      def unwrap!
+        raise error
+      end
     end
 
     ##

data/lib/shopify_cli/sed.rb

@@ -0,0 +1,19 @@
+module ShopifyCLI
+  class Sed
+    class SedError < StandardError; end
+
+    def replace_inline(filename, pattern, output)
+      command =
+        case CLI::Kit::System.os
+        when :mac
+          "sed -i ''"
+        when :linux
+          "sed -i"
+        else
+          raise "Unrecognized system!"
+        end
+      success = system("#{command} 's/#{pattern}/#{output}/' #{filename}")
+      raise SedError unless success
+    end
+  end
+end