shopify-cli 2.6.3 → 2.7.0

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

@@ -16,7 +16,7 @@ module Extension
 
         def self.find(type)
           case type.downcase
-          when "admin_ui_extension"
+          when "product_subscription"
             new(name: "@shopify/admin-ui-extensions")
           when "checkout_ui_extension"
             new(name: "@shopify/checkout-ui-extensions")

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

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

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

@@ -5,10 +5,14 @@ module Extension
     module ServerConfig
       class Extension < Base
         include SmartProperties
+
         property! :uuid, accepts: String
         property! :type, accepts: String
         property! :user, accepts: ServerConfig::User
         property! :development, accepts: ServerConfig::Development
+        property  :extension_points, accepts: Array
+        property  :version, accepts: String
+        property  :title, accepts: String
 
         def self.build(uuid: "", template:, type:, root_dir:)
           renderer = ServerConfig::DevelopmentRenderer.find(type)

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

@@ -6,8 +6,11 @@ module Extension
       class Root < Base
         include SmartProperties
 
-        property! :port, accepts: Integer, default: 39351
+        property  :app, accepts: ServerConfig::App
         property! :extensions, accepts: Array, default: -> { [] }
+        property! :port, accepts: Integer, default: 39351
+        property  :public_url, accepts: String
+        property  :store, accepts: String
 
         def to_yaml
           to_h.to_yaml.gsub("---\n", "")

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/extension/tasks/convert_server_config.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    class ConvertServerConfig
+      include SmartProperties
+
+      property! :api_key, accepts: String
+      property! :context, accepts: ShopifyCLI::Context
+      property! :hash, accepts: Hash
+      property! :registration_uuid, accepts: String
+      property  :resource_url, accepts: String
+      property! :store, accepts: String
+      property! :title, accepts: String
+      property! :tunnel_url, accepts: String
+      property! :type, accepts: String
+
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def call
+        context.abort(context.message("tasks.errors.parse_error")) if hash.nil?
+
+        renderer = Models::ServerConfig::DevelopmentRenderer.find(type)
+
+        extension = Models::ServerConfig::Extension.new(
+          uuid: registration_uuid,
+          type: type.upcase,
+          user: Models::ServerConfig::User.new,
+          development: Models::ServerConfig::Development.new(
+            build_dir: hash.dig("development", "build_dir"),
+            renderer: renderer,
+            entries: Models::ServerConfig::DevelopmentEntries.new(
+              main: hash.dig("development", "entries", "main")
+            )
+          ),
+          extension_points: hash.dig("extension_points"),
+          version: version(renderer.name, context),
+          title: title
+        )
+
+        unless resource_url.nil?
+          extension.development.resource = Models::ServerConfig::DevelopmentResource.new(url: resource_url)
+        end
+        server_config = Models::ServerConfig::Root.new(
+          extensions: [extension],
+          public_url: tunnel_url,
+          store: store
+        )
+
+        unless api_key.nil?
+          server_config.app = Models::ServerConfig::App.new(api_key: api_key)
+        end
+
+        server_config
+      end
+
+      def version(renderer, context)
+        Tasks::FindPackageFromJson.call(renderer, context: context).version
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+require "shopify_cli"
+
+module Extension
+  module Tasks
+    class EnsureResourceUrl < ShopifyCLI::Task
+      include SmartProperties
+
+      property! :context, accepts: ShopifyCLI::Context
+      property! :specification_handler, accepts: Extension::Models::SpecificationHandlers::Default
+
+      def self.call(*args)
+        new(*args).call
+      end
+
+      def call
+        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
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+require "json"
+
+module Extension
+  module Tasks
+    class FindPackageFromJson < ShopifyCLI::Task
+      include SmartProperties
+
+      property! :context, accepts: ShopifyCLI::Context
+
+      def self.call(package_name, **config)
+        new(**config).call(package_name)
+      end
+
+      def call(package_name)
+        ShopifyCLI::Result.success(resolve_package_json(package_name))
+          .then { |file| File.read(file) }
+          .then { |file| JSON.parse(file) }
+          .then { |file| file.dig("version") }
+          .then { |version| return Models::NpmPackage.new(name: package_name, version: version) }
+          .unwrap do |error|
+            context.debug(error)
+            context.abort(context.message("errors.module_not_found", package_name))
+          end
+      end
+
+      private
+
+      def resolve_package_json(package_name)
+        path = "path.join(require.resolve('#{package_name}'), '../package.json')"
+        package_json, error, _ = CLI::Kit::System.capture3("node", "-p", path)
+        return error unless !error.nil?
+        package_json.chomp
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require "shopify_cli"
+require "yaml"
+
+module Extension
+  module Tasks
+    class MergeServerConfig < ShopifyCLI::Task
+      class << self
+        def call(context:, file_name:, resource_url:, tunnel_url:, type:)
+          config = YAML.load_file(file_name)
+          project = ExtensionProject.current
+          Tasks::ConvertServerConfig.call(
+            api_key: project.env.api_key,
+            context: context,
+            hash: config,
+            registration_uuid: project.registration_uuid,
+            resource_url: resource_url || project.resource_url,
+            store: project.env.shop || "",
+            title: project.title,
+            tunnel_url: tunnel_url,
+            type: type
+          )
+        rescue Psych::SyntaxError => e
+          raise(
+            ShopifyCLI::Abort,
+            ShopifyCLI::Context.message("core.yaml.error.invalid", file_name, e.message)
+          )
+        end
+      end
+    end
+  end
+end

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! :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,160 +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
-
-          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}}
-          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