shopify-cli 2.6.6 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb41d18df964832b9ebc6be79e80006c4750c8d416c9550cbcc625d190bf26b9
-  data.tar.gz: d5c6b523faf27c0a6b3c53ccaadd1c4f47e932d7e0c2520e7f0bfcb2f7f7b820
+  metadata.gz: 4cce33ea79f749e3dc6e18d724ac5e584f887971224119f6e8ea61ade325798d
+  data.tar.gz: 3ae9563de4ea7eb1eaf3e51a03e71fba509ca9249c35e9be8d1311e952ddf577
 SHA512:
-  metadata.gz: 396c3c47f510e78d67775fc6b6a091849ce8c3955d2c91ec516659ef4377df44a00a3faaa70facdd0649763b2a3b69f96ab4f859a003b23becd6baf3202d4b64
-  data.tar.gz: 1514e2a4c8f1841e8714a30f4e05450c5116863cc2c14cf5655143a43a49e1b5f6f2da1b8ffc2af6acd683359ea970920090ba55c6f82213e91de1cd4aeb7b87
+  metadata.gz: f5e46c8fa4c9eeb026d7e7b451a53886338a32ea084153f541eda085a6a3bb6cf5247831498b0dcc960c9079e7eaf3906662965c32e17f2dfd31a47113343674
+  data.tar.gz: 46df1b135b1d37618560a00fb8121291ddf9d63f0e35c2c33abfdcf3decb2b9d0fb3380c99726cedab37bd4b01627ac4a3df51869312f82bbfd5ebeb43d9b6a3

data/.devcontainer.json

@@ -0,0 +1,5 @@
+{
+  "build": {
+    "dockerfile": "Codespace.dockerfile"
+  },
+}

data/.github/DESIGN.md

@@ -30,7 +30,7 @@ The user understands the following mechanics of a CLI:
 When creating a new command or subcommand there are a few things to keep in mind.
 
 ### What is the quickest way to execute a command?
-Commands are best executed autonomously. Most of the time the command should be self contained and should not requre additional input from the user. For example when running `shopify populate products` the command will execute without additional inputs required from the user even though the command could ask for things like `product name`, `price`, etc.
+Commands are best executed autonomously. Most of the time the command should be self contained and should not require additional input from the user. For example when running `shopify populate products` the command will execute without additional inputs required from the user even though the command could ask for things like `product name`, `price`, etc.
 
 When creating a new command or subcommand consider how much information is absolutely necessary for the command to execute autonomously. If a command always requires arguments or additional information then  adding smart defaults could help make inputting the command faster. 
 

data/.github/ISSUE_TEMPLATE.md

@@ -25,6 +25,13 @@ Tip: include an error message (in a `<details></details>` tag) if your issue is
 1.
 
 
+## Stacktrace
+
+<!--Stacktrace
+Add any stacktrace that might help debug the reported issue.
+Otherwise, delete this section.
+-->
+
 
 ## Specifications
 

data/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "dracula-theme.theme-dracula",
+  ]
+}

data/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "files.exclude": {
+    "**/.git": true,
+    "**/node_modules": true,
+    "**/.DS_Store": true
+  },
+  "editor.formatOnSave": false,
+  "workbench.colorTheme": "Dracula Soft",
+}

data/CHANGELOG.md

@@ -1,9 +1,17 @@
 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.7.0
+### Changed
+* [#1650](https://github.com/Shopify/shopify-cli/pull/1650): **Breaking** Move app commands under `shopify app`.
+
+### Fixed
+* [#1714](https://github.com/Shopify/shopify-cli/pull/1714): Fix theme serve not serving assets locally when two URLs are on the same line
+* [#1729](https://github.com/Shopify/shopify-cli/pull/1729): Update theme-check to 1.8.0
+
 ## Version 2.6.6
 ### Added
-* [#1609](https://github.com/Shopify/shopify-cli/pull/1609): Add `--bind=HOST` option to `shopify theme serve`.
+* [#1609](https://github.com/Shopify/shopify-cli/pull/1609): Add `--http-bind=HOST` option to `shopify theme serve`.
 
 ### Fixed
 * [#1678](https://github.com/Shopify/shopify-cli/pull/1678): Fix migrator's incompatibility with Ruby 2.5.
@@ -30,6 +38,7 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 
 ### 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
@@ -53,11 +62,11 @@ From version 2.6.0, the sections in this file adhere to the [keep a changelog](h
 * [#1553](https://github.com/Shopify/shopify-cli/pull/1553): Add support for PHP app projects
 
 ## Version 2.4.0
-* [#1488](https://github.com/Shopify/shopify-cli/pull/1488): Update Theme-Check to 1.4
+* [#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
-* [#1386](https://github.com/Shopify/shopify-cli/pull/1386): Update Theme-Check to 1.2
+* [#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

data/CONTRIBUTING.md

@@ -1,31 +1,3 @@
 # Contributing
 
-This documents includes guidelines for contributors.
-
-## Testing
-
-The project employs a diverse suite tests that help ensure it works as intended and prevents regressions as it continues to grow and evolve.
-
-### Unit Tests
-Most of the internal components the project uses have unit tests to thoroughly test them. Here dependencies of components are mocked or stubbed appropriately to ensure tests are reliable, test only one component and are fast!
-
-### Acceptance Tests
-
-Acceptance tests run the built `shopify` command line against a wide range of fixtures and verify its output and results. They are the slowest to run however provide the most coverage. The idea is to test a few complete scenarios for each major feature.
-
-Those are written in [Cucumber](https://cucumber.io/) and Ruby and can be found in the [`features/`](/features) directory. They can be executed by running:
-
-```bash
-bundle exec cucumber
-bundle exec cucumber features/theme.feature:3 # A specific test
-```
-
-> **Note** that we currently don't have an approach for stubbing the interactions with the GraphQL APIs and that therefore we can't write acceptance tests for commands that interact with APIs.
-
-#### Debugging acceptance tests
-When developing acceptance tests, it can be helpful to see the outputs of running commands.
-To see outputs, append `--verbose` when running an acceptance test. Example:
-
-```sh
-bundle exec cucumber features/theme.feature --verbose
-```
+Check out the [contributors' documentation](/docs)

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    shopify-cli (2.6.6)
+    shopify-cli (2.7.0)
       bugsnag (~> 6.22)
       listen (~> 3.7.0)
-      theme-check (~> 1.7.2)
+      theme-check (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -90,7 +90,7 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.13.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.6)
@@ -119,7 +119,7 @@ GEM
     ruby-progressbar (1.11.0)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    theme-check (1.7.2)
+    theme-check (1.8.0)
       liquid (>= 5.1.0)
       nokogiri (>= 1.12)
       parser (~> 3)

data/README.md

@@ -1,113 +1,34 @@
-# Shopify CLI
-
-[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE.md)
-[![Build Status](https://github.com/Shopify/shopify-cli/workflows/CI/badge.svg)](https://github.com/Shopify/shopify-cli/actions)
+<div align="center">
+  <img src="assets/logo.png" width="150"/>
+  <h1>Shopify CLI</h1>
+  <a href=""><img src="https://github.com/shopify/shopify-cli/workflows/CI/badge.svg" alt="Shopify"></a>
+  <img src="https://img.shields.io/github/v/release/shopify/shopify-cli?include_prereleases&style=flat-square" alt="Latest Version">
+  <img src="https://img.shields.io/github/forks/shopify/shopify-cli?style=flat-square" alt="GitHub forks">
+  <img src="https://img.shields.io/github/stars/shopify/shopify-cli?style=flat-square" alt="GitHub stars">
+  <img src="https://img.shields.io/github/commit-activity/w/shopify/shopify-cli?style=flat-square" alt="Commit Activity">
+    <img src="https://img.shields.io/github/contributors/shopify/shopify-cli?style=flat-square" alt="Contributors">
+  <img src="https://img.shields.io/github/commits-since/shopify/shopify-cli/latest?style=flat-square" alt="Latest Commits">
+  <a href="http://twitter.com/ShopifyDevs"><img src="https://img.shields.io/twitter/follow/ShopifyDevs?style=flat-square" alt="Twitter Followers"></a>
+  <img src="https://img.shields.io/badge/License-MIT-green.svg" alt="License">
+  <img src="https://img.shields.io/badge/Powered%20by-Ruby-red" alt="Powered by Ruby">
+</div>
 
 
 Shopify CLI helps you build Shopify themes and apps. Use Shopify CLI to automate and enhance your local development workflow.
 
 Shopify CLI is available as a gem and can be run and installed on Mac, Linux and Windows systems.
 
-## Installation for Mac OS Users
-
-- Make sure you have [Homebrew](https://brew.sh/) installed
-- Open your terminal app
-- Run `brew tap shopify/shopify`
-- Run `brew install shopify-cli`
-- After the installation is completed, run `shopify version`, if this outputs a version number you've successfully installed the CLI.
-
-### To upgrade Shopify CLI
-
-#### Homebrew (Mac OS)
-
-```shell
-$ brew update
-$ brew upgrade shopify-cli
-```
-
-#### apt (Debian, Ubuntu)
-
-1.- Download the latest `.deb` binary for Shopify CLI from the releases page.
-
-2.- Install the downloaded file and make sure to replace /path/to/download/shopify-cli-x.y.z.deb with the path to your file's location:
-
-```shell
-$ sudo apt install /path/to/downloaded/shopify-cli-x.y.z.deb
-```
-
-#### yum (CentOS 8+, Fedora, Red Hat, SUSE)
-
-1.- Download the latest .rpm file for Shopify App CLI from the releases page.
-
-2.- Install the downloaded file and make sure to replace /path/to/downloaded/shopify-cli-x.y.x.rpm with the path to your file's location:
-
-```shell
- $ sudo yum install /path/to/downloaded/shopify-cli-x.y.x.rpm
-```
-
-#### RubyGems (macOS, Linux, Windows 10)
-
-```shell
-$ gem update shopify-cli
-```
-
-
-## Command specification and semantics
-
-Shopify CLI offers a command structure similar to other CLIs:
-
-`shopify [ GLOBAL_ACTION | RESOURCE [ ACTION ] ] [ VARIADIC_ARGS ] [ OPTIONS ]`
-
-The top level command will always be a **resource** or a **global action**:
-
-- Resources represent Shopify concepts that you can work with in the CLI, for example `theme`.
-- Usually, global actions are commands that alter the state of the CLI (e.g `config` or `login`)
-
-Actions are commands that you can run to interact with a resource.
-
-You can add `--help` or `-h` to the end of your command to get a full explanation of the available options for the command.
-
-## Quick start guide for theme developers
-
-This quick start guide shows you how to begin local theme development when working with a new theme from scratch.
-
-### 1.- Authenticate the CLI
-
-After you install Shopify CLI, you need to authenticate your CLI instance and connect to the store that you want to work on.
-
-Run:
-
-`shopify login --store=<your-shop-url>`
-
-When prompted, open the provided accounts.shopify.com URL in a browser. In your browser window, log into the account that's attached to the store that you want to use for development.
-
-### 2.- Create a new theme
-
-Run:
-
-`shopify theme init`
-
-To initialize a theme on your current working directory. This will actually clone Shopify's starter theme which you should use as a reference when building themes for Shopify.
-
-### 3.- Start the local theme server
-
-Shopify CLI comes with a local theme server which lets you preview your changes live on your local machine.
-
-After you create or navigate to your theme, you can run `shopify theme serve` to interact with the theme in a browser. Shopify CLI uploads the theme as a development theme on the store that you're connected to, and gives you an IP address and port to preview changes in real time using the store's data.
-
-Run:
-
-`shopify theme serve`
+## Installation 
 
-To start the server. The server includes hot reload for CSS & Sections.
+Check out our [installation steps](docs/users/installation.md).
 
-**Note:** Shopify CLI is the recommended and officially supported tool for developing themes and creating CI/CD workflows. Please refer to the [Theme Kit Migration Guide](https://github.com/Shopify/shopify-cli/blob/main/THEMEKIT_MIGRATION.md) for details.
+## Contributing 👩‍💻
 
-### Contributing
+Shopify CLI is an [open source tool](/LICENSE) and everyone is welcome to help the community by [contributing](/docs/README.md) to the project.
 
-Shopify CLI is an [open source tool](https://github.com/Shopify/shopify-cli/blob/main/LICENSE) and everyone is welcome to help the community by [contributing](https://github.com/Shopify/shopify-cli/blob/main/.github/CONTRIBUTING.md) to the project.
+## Help 🖐
 
-### Where to get help
+If you encounter issues using the CLI or have feedback you'd like to share with us, below are some options:
 
 - [Open a GitHub issue](https://github.com/Shopify/shopify-cli/issues) - To report bugs or request new features, open an issue in the Shopify CLI repository.
 

data/Tests.dockerfile

@@ -0,0 +1,35 @@
+# 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
+
+RUN git config --global user.email "development-lifecycle@shopify.com"
+RUN git config --global user.name "Development Lifecycle"
+
+RUN gem update bundler
+
+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
+
+# 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
+
+# Install the latest version of Yarn
+RUN sudo npm install --global yarn
+
+# Python is necessary to compile NPM packages with native extensions through node-gyp
+RUN sudo apt install python-minimal -y
+
+# Install sqlite3
+RUN sudo apt-get install libsqlite3-dev -y

data/dev.yml

@@ -13,9 +13,6 @@ up:
       - rpm:
           version: 4.16.1.3
   - bundler
-  - node:
-      version: 14.9.0
-      yarn: true
   - docker
 
 test:

data/docs/README.md

@@ -0,0 +1,13 @@
+# Documentation
+
+This directory contains documentation for **contributors** of the Shopify CLI.
+It also contains documentation that is relevant to **users** like migration guidelines.
+
+## Contributors
+
+- [**Testing**](contributors/testing.md): Read about testing strategies and how they are used across the codebase.
+
+## Users
+
+- [**Installation**](users/installation.md): Learn how to install the Shopify CLI in different OSs.
+- [**Migrate from theme-kit**](users/migrate-from-themekit.md): If you were previously using theme-kit, check out this documentation to learn how to migrate to the Shopify CLI theme commands.

data/docs/contributors/testing.md

@@ -0,0 +1,27 @@
+## Testing
+
+The project employs a diverse suite tests that help ensure it works as intended and prevents regressions as it continues to grow and evolve.
+
+### Unit Tests
+Most of the internal components the project uses have unit tests to thoroughly test them. Here dependencies of components are mocked or stubbed appropriately to ensure tests are reliable, test only one component and are fast!
+
+### Acceptance Tests
+
+Acceptance tests run the built `shopify` command line against a wide range of fixtures and verify its output and results. They are the slowest to run however provide the most coverage. The idea is to test a few complete scenarios for each major feature.
+
+Those are written in [Cucumber](https://cucumber.io/) and Ruby and can be found in the [`features/`](/features) directory. They can be executed by running:
+
+```bash
+bundle exec cucumber
+bundle exec cucumber features/theme.feature:3 # A specific test
+```
+
+> **Note** that we currently don't have an approach for stubbing the interactions with the GraphQL APIs and that therefore we can't write acceptance tests for commands that interact with APIs.
+
+#### Debugging acceptance tests
+When developing acceptance tests, it can be helpful to see the outputs of running commands.
+To see outputs, append `--verbose` when running an acceptance test. Example:
+
+```sh
+bundle exec cucumber features/theme.feature --verbose
+```

data/docs/users/installation.md

@@ -0,0 +1,46 @@
+# Installation
+
+## Installation through RubyGems
+
+The easiest method to install the Shopify CLI is through RubyGems:
+
+```shell
+$ gem install shopify-cli
+```
+
+## Installation for macOS Users
+
+- Make sure you have [Homebrew](https://brew.sh/) installed
+- Open your terminal app
+- Run `brew tap shopify/shopify`
+- Run `brew install shopify-cli`
+- After the installation is completed, run `shopify version`, if this outputs a version number you've successfully installed the CLI.
+
+### To upgrade Shopify CLI
+
+#### Homebrew (Mac OS)
+
+```shell
+$ brew update
+$ brew upgrade shopify-cli
+```
+
+## Installation for Debian and Ubuntu users through `apt`
+
+1.- Download the latest `.deb` binary for Shopify CLI from the releases page.
+
+2.- Install the downloaded file and make sure to replace /path/to/download/shopify-cli-x.y.z.deb with the path to your file's location:
+
+```shell
+$ sudo apt install /path/to/downloaded/shopify-cli-x.y.z.deb
+```
+
+## Installation for CentOS 8+, Fedora, Red Hat, and SUSE users through `yum`
+
+1.- Download the latest .rpm file for Shopify App CLI from the releases page.
+
+2.- Install the downloaded file and make sure to replace /path/to/downloaded/shopify-cli-x.y.x.rpm with the path to your file's location:
+
+```shell
+ $ sudo yum install /path/to/downloaded/shopify-cli-x.y.x.rpm
+```

data/{THEMEKIT_MIGRATION.md → docs/users/migrate-from-themekit.md}

@@ -1,4 +1,4 @@
-# Theme Kit Migration
+# Migrate from Theme Kit
 
 Shopify CLI is the recommended and officially supported tool for developing Themes and creating CI/CD workflows.
 

data/lib/project_types/extension/cli.rb

@@ -12,7 +12,7 @@ module Extension
     register_messages(Extension::Messages::MessageLoading.load)
   end
 
-  class Command < ShopifyCLI::ProjectCommands
+  class Command < ShopifyCLI::Command::ProjectCommand
     hidden_feature
     autoload :ExtensionCommand, Project.project_filepath("commands/extension_command")
 
@@ -42,8 +42,10 @@ module Extension
     autoload :GetExtensions, Project.project_filepath("tasks/get_extensions")
     autoload :GetProduct, Project.project_filepath("tasks/get_product")
     autoload :RunExtensionCommand, Project.project_filepath("tasks/run_extension_command")
-    autoload :LoadServerConfig, Project.project_filepath("tasks/load_server_config")
+    autoload :MergeServerConfig, Project.project_filepath("tasks/merge_server_config")
     autoload :FindPackageFromJson, Project.project_filepath("tasks/find_package_from_json.rb")
+    autoload :EnsureResourceUrl, Project.project_filepath("tasks/ensure_resource_url.rb")
+    autoload :ConvertServerConfig, Project.project_filepath("tasks/convert_server_config")
 
     module Converters
       autoload :RegistrationConverter, Project.project_filepath("tasks/converters/registration_converter")
@@ -51,7 +53,6 @@ module Extension
       autoload :ValidationErrorConverter, Project.project_filepath("tasks/converters/validation_error_converter")
       autoload :AppConverter, Project.project_filepath("tasks/converters/app_converter")
       autoload :ProductConverter, Project.project_filepath("tasks/converters/product_converter")
-      autoload :ServerConfigConverter, Project.project_filepath("tasks/converters/server_config_converter")
     end
   end
 
@@ -94,9 +95,11 @@ module Extension
 
     module ServerConfig
       autoload :Base, Project.project_filepath("models/server_config/base")
+      autoload :App, Project.project_filepath("models/server_config/app")
       autoload :Development, Project.project_filepath("models/server_config/development")
       autoload :DevelopmentEntries, Project.project_filepath("models/server_config/development_entries")
       autoload :DevelopmentRenderer, Project.project_filepath("models/server_config/development_renderer")
+      autoload :DevelopmentResource, Project.project_filepath("models/server_config/development_resource")
       autoload :Extension, Project.project_filepath("models/server_config/extension")
       autoload :Root, Project.project_filepath("models/server_config/root")
       autoload :User, Project.project_filepath("models/server_config/user")

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

@@ -2,12 +2,10 @@
 
 module Extension
   class Command
-    class Create < ShopifyCLI::SubCommand
-      DEVELOPMENT_SERVER_SUPPORTED_TYPES = [
-        "checkout_ui_extension",
-      ]
-
-      prerequisite_task :ensure_authenticated
+    class Create < ShopifyCLI::Command::SubCommand
+      unless ShopifyCLI::Environment.acceptance_test?
+        prerequisite_task :ensure_authenticated
+      end
 
       options do |parser, flags|
         parser.on("--name=NAME") { |name| flags[:name] = name }
@@ -66,6 +64,7 @@ module Extension
         @ctx.chdir(form.directory_name)
         write_env_file(form)
       rescue => error
+        @ctx.debug(error)
         raise error
       end
 

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

@@ -3,7 +3,7 @@ require "shopify_cli"
 
 module Extension
   class Command
-    class ExtensionCommand < ShopifyCLI::SubCommand
+    class ExtensionCommand < ShopifyCLI::Command::SubCommand
       def project
         @project ||= ExtensionProject.current
       end

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

@@ -63,7 +63,9 @@ module Extension
         ShopifyCLI::Tasks::EnsureDevStore.call(context) if required_fields.include?(:shop)
 
         project = ExtensionProject.current
-        ensure_resource_resource_url! if specification_handler.supplies_resource_url? && !supports_development_server?
+        if resource_url_required?
+          Tasks::EnsureResourceUrl.call(context: context, specification_handler: specification_handler)
+        end
 
         return if required_fields.all? do |field|
           value = project.env.public_send(field)
@@ -73,6 +75,10 @@ module Extension
         context.abort(context.message("serve.serve_missing_information"))
       end
 
+      def resource_url_required?
+        specification_handler.supplies_resource_url? && resource_url.nil?
+      end
+
       def options
         project = ExtensionProject.current
 
@@ -88,28 +94,6 @@ module Extension
         end
       end
 
-      def ensure_resource_resource_url!
-        project = ExtensionProject.current(force_reload: true)
-
-        ShopifyCLI::Result
-          .wrap(project.resource_url)
-          .rescue { specification_handler.build_resource_url(shop: project.env.shop, context: context) }
-          .then(&method(:persist_resource_url))
-          .unwrap do |nil_or_exception|
-            case nil_or_exception
-            when nil
-              context.warn(context.message("warnings.resource_url_auto_generation_failed", project.env.shop))
-            else
-              context.abort(nil_or_exception)
-            end
-          end
-      end
-
-      def persist_resource_url(resource_url)
-        ExtensionProject.update_env_file(context: context, resource_url: resource_url)
-        resource_url
-      end
-
       def new_serve_flow
         Tasks::RunExtensionCommand.new(
           type: specification_handler.specification.identifier,
@@ -117,6 +101,8 @@ module Extension
           context: context,
           port: port,
           config_file_name: specification_handler.server_config_file,
+          resource_url: resource_url,
+          tunnel_url: tunnel_url
         ).call
       end
 

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

@@ -4,10 +4,6 @@ module Extension
       class AskTemplate
         include ShopifyCLI::MethodObject
 
-        TEMPLATE_REQUIRED_TYPES = [
-          "checkout_ui_extension",
-        ]
-
         property! :ctx
         property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
         property :prompt,
@@ -25,7 +21,7 @@ module Extension
         def template_required?(project_details)
           return false unless extension_server_beta?
           type = project_details&.type&.identifier
-          TEMPLATE_REQUIRED_TYPES.include?(type.downcase)
+          Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES.include?(type.downcase)
         end
 
         def extension_server_beta?

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

@@ -6,11 +6,10 @@ module Extension
     class DevelopmentServerRequirements
       SUPPORTED_EXTENSION_TYPES = [
         "checkout_ui_extension",
+        "checkout_post_purchase",
+        "product_subscription",
       ]
 
-      UNIX_NAME = "shopify-extensions"
-      WINDOWS_NAME = "shopify-extensions.exe"
-
       class << self
         def supported?(type)
           binary_installed? && type_supported?(type) && beta_enabled?

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Extension
+  module Models
+    module ServerConfig
+      class App < Base
+        include SmartProperties
+
+        property! :api_key, accepts: String
+      end
+    end
+  end
+end

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

@@ -12,11 +12,12 @@ module Extension
 
         CURRENT_DIRECTORY = "."
 
-        property :root_dir, accepts: String, default: CURRENT_DIRECTORY
+        property  :root_dir, accepts: String, default: CURRENT_DIRECTORY
         property! :build_dir, accepts: String, default: "build"
-        property :template, accepts: VALID_TEMPLATES
-        property :renderer, accepts: ServerConfig::DevelopmentRenderer
-        property :entries, accepts: ServerConfig::DevelopmentEntries
+        property  :template, accepts: VALID_TEMPLATES
+        property  :renderer, accepts: ServerConfig::DevelopmentRenderer
+        property  :entries, accepts: ServerConfig::DevelopmentEntries
+        property  :resource, accepts: ServerConfig::DevelopmentResource
       end
     end
   end