shopify-cli 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5eeebd9058a041844656003db1812bd64cc52b71f2cd9e971a196017ef272ad7
-  data.tar.gz: cfb9881073152f718fb32bc6150329b0a0c7891058de9ce5145847717deaae35
+  metadata.gz: 51b5808e81e2d168620af088bec6f155869a9870b516960927735f9b7b886e55
+  data.tar.gz: 47c04e0dbabd30bb2c03e8c99771e724e16fe7c336fd342be01540749088bee5
 SHA512:
-  metadata.gz: 606af4b1db0d92a2d1c15cf31a2376da3b5dc24b3def4cf5d78a7a5662cb64fc76b29e364f85e1880db5e7e2383ac3a9dd9b705f4f319414e6e5bf8c6c59788a
-  data.tar.gz: 6880b9158d5ff14287e6bbfec091b6240979ef663c1b64494f6ed3b1fe2fdb98e60bc21b4dfc30a09129a3ff1c5136a68166f363ba111d21e0fdb6976ae737a8
+  metadata.gz: d75f831a6214930264f60c6c5699beddba9ae73c834878723b2b6c764a5e98d30e427183fa6946fdf57c45a90859cc0a4bbd5420616a72b2f340c0c91093a430
+  data.tar.gz: b73c3d43b0a711994930c0490de71bfeeeff0775b5e0ce6efc48c8c40935b630e5d0ed7182d6eb20188357199a469325b7b40f6cbf317dccb34655745e315ef6

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -21,12 +21,23 @@ Fixes #0000 <!-- link to issue if one exists -->
   Before / after screenshots appreciated for UI changes.
 -->
 
-### Update checklist
+### How to test your changes?
+
 <!--
-  Ideally, CHANGELOG entries should be in the format
-  `* [#PR](PR URL): Message`. You should consider adding your PR
-  and then making the CHANGELOG update once you know the PR number.
+  Please, provide steps for the reviewer to test your changes locally.
 -->
+
+### Post-release steps
+
+<!--
+  If changes require post-release steps, for example merging and publishing some documentation changes,
+  specify it in this section and add the label "includes-post-release-steps".
+  If it doesn't, feel free to remove this section.
+-->
+
+### Update checklist
+
 - [ ] 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.

data/.github/workflows/shopify.yml

@@ -44,19 +44,14 @@ jobs:
       - name: Run Tests
         run: bundle exec rake test
   acceptance_tests:
-    name: Acceptance Tests with Ruby ${{ matrix.version }} on ${{ matrix.os }}
+    name: Acceptance Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         version:
           - 3.0.2
-          - 2.6.6
-          - 2.7.1
         os:
-          - macos-10.15
-          - macos-11
           - ubuntu-20.04
-          - ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - name: Set Git configuration
@@ -74,6 +69,8 @@ jobs:
         with:
           node-version: "14.9.0"
 
+      - uses: docker-practice/actions-setup-docker@master
+
       - name: Install Dependencies
         run: bundle install
 

data/CHANGELOG.md

@@ -1,23 +1,30 @@
-Unreleased
-------
+From version 2.6.0, the sections in this file adhere to the [keep a changelog](https://keepachangelog.com/en/1.0.0/) specification.
+## [Unreleased]
 
-Version 2.6.3
-------
-* Enable error-reporting.
+## Version 2.6.4
+### Fixed
+* [#1633](https://github.com/Shopify/shopify-cli/pull/1633): Runtime error when the shop passed on login is invalid
+* [#1625](https://github.com/Shopify/shopify-cli/pull/1625): Fix push bug with post-purchase extensions
 
-Version 2.6.2
-------
+### Added
+* [#1542](https://github.com/Shopify/shopify-cli/pull/1542): Add option theme serve --poll to force polling when watching files
+* [#1635](https://github.com/Shopify/shopify-cli/pull/1635): Command to enable or disable anonymous usage and error reporting.
+* [#1614](https://github.com/Shopify/shopify-cli/pull/1614): Add ability to set custom ngrok port for all app serve commands.
+### Removed
+
+### Changed
+* [#1635](https://github.com/Shopify/shopify-cli/pull/1635): Automatic usage and error reporting configuration has been unified under `analytics.enabled`.
+### Security
+
+## Version 2.6.3
+* Enable error-reporting.
 
+## Version 2.6.2
 * Fix broken installation due to a missing variable in `extconf.rb`
   
-Version 2.6.1
-------
-
+## Version 2.6.1
 * [#1608](https://github.com/Shopify/shopify-cli/pull/1608): Fix errors not being reported.
-
-Version 2.6.0
-------
-
+## 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.
@@ -26,92 +33,72 @@ Version 2.6.0
 * [#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
-------
-
+## Version 2.5.0
 * [#1553](https://github.com/Shopify/shopify-cli/pull/1553): Add support for PHP app projects
 
-Version 2.4.0
-------
-
+## Version 2.4.0
 * [#1488](https://github.com/Shopify/shopify-cli/pull/1488): Update Theme-Check to 1.4
 * [#1507](https://github.com/Shopify/shopify-cli/pull/1507): Limit the generated name for themes to 50 characters
 
-Version 2.3.0
-------
-
+## Version 2.3.0
 * [#1386](https://github.com/Shopify/shopify-cli/pull/1386): Update Theme-Check to 1.2
 * [#1457](https://github.com/Shopify/shopify-cli/pull/1457): Fix uploading of binary theme files under Windows
 * [#1480](https://github.com/Shopify/shopify-cli/pull/1480): Fix customers pages not working with `theme serve`
 * [#1479](https://github.com/Shopify/shopify-cli/pull/1479): Add theme push & pull option to ignore files per command
+v
+## Version 2.2.2
+* [1382](https:/github.com/Shopify/shopify-cli/pull/1382): Client side module upload for Scripts
 
-Version 2.2.2
-------
-* [1382](https://github.com/Shopify/shopify-cli/pull/1382): Client side module upload for Scripts
-
-Version 2.2.1
-------
-
+## Version 2.2.1
 * [1432](https://github.com/Shopify/shopify-cli/pull/1432) New method for determining renderer package name
 
-Version 2.2.0
-------
-* [#1424](https://github.com/Shopify/shopify-cli/pull/1424/): Add `--resourceUrl` flag to extension serve command
+## Version 2.2.0
+* [#1424](https//github.com/Shopify/shopify-cli/pull/1424/): Add `--resourceUrl` flag to extension serve command
 * [#1419](https://github.com/Shopify/shopify-cli/pull/1419): Remove analytics prompt when used in CI
 * [#1418](https://github.com/Shopify/shopify-cli/pull/1418): Auto configure resource URL for Checkout Extensions
 * [#1399](https://github.com/Shopify/shopify-cli/pull/1399): Fix error when running `shopify extension serve` in a theme app extension project
 
-Version 2.1.0
--------------
-* [#1357](https://github.com/Shopify/shopify-cli/pull/1357): Update Theme-Check to 1.1
+## Version 2.1.0
+* [#1357](https//github.com/Shopify/shopify-cli/pull/1357): Update Theme-Check to 1.1
 * [#1352](https://github.com/Shopify/shopify-cli/pull/1352): Add `shopify extension check` for checking theme app extensions
 * [#1304](https://github.com/Shopify/shopify-cli/pull/1304): Prompt user to run `shopify extension connect` if .env file is missing
 
-Version 2.0.2
--------------
-* [#1305](https://github.com/Shopify/shopify-cli/pull/1305): Fix `Uninitialized constant Net::WriteTimeout` error
+## Version 2.0.2
+* [#1305](https//github.com/Shopify/shopify-cli/pull/1305): Fix `Uninitialized constant Net::WriteTimeout` error
 * [#1319](https://github.com/Shopify/shopify-cli/pull/1319): Fix `theme pull` not pulling some files
 * [#1321](https://github.com/Shopify/shopify-cli/pull/1321): Fix error when pulling images with `theme pull`
 * [#1322](https://github.com/Shopify/shopify-cli/pull/1322): Fix error when running `shopify theme language-server --help`
 * [#1324](https://github.com/Shopify/shopify-cli/pull/1324): Fix issue [#1308](https://github.com/Shopify/shopify-cli/issues/1308) where a non-English language on Partner Account breaks how CLI determines latest API version.
 * [#1343](https://github.com/Shopify/shopify-cli/pull/1343): Fix inconsistent use of periods vs ellipsis in messages. This replaces periods with ellipsis.
 
-Version 2.0.1
--------------
-* [#1295](https://github.com/Shopify/shopify-cli/pull/1295): Ignore files at the root of a theme app extension project
+## Version 2.0.1
+* [#1295](https//github.com/Shopify/shopify-cli/pull/1295): Ignore files at the root of a theme app extension project
 * [#1296](https://github.com/Shopify/shopify-cli/pull/1296): Fix issue [#1294](https://github.com/Shopify/shopify-cli/issues/1294) regarding call to Windows `start` command with URL.
 * [#1298](https://github.com/Shopify/shopify-cli/pull/1298): Fix error in `theme serve` command
 * [#1301](https://github.com/Shopify/shopify-cli/pull/1301): Add `theme init` command
 
-Version 2.0.0
--------------
-* Adds support for theme development
+## Version 2.0.0
+* Adds support or theme development
 * Changes to command structure (note that these are breaking changes, see [README](README.md))
 * Checkout the [apps](https://shopify.dev/apps/tools/cli) and [themes](https://shopify.dev/themes/tools/cli) sections of the new [shopify.dev](https://shopify.dev) after Unite 2021 (June 29).
 
-Version 1.14.0
---------------
+## Version 1.14.0
 * [#1275](https://github.com/Shopify/shopify-cli/pull/1275): Use script.json to specify script metadata
 * [#1279](https://github.com/Shopify/shopify-cli/pull/1279): Fix bug where a script push still fails after the user answers the force push prompt
 * [#1288](https://github.com/Shopify/shopify-cli/pull/1288): Fix bug where Scripts SDK was included for projects that don't require it
 
-Version 1.13.1
---------------
+## Version 1.13.1
 * [#1274](https://github.com/Shopify/shopify-cli/pull/1274): Only print api_key during error if it exists
 * [#1272](https://github.com/Shopify/shopify-cli/pull/1272): Fix minor bug with extension serve for UI extensions
 
-Version 1.13.0
---------------
-
+## Version 1.13.0
 * [#1266](https://github.com/Shopify/shopify-cli/pull/1266): Developer Console release
 * [#1265](https://github.com/Shopify/shopify-cli/pull/1265): Fix bug where commands hang after an unsuccessful authentication
 
-Version 1.12.0
---------------
+## Version 1.12.0
 * [#1255](https://github.com/Shopify/shopify-cli/pull/1255): Fix beta flag checks when running `shopify serve`
 
-Version 1.11.0
---------------
+## Version 1.11.0
 * [#1221](https://github.com/Shopify/shopify-cli/pull/1221): Prioritizes returning an HTTPS URL over HTTP from `shopify tunnel status`.
 * [#1223](https://github.com/Shopify/shopify-cli/pull/1233): Running `shopify serve` in an extension project now automatically runs `shopify tunnel`.
 * [#1225](https://github.com/Shopify/shopify-cli/pull/1225): Improved handling of "account not found" scenario, plus improvements to related tests and UX messaging
@@ -119,60 +106,52 @@ Version 1.11.0
 * [#1238](https://github.com/Shopify/shopify-cli/pull/1238): Auto Tunnel Support for Checkout Extension
 * [#1256](https://github.com/Shopify/shopify-cli/pull/1256): Allow using spaces around the equal sign on .env file.
 
-Version 1.10.0
---------------
+## Version 1.10.0
 * Updating internal features in development
 
-Version 1.9.1
--------------
+## Version 1.9.1
 * [#1201](https://github.com/Shopify/shopify-cli/pull/1201) Determine Argo Renderer Dynamically. This fixes `shopify serve` and `shopify push` for extensions.
 
-Version 1.9.0
--------------
+## Version 1.9.0
 * [#1181](https://github.com/Shopify/shopify-cli/pull/1181): Remove the subcommand references of the `generate` command for node apps (fixes [1176](https://github.com/Shopify/shopify-cli/issues/1176))
 
-Version 1.8.0
--------------
+## Version 1.8.0
 * [#1119](https://github.com/Shopify/shopify-cli/pull/1119): Enable guest serialization for scripts
 
-Version 1.7.1
-------
+## Version 1.7.1
+
 * Updating internal features in development
 
-Version 1.7.0
------
+## Version 1.7.0
 * [#1109](https://github.com/Shopify/shopify-cli/pull/1109): Abort app generation if name contains disallowed text.
 * [#1075](https://github.com/Shopify/shopify-cli/pull/1075): Add support for kebab-case flags
 
-Version 1.6.0
------
+## Version 1.6.0
 * [#1049](https://github.com/Shopify/shopify-cli/pull/1049): Add schema versioning support to the script project type
 * [#1059](https://github.com/Shopify/shopify-cli/pull/1059): Remove the functionality of the `generate` command for node apps, since it will no longer be feasible with the new node library
 * [#1046](https://github.com/Shopify/shopify-cli/pull/1046): Include a vendored copy of Webrick, as it's no longer included in Ruby 3.
 * [#1041](https://github.com/Shopify/shopify-cli/pull/1041): Remove unnecessary shell call to `spring stop`. We already pass `--skip-spring` when creating the app so running `spring stop` would have no effect.
 * [#1034](https://github.com/Shopify/shopify-cli/pull/1034): Abort if a system call fails.
 
-Version 1.5.0
------
+## Version 1.5.0
 * [#965](https://github.com/Shopify/shopify-cli/pull/965): Remove --no-optional when using npm to create new project
 * [#958](https://github.com/Shopify/shopify-cli/pull/958): Split `connect` command into project-specific functionality
 * [#992](https://github.com/Shopify/shopify-cli/pull/992): Add Theme Kit functionality to CLI
 
-Version 1.4.1
-------
+## Version 1.4.1
+
 * [#917](https://github.com/Shopify/shopify-cli/pull/917): Ensure analytics for create action includes the same fields as other commands
 
-Version 1.4.0
-------
+## Version 1.4.0
+
 * Updates to tests, dependencies and internal tooling
 * [#924](https://github.com/Shopify/shopify-cli/pull/924): Improve debugging messages on Partner API errors
 
-Version 1.3.1
-------
+## Version 1.3.1
+
 * Allow any characters in ngrok account names
 
-Version 1.3.0
-------
+## Version 1.3.0
 * Support for new `shopify config analytics` command to enable/disable anonymous usage reporting
 
 Version 1.2.0
@@ -187,49 +166,39 @@ Version 1.1.1
 ------
 * Fix a bug where usernames with spaces caused issues on Windows
 
-Version 1.1.0
-------
+## Version 1.1.0
 * Add native Windows 10 support, including variety of stability fixes.
 
-Version 1.0.5
-------
+## Version 1.0.5
 * Fix a bug in out opt-in metrics
 
-Version 1.0.4
-------
+## Version 1.0.4
 * Fix a bug when running the `connect` command with an account with multiple organizations
 
-Version 1.0.3
-------
+## Version 1.0.3
 * Fix a bug which causes an error in the `populate` and `generate` commands when prompting for the shop name
 
-Version 1.0.2
-------
+## Version 1.0.2
 * Fix missing shop parameter to AdminAPI.query() call (impacting populate and generate commands)
 
-Version 1.0.1
-------
+## Version 1.0.1
 * Fixed an issue with RVM taking over the shell shim fd when it was not in use
 
-Version 1.0.0
-------
+## Version 1.0.0
 * Release the installer-based version of the CLI
 
-Version 0.9.3 - Internal Test Version
-------
+## Version 0.9.3 - Internal Test Version
 * Rebased to master
 * Removed auto-generated files from builds directory
 
-Version 0.9.2 - Internal Test Version
-------
+## Version 0.9.2 - Internal Test Version
 * Rebased to master, to pull in 7+ Pull Requests
 * Updates to dependencies to package files (updated Ruby version)
 
-Version 0.9.1 - Internal Test Version
-------
+## Version 0.9.1 - Internal Test Version
 * Updated required Ruby version for the CLI
 * Minor fixes for the build / release process
 
-Version 0.9.0 - Internal Test Version
-------
+## Version 0.9.0 - Internal Test Version
+
 * Initial test release of gem-based CLI

data/Dockerfile

@@ -1,7 +1,7 @@
 # This is a Docker image to test the CLI in UNIX environments other than macOS
 # Build the image: docker build . -t shopify-cli
 # Run tests: docker run -t --rm --volume "$(pwd):/usr/src/app" shopify-cli bundle exec rake test
-FROM cimg/ruby:2.7.1-node
+FROM cimg/ruby:2.7.1
 
 RUN git config --global user.email "development-lifecycle@shopify.com"
 RUN git config --global user.name "Development Lifecycle"
@@ -14,4 +14,14 @@ 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
-RUN bundle install
+RUN bundle install
+
+# Update git
+RUN sudo add-apt-repository -y ppa:git-core/ppa
+RUN sudo apt-get update
+RUN sudo apt-get install git -y
+
+# Install the latest version of NodeJS
+RUN sudo apt-get install ca-certificates -y
+RUN curl -fsSL https://deb.nodesource.com/setup_current.x | sudo -E bash -
+RUN sudo apt-get install -y nodejs

data/Gemfile

@@ -13,6 +13,7 @@ group :development, :test do
   gem "rubocop-shopify", require: false
   gem "rubocop-minitest", require: false
   gem "rubocop-rake", require: false
+  gem "iniparse", "~> 1.5"
 end
 
 group :test do

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.6.3)
+    shopify-cli (2.6.4)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.7)
+      theme-check (~> 1.7.2)
 
 GEM
   remote: https://rubygems.org/
@@ -56,6 +56,7 @@ GEM
     fakefs (1.3.2)
     ffi (1.15.4)
     hashdiff (1.0.1)
+    iniparse (1.5.0)
     liquid (5.1.0)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -136,6 +137,7 @@ DEPENDENCIES
   byebug
   cucumber (~> 7.0)
   fakefs (>= 1.0)
+  iniparse (~> 1.5)
   minitest (>= 5.0.0)
   minitest-fail-fast
   minitest-reporters
@@ -151,4 +153,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.22
+   2.2.29

data/RELEASING.md

@@ -1,65 +1,52 @@
 ## Releasing Shopify CLI
 
 1. Check the Semantic Versioning page for info on how to version the new release: http://semver.org
-
-1. Make sure you're on the most recent `main`
+2. Make sure you're on the most recent `main`
    ```
    $ git checkout main
    $ git pull
    ```
-
-1. Create a branch named `release_X_Y_Z` (replacing `X_Y_Z` with the intended release version)
+3. Create a branch named `release_X_Y_Z` (replacing `X_Y_Z` with the intended release version)
    ```
    $ git checkout -b release_X_Y_Z
    ```
-
-1. Update the version of Shopify CLI in `lib/shopify_cli/version.rb`
-
-1. Update the version of Shopify CLI at the top of `Gemfile.lock` (failing to do so causes the CI build to fail)
-
-1. Add an entry for the new release to `CHANGELOG.md`
-
-1. Commit the changes with a commit message like "Packaging for release X.Y.Z"
+4. Update the version of Shopify CLI in `lib/shopify_cli/version.rb`
+5. Update the version of Shopify CLI at the top of `Gemfile.lock` (failing to do so causes the CI build to fail)
+6. Add an entry for the new release to `CHANGELOG.md`
+7. Commit the changes with a commit message like "Packaging for release X.Y.Z"
    ```
    $ git commit -am "Packaging for release vX.Y.Z"
    ```
-
-1. Push out the changes
+8. Push out the changes
    ```
    $ git push -u origin release_X_Y_Z
    ```
 
-1. Open a PR for the branch, get necessary approvals from code owners and merge into main branch. Note that the PR title will be the release note in Shipit, so make sure it mentions the release
-
-1. Deploy using Shipit
-
-1. Update your `main` branch to the latest version
+9. Open a PR for the branch, get necessary approvals from code owners and merge into main branch. Note that the PR title will be the release note in Shipit, so make sure it mentions the release
+10. Deploy using Shipit
+11. Update your `main` branch to the latest version
    ```
    $ git checkout main
    $ git pull
    ```
-
-1. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
+   
+12. On local machine and _AFTER_ gem has been published to https://rubygems.org, run
    ```
    $ rake package
    ```
    This will generate the `.deb`, `.rpm` and brew formula files, which will be located in `packaging/builds/X.Y.Z/`.
 
-1. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
+13. Clone the `Shopify/homebrew-shopify` repository (if not already cloned), and then
     * create a branch named `release_X_Y_Z_of_shopify-cli`
     * update the brew formula in `shopify-cli.rb` with the generated formula in `packaging/builds/X.Y.Z/` in the `Shopify/shopify-cli` repo (from the `rake package` step above)
     * commit the change and create a PR on the [Shopify Homebrew repository](https://github.com/Shopify/homebrew-shopify)
     * when PR is approved, merge into main branch
-
-1. Go to [releases](https://github.com/Shopify/shopify-cli/releases) page of `Shopify/shopify-cli` repo and create a new release:
+  
+14. Go to [releases](https://github.com/Shopify/shopify-cli/releases) page of `Shopify/shopify-cli` repo and create a new release:
     * use the tag created by Shipit (should be "vX.Y.Z")
     * release title = "Version X.Y.Z"
-    * description should be
-      ```
-      Release of version X.Y.Z of Shopify CLI
-
-      Please refer to [CHANGELOG](https://github.com/Shopify/shopify-cli/blob/main/CHANGELOG.md) for details.
-      ```
+    * description should be the content of the section in the `CHANGELOG.md`
     * upload the `.deb` and `.rpm` files from `packaging/builds/X.Y.Z/` (generated in step 9)
     * if it's a pre-release version, select the "This is a pre-release" checkbox
     * and click "Publish release".
+15. Go through all the PR [labeled with `includes-post-release-steps`](https://github.com/Shopify/shopify-cli/labels/includes-post-release-steps) and follow the post-release steps described in those PRs. Delete the labels afterward.

data/Rakefile

@@ -22,11 +22,6 @@ namespace :linux do
   task :test do
     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
-    Utilities::Docker.run_and_rm_container("bundle", "exec", "cucumber")
-  end
 end
 
 RuboCop::RakeTask.new

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

@@ -23,7 +23,7 @@ module Extension
         Features::ArgoSetup.new(git_template: git_template).call(directory_name, identifier, context)
       end
 
-      def config(context)
+      def config(context, include_renderer_version: true)
         js_system = ShopifyCLI::JsSystem.new(ctx: context)
         if js_system.package_manager == "yarn"
           run_yarn_install(context, js_system)
@@ -31,9 +31,15 @@ module Extension
         end
         filepath = File.join(context.root, SCRIPT_PATH)
         context.abort(context.message("features.argo.missing_file_error")) unless File.exist?(filepath)
+
+        renderer_version = nil
+        if include_renderer_version
+          renderer_version = renderer_package(context).version
+        end
+
         begin
           {
-            renderer_version: renderer_package(context).version,
+            renderer_version: renderer_version,
             serialized_script: Base64.strict_encode64(File.read(filepath).chomp),
           }
         rescue StandardError

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

@@ -11,7 +11,7 @@ module Extension
         def config(context)
           {
             **Features::ArgoConfig.parse_yaml(context, PERMITTED_CONFIG_KEYS),
-            **argo.config(context),
+            **argo.config(context, include_renderer_version: false),
           }
         end
 

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

@@ -9,7 +9,7 @@ module Extension
         def config(context)
           {
             **Features::ArgoConfig.parse_yaml(context, PERMITTED_CONFIG_KEYS),
-            **argo.config(context),
+            **argo.config(context, include_renderer_version: false),
           }
         end
 

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

@@ -2,20 +2,18 @@
 module Node
   class Command
     class Serve < ShopifyCLI::SubCommand
+      include ShopifyCLI::CommandOptions::CommandServeOptions
+
       prerequisite_task ensure_project_type: :node
       prerequisite_task :ensure_env, :ensure_dev_store
 
-      options do |parser, flags|
-        parser.on("--host=HOST") do |h|
-          flags[:host] = h.gsub('"', "")
-        end
-        parser.on("--port=PORT") { |port| flags[:port] = port }
-      end
+      parse_host_option
+      parse_port_option
 
       def call(*)
         project = ShopifyCLI::Project.current
-        url = options.flags[:host] || ShopifyCLI::Tunnel.start(@ctx)
-        @ctx.abort(@ctx.message("node.serve.error.host_must_be_https")) if url.match(/^https/i).nil?
+        tunnel_port = port.to_s
+        url = host || ShopifyCLI::Tunnel.start(@ctx, port: tunnel_port)
         project.env.update(@ctx, :host, url)
         ShopifyCLI::Tasks::UpdateDashboardURLS.call(
           @ctx,
@@ -30,18 +28,11 @@ module Node
 
         CLI::UI::Frame.open(@ctx.message("node.serve.running_server")) do
           env = project.env.to_h
-          env["PORT"] = port.to_s
+          env["PORT"] = tunnel_port
           @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

@@ -122,11 +122,6 @@ module Node
               {{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,
             {{*}} To install and start using your app, open this URL in your browser:
             {{green:%s}}