shopify-cli 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45acefe059ce1e83e77f20be8ee3b7815c5be28f834ef7697dd9000175884c4f
-  data.tar.gz: a1abb2765725c6a1d593f869c323f179429b7c21d25de9bfa8649e5817dc9d6e
+  metadata.gz: efb6500804d976bce67276002bd2e95343cc080c7278fc7c510017676abb24a0
+  data.tar.gz: 3f0ab9095319fb4743fb37d19db43195c4fd4c737122ceada5958c00bad01b84
 SHA512:
-  metadata.gz: 5f73366ea4f16f7d5615fe6ae62edd58692f85288b7f6056be61a4cbcbf72c94a1979cc806255fe55c82504f42433c1264ca9b479203639dbaf209273189cccc
-  data.tar.gz: 556ef6bdc6338c156d1ef6c9f9971e37d687cd7c1c8c93f6dc609a053f2303cde7d03b968e2e0e2336e59bc5b89539e8fb3a12f38e3427bbddb29bf448d7f130
+  metadata.gz: 27cf1b9e1256bb8732fbc291eb423a26ec1570e79cd960c9cc508e387ca58edeb5559680183f5a94009255b17f970e78ed4e1aee591f2782a29be2b9ab9b79b2
+  data.tar.gz: d6e489fc945ce4f27f3800238ff62b24b23073debfe29e48a196c972f7c7ebb34cea7f0affe7d7d326e48573e6df61c7ff68d062e261e83844fbd72cb0ce29ab

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -29,4 +29,4 @@ Fixes #0000 <!-- link to issue if one exists -->
 -->
 - [ ] I've added a CHANGELOG entry for this PR (if the change is public-facing)
 - [ ] I've considered possible cross-platform impacts (Mac, Linux, Windows).
-- [ ] I've left the version number as is (we'll handle incrmenting this when releasing).
+- [ ] I've left the version number as is (we'll handle incrementing this when releasing).

data/.github/workflows/release.yml

@@ -15,12 +15,10 @@ jobs:
     - uses: actions/checkout@v2
     
     - name: Set up Ruby
-      uses: actions/setup-ruby@v1.1.2
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.6
-    
-    - name: Install dependencies
-      run: bundle install
+        bundler-cache: true
 
     - name: Create package
       run: bundle exec rake package

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 Unreleased
 ------
 
+Version 1.13.0
+--------------
+
+* [1266](https://github.com/Shopify/shopify-app-cli/pull/1266): Developer Console release
+* [1265](https://github.com/Shopify/shopify-app-cli/pull/1265): Fix bug where commands hang after an unsuccessful authentication
+
 Version 1.12.0
 --------------
 * [1255](https://github.com/Shopify/shopify-app-cli/pull/1255): Fix beta flag checks when running `shopify serve`
@@ -12,6 +18,7 @@ Version 1.11.0
 * [#1225](https://github.com/Shopify/shopify-app-cli/pull/1225): Improved handling of "account not found" scenario, plus improvements to related tests and UX messaging
 * [#1229](https://github.com/Shopify/shopify-app-cli/pull/1229): Allows Checkout Extensions to specify configuration attributes in their extension.config.yml file.
 * [#1238](https://github.com/Shopify/shopify-app-cli/pull/1238): Auto Tunnel Support for Checkout Extension
+* [#1256](https://github.com/Shopify/shopify-app-cli/pull/1256): Allow using spaces around the equal sign on .env file.
 
 Version 1.10.0
 --------------

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

@@ -12,7 +12,6 @@ module Extension
 
       property! :renderer, accepts: Models::NpmPackage
       property! :cli, accepts: Models::NpmPackage
-      property :beta_access, accepts: Array, default: -> { [] }
 
       def accepts_port?
         case cli
@@ -51,7 +50,6 @@ module Extension
       end
 
       def accepts_shop?
-        return false unless beta_access.include?(:argo_admin_beta)
         case cli
         when admin?
           cli >= ARGO_ADMIN_CLI_0_11_0
@@ -61,7 +59,6 @@ module Extension
       end
 
       def accepts_api_key?
-        return false unless beta_access.include?(:argo_admin_beta)
         case cli
         when admin?
           cli >= ARGO_ADMIN_CLI_0_11_0

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

@@ -8,7 +8,6 @@ module Extension
       property! :context, accepts: ShopifyCli::Context
       property! :port, accepts: Integer, default: 39351
       property  :tunnel_url, accepts: String, default: ""
-      property :beta_access, accepts: Array, default: -> { [] }
 
       def call
         validate_env!
@@ -61,8 +60,6 @@ module Extension
 
         return if required_fields.none?
 
-        return unless beta_access.include?(:argo_admin_beta)
-
         ShopifyCli::Tasks::EnsureEnv.call(context, required: required_fields)
         ShopifyCli::Tasks::EnsureDevStore.call(context) if required_fields.include?(:shop)
 

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

@@ -57,7 +57,6 @@ module Extension
             context: context,
             port: port,
             tunnel_url: tunnel_url,
-            beta_access: beta_access
           ).call
         end
 
@@ -69,18 +68,9 @@ module Extension
           @argo_runtime ||= Features::ArgoRuntime.new(
             renderer: renderer_package(context),
             cli: cli_package(context),
-            beta_access: beta_access
           )
         end
 
-        def beta_access
-          argo_admin_beta? ? [:argo_admin_beta] : []
-        end
-
-        def argo_admin_beta?
-          ShopifyCli::Shopifolk.check && ShopifyCli::Feature.enabled?(:argo_admin_beta)
-        end
-
         def cli_package(context)
           cli_package_name = specification.features.argo&.cli_package_name
           return unless cli_package_name

data/lib/project_types/script/cli.rb

@@ -48,23 +48,23 @@ module Script
 
     module Infrastructure
       autoload :Errors, Project.project_filepath("layers/infrastructure/errors")
-      autoload :AssemblyScriptDependencyManager,
-        Project.project_filepath("layers/infrastructure/assemblyscript_dependency_manager")
-      autoload :AssemblyScriptProjectCreator,
-        Project.project_filepath("layers/infrastructure/assemblyscript_project_creator")
-      autoload :AssemblyScriptTaskRunner, Project.project_filepath("layers/infrastructure/assemblyscript_task_runner")
-      autoload :AssemblyScriptTsConfig, Project.project_filepath("layers/infrastructure/assemblyscript_tsconfig")
       autoload :CommandRunner, Project.project_filepath("layers/infrastructure/command_runner")
-      autoload :RustProjectCreator,
-        Project.project_filepath("layers/infrastructure/rust_project_creator.rb")
-      autoload :RustTaskRunner, Project.project_filepath("layers/infrastructure/rust_task_runner")
-
       autoload :PushPackageRepository, Project.project_filepath("layers/infrastructure/push_package_repository")
       autoload :ExtensionPointRepository, Project.project_filepath("layers/infrastructure/extension_point_repository")
-      autoload :ProjectCreator, Project.project_filepath("layers/infrastructure/project_creator")
       autoload :ScriptProjectRepository, Project.project_filepath("layers/infrastructure/script_project_repository")
       autoload :ScriptService, Project.project_filepath("layers/infrastructure/script_service")
-      autoload :TaskRunner, Project.project_filepath("layers/infrastructure/task_runner")
+
+      module Languages
+        autoload :AssemblyScriptProjectCreator,
+          Project.project_filepath("layers/infrastructure/languages/assemblyscript_project_creator")
+        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")
+      end
     end
   end
 

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

@@ -36,11 +36,8 @@ payment_methods:
   assemblyscript:
     package: "@shopify/scripts-checkout-apis"
     toolchain-version: "^5.0.0"
-    sdk-version: "^9.0.0"
 shipping_methods:
   domain: 'checkout'
   assemblyscript:
     package: "@shopify/scripts-checkout-apis"
-    sdk-version: "^9.0.0"
     toolchain-version: "^5.0.0"
-

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

@@ -18,7 +18,7 @@ module Script
                 language: language,
                 no_config_ui: no_config_ui
               )
-              project_creator = Infrastructure::ProjectCreator
+              project_creator = Infrastructure::Languages::ProjectCreator
                 .for(ctx, language, extension_point, script_name, project.id)
               install_dependencies(ctx, language, script_name, project_creator)
               bootstrap(ctx, project_creator)
@@ -29,7 +29,7 @@ module Script
           private
 
           def install_dependencies(ctx, language, script_name, project_creator)
-            task_runner = Infrastructure::TaskRunner.for(ctx, language, script_name)
+            task_runner = Infrastructure::Languages::TaskRunner.for(ctx, language, script_name)
             project_creator.setup_dependencies
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
           end

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

@@ -8,7 +8,8 @@ module Script
           def call(ctx:, force:)
             script_project_repo = Infrastructure::ScriptProjectRepository.new(ctx: ctx)
             script_project = script_project_repo.get
-            task_runner = Infrastructure::TaskRunner.for(ctx, script_project.language, script_project.script_name)
+            task_runner = Infrastructure::Languages::TaskRunner
+              .for(ctx, script_project.language, script_project.script_name)
 
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
             BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project)

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

@@ -72,7 +72,7 @@ module Script
         class SystemCallFailureError < ScriptProjectError
           attr_reader :out, :cmd
           def initialize(out:, cmd:)
-            super()
+            super(out)
             @out = out
             @cmd = cmd
           end

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

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class AssemblyScriptProjectCreator
+          include SmartProperties
+          property! :ctx, accepts: ShopifyCli::Context
+          property! :extension_point, accepts: Domain::ExtensionPoint
+          property! :script_name, accepts: String
+          property! :path_to_project, accepts: String
+
+          BOOTSTRAP = "npx --no-install shopify-scripts-toolchain-as bootstrap --from %{extension_point} --dest %{base}"
+          BUILD = "shopify-scripts-toolchain-as build --src src/shopify_main.ts " \
+          "--binary build/script.wasm --metadata build/metadata.json"
+          MIN_NODE_VERSION = "14.5.0"
+          ASC_ARGS = "-- --lib node_modules --optimize --use Date="
+
+          def setup_dependencies
+            write_npmrc
+            write_package_json
+          end
+
+          def bootstrap
+            command_runner.call(bootstap_command)
+          end
+
+          private
+
+          def command_runner
+            @command_runner ||= CommandRunner.new(ctx: ctx)
+          end
+
+          def write_npmrc
+            command_runner.call("npm --userconfig ./.npmrc config set @shopify:registry https://registry.npmjs.com")
+            command_runner.call("npm --userconfig ./.npmrc config set engine-strict true")
+          end
+
+          def extension_point_version
+            return extension_point.sdks.assemblyscript.version if extension_point.sdks.assemblyscript.versioned?
+
+            out = command_runner.call("npm show #{extension_point.sdks.assemblyscript.package} version --json")
+            "^#{JSON.parse(out)}"
+          end
+
+          def write_package_json
+            package_json = <<~HERE
+              {
+                "name": "#{script_name}",
+                "version": "1.0.0",
+                "devDependencies": {
+                  "@shopify/scripts-sdk-as": "#{extension_point.sdks.assemblyscript.sdk_version}",
+                  "@shopify/scripts-toolchain-as": "#{extension_point.sdks.assemblyscript.toolchain_version}",
+                  "#{extension_point.sdks.assemblyscript.package}": "#{extension_point_version}",
+                  "@as-pect/cli": "^6.0.0",
+                  "assemblyscript": "^0.18.13"
+                },
+                "scripts": {
+                  "test": "asp --summary --verbose",
+                  "build": "#{build_command}"
+                },
+                "engines": {
+                  "node": ">=#{MIN_NODE_VERSION}"
+                }
+              }
+            HERE
+            ctx.write("package.json", package_json)
+          end
+
+          def bootstap_command
+            type = extension_point.dasherize_type
+            base_command = format(BOOTSTRAP, extension_point: type, base: path_to_project)
+            domain = extension_point.domain
+
+            if domain.nil?
+              base_command
+            else
+              "#{base_command} --domain #{domain}"
+            end
+          end
+
+          def build_command
+            type = extension_point.dasherize_type
+            domain = extension_point.domain
+
+            if domain.nil?
+              "#{BUILD} #{ASC_ARGS}"
+            else
+              "#{BUILD} --domain #{domain} --ep #{type} #{ASC_ARGS}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class AssemblyScriptTaskRunner
+          BYTECODE_FILE = "build/%{name}.wasm"
+          METADATA_FILE = "build/metadata.json"
+          SCRIPT_SDK_BUILD = "npm run build"
+
+          attr_reader :ctx, :script_name
+
+          def initialize(ctx, script_name)
+            @ctx = ctx
+            @script_name = script_name
+          end
+
+          def build
+            compile
+            bytecode
+          end
+
+          def compiled_type
+            "wasm"
+          end
+
+          def install_dependencies
+            check_node_version!
+
+            output, status = ctx.capture2e("npm install --no-audit --no-optional --legacy-peer-deps --loglevel error")
+            raise Errors::DependencyInstallError, output unless status.success?
+          end
+
+          def dependencies_installed?
+            # Assuming if node_modules folder exist at root of script folder, all deps are installed
+            ctx.dir_exist?("node_modules")
+          end
+
+          def metadata
+            unless @ctx.file_exist?(METADATA_FILE)
+              msg = @ctx.message("script.error.metadata_not_found_cause", METADATA_FILE)
+              raise Domain::Errors::MetadataNotFoundError, msg
+            end
+
+            raw_contents = File.read(METADATA_FILE)
+            Domain::Metadata.create_from_json(@ctx, raw_contents)
+          end
+
+          private
+
+          def check_node_version!
+            output, status = @ctx.capture2e("node", "--version")
+            raise Errors::DependencyInstallError, output unless status.success?
+
+            require "semantic/semantic"
+            version = ::Semantic::Version.new(output[1..-1])
+            unless version >= ::Semantic::Version.new(AssemblyScriptProjectCreator::MIN_NODE_VERSION)
+              raise Errors::DependencyInstallError,
+                "Node version must be >= v#{AssemblyScriptProjectCreator::MIN_NODE_VERSION}. "\
+                "Current version: #{output.strip}."
+            end
+          end
+
+          def compile
+            check_compilation_dependencies!
+            CommandRunner.new(ctx: ctx).call(SCRIPT_SDK_BUILD)
+          end
+
+          def check_compilation_dependencies!
+            pkg = JSON.parse(File.read("package.json"))
+            build_script = pkg.dig("scripts", "build")
+
+            raise Errors::BuildScriptNotFoundError,
+              "Build script not found" if build_script.nil?
+
+            unless build_script.start_with?("shopify-scripts")
+              raise Errors::InvalidBuildScriptError, "Invalid build script"
+            end
+          end
+
+          def bytecode
+            legacy_filename = format(BYTECODE_FILE, name: script_name)
+            filename = format(BYTECODE_FILE, name: "script")
+
+            bytecode_file = if ctx.file_exist?(filename)
+              filename
+            elsif ctx.file_exist?(legacy_filename)
+              legacy_filename
+            else
+              raise Errors::WebAssemblyBinaryNotFoundError
+            end
+
+            contents = ctx.binread(bytecode_file)
+            ctx.rm(bytecode_file)
+
+            contents
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class ProjectCreator
+          PROJECT_CREATORS = {
+            "assemblyscript" => AssemblyScriptProjectCreator,
+            "rust" => RustProjectCreator,
+          }
+
+          def self.for(ctx, language, extension_point, script_name, path_to_project)
+            raise Errors::ProjectCreatorNotFoundError unless PROJECT_CREATORS[language]
+            PROJECT_CREATORS[language].new(
+              ctx: ctx,
+              extension_point: extension_point,
+              script_name: script_name,
+              path_to_project: path_to_project
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class RustProjectCreator
+          include SmartProperties
+          property! :ctx, accepts: ShopifyCli::Context
+          property! :extension_point, accepts: Domain::ExtensionPoint
+          property! :script_name, accepts: String
+          property! :path_to_project, accepts: String
+
+          ORIGIN_BRANCH = "main"
+          SAMPLE_PATH = "default"
+
+          def setup_dependencies
+            git_init
+            setup_remote
+            setup_sparse_checkout
+            pull
+            clean
+            set_script_name
+          end
+
+          def bootstrap
+          end
+
+          private
+
+          def command_runner
+            @command_runner ||= CommandRunner.new(ctx: ctx)
+          end
+
+          def git_init
+            command_runner.call("git init")
+          end
+
+          def setup_remote
+            repo = extension_point.sdks.rust.package
+            command_runner.call("git remote add -f origin #{repo}")
+          end
+
+          def setup_sparse_checkout
+            type = extension_point.type
+            command_runner.call("git config core.sparsecheckout true")
+            command_runner.call("echo #{type}/#{SAMPLE_PATH} >> .git/info/sparse-checkout")
+          end
+
+          def pull
+            command_runner.call("git pull origin #{ORIGIN_BRANCH}")
+          end
+
+          def clean
+            type = extension_point.type
+            ctx.rm_rf(".git")
+            source = File.join(path_to_project, File.join(type, SAMPLE_PATH))
+            FileUtils.copy_entry(source, path_to_project)
+            ctx.rm_rf(type)
+          end
+
+          def set_script_name
+            config_file = "Cargo.toml"
+            upstream_name = "#{extension_point.type.gsub("_", "-")}-default"
+            contents = File.read(config_file)
+            new_contents = contents.sub(upstream_name, script_name)
+            File.write(config_file, new_contents)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class RustTaskRunner
+          attr_reader :ctx
+
+          BUILD_TARGET = "wasm32-unknown-unknown"
+          METADATA_FILE = "build/metadata.json"
+          CARGO_BUILD_CMD = "cargo build --target=#{BUILD_TARGET} --release"
+
+          def initialize(ctx, _)
+            @ctx = ctx
+          end
+
+          def dependencies_installed?
+            true
+          end
+
+          def install_dependencies
+          end
+
+          def build
+            compile
+            bytecode
+          end
+
+          def compiled_type
+            "wasm"
+          end
+
+          def metadata
+            unless @ctx.file_exist?(METADATA_FILE)
+              msg = @ctx.message("script.error.metadata_not_found_cause", METADATA_FILE)
+              raise Domain::Errors::MetadataNotFoundError, msg
+            end
+
+            raw_contents = File.read(METADATA_FILE)
+            Domain::Metadata.create_from_json(@ctx, raw_contents)
+          end
+
+          private
+
+          def compile
+            CommandRunner.new(ctx: ctx).call(CARGO_BUILD_CMD)
+          end
+
+          def bytecode
+            binary_name = "script.wasm"
+            binary_path = "target/#{BUILD_TARGET}/release/#{binary_name}"
+            raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(binary_path)
+
+            ctx.binread(binary_path)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Script
+  module Layers
+    module Infrastructure
+      module Languages
+        class TaskRunner
+          TASK_RUNNERS = {
+            "assemblyscript" => AssemblyScriptTaskRunner,
+            "rust" => RustTaskRunner,
+          }
+
+          def self.for(ctx, language, script_name)
+            raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
+            TASK_RUNNERS[language].new(ctx, script_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify-cli/admin_api.rb

@@ -85,11 +85,14 @@ module ShopifyCli
 
       private
 
-      def authenticated_req(ctx, shop)
-        yield
+      def authenticated_req(ctx, shop, &block)
+        CLI::Kit::Util
+          .begin(&block)
+          .retry_after(API::APIRequestUnauthorizedError, retries: 1) do
+            authenticate(ctx, shop)
+          end
       rescue API::APIRequestUnauthorizedError
-        authenticate(ctx, shop)
-        retry
+        ctx.abort(ctx.message("core.api.error.failed_auth"))
       end
 
       def authenticate(ctx, shop)

data/lib/shopify-cli/messages/messages.rb

@@ -184,6 +184,7 @@ module ShopifyCli
 
         api: {
           error: {
+            failed_auth: "Failed to authenticate with Shopify. Please try again later.",
             internal_server_error: "{{red:{{x}} An unexpected error occurred on Shopify.}}",
             internal_server_error_debug: "\n{{red:Response details:}}\n%s\n\n",
             invalid_url: "Invalid URL: %s",

data/lib/shopify-cli/partners_api.rb

@@ -59,11 +59,14 @@ module ShopifyCli
 
       private
 
-      def authenticated_req(ctx)
-        yield
+      def authenticated_req(ctx, &block)
+        CLI::Kit::Util
+          .begin(&block)
+          .retry_after(API::APIRequestUnauthorizedError, retries: 1) do
+            authenticate(ctx)
+          end
       rescue API::APIRequestUnauthorizedError
-        authenticate(ctx)
-        retry
+        ctx.abort(ctx.message("core.api.error.failed_auth"))
       rescue API::APIRequestNotFoundError
         ctx.puts(ctx.message("core.partners_api.error.account_not_found", ShopifyCli::TOOL_NAME))
       end

data/lib/shopify-cli/resources/env_file.rb

@@ -22,7 +22,7 @@ module ShopifyCli
         def parse(directory)
           File.read(File.join(directory, FILENAME))
             .gsub("\r\n", "\n").split("\n").each_with_object({}) do |line, output|
-            match = /\A([A-Za-z_0-9]+)=(.*)\z/.match(line)
+            match = /\A([A-Za-z_0-9]+)\s*=\s*(.*)\z/.match(line)
             if match
               key = match[1]
               output[key] = case match[2]

data/lib/shopify-cli/version.rb

@@ -1,3 +1,3 @@
 module ShopifyCli
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify-cli
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,18 +233,18 @@ files:
 - lib/project_types/script/layers/domain/metadata.rb
 - lib/project_types/script/layers/domain/push_package.rb
 - lib/project_types/script/layers/domain/script_project.rb
-- lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb
-- lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb
 - lib/project_types/script/layers/infrastructure/command_runner.rb
 - lib/project_types/script/layers/infrastructure/errors.rb
 - lib/project_types/script/layers/infrastructure/extension_point_repository.rb
-- lib/project_types/script/layers/infrastructure/project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/assemblyscript_project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/assemblyscript_task_runner.rb
+- lib/project_types/script/layers/infrastructure/languages/project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/rust_project_creator.rb
+- lib/project_types/script/layers/infrastructure/languages/rust_task_runner.rb
+- lib/project_types/script/layers/infrastructure/languages/task_runner.rb
 - lib/project_types/script/layers/infrastructure/push_package_repository.rb
-- lib/project_types/script/layers/infrastructure/rust_project_creator.rb
-- lib/project_types/script/layers/infrastructure/rust_task_runner.rb
 - lib/project_types/script/layers/infrastructure/script_project_repository.rb
 - lib/project_types/script/layers/infrastructure/script_service.rb
-- lib/project_types/script/layers/infrastructure/task_runner.rb
 - lib/project_types/script/messages/messages.rb
 - lib/project_types/script/tasks/ensure_env.rb
 - lib/project_types/script/ui/error_handler.rb

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

@@ -1,95 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class AssemblyScriptProjectCreator
-        include SmartProperties
-        property! :ctx, accepts: ShopifyCli::Context
-        property! :extension_point, accepts: Domain::ExtensionPoint
-        property! :script_name, accepts: String
-        property! :path_to_project, accepts: String
-
-        BOOTSTRAP = "npx --no-install shopify-scripts-toolchain-as bootstrap --from %{extension_point} --dest %{base}"
-        BUILD = "shopify-scripts-toolchain-as build --src src/shopify_main.ts " \
-        "--binary build/script.wasm --metadata build/metadata.json"
-        MIN_NODE_VERSION = "14.5.0"
-        ASC_ARGS = "-- --lib node_modules --optimize --use Date="
-
-        def setup_dependencies
-          write_npmrc
-          write_package_json
-        end
-
-        def bootstrap
-          command_runner.call(bootstap_command)
-        end
-
-        private
-
-        def command_runner
-          @command_runner ||= CommandRunner.new(ctx: ctx)
-        end
-
-        def write_npmrc
-          command_runner.call("npm --userconfig ./.npmrc config set @shopify:registry https://registry.npmjs.com")
-          command_runner.call("npm --userconfig ./.npmrc config set engine-strict true")
-        end
-
-        def extension_point_version
-          return extension_point.sdks.assemblyscript.version if extension_point.sdks.assemblyscript.versioned?
-
-          out = command_runner.call("npm show #{extension_point.sdks.assemblyscript.package} version --json")
-          "^#{JSON.parse(out)}"
-        end
-
-        def write_package_json
-          package_json = <<~HERE
-            {
-              "name": "#{script_name}",
-              "version": "1.0.0",
-              "devDependencies": {
-                "@shopify/scripts-sdk-as": "#{extension_point.sdks.assemblyscript.sdk_version}",
-                "@shopify/scripts-toolchain-as": "#{extension_point.sdks.assemblyscript.toolchain_version}",
-                "#{extension_point.sdks.assemblyscript.package}": "#{extension_point_version}",
-                "@as-pect/cli": "^6.0.0",
-                "assemblyscript": "^0.18.13"
-              },
-              "scripts": {
-                "test": "asp --summary --verbose",
-                "build": "#{build_command}"
-              },
-              "engines": {
-                "node": ">=#{MIN_NODE_VERSION}"
-              }
-            }
-          HERE
-          ctx.write("package.json", package_json)
-        end
-
-        def bootstap_command
-          type = extension_point.dasherize_type
-          base_command = format(BOOTSTRAP, extension_point: type, base: path_to_project)
-          domain = extension_point.domain
-
-          if domain.nil?
-            base_command
-          else
-            "#{base_command} --domain #{domain}"
-          end
-        end
-
-        def build_command
-          type = extension_point.dasherize_type
-          domain = extension_point.domain
-
-          if domain.nil?
-            "#{BUILD} #{ASC_ARGS}"
-          else
-            "#{BUILD} --domain #{domain} --ep #{type} #{ASC_ARGS}"
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class AssemblyScriptTaskRunner
-        BYTECODE_FILE = "build/%{name}.wasm"
-        METADATA_FILE = "build/metadata.json"
-        SCRIPT_SDK_BUILD = "npm run build"
-
-        attr_reader :ctx, :script_name
-
-        def initialize(ctx, script_name)
-          @ctx = ctx
-          @script_name = script_name
-        end
-
-        def build
-          compile
-          bytecode
-        end
-
-        def compiled_type
-          "wasm"
-        end
-
-        def install_dependencies
-          check_node_version!
-
-          output, status = ctx.capture2e("npm install --no-audit --no-optional --legacy-peer-deps --loglevel error")
-          raise Errors::DependencyInstallError, output unless status.success?
-        end
-
-        def dependencies_installed?
-          # Assuming if node_modules folder exist at root of script folder, all deps are installed
-          ctx.dir_exist?("node_modules")
-        end
-
-        def metadata
-          unless @ctx.file_exist?(METADATA_FILE)
-            msg = @ctx.message("script.error.metadata_not_found_cause", METADATA_FILE)
-            raise Domain::Errors::MetadataNotFoundError, msg
-          end
-
-          raw_contents = File.read(METADATA_FILE)
-          Domain::Metadata.create_from_json(@ctx, raw_contents)
-        end
-
-        private
-
-        def check_node_version!
-          output, status = @ctx.capture2e("node", "--version")
-          raise Errors::DependencyInstallError, output unless status.success?
-
-          require "semantic/semantic"
-          version = ::Semantic::Version.new(output[1..-1])
-          unless version >= ::Semantic::Version.new(AssemblyScriptProjectCreator::MIN_NODE_VERSION)
-            raise Errors::DependencyInstallError,
-              "Node version must be >= v#{AssemblyScriptProjectCreator::MIN_NODE_VERSION}. "\
-              "Current version: #{output.strip}."
-          end
-        end
-
-        def compile
-          check_compilation_dependencies!
-          CommandRunner.new(ctx: ctx).call(SCRIPT_SDK_BUILD)
-        end
-
-        def check_compilation_dependencies!
-          pkg = JSON.parse(File.read("package.json"))
-          build_script = pkg.dig("scripts", "build")
-
-          raise Errors::BuildScriptNotFoundError,
-            "Build script not found" if build_script.nil?
-
-          unless build_script.start_with?("shopify-scripts")
-            raise Errors::InvalidBuildScriptError, "Invalid build script"
-          end
-        end
-
-        def bytecode
-          legacy_filename = format(BYTECODE_FILE, name: script_name)
-          filename = format(BYTECODE_FILE, name: "script")
-
-          bytecode_file = if ctx.file_exist?(filename)
-            filename
-          elsif ctx.file_exist?(legacy_filename)
-            legacy_filename
-          else
-            raise Errors::WebAssemblyBinaryNotFoundError
-          end
-
-          contents = ctx.binread(bytecode_file)
-          ctx.rm(bytecode_file)
-
-          contents
-        end
-      end
-    end
-  end
-end

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class ProjectCreator
-        PROJECT_CREATORS = {
-          "assemblyscript" => Infrastructure::AssemblyScriptProjectCreator,
-          "rust" => Infrastructure::RustProjectCreator,
-        }
-
-        def self.for(ctx, language, extension_point, script_name, path_to_project)
-          raise Errors::ProjectCreatorNotFoundError unless PROJECT_CREATORS[language]
-          PROJECT_CREATORS[language].new(
-            ctx: ctx,
-            extension_point: extension_point,
-            script_name: script_name,
-            path_to_project: path_to_project
-          )
-        end
-      end
-    end
-  end
-end

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

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class RustProjectCreator
-        include SmartProperties
-        property! :ctx, accepts: ShopifyCli::Context
-        property! :extension_point, accepts: Domain::ExtensionPoint
-        property! :script_name, accepts: String
-        property! :path_to_project, accepts: String
-
-        ORIGIN_BRANCH = "main"
-        SAMPLE_PATH = "default"
-
-        def setup_dependencies
-          git_init
-          setup_remote
-          setup_sparse_checkout
-          pull
-          clean
-          set_script_name
-        end
-
-        def bootstrap
-        end
-
-        private
-
-        def command_runner
-          @command_runner ||= CommandRunner.new(ctx: ctx)
-        end
-
-        def git_init
-          command_runner.call("git init")
-        end
-
-        def setup_remote
-          repo = extension_point.sdks.rust.package
-          command_runner.call("git remote add -f origin #{repo}")
-        end
-
-        def setup_sparse_checkout
-          type = extension_point.type
-          command_runner.call("git config core.sparsecheckout true")
-          command_runner.call("echo #{type}/#{SAMPLE_PATH} >> .git/info/sparse-checkout")
-        end
-
-        def pull
-          command_runner.call("git pull origin #{ORIGIN_BRANCH}")
-        end
-
-        def clean
-          type = extension_point.type
-          ctx.rm_rf(".git")
-          source = File.join(path_to_project, File.join(type, SAMPLE_PATH))
-          FileUtils.copy_entry(source, path_to_project)
-          ctx.rm_rf(type)
-        end
-
-        def set_script_name
-          config_file = "Cargo.toml"
-          upstream_name = "#{extension_point.type.gsub("_", "-")}-default"
-          contents = File.read(config_file)
-          new_contents = contents.sub(upstream_name, script_name)
-          File.write(config_file, new_contents)
-        end
-      end
-    end
-  end
-end

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

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-module Script
-  module Layers
-    module Infrastructure
-      class RustTaskRunner
-        attr_reader :ctx
-
-        BUILD_TARGET = "wasm32-unknown-unknown"
-        METADATA_FILE = "build/metadata.json"
-        CARGO_BUILD_CMD = "cargo build --target=#{BUILD_TARGET} --release"
-
-        def initialize(ctx, _)
-          @ctx = ctx
-        end
-
-        def dependencies_installed?
-          true
-        end
-
-        def install_dependencies
-        end
-
-        def build
-          compile
-          bytecode
-        end
-
-        def compiled_type
-          "wasm"
-        end
-
-        def metadata
-          unless @ctx.file_exist?(METADATA_FILE)
-            msg = @ctx.message("script.error.metadata_not_found_cause", METADATA_FILE)
-            raise Domain::Errors::MetadataNotFoundError, msg
-          end
-
-          raw_contents = File.read(METADATA_FILE)
-          Domain::Metadata.create_from_json(@ctx, raw_contents)
-        end
-
-        private
-
-        def compile
-          CommandRunner.new(ctx: ctx).call(CARGO_BUILD_CMD)
-        end
-
-        def bytecode
-          binary_name = "script.wasm"
-          binary_path = "target/#{BUILD_TARGET}/release/#{binary_name}"
-          raise Errors::WebAssemblyBinaryNotFoundError unless ctx.file_exist?(binary_path)
-
-          ctx.binread(binary_path)
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Script
-  module Layers
-    module Infrastructure
-      class TaskRunner
-        TASK_RUNNERS = {
-          "assemblyscript" => Infrastructure::AssemblyScriptTaskRunner,
-          "rust" => Infrastructure::RustTaskRunner,
-        }
-
-        def self.for(ctx, language, script_name)
-          raise Errors::TaskRunnerNotFoundError unless TASK_RUNNERS[language]
-          TASK_RUNNERS[language].new(ctx, script_name)
-        end
-      end
-    end
-  end
-end