shopify-cli 2.6.6 → 2.7.3

data/lib/project_types/extension/tasks/run_extension_command.rb

@@ -7,10 +7,6 @@ module Extension
     class RunExtensionCommand < ShopifyCLI::Task
       include SmartProperties
 
-      SUPPORTED_EXTENSION_TYPES = [
-        "checkout_ui_extension",
-      ]
-
       SUPPORTED_COMMANDS = [
         "create",
         "build",
@@ -18,12 +14,14 @@ module Extension
       ]
 
       property! :command, accepts: SUPPORTED_COMMANDS
-      property! :type, accepts: SUPPORTED_EXTENSION_TYPES
-      property :context, accepts: ShopifyCLI::Context
+      property! :type, accepts: Models::DevelopmentServerRequirements::SUPPORTED_EXTENSION_TYPES
+      property! :context, accepts: ShopifyCLI::Context
       property :config_file_name, accepts: String
       property :port, accepts: Integer, default: 39351
+      property :resource_url, accepts: String
       property :root_dir, accepts: String
       property :template, accepts: Models::ServerConfig::Development::VALID_TEMPLATES
+      property :tunnel_url, accepts: String
 
       def call
         ShopifyCLI::Result.success(config_file_exists?)
@@ -43,14 +41,17 @@ module Extension
       end
 
       def load_or_build_server_config(config_file_exists)
-        return load_server_config if config_file_exists
+        return merge_server_config if config_file_exists
         build_server_config
       end
 
-      def load_server_config
-        Tasks::LoadServerConfig.call(
+      def merge_server_config
+        Tasks::MergeServerConfig.call(
+          context: context,
           file_name: config_file_name,
-          type: type,
+          resource_url: resource_url,
+          tunnel_url: tunnel_url,
+          type: type
         )
       end
 

data/lib/project_types/node/cli.rb

@@ -5,22 +5,6 @@ module Node
     register_messages(Node::Messages::MESSAGES)
   end
 
-  # define/autoload project specific Commands
-  class Command < ShopifyCLI::ProjectCommands
-    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
-    subcommand :Create, "create", Project.project_filepath("commands/create")
-    subcommand :Deploy, "deploy", Project.project_filepath("commands/deploy")
-    subcommand :Generate, "generate", Project.project_filepath("commands/generate")
-    subcommand :Open, "open", Project.project_filepath("commands/open")
-    subcommand :Serve, "serve", Project.project_filepath("commands/serve")
-    subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
-  end
-  ShopifyCLI::Commands.register("Node::Command", "node")
-
-  # define/autoload project specific Tasks
-  module Tasks
-  end
-
   # define/autoload project specific Forms
   module Forms
     autoload :Create, Project.project_filepath("forms/create")

data/lib/project_types/node/forms/create.rb

@@ -4,10 +4,10 @@ module Node
   module Forms
     class Create < ShopifyCLI::Form
       attr_accessor :name
-      flag_arguments :title, :organization_id, :shop_domain, :type
+      flag_arguments :name, :organization_id, :shop_domain, :type
 
       def ask
-        self.title ||= CLI::UI::Prompt.ask(ctx.message("node.forms.create.app_name"))
+        self.name ||= CLI::UI::Prompt.ask(ctx.message("node.forms.create.app_name"))
         self.name = format_name
         self.type = ask_type
         res = ShopifyCLI::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
@@ -18,12 +18,12 @@ module Node
       private
 
       def format_name
-        name = title.downcase.split(" ").join("_")
+        formatted_name = name.downcase.split(" ").join("_")
 
-        if name.include?("shopify")
+        if formatted_name.include?("shopify")
           ctx.abort(ctx.message("node.forms.create.error.invalid_app_name"))
         end
-        name
+        formatted_name
       end
 
       def ask_type

data/lib/project_types/node/messages/messages.rb

@@ -5,155 +5,13 @@ module Node
     MESSAGES = {
       node: {
         help: <<~HELP,
-          Suite of commands for developing Node.js apps. See {{command:%1$s node <command> --help}} for usage of each command.
-            Usage: {{command:%1$s node [ %2$s ]}}
+          Suite of commands for developing Node.js apps. See {{command:%1$s app node <command> --help}} for usage of each command.
+            Usage: {{command:%1$s app node [ %2$s ]}}
         HELP
 
         error: {
           generic: "Error",
         },
-
-        connect: {
-          connected: "Project now connected to {{green:%s}}",
-          help: <<~HELP,
-            {{command:%s node connect}}: Connects an existing Node.js app to Shopify CLI. Creates a config file.
-              Usage: {{command:%s node connect}}
-          HELP
-          production_warning: <<~MESSAGE,
-            {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
-          MESSAGE
-        },
-
-        create: {
-          help: <<~HELP,
-            {{command:%s node create}}: Creates an embedded nodejs app.
-              Usage: {{command:%s node create}}
-              Options:
-                {{command:--name=NAME}} App name. Any string.
-                {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
-                {{command:--store=MYSHOPIFYDOMAIN }} Development store URL. Must be an existing development store.
-          HELP
-          error: {
-            node_required: "node is required to create an app project. Download at https://nodejs.org/en/download.",
-            node_version_failure: "Failed to get the current node version. Please make sure it is installed as " \
-              "per the instructions at https://nodejs.org/en.",
-            npm_required: "npm is required to create an app project. Download at https://www.npmjs.com/get-npm.",
-            npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
-              "the instructions at https://www.npmjs.com/get-npm.",
-          },
-          node_version: "node %s",
-          npm_version: "npm %s",
-        },
-
-        deploy: {
-          help: <<~HELP,
-            Deploy the current Node project to a hosting service. Heroku ({{underline:https://www.heroku.com}}) is currently the only option, but more will be added in the future.
-              Usage: {{command:%s node deploy [ heroku ]}}
-          HELP
-          extended_help: <<~HELP,
-            {{bold:Subcommands:}}
-              {{cyan:heroku}}: Deploys the current Node project to Heroku.
-                Usage: {{command:%s node deploy heroku}}
-          HELP
-          heroku: {
-            help: <<~HELP,
-              Deploy the current Node project to Heroku
-                Usage: {{command:%s node deploy heroku}}
-            HELP
-            downloading: "Downloading Heroku CLI…",
-            downloaded: "Downloaded Heroku CLI",
-            installing: "Installing Heroku CLI…",
-            installing_windows: "Running Heroku CLI install wizard…",
-            installed: "Installed Heroku CLI",
-            authenticating: "Authenticating with Heroku…",
-            authenticated: "{{v}} Authenticated with Heroku",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as {{green:%s}}",
-            deploying: "Deploying to Heroku…",
-            deployed: "{{v}} Deployed to Heroku",
-            git: {
-              checking: "Checking git repo…",
-              initialized: "Git repo initialized",
-              what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch {{green:%s}} selected for deploy",
-            },
-            app: {
-              no_apps_found: "No existing Heroku app found. What would you like to do?",
-              name: "What is your Heroku app’s name?",
-              select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app %s…",
-              selected: "{{v}} Heroku app {{green:%s}} selected",
-              create: "Create a new Heroku app",
-              creating: "Creating new Heroku app…",
-              created: "{{v}} New Heroku app created",
-            },
-          },
-        },
-
-        generate: {
-          help: <<~HELP,
-            {{red:The {{command:generate}} command is no longer supported.}}
-              You can complete any tasks previously supported by {{command:generate}} with these guides:
-              {{green:page}}
-                Create a page with Polaris design components: {{green:https://shopify.dev/tutorials/build-a-shopify-app-with-node-and-react/build-your-user-interface-with-polaris}}
-
-              {{green:webhook}}
-                Register and process webhooks: {{green:https://github.com/Shopify/shopify-node-api/blob/main/docs/usage/webhooks.md}}
-
-              {{green:billing}}
-                Create and manage app billing models: {{green:https://shopify.dev/tutorials/bill-for-your-app-using-graphql-admin-api}}
-          HELP
-        },
-
-        open: {
-          help: <<~HELP,
-            Open your local development app in the default browser.
-              Usage: {{command:%s node open}}
-          HELP
-        },
-
-        serve: {
-          help: <<~HELP,
-            Start a local development node server for your project, as well as a public ngrok tunnel to your localhost.
-              Usage: {{command:%s node serve}}
-          HELP
-          extended_help: <<~HELP,
-            {{bold:Options:}}
-              {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
-              {{cyan:--port=PORT}}: Use custom port.
-          HELP
-
-          open_info: <<~MESSAGE,
-            {{*}} To install and start using your app, open this URL in your browser:
-            {{green:%s}}
-          MESSAGE
-          running_server: "Running server…",
-        },
-
-        tunnel: {
-          help: <<~HELP,
-            Start or stop an http tunnel to your local development app using ngrok.
-              Usage: {{command:%s node tunnel [ auth | start | stop ]}}
-          HELP
-          extended_help: <<~HELP,
-            {{bold:Subcommands:}}
-
-              {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account. Visit https://dashboard.ngrok.com/signup to sign up.
-                Usage: {{command:%1$s node tunnel auth <token>}}
-
-              {{cyan:start}}: Starts an ngrok tunnel, will print the URL for an existing tunnel if already running.
-                Usage: {{command:%1$s node tunnel start}}
-
-              {{cyan:stop}}: Stops the ngrok tunnel.
-                Usage: {{command:%1$s node tunnel stop}}
-
-          HELP
-
-          error: {
-            token_argument_missing: "{{x}} {{red:auth requires a token argument}}\n\n",
-          },
-
-        },
-
         forms: {
           create: {
             error: {

data/lib/project_types/php/cli.rb

@@ -5,17 +5,6 @@ module PHP
     register_messages(PHP::Messages::MESSAGES)
   end
 
-  # define/autoload project specific Commands
-  class Command < ShopifyCLI::ProjectCommands
-    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
-    subcommand :Create, "create", Project.project_filepath("commands/create")
-    subcommand :Deploy, "deploy", Project.project_filepath("commands/deploy")
-    subcommand :Open, "open", Project.project_filepath("commands/open")
-    subcommand :Serve, "serve", Project.project_filepath("commands/serve")
-    subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
-  end
-  ShopifyCLI::Commands.register("PHP::Command", "php")
-
   # define/autoload project specific Tasks
   module Tasks
   end

data/lib/project_types/php/forms/create.rb

@@ -3,11 +3,10 @@ require "uri"
 module PHP
   module Forms
     class Create < ShopifyCLI::Form
-      attr_accessor :name
-      flag_arguments :title, :organization_id, :shop_domain, :type
+      flag_arguments :name, :organization_id, :shop_domain, :type
 
       def ask
-        self.title ||= CLI::UI::Prompt.ask(ctx.message("php.forms.create.app_name"))
+        self.name ||= CLI::UI::Prompt.ask(ctx.message("php.forms.create.app_name"))
         self.name = format_name
         self.type = ask_type
         res = ShopifyCLI::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
@@ -18,12 +17,12 @@ module PHP
       private
 
       def format_name
-        name = title.downcase.split(" ").join("_")
+        formatted_name = name.downcase.split(" ").join("_")
 
-        if name.include?("shopify")
+        if formatted_name.include?("shopify")
           ctx.abort(ctx.message("php.forms.create.error.invalid_app_name"))
         end
-        name
+        formatted_name
       end
 
       def ask_type

data/lib/project_types/php/messages/messages.rb

@@ -5,168 +5,9 @@ module PHP
     MESSAGES = {
       php: {
         help: <<~HELP,
-          Suite of commands for developing PHP apps with Laravel. See {{command:%1$s php <command> --help}} for usage of each command.
-            Usage: {{command:%1$s php [ %2$s ]}}
+          Suite of commands for developing PHP apps with Laravel. See {{command:%1$s app php <command> --help}} for usage of each command.
+            Usage: {{command:%1$s app php [ %2$s ]}}
         HELP
-
-        connect: {
-          connected: "Project now connected to {{green:%s}}",
-          help: <<~HELP,
-            {{command:%s php connect}}: Connects an existing PHP app to Shopify CLI. Creates a config file.
-              Usage: {{command:%s php connect}}
-          HELP
-          production_warning: <<~MESSAGE,
-            {{yellow:! Warning: if you have connected to an {{bold:app in production}}, running {{command:serve}} may update the app URL and cause an outage.
-            MESSAGE
-        },
-
-        create: {
-          help: <<~HELP,
-            {{command:%s create php}}: Creates an embedded PHP app.
-              Usage: {{command:%s create php}}
-              Options:
-                {{command:--name=NAME}} App name. Any string.
-                {{command:--organization-id=ID}} Partner organization ID. Must be an existing organization.
-                {{command:--shop-domain=MYSHOPIFYDOMAIN}} Development store URL. Must be an existing development store.
-                {{command:--type=APPTYPE}} Whether this app is public or custom.
-                {{command:--verbose}} Output verbose information when installing dependencies.
-            HELP
-
-          error: {
-            php_required: <<~VERSION,
-              PHP is required to create an app project. For installation instructions, visit:
-                {{underline:https://www.php.net/manual/en/install.php}}
-              VERSION
-            php_version_failure: <<~VERSION,
-              Failed to get the current PHP version. Please make sure it is installed as per the instructions at:
-                {{underline:https://www.php.net/manual/en/install.php.}}
-              VERSION
-            php_version_too_low: "Your PHP version is too low. Please use version %s or higher.",
-            composer_required: <<~COMPOSER,
-              Composer is required to create an app project. Download at:
-                {{underline:https://getcomposer.org/download/}}
-              COMPOSER
-            npm_required: "npm is required to create an app project. Download at https://www.npmjs.com/get-npm.",
-            npm_version_failure: "Failed to get the current npm version. Please make sure it is installed as per " \
-              "the instructions at https://www.npmjs.com/get-npm.",
-            app_setup: "Failed to set up the app",
-          },
-
-          php_version: "PHP %s",
-          npm_version: "npm %s",
-          app_setting_up: "Setting up app…",
-          app_set_up: "App is now set up",
-        },
-
-        open: {
-          help: <<~HELP,
-            Open your local development app in the default browser.
-              Usage: {{command:%s open}}
-            HELP
-        },
-
-        deploy: {
-          help: <<~HELP,
-            Deploy the current PHP project to a hosting service. Heroku ({{underline:https://www.heroku.com}}) is currently the only option, but more will be added in the future.
-              Usage: {{command:%s deploy [ heroku ]}}
-            HELP
-
-          extended_help: <<~HELP,
-            {{bold:Subcommands:}}
-              {{cyan:heroku}}: Deploys the current PHP project to Heroku.
-                Usage: {{command:%s deploy heroku}}
-            HELP
-
-          heroku: {
-            help: <<~HELP,
-              Deploy the current PHP project to Heroku
-                Usage: {{command:%s deploy heroku}}
-              HELP
-
-            error: {
-              generate_app_key: "Failed to generate Laravel APP_KEY",
-            },
-
-            downloading: "Downloading Heroku CLI…",
-            downloaded: "Downloaded Heroku CLI",
-            installing: "Installing Heroku CLI…",
-            installing_windows: "Running Heroku CLI install wizard…",
-            installed: "Installed Heroku CLI",
-            authenticating: "Authenticating with Heroku…",
-            authenticated: "{{v}} Authenticated with Heroku",
-            authenticated_with_account: "{{v}} Authenticated with Heroku as `%s`",
-            deploying: "Deploying to Heroku…",
-            deployed: "Deployed to Heroku",
-            post_deploy: <<~DEPLOYED,
-              {{v}} Deployed to Heroku, you can access your app at {{green:%s}}
-
-                If you're deploying this app for the first time, make sure to set up your database and your app's environment at {{bold:App dashboard -> Settings -> Config Vars}}.
-
-                When setting your config vars, don't forget to set up your database and the appropriate Laravel values for it, particularly {{bold:DB_CONNECTION and DB_DATABASE}}.
-              DEPLOYED
-            git: {
-              checking: "Checking git repo…",
-              initialized: "Git repo initialized",
-              what_branch: "What branch would you like to deploy?",
-              branch_selected: "{{v}} Git branch `%s` selected for deploy",
-            },
-            app: {
-              no_apps_found: "No existing Heroku app found. What would you like to do?",
-              name: "What is your Heroku app’s name?",
-              select: "Specify an existing Heroku app",
-              selecting: "Selecting Heroku app `%s`…",
-              selected: "{{v}} Heroku app `%s` selected",
-              create: "Create a new Heroku app",
-              creating: "Creating new Heroku app…",
-              created: "{{v}} New Heroku app created",
-              setting_configs: "Setting Shopify app configs…",
-              configs_set: "{{v}} Shopify app configs set",
-            },
-          },
-        },
-
-        serve: {
-          help: <<~HELP,
-            Start a local development PHP server for your project, as well as a public ngrok tunnel to your localhost.
-              Usage: {{command:%s serve}}
-            HELP
-          extended_help: <<~HELP,
-            {{bold:Options:}}
-              {{cyan:--host=HOST}}: Bypass running tunnel and use custom host. HOST must be HTTPS url.
-              {{cyan:--port=PORT}}: Use custom port.
-            HELP
-
-          open_info: <<~MESSAGE,
-            {{*}} To install and start using your app, open this URL in your browser:
-            {{green:%s}}
-          MESSAGE
-          running_server: "Running server…",
-        },
-
-        tunnel: {
-          help: <<~HELP,
-            Start or stop an http tunnel to your local development app using ngrok.
-              Usage: {{command:%s tunnel [ auth | start | stop ]}}
-            HELP
-          extended_help: <<~HELP,
-            {{bold:Subcommands:}}
-
-              {{cyan:auth}}: Writes an ngrok auth token to ~/.ngrok2/ngrok.yml to connect with an ngrok account. Visit https://dashboard.ngrok.com/signup to sign up.
-                Usage: {{command:%1$s tunnel auth <token>}}
-
-              {{cyan:start}}: Starts an ngrok tunnel, will print the URL for an existing tunnel if already running.
-                Usage: {{command:%1$s tunnel start}}
-
-              {{cyan:stop}}: Stops the ngrok tunnel.
-                Usage: {{command:%1$s tunnel stop}}
-
-            HELP
-
-          error: {
-            token_argument_missing: "{{x}} {{red:auth requires a token argument}}\n\n",
-          },
-        },
-
         forms: {
           create: {
             error: {

data/lib/project_types/rails/cli.rb

@@ -5,22 +5,6 @@ module Rails
     register_messages(Rails::Messages::MESSAGES)
   end
 
-  # define/autoload project specific Commands
-  class Command < ShopifyCLI::ProjectCommands
-    subcommand :Connect, "connect", Project.project_filepath("commands/connect")
-    subcommand :Create, "create", Project.project_filepath("commands/create")
-    subcommand :Deploy, "deploy", Project.project_filepath("commands/deploy")
-    subcommand :Generate, "generate", Project.project_filepath("commands/generate")
-    subcommand :Open, "open", Project.project_filepath("commands/open")
-    subcommand :Serve, "serve", Project.project_filepath("commands/serve")
-    subcommand :Tunnel, "tunnel", Project.project_filepath("commands/tunnel")
-  end
-  ShopifyCLI::Commands.register("Rails::Command", "rails")
-
-  # define/autoload project specific Tasks
-  module Tasks
-  end
-
   # define/autoload project specific Forms
   module Forms
     autoload :Create, Project.project_filepath("forms/create")

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

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 module Rails
   class Command
-    class Create < ShopifyCLI::SubCommand
-      unless ShopifyCLI::Environment.acceptance_test?
-        prerequisite_task :ensure_authenticated
-      end
+    class Create < ShopifyCLI::Command::AppSubCommand
+      prerequisite_task :ensure_authenticated
 
       USER_AGENT_CODE = <<~USERAGENT
         module ShopifyAPI
@@ -158,10 +156,10 @@ module Rails
 
         CLI::UI::Frame.open(@ctx.message("rails.create.generating_app", name)) do
           new_command = %w(rails new)
+          new_command << name
           new_command += DEFAULT_RAILS_FLAGS
           new_command << "--database=#{db}"
           new_command += options.flags[:rails_opts].split unless options.flags[:rails_opts].nil?
-          new_command << name
 
           syscall(new_command)
         end

data/lib/project_types/rails/forms/create.rb

@@ -3,8 +3,7 @@ require "uri"
 module Rails
   module Forms
     class Create < ShopifyCLI::Form
-      attr_accessor :name
-      flag_arguments :title, :organization_id, :shop_domain, :type, :db
+      flag_arguments :name, :organization_id, :shop_domain, :type, :db
       VALID_DB_TYPES = ["sqlite3",
                         "mysql",
                         "postgresql",
@@ -18,7 +17,7 @@ module Rails
                         "jdbc"]
 
       def ask
-        self.title ||= CLI::UI::Prompt.ask(ctx.message("rails.forms.create.app_name"))
+        self.name ||= CLI::UI::Prompt.ask(ctx.message("rails.forms.create.app_name"))
         self.name = format_name
         self.type = ask_type
         res = ShopifyCLI::Tasks::SelectOrgAndShop.call(ctx, organization_id: organization_id, shop_domain: shop_domain)
@@ -30,13 +29,13 @@ module Rails
       private
 
       def format_name
-        name = title.downcase.split(" ").join("_")
+        formatted_name = name.downcase.split(" ").join("_")
 
-        if name.include?("shopify")
+        if formatted_name.include?("shopify")
           ctx.abort(ctx.message("rails.forms.create.error.invalid_app_name"))
         end
 
-        name
+        formatted_name
       end
 
       def ask_type