shopify-cli 2.13.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54fd77e2aa3b1721ea02cd7cad4a84afdae67a3c73510e6ee8b01e44bfc5949
-  data.tar.gz: a92380f94b7a33cea4eae04d2d528ef09a51d161a5b77a900a294e7176ee89e9
+  metadata.gz: 141760dcf4bd3da2b9e92a238c72ee4612fc9e72ce4f522db84f190028439175
+  data.tar.gz: f16bc2db60656219f7f1484ce455380822fb7d7da4c65faeceeaf065953076c9
 SHA512:
-  metadata.gz: 3a55cc0e5a57ab4a842411667dfca871140ef324d17c537157e3913cce383c84ae70ebd26cbf8f14a020b94283c9d6264ab71af5f55c37255fbe7966ee8f46f5
-  data.tar.gz: 24328c051c6795d7c4778fdaea861cc77d3337a886126074bce4ae3073b635b6bcd878457e8cad4399c5982b0be5d168a3f6f3c86c5e3bbbe7b7b2ce192e4d58
+  metadata.gz: 1df93436fa11a84a2df90f354a59277fbf29bd2445b097da8c2ddd6d727dc9d2d4792602de476f3479329e58873dfd222ea185fd096271896bd4ee8533f5b242
+  data.tar.gz: ada360c3f4529d52a0315c70b1c4fea63ad69f0da1ca7aab384958adb8bf342003d4c4dced65ddc4984e5732fb5e2604f77ba82702908242b1d1427570362626

data/.github/CODEOWNERS

@@ -3,3 +3,8 @@
 
 /lib/project_types/script/ @shopify/scripts-platform
 /test/project_types/script/ @shopify/scripts-platform
+
+/lib/project_types/theme/ @shopify/theme-platform-dev-experience
+/lib/shopify_cli/theme/ @shopify/theme-platform-dev-experience
+/test/project_types/theme/ @shopify/theme-platform-dev-experience
+/test/shopify-cli/theme/ @shopify/theme-platform-dev-experience

data/.github/CONTRIBUTING.md

@@ -17,7 +17,7 @@ When contributing to the Shopify CLI, there are a set of [design guidelines](htt
 
 ### Where to find known issues
 
-We track all of our issues in GitHub and [bugs](https://github.com/Shopify/shopify-cli/labels/Bug) are labeled accordingly. If you are planning to work on an issue, avoid ones which already have an assignee, where someone has commented within the last two weeks they are working on it, or the issue is labeled with [fix in progress](https://github.com/Shopify/shopify-cli/labels/fix%20in%20progress). We will do our best to communicate when an issue is being worked on internally.
+We track all of our issues in GitHub and [bugs](https://github.com/Shopify/shopify-cli/labels/type:bug) are labeled accordingly. If you are planning to work on an issue, avoid ones which already have an assignee, where someone has commented within the last two weeks they are working on it, or the issue is labeled with [fix in progress](https://github.com/Shopify/shopify-cli/labels/fix%20in%20progress). We will do our best to communicate when an issue is being worked on internally.
 
 ### Running against a local environment
 

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -40,4 +40,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 incrementing this when releasing).
-- [ ] I've included any post-release steps in the section above.
+- [ ] I've included any post-release steps in the section above (if needed).

data/.github/workflows/stale.yml

@@ -0,0 +1,46 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '31 3 * * *' # randomly chosen time of day
+  workflow_dispatch:
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v4
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-issue-stale: 90
+        days-before-pr-stale: 30
+        days-before-close: 10
+        stale-issue-message: |-
+          This issue seems inactive. If it's still relevant, please add a comment saying so. Otherwise, take no action.
+
+          → If there's no activity within a week, then a bot will automatically close this.
+
+          Thanks for helping to improve Shopify's dev tooling and experience.
+        stale-pr-message: |-
+          This PR seems inactive. If it's still relevant, please add a comment saying so. Otherwise, take no action.
+
+          → If there's no activity within a week, then a bot will automatically close this.
+
+          Thanks for helping to improve Shopify's dev tooling and experience.
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        ascending: true
+        # The math seems a bit fuzzy, but this should amount to a max of 50 issues daily.
+        # But then the same issues get checked first so we don't end up progressing too quickly until we can close what we started.
+        # Hopefully https://github.com/actions/stale/issues/692 will be closed and fix some of this mess.
+        operations-per-run: 200

data/CHANGELOG.md

@@ -2,6 +2,38 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ## [Unreleased]
 
+## Version 2.15.1
+
+### Added
+* [#1934](https://github.com/Shopify/shopify-cli/pull/1934): Block directories in theme assets
+* [#1880](https://github.com/Shopify/shopify-cli/pull/1880): Recognize attempts to pass a store name and suggest correction
+
+### Fixed
+* [#1874](https://github.com/Shopify/shopify-cli/pull/1874): Make ngrok errors more robust and helpful
+* [#2172](https://github.com/Shopify/shopify-cli/pull/2172): Fix Ruby check for Rails app creation
+
+## Version 2.15.0
+
+### Fixed
+* [#2086](https://github.com/Shopify/shopify-cli/pull/2086): Improve check of dependency versions
+* [#2149](https://github.com/Shopify/shopify-cli/pull/2149): Fix `ThemeAdminAPI` not to handle asset errors
+* [#2122](https://github.com/Shopify/shopify-cli/pull/2122): Fix `--only`/`--ignore` flags parser to support multiple occurrences without quotes
+* [#2146](https://github.com/Shopify/shopify-cli/pull/2146): Prevent duplicate locales for Checkout extension localization
+
+## Version 2.14.0
+
+### Changed
+* [#2126](https://github.com/Shopify/shopify-cli/pull/2126): Use javy version 0.2.1
+
+### Added
+* [#2103](https://github.com/Shopify/shopify-cli/pull/2103): Improve `shopify theme package` to include the `release-notes.md` file
+
+### Fixed
+* [#2112](https://github.com/Shopify/shopify-cli/pull/2112): Fix intermittent error ("can't add a new key into hash during iteration") in the `theme push` command
+* [#2088](https://github.com/Shopify/shopify-cli/pull/2088): Update theme-check to 1.10.1
+* [#2130](https://github.com/Shopify/shopify-cli/pull/2130): Fix Homebrew installation.
+* [#2133](https://github.com/Shopify/shopify-cli/pull/2133): Fix ignore file handling in DevServer::Watcher.
+
 ## Version 2.13.0
 
 ### Added
@@ -11,6 +43,10 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 ### Fixed
 * [#2092](https://github.com/Shopify/shopify-cli/pull/2092): Fix `RootHelper` parse logic to support options with an equal (e.g.: `option=value`)
 * [#2089](https://github.com/Shopify/shopify-cli/pull/2089): Use javy version 0.2.0
+* [#2114](https://github.com/Shopify/shopify-cli/pull/2114): Fix `theme` command error messaging with `ThemeAdminAPI` wrapper
+
+### Removed
+* [#2102](https://github.com/Shopify/shopify-cli/pull/2102): Remove AssemblyScript as a supported script language.
 
 ## Version 2.12.0
 ### Added

data/Gemfile

@@ -15,6 +15,7 @@ group :development, :test do
   gem "rubocop-rake", require: false
   gem "iniparse", "~> 1.5"
   gem "colorize", "~> 0.8.1"
+  gem "octokit", "~> 4.0"
 end
 
 group :test do

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.13.0)
+    shopify-cli (2.15.1)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.9.0)
+      theme-check (~> 1.10.1)
 
 GEM
   remote: https://rubygems.org/
@@ -13,13 +13,13 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     ansi (1.5.0)
     ast (2.4.2)
-    bugsnag (6.23.0)
+    bugsnag (6.24.2)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
     cucumber (7.0.0)
@@ -55,11 +55,34 @@ GEM
       cucumber-messages (~> 17.0, >= 17.0.1)
     diff-lcs (1.4.4)
     fakefs (1.3.2)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     ffi (1.15.4)
     hashdiff (1.0.1)
     iniparse (1.5.0)
-    liquid (5.1.0)
-    listen (3.7.0)
+    liquid (5.3.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     method_source (1.0.0)
@@ -77,11 +100,15 @@ GEM
       ruby-progressbar
     mocha (1.13.0)
     multi_test (0.1.2)
+    multipart-post (2.1.1)
     nokogiri (1.13.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    octokit (4.22.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.21.0)
-    parser (3.1.0.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -94,7 +121,7 @@ GEM
     rack (2.2.3)
     rainbow (3.1.1)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.2.0)
@@ -117,9 +144,13 @@ GEM
     rubocop-shopify (2.0.1)
       rubocop (~> 1.11)
     ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.9.0)
+    theme-check (1.10.2)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)
@@ -134,7 +165,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.2.2)
+  bundler (~> 2.3.8)
   byebug
   colorize (~> 0.8.1)
   cucumber (~> 7.0)
@@ -144,6 +175,7 @@ DEPENDENCIES
   minitest-fail-fast
   minitest-reporters
   mocha
+  octokit (~> 4.0)
   pry-byebug
   rack
   rake
@@ -155,4 +187,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.29
+   2.3.8

data/Rakefile

@@ -2,6 +2,8 @@ ENV["SHOPIFY_CLI_TEST"] = "1"
 
 require_relative "bin/load_shopify"
 require_relative "utilities/utilities"
+require_relative "lib/shopify_cli/constants"
+require_relative "lib/shopify_cli/version"
 require "rake/testtask"
 require "rubocop/rake_task"
 require "bundler/gem_tasks"
@@ -33,6 +35,20 @@ task :console do
   exec("irb", "-r", "./bin/load_shopify.rb", "-r", "byebug")
 end
 
+desc("Notifies a new version to Bugsnag")
+task :notify_version_to_bugsnag do
+  # This task runs at deployment time to notify
+  # Bugsnag about new versions. Because the deployment
+  # environment has Node, we can run the Bugsnag CLI
+  # through npx.
+  system(
+    { "npm_config_yes" => "true" },
+    "npx", "-q", "bugsnag-build-reporter",
+    "-k", ShopifyCLI::Constants::Bugsnag::API_KEY,
+    "-v", ShopifyCLI::VERSION
+  ) || abort
+end
+
 namespace :rdoc do
   repo = "https://github.com/Shopify/shopify-cli.wiki.git"
   intermediate = "markdown_intermediate"
@@ -113,6 +129,33 @@ end
 desc("Builds all distribution packages of the CLI")
 task(package: "package:all")
 
+namespace :release do
+  require "shopify_cli/release"
+
+  task :prepare, [:new_version] do |_t, args|
+    new_version = args[:new_version]
+    unless new_version
+      raise <<~NO_NEW_VERSION
+        New version must be provided, e.g.:
+
+        $ GITHUB_ACCESS_TOKEN=abcdef rake "release:prepare[1.2.3]"
+
+      NO_NEW_VERSION
+    end
+    github_access_token = ENV["GITHUB_ACCESS_TOKEN"]
+    unless github_access_token
+      raise <<~NO_GITHUB_ACCESS_TOKEN
+        GitHub access token must be provided, e.g.:
+
+        $ GITHUB_ACCESS_TOKEN=abcdef rake "release:prepare[1.2.3]"
+      NO_GITHUB_ACCESS_TOKEN
+    end
+
+    ShopifyCLI::Release.new(new_version, github_access_token).prepare!
+    puts "Completed!"
+  end
+end
+
 namespace :extensions do
   task :update do
     version = ENV.fetch("VERSION").strip

data/ext/javy/hashes/javy-arm-macos-v0.2.1.gz.sha256

@@ -0,0 +1 @@
+80576fe617d6e093a72bc826f041207ddc57605381f0db6451ba27310e57e830

data/ext/javy/hashes/javy-x86_64-linux-v0.2.1.gz.sha256

@@ -0,0 +1 @@
+6b7b6f6745594c2e8efcaf948c0ef367911446101d2b8a7c8138ce2aca868cbd

data/ext/javy/hashes/javy-x86_64-macos-v0.2.1.gz.sha256

@@ -0,0 +1 @@
+4010c2d154f1ef7ebf1f8c49621a0742ab75c60fd77746a5fa175878d07f16ef

data/ext/javy/hashes/javy-x86_64-windows-v0.2.1.gz.sha256

@@ -0,0 +1 @@
+c12418f7b3e4edead87ade1f44bd7280626a92d8d1238d7f8eb91b1122f20f20

data/ext/javy/version

@@ -1 +1 @@
-v0.2.0
+v0.2.1

data/ext/shopify-extensions/version

@@ -1 +1 @@
-v0.1.0
+v0.2.0

data/lib/project_types/extension/forms/questions/ask_template.rb

@@ -11,21 +11,18 @@ module Extension
           default: -> { CLI::UI::Prompt.method(:ask) }
 
         def call(project_details)
-          return project_details unless template_required?(project_details)
-          project_details.template = template || choose_interactively
+          if template_required?(project_details)
+            project_details.template = template || choose_interactively
+          end
           project_details
         end
 
         private
 
         def template_required?(project_details)
-          return false unless extension_server_beta?
           type = project_details&.type&.identifier
-          Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES.include?(type.downcase)
-        end
-
-        def extension_server_beta?
-          ShopifyCLI::Shopifolk.check && ShopifyCLI::Feature.enabled?(:extension_server_beta)
+          (Models::DevelopmentServerRequirements.beta_enabled? &&
+            Models::DevelopmentServerRequirements.type_supported?(type.downcase))
         end
 
         def choose_interactively

data/lib/project_types/extension/messages/messages.rb

@@ -115,6 +115,16 @@ module Extension
         tunnel_already_running: "A tunnel running on another port has been detected. Close the tunnel and try again.",
       },
       tunnel: {
+        duplicate_session: <<~MESSAGE,
+          Another ngrok tunnel is currently running with your auth token, possibly on another machine.
+
+          Terminate that tunnel before opening a new one.
+        MESSAGE
+        invalid_token: <<~MESSAGE,
+          The ngrok token currently configured is invalid.
+
+          After generating a new token, update your local ngrok configuration using {{command:shopify app tunnel auth <token>}}
+        MESSAGE
         missing_token: "{{x}} {{red:auth requires a token argument}}. "\
           "Find it on your ngrok dashboard: {{underline:https://dashboard.ngrok.com/auth/your-authtoken}}.",
         invalid_port: "%s is not a valid port.",

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "shopify_cli"
 
 module Extension
@@ -12,21 +13,26 @@ module Extension
 
       class << self
         def supported?(type)
-          binary_installed? && type_supported?(type) && beta_enabled?
+          binary_installed? && type_supported?(type) && type_enabled?(type)
         end
 
-        private
-
-        def binary_installed?
-          Models::DevelopmentServer.new.executable_installed?
+        def beta_enabled?
+          ShopifyCLI::Feature.enabled?(:extension_server_beta)
         end
 
         def type_supported?(type)
           SUPPORTED_EXTENSION_TYPES.include?(type.downcase)
         end
 
-        def beta_enabled?
-          ShopifyCLI::Shopifolk.check && ShopifyCLI::Feature.enabled?(:extension_server_beta)
+        private
+
+        def binary_installed?
+          Models::DevelopmentServer.new.executable_installed?
+        end
+
+        # Some types are enabled unconditionally; others require beta_enabled
+        def type_enabled?(type)
+          beta_enabled? || "checkout_ui_extension" == type.downcase
         end
       end
     end

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

@@ -2,9 +2,27 @@ require "semantic/semantic"
 
 module Extension
   module Models
-    NpmPackage = Struct.new(:name, :version, keyword_init: true) do
+    class NpmPackage
+      include SmartProperties
       include Comparable
 
+      property :name
+      property :version
+      property :scripts, accepts: Hash
+      property :dependencies, accepts: Hash
+      property :dev_dependencies, accepts: Hash
+
+      def initialize(**config)
+        super(**config.select { |property_name, _| self.class.properties.key?(property_name) })
+      end
+
+      def self.parse(io)
+        ShopifyCLI::Result.call { JSON.parse(io.read) }
+          .then(&ShopifyCLI::TransformDataStructure.new(underscore_keys: true, symbolize_keys: true, shallow: true))
+          .then { |specification| new(**specification) }
+          .unwrap { |error| raise "Failed to parse NPM package specification: #{error}" }
+      end
+
       def <=>(other)
         return nil unless name == other.name
         Semantic::Version.new(version) <=> Semantic::Version.new(other.version)

data/lib/project_types/extension/models/server_config/development_renderer.rb

@@ -13,15 +13,16 @@ module Extension
         ]
 
         property! :name, accepts: VALID_RENDERERS
+        property! :version, accepts: String, default: "latest"
 
         def self.find(type)
           case type.downcase
           when "product_subscription"
-            new(name: "@shopify/admin-ui-extensions")
+            new(name: "@shopify/admin-ui-extensions", version: "^1.0.1")
           when "checkout_ui_extension"
-            new(name: "@shopify/checkout-ui-extensions")
+            new(name: "@shopify/checkout-ui-extensions", version: "^0.14.0")
           when "checkout_post_purchase"
-            new(name: "@shopify/post-purchase-ui-extensions")
+            new(name: "@shopify/post-purchase-ui-extensions", version: "^0.13.2")
           end
         end
       end

data/lib/project_types/extension/models/server_config/root.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "yaml"
+
 module Extension
   module Models
     module ServerConfig

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

@@ -43,6 +43,7 @@ module Extension
             # Localization is optional
             return {} if locale_filenames.empty?
 
+            validate_no_duplicate_locale(locale_filenames)
             validate_total_size(locale_filenames)
             default_locale = single_default_locale(locale_filenames)
 
@@ -61,6 +62,18 @@ module Extension
           end
         end
 
+        def validate_no_duplicate_locale(locale_filenames)
+          duplicate_locale = locale_filenames
+            .map { |filename| basename_for_locale_filename(filename.downcase) }
+            .group_by { |locale| locale }
+            .detect { |_k, v| v.size > 1 }
+            &.first
+          raise(
+            ShopifyCLI::Abort,
+            ShopifyCLI::Context.message("#{L10N_ERROR_PREFIX}.duplicate_locale_code", duplicate_locale)
+          ) unless duplicate_locale.nil?
+        end
+
         def validate_total_size(locale_filenames)
           total_size = locale_filenames.sum { |filename| File.size(filename) }
           if total_size > L10N_BUNDLE_SIZE_LIMIT

data/lib/project_types/script/cli.rb

@@ -64,10 +64,6 @@ module Script
       autoload :ServiceLocator, Project.project_filepath("layers/infrastructure/service_locator")
 
       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 :TaskRunner, Project.project_filepath("layers/infrastructure/languages/task_runner")
         autoload :TypeScriptProjectCreator,

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

@@ -1,9 +1,6 @@
 payment_methods:
   domain: 'checkout'
   libraries:
-    assemblyscript:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
-      package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
       package: "@shopify/scripts-checkout-apis"
@@ -13,9 +10,6 @@ payment_methods:
 shipping_methods:
   domain: 'checkout'
   libraries:
-    assemblyscript:
-      repo: "https://github.com/Shopify/scripts-apis-examples"
-      package: "@shopify/scripts-checkout-apis"
     typescript:
       beta: true
       package: "@shopify/scripts-checkout-apis"
@@ -42,3 +36,21 @@ delivery_discount_types:
       repo: "https://github.com/Shopify/scripts-apis-examples"
     wasm:
       repo: "https://github.com/Shopify/scripts-apis-examples"
+product_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+order_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"
+shipping_discount_type:
+  beta: true
+  domain: 'discounts'
+  libraries:
+    wasm:
+      repo: "https://github.com/Shopify/scripts-apis-examples"

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

@@ -5,31 +5,16 @@ module Script
     module Application
       class BuildScript
         class << self
-          def call(ctx:, task_runner:, script_project:, library:)
+          def call(ctx:, task_runner:)
             CLI::UI::Frame.open(ctx.message("script.application.building")) do
               UI::StrictSpinner.spin(ctx.message("script.application.building_script")) do |spinner|
-                script_content = task_runner.build
-                metadata_file_location = task_runner.metadata_file_location
-                metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
-
-                Infrastructure::PushPackageRepository.new(ctx: ctx).create_push_package(
-                  script_project: script_project,
-                  script_content: script_content,
-                  metadata: metadata,
-                  library: library,
-                )
+                task_runner.build
                 spinner.update_title(ctx.message("script.application.built"))
               end
-            rescue StandardError => e
+            rescue Infrastructure::Errors::BuildError => e
               CLI::UI::Frame.with_frame_color_override(:red) do
                 ctx.puts("\n{{red:#{e.message}}}")
               end
-              errors = [
-                Infrastructure::Errors::BuildScriptNotFoundError,
-                Infrastructure::Errors::WebAssemblyBinaryNotFoundError,
-              ]
-
-              raise Infrastructure::Errors::BuildError unless errors.any? { |err| e.is_a?(err) }
               raise
             end
           end

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

@@ -21,30 +21,32 @@ module Script
               api: script_project.extension_point_type
             ) if library.nil? && (script_project.language != "wasm")
 
-            library_name = library&.package
-            library_data = {
-              language: script_project.language,
-              version: task_runner.library_version(library_name),
-            } if library_name
-
             ProjectDependencies.install(ctx: ctx, task_runner: task_runner)
-            BuildScript.call(ctx: ctx, task_runner: task_runner, script_project: script_project, library: library_data)
-
-            metadata_file_location = task_runner.metadata_file_location
-            metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+            BuildScript.call(ctx: ctx, task_runner: task_runner)
 
             CLI::UI::Frame.open(ctx.message("script.application.pushing")) do
               UI::PrintingSpinner.spin(ctx, ctx.message("script.application.pushing_script")) do |p_ctx, spinner|
+                library_name = library&.package
+                library_data = {
+                  language: script_project.language,
+                  version: task_runner.library_version(library_name),
+                } if library_name
+
+                metadata_file_location = task_runner.metadata_file_location
+                metadata = Infrastructure::MetadataRepository.new(ctx: ctx).get_metadata(metadata_file_location)
+
                 package = Infrastructure::PushPackageRepository.new(ctx: p_ctx).get_push_package(
                   script_project: script_project,
                   metadata: metadata,
                   library: library_data,
                 )
+
                 script_service = Infrastructure::ServiceLocator.script_service(
                   ctx: p_ctx,
                   api_key: script_project.api_key
                 )
                 module_upload_url = Infrastructure::ScriptUploader.new(script_service).upload(package.script_content)
+
                 uuid = script_service.set_app_script(
                   uuid: package.uuid,
                   extension_point_type: package.extension_point_type,