shopify-cli 1.4.0 → 1.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/CODEOWNERS +2 -2
- data/.github/CONTRIBUTING.md +9 -1
- data/.github/PULL_REQUEST_TEMPLATE.md +10 -1
- data/.github/workflows/release.yml +61 -0
- data/.github/workflows/triage.yml +22 -0
- data/.rubocop.yml +56 -7
- data/.rubocop_todo.yml +4 -13
- data/.travis.yml +1 -0
- data/CHANGELOG.md +27 -1
- data/Gemfile +12 -10
- data/Gemfile.lock +33 -31
- data/README.md +39 -7
- data/RELEASING.md +5 -27
- data/Rakefile +32 -28
- data/bin/load_shopify.rb +6 -6
- data/bin/shopify +2 -2
- data/dev.yml +2 -2
- data/docs/_config.yml +1 -18
- data/docs/app/node/commands/index.md +2 -80
- data/docs/app/node/index.md +2 -33
- data/docs/app/rails/commands/index.md +2 -78
- data/docs/app/rails/index.md +2 -34
- data/docs/core/index.md +2 -84
- data/docs/getting-started/index.md +2 -25
- data/docs/getting-started/install/index.md +1 -118
- data/docs/getting-started/migrate/index.md +2 -94
- data/docs/getting-started/uninstall/index.md +2 -35
- data/docs/getting-started/upgrade/index.md +2 -39
- data/docs/help/start-app/index.md +2 -4
- data/docs/index.md +2 -24
- data/ext/shopify-cli/extconf.rb +7 -7
- data/install.sh +1 -1
- data/lib/docgen/markdown.rb +11 -11
- data/lib/{project_types/extension/graphql → graphql}/get_app_by_api_key.graphql +0 -0
- data/lib/project_types/extension/cli.rb +64 -47
- data/lib/project_types/extension/commands/build.rb +3 -3
- data/lib/project_types/extension/commands/create.rb +16 -9
- data/lib/project_types/extension/commands/extension_command.rb +8 -5
- data/lib/project_types/extension/commands/push.rb +8 -8
- data/lib/project_types/extension/commands/register.rb +19 -30
- data/lib/project_types/extension/commands/serve.rb +23 -3
- data/lib/project_types/extension/commands/tunnel.rb +12 -12
- data/lib/project_types/extension/extension_project.rb +4 -4
- data/lib/project_types/extension/extension_project_keys.rb +4 -4
- data/lib/project_types/extension/features/argo.rb +117 -0
- data/lib/project_types/extension/features/argo_config.rb +5 -5
- data/lib/project_types/extension/features/argo_dependencies.rb +5 -5
- data/lib/project_types/extension/features/argo_setup.rb +2 -2
- data/lib/project_types/extension/features/argo_setup_steps.rb +4 -4
- data/lib/project_types/extension/forms/create.rb +28 -34
- data/lib/project_types/extension/forms/questions/ask_app.rb +53 -0
- data/lib/project_types/extension/forms/questions/ask_name.rb +40 -0
- data/lib/project_types/extension/forms/questions/ask_type.rb +36 -0
- data/lib/project_types/extension/messages/messages.rb +53 -52
- data/lib/project_types/extension/models/lazy_specification_handler.rb +12 -0
- data/lib/project_types/extension/models/specification.rb +35 -0
- data/lib/project_types/extension/models/specification_handlers/checkout_post_purchase.rb +19 -0
- data/lib/project_types/extension/models/specification_handlers/default.rb +67 -0
- data/lib/project_types/extension/models/specifications.rb +77 -0
- data/lib/project_types/extension/tasks/configure_features.rb +52 -0
- data/lib/project_types/extension/tasks/converters/app_converter.rb +6 -6
- data/lib/project_types/extension/tasks/converters/registration_converter.rb +6 -6
- data/lib/project_types/extension/tasks/converters/validation_error_converter.rb +4 -4
- data/lib/project_types/extension/tasks/converters/version_converter.rb +7 -7
- data/lib/project_types/extension/tasks/create_extension.rb +4 -4
- data/lib/project_types/extension/tasks/fetch_specifications.rb +38 -0
- data/lib/project_types/extension/tasks/get_app.rb +4 -4
- data/lib/project_types/extension/tasks/get_apps.rb +3 -3
- data/lib/project_types/extension/tasks/update_draft.rb +4 -4
- data/lib/project_types/extension/tasks/user_errors.rb +4 -4
- data/lib/project_types/node/cli.rb +19 -16
- data/lib/project_types/node/commands/connect.rb +15 -0
- data/lib/project_types/node/commands/create.rb +44 -41
- data/lib/project_types/node/commands/deploy.rb +4 -4
- data/lib/project_types/node/commands/deploy/heroku.rb +24 -24
- data/lib/project_types/node/commands/generate.rb +9 -18
- data/lib/project_types/node/commands/open.rb +2 -2
- data/lib/project_types/node/commands/populate.rb +6 -6
- data/lib/project_types/node/commands/populate/customer.rb +5 -5
- data/lib/project_types/node/commands/populate/draft_order.rb +5 -5
- data/lib/project_types/node/commands/populate/product.rb +5 -5
- data/lib/project_types/node/commands/serve.rb +9 -9
- data/lib/project_types/node/commands/tunnel.rb +7 -7
- data/lib/project_types/node/forms/create.rb +7 -7
- data/lib/project_types/node/messages/messages.rb +19 -53
- data/lib/project_types/rails/cli.rb +21 -18
- data/lib/project_types/rails/commands/connect.rb +15 -0
- data/lib/project_types/rails/commands/create.rb +58 -57
- data/lib/project_types/rails/commands/deploy.rb +4 -4
- data/lib/project_types/rails/commands/deploy/heroku.rb +30 -30
- data/lib/project_types/rails/commands/generate.rb +7 -7
- data/lib/project_types/rails/commands/generate/webhook.rb +6 -6
- data/lib/project_types/rails/commands/open.rb +2 -2
- data/lib/project_types/rails/commands/populate.rb +6 -6
- data/lib/project_types/rails/commands/populate/customer.rb +5 -5
- data/lib/project_types/rails/commands/populate/draft_order.rb +5 -5
- data/lib/project_types/rails/commands/populate/product.rb +5 -5
- data/lib/project_types/rails/commands/serve.rb +11 -11
- data/lib/project_types/rails/commands/tunnel.rb +7 -7
- data/lib/project_types/rails/forms/create.rb +24 -24
- data/lib/project_types/rails/gem.rb +24 -24
- data/lib/project_types/rails/messages/messages.rb +12 -9
- data/lib/project_types/rails/ruby.rb +2 -2
- data/lib/project_types/script/cli.rb +44 -38
- data/lib/project_types/script/commands/create.rb +15 -10
- data/lib/project_types/script/commands/disable.rb +3 -3
- data/lib/project_types/script/commands/enable.rb +19 -9
- data/lib/project_types/script/commands/push.rb +10 -17
- data/lib/project_types/script/config/extension_points.yml +17 -12
- data/lib/project_types/script/errors.rb +22 -0
- data/lib/project_types/script/forms/create.rb +29 -5
- data/lib/project_types/script/graphql/app_script_update_or_create.graphql +12 -1
- data/lib/project_types/script/layers/application/build_script.rb +19 -19
- data/lib/project_types/script/layers/application/create_script.rb +41 -12
- data/lib/project_types/script/layers/application/disable_script.rb +2 -2
- data/lib/project_types/script/layers/application/enable_script.rb +2 -2
- data/lib/project_types/script/layers/application/extension_points.rb +24 -0
- data/lib/project_types/script/layers/application/project_dependencies.rb +4 -4
- data/lib/project_types/script/layers/application/push_script.rb +15 -18
- data/lib/project_types/script/layers/domain/config_ui.rb +16 -0
- data/lib/project_types/script/layers/domain/errors.rb +23 -0
- data/lib/project_types/script/layers/domain/extension_point.rb +62 -7
- data/lib/project_types/script/layers/domain/metadata.rb +55 -0
- data/lib/project_types/script/layers/domain/push_package.rb +29 -6
- data/lib/project_types/script/layers/infrastructure/assemblyscript_project_creator.rb +19 -55
- data/lib/project_types/script/layers/infrastructure/assemblyscript_task_runner.rb +49 -18
- data/lib/project_types/script/layers/infrastructure/config_ui_repository.rb +46 -0
- data/lib/project_types/script/layers/infrastructure/errors.rb +37 -1
- data/lib/project_types/script/layers/infrastructure/extension_point_repository.rb +12 -6
- data/lib/project_types/script/layers/infrastructure/project_creator.rb +2 -1
- data/lib/project_types/script/layers/infrastructure/push_package_repository.rb +20 -13
- data/lib/project_types/script/layers/infrastructure/rust_project_creator.rb +72 -0
- data/lib/project_types/script/layers/infrastructure/rust_task_runner.rb +59 -0
- data/lib/project_types/script/layers/infrastructure/script_service.rb +39 -17
- data/lib/project_types/script/layers/infrastructure/task_runner.rb +4 -3
- data/lib/project_types/script/messages/messages.rb +79 -10
- data/lib/project_types/script/script_project.rb +26 -16
- data/lib/project_types/script/ui/error_handler.rb +141 -45
- data/lib/project_types/script/ui/printing_spinner.rb +1 -1
- data/lib/project_types/script/ui/strict_spinner.rb +1 -1
- data/lib/project_types/theme/cli.rb +40 -0
- data/lib/project_types/theme/commands/connect.rb +54 -0
- data/lib/project_types/theme/commands/create.rb +48 -0
- data/lib/project_types/theme/commands/deploy.rb +38 -0
- data/lib/project_types/theme/commands/generate.rb +20 -0
- data/lib/project_types/theme/commands/generate/env.rb +79 -0
- data/lib/project_types/theme/commands/push.rb +55 -0
- data/lib/project_types/theme/commands/serve.rb +31 -0
- data/lib/project_types/theme/forms/connect.rb +34 -0
- data/lib/project_types/theme/forms/create.rb +22 -0
- data/lib/project_types/theme/messages/messages.rb +147 -0
- data/lib/project_types/theme/tasks/ensure_themekit_installed.rb +78 -0
- data/lib/project_types/theme/themekit.rb +113 -0
- data/lib/rubygems_plugin.rb +3 -3
- data/lib/shopify-cli/admin_api.rb +52 -12
- data/lib/shopify-cli/admin_api/populate_resource_command.rb +17 -17
- data/lib/shopify-cli/admin_api/schema.rb +3 -3
- data/lib/shopify-cli/api.rb +36 -31
- data/lib/shopify-cli/command.rb +1 -1
- data/lib/shopify-cli/commands.rb +9 -9
- data/lib/shopify-cli/commands/config.rb +28 -28
- data/lib/shopify-cli/commands/connect.rb +35 -18
- data/lib/shopify-cli/commands/create.rb +5 -5
- data/lib/shopify-cli/commands/help.rb +6 -6
- data/lib/shopify-cli/commands/logout.rb +3 -3
- data/lib/shopify-cli/commands/system.rb +33 -33
- data/lib/shopify-cli/commands/version.rb +2 -2
- data/lib/shopify-cli/context.rb +43 -22
- data/lib/shopify-cli/core.rb +4 -4
- data/lib/shopify-cli/core/entry_point.rb +5 -5
- data/lib/shopify-cli/core/executor.rb +1 -1
- data/lib/shopify-cli/core/help_resolver.rb +2 -2
- data/lib/shopify-cli/core/monorail.rb +21 -19
- data/lib/shopify-cli/db.rb +2 -2
- data/lib/shopify-cli/feature.rb +1 -3
- data/lib/shopify-cli/form.rb +1 -1
- data/lib/shopify-cli/git.rb +17 -17
- data/lib/shopify-cli/helpers.rb +1 -1
- data/lib/shopify-cli/helpers/haikunator.rb +1 -1
- data/lib/shopify-cli/heroku.rb +28 -28
- data/lib/shopify-cli/http_request.rb +21 -9
- data/lib/shopify-cli/js_deps.rb +13 -13
- data/lib/shopify-cli/js_system.rb +5 -5
- data/lib/shopify-cli/lazy_delegator.rb +55 -0
- data/lib/shopify-cli/messages/messages.rb +21 -10
- data/lib/shopify-cli/method_object.rb +104 -0
- data/lib/shopify-cli/oauth.rb +25 -25
- data/lib/shopify-cli/oauth/servlet.rb +9 -9
- data/lib/shopify-cli/options.rb +3 -3
- data/lib/shopify-cli/packager.rb +24 -24
- data/lib/shopify-cli/partners_api.rb +38 -16
- data/lib/shopify-cli/partners_api/organizations.rb +10 -10
- data/lib/shopify-cli/process_supervision.rb +8 -8
- data/lib/shopify-cli/project.rb +27 -23
- data/lib/shopify-cli/project_type.rb +21 -5
- data/lib/shopify-cli/resolve_constant.rb +25 -0
- data/lib/shopify-cli/resources.rb +1 -1
- data/lib/shopify-cli/resources/env_file.rb +9 -9
- data/lib/shopify-cli/result.rb +432 -0
- data/lib/shopify-cli/shopifolk.rb +35 -18
- data/lib/shopify-cli/sub_command.rb +1 -1
- data/lib/shopify-cli/task.rb +9 -1
- data/lib/shopify-cli/tasks.rb +7 -7
- data/lib/shopify-cli/tasks/create_api_client.rb +17 -6
- data/lib/shopify-cli/tasks/ensure_dev_store.rb +11 -11
- data/lib/shopify-cli/tasks/ensure_env.rb +18 -15
- data/lib/shopify-cli/tasks/ensure_loopback_url.rb +4 -4
- data/lib/shopify-cli/tasks/select_org_and_shop.rb +29 -24
- data/lib/shopify-cli/tasks/update_dashboard_urls.rb +10 -10
- data/lib/shopify-cli/transform_data_structure.rb +86 -0
- data/lib/shopify-cli/tunnel.rb +36 -30
- data/lib/shopify-cli/version.rb +1 -1
- data/lib/shopify_cli.rb +57 -52
- data/shopify-cli.gemspec +6 -6
- data/shopify.fish +1 -1
- data/shopify.sh +1 -1
- data/vendor/deps/cli-kit/REVISION +1 -1
- data/vendor/deps/cli-kit/lib/cli/kit/logger.rb +2 -2
- data/vendor/deps/cli-kit/lib/cli/kit/system.rb +3 -3
- data/vendor/deps/cli-ui/REVISION +1 -1
- data/vendor/deps/cli-ui/lib/cli/ui.rb +26 -22
- data/vendor/deps/cli-ui/lib/cli/ui/ansi.rb +4 -6
- data/vendor/deps/cli-ui/lib/cli/ui/frame.rb +3 -3
- data/vendor/deps/cli-ui/lib/cli/ui/frame/frame_stack.rb +8 -9
- data/vendor/deps/cli-ui/lib/cli/ui/frame/frame_style.rb +1 -1
- data/vendor/deps/cli-ui/lib/cli/ui/glyph.rb +1 -0
- data/vendor/deps/cli-ui/lib/cli/ui/printer.rb +15 -3
- data/vendor/deps/cli-ui/lib/cli/ui/prompt/interactive_options.rb +4 -11
- data/vendor/deps/cli-ui/lib/cli/ui/spinner.rb +3 -5
- data/vendor/deps/cli-ui/lib/cli/ui/terminal.rb +10 -10
- data/vendor/deps/cli-ui/lib/cli/ui/version.rb +1 -1
- data/vendor/deps/cli-ui/lib/cli/ui/wrap.rb +56 -0
- data/vendor/deps/webrick/.gitignore +9 -0
- data/vendor/deps/webrick/Gemfile +3 -0
- data/vendor/deps/webrick/LICENSE.txt +22 -0
- data/vendor/deps/webrick/README.md +61 -0
- data/vendor/deps/webrick/Rakefile +10 -0
- data/vendor/deps/webrick/lib/webrick.rb +232 -0
- data/vendor/deps/webrick/lib/webrick/accesslog.rb +157 -0
- data/vendor/deps/webrick/lib/webrick/cgi.rb +313 -0
- data/vendor/deps/webrick/lib/webrick/compat.rb +36 -0
- data/vendor/deps/webrick/lib/webrick/config.rb +158 -0
- data/vendor/deps/webrick/lib/webrick/cookie.rb +172 -0
- data/vendor/deps/webrick/lib/webrick/htmlutils.rb +30 -0
- data/vendor/deps/webrick/lib/webrick/httpauth.rb +96 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/authenticator.rb +117 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/basicauth.rb +116 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/digestauth.rb +395 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/htdigest.rb +132 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/htgroup.rb +97 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/htpasswd.rb +158 -0
- data/vendor/deps/webrick/lib/webrick/httpauth/userdb.rb +53 -0
- data/vendor/deps/webrick/lib/webrick/httpproxy.rb +354 -0
- data/vendor/deps/webrick/lib/webrick/httprequest.rb +636 -0
- data/vendor/deps/webrick/lib/webrick/httpresponse.rb +564 -0
- data/vendor/deps/webrick/lib/webrick/https.rb +152 -0
- data/vendor/deps/webrick/lib/webrick/httpserver.rb +294 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet.rb +23 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/abstract.rb +152 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/cgi_runner.rb +47 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/cgihandler.rb +126 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/erbhandler.rb +88 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/filehandler.rb +552 -0
- data/vendor/deps/webrick/lib/webrick/httpservlet/prochandler.rb +47 -0
- data/vendor/deps/webrick/lib/webrick/httpstatus.rb +194 -0
- data/vendor/deps/webrick/lib/webrick/httputils.rb +512 -0
- data/vendor/deps/webrick/lib/webrick/httpversion.rb +76 -0
- data/vendor/deps/webrick/lib/webrick/log.rb +156 -0
- data/vendor/deps/webrick/lib/webrick/server.rb +381 -0
- data/vendor/deps/webrick/lib/webrick/ssl.rb +215 -0
- data/vendor/deps/webrick/lib/webrick/utils.rb +265 -0
- data/vendor/deps/webrick/lib/webrick/version.rb +18 -0
- data/vendor/deps/webrick/webrick.gemspec +74 -0
- data/vendor/gen/template/bin/update-deps +9 -9
- metadata +83 -29
- data/docs/Gemfile +0 -5
- data/docs/Gemfile.lock +0 -258
- data/docs/_data/nav.yml +0 -35
- data/docs/_includes/footer.html +0 -15
- data/docs/_includes/head.html +0 -19
- data/docs/_includes/sidebar_nav.html +0 -22
- data/docs/_includes/toc.html +0 -112
- data/docs/_layouts/default.html +0 -79
- data/docs/css/docs.css +0 -157
- data/docs/images/header.png +0 -0
- data/docs/installing-ruby.md +0 -28
- data/lib/project_types/extension/features/argo/admin.rb +0 -20
- data/lib/project_types/extension/features/argo/base.rb +0 -129
- data/lib/project_types/extension/features/argo/checkout.rb +0 -20
- data/lib/project_types/extension/forms/register.rb +0 -47
- data/lib/project_types/extension/models/type.rb +0 -81
- data/lib/project_types/extension/models/types/checkout_post_purchase.rb +0 -23
- data/lib/project_types/extension/models/types/product_subscription.rb +0 -24
- data/lib/project_types/node/commands/generate/billing.rb +0 -39
- data/lib/project_types/node/commands/generate/page.rb +0 -59
- data/lib/project_types/node/commands/generate/webhook.rb +0 -37
- data/lib/project_types/script/layers/domain/script.rb +0 -18
- data/lib/project_types/script/layers/infrastructure/assemblyscript_tsconfig.rb +0 -38
- data/lib/project_types/script/layers/infrastructure/script_repository.rb +0 -59
- data/lib/project_types/script/templates/ts/as-pect.config.js +0 -27
- data/lib/project_types/script/templates/ts/as-pect.d.ts +0 -1
@@ -7,9 +7,21 @@ module Extension
|
|
7
7
|
NPM_SERVE_COMMAND = %w(run-script server)
|
8
8
|
|
9
9
|
def call(_args, _command_name)
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
if argo_admin?
|
11
|
+
ShopifyCli::Tasks::EnsureEnv.call(@ctx, required: [:api_key, :secret, :shop])
|
12
|
+
ShopifyCli::Tasks::EnsureDevStore.call(@ctx)
|
13
|
+
end
|
14
|
+
|
15
|
+
CLI::UI::Frame.open(@ctx.message("serve.frame_title")) do
|
16
|
+
yarn_serve_command = YARN_SERVE_COMMAND
|
17
|
+
npm_serve_command = NPM_SERVE_COMMAND
|
18
|
+
if argo_admin?
|
19
|
+
serve_args = %W(--shop=#{project.env.shop} --apiKey=#{project.env.api_key})
|
20
|
+
yarn_serve_command += serve_args
|
21
|
+
npm_serve_command += %w(--) + serve_args
|
22
|
+
end
|
23
|
+
success = ShopifyCli::JsSystem.call(@ctx, yarn: yarn_serve_command, npm: npm_serve_command)
|
24
|
+
@ctx.abort(@ctx.message("serve.serve_failure_message")) unless success
|
13
25
|
end
|
14
26
|
end
|
15
27
|
|
@@ -19,6 +31,14 @@ module Extension
|
|
19
31
|
Usage: {{command:#{ShopifyCli::TOOL_NAME} serve}}
|
20
32
|
HELP
|
21
33
|
end
|
34
|
+
|
35
|
+
private
|
36
|
+
|
37
|
+
def argo_admin?
|
38
|
+
ShopifyCli::Shopifolk.check &&
|
39
|
+
ShopifyCli::Feature.enabled?(:argo_admin_beta) &&
|
40
|
+
extension_type.specification.features&.argo&.surface_area == "admin"
|
41
|
+
end
|
22
42
|
end
|
23
43
|
end
|
24
44
|
end
|
@@ -1,17 +1,17 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require
|
2
|
+
require "shopify_cli"
|
3
3
|
|
4
4
|
module Extension
|
5
5
|
module Commands
|
6
6
|
class Tunnel < ExtensionCommand
|
7
7
|
options do |parser, flags|
|
8
|
-
parser.on(
|
8
|
+
parser.on("--port=PORT") { |port| flags[:port] = port }
|
9
9
|
end
|
10
10
|
|
11
|
-
AUTH_SUBCOMMAND =
|
12
|
-
START_SUBCOMMAND =
|
13
|
-
STOP_SUBCOMMAND =
|
14
|
-
STATUS_SUBCOMMAND =
|
11
|
+
AUTH_SUBCOMMAND = "auth"
|
12
|
+
START_SUBCOMMAND = "start"
|
13
|
+
STOP_SUBCOMMAND = "stop"
|
14
|
+
STATUS_SUBCOMMAND = "status"
|
15
15
|
DEFAULT_PORT = 39351
|
16
16
|
|
17
17
|
def call(args, _name)
|
@@ -27,11 +27,11 @@ module Extension
|
|
27
27
|
end
|
28
28
|
|
29
29
|
def self.help
|
30
|
-
ShopifyCli::Context.message(
|
30
|
+
ShopifyCli::Context.message("tunnel.help", ShopifyCli::TOOL_NAME)
|
31
31
|
end
|
32
32
|
|
33
33
|
def self.extended_help
|
34
|
-
ShopifyCli::Context.message(
|
34
|
+
ShopifyCli::Context.message("tunnel.extended_help", ShopifyCli::TOOL_NAME, DEFAULT_PORT)
|
35
35
|
end
|
36
36
|
|
37
37
|
private
|
@@ -40,9 +40,9 @@ module Extension
|
|
40
40
|
tunnel_url = ShopifyCli::Tunnel.urls.first
|
41
41
|
|
42
42
|
if tunnel_url.nil?
|
43
|
-
@ctx.puts(@ctx.message(
|
43
|
+
@ctx.puts(@ctx.message("tunnel.no_tunnel_running"))
|
44
44
|
else
|
45
|
-
@ctx.puts(@ctx.message(
|
45
|
+
@ctx.puts(@ctx.message("tunnel.tunnel_running_at", tunnel_url))
|
46
46
|
end
|
47
47
|
end
|
48
48
|
|
@@ -50,7 +50,7 @@ module Extension
|
|
50
50
|
return DEFAULT_PORT unless options.flags.key?(:port)
|
51
51
|
|
52
52
|
port = options.flags[:port].to_i
|
53
|
-
@ctx.abort(@ctx.message(
|
53
|
+
@ctx.abort(@ctx.message("tunnel.invalid_port", options.flags[:port])) unless port > 0
|
54
54
|
port
|
55
55
|
end
|
56
56
|
|
@@ -58,7 +58,7 @@ module Extension
|
|
58
58
|
token = args.shift
|
59
59
|
|
60
60
|
if token.nil?
|
61
|
-
@ctx.puts(@ctx.message(
|
61
|
+
@ctx.puts(@ctx.message("tunnel.missing_token"))
|
62
62
|
@ctx.puts("#{self.class.help}\n#{self.class.extended_help}")
|
63
63
|
else
|
64
64
|
ShopifyCli::Tunnel.auth(@ctx, token)
|
@@ -1,5 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require
|
2
|
+
require "shopify_cli"
|
3
3
|
|
4
4
|
module Extension
|
5
5
|
class ExtensionProject < ShopifyCli::Project
|
@@ -13,7 +13,7 @@ module Extension
|
|
13
13
|
)
|
14
14
|
end
|
15
15
|
|
16
|
-
def write_env_file(context:, title:, api_key:
|
16
|
+
def write_env_file(context:, title:, api_key: "", api_secret: "", registration_id: nil)
|
17
17
|
ShopifyCli::Resources::EnvFile.new(
|
18
18
|
api_key: api_key,
|
19
19
|
secret: api_secret,
|
@@ -34,11 +34,11 @@ module Extension
|
|
34
34
|
end
|
35
35
|
|
36
36
|
def app
|
37
|
-
Models::App.new(api_key: env[
|
37
|
+
Models::App.new(api_key: env["api_key"], secret: env["secret"])
|
38
38
|
end
|
39
39
|
|
40
40
|
def registered?
|
41
|
-
property_present?(
|
41
|
+
property_present?("api_key") && property_present?("secret") && registration_id?
|
42
42
|
end
|
43
43
|
|
44
44
|
def title
|
@@ -1,10 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require
|
2
|
+
require "shopify_cli"
|
3
3
|
|
4
4
|
module Extension
|
5
5
|
module ExtensionProjectKeys
|
6
|
-
REGISTRATION_ID_KEY =
|
7
|
-
EXTENSION_TYPE_KEY =
|
8
|
-
TITLE_KEY =
|
6
|
+
REGISTRATION_ID_KEY = "EXTENSION_ID"
|
7
|
+
EXTENSION_TYPE_KEY = "EXTENSION_TYPE"
|
8
|
+
TITLE_KEY = "EXTENSION_TITLE"
|
9
9
|
end
|
10
10
|
end
|
@@ -0,0 +1,117 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require "base64"
|
3
|
+
require "shopify_cli"
|
4
|
+
require "semantic/semantic"
|
5
|
+
|
6
|
+
module Extension
|
7
|
+
module Features
|
8
|
+
class Argo
|
9
|
+
include SmartProperties
|
10
|
+
|
11
|
+
property! :git_template, converts: :to_str
|
12
|
+
property! :renderer_package_name, converts: :to_str
|
13
|
+
|
14
|
+
SCRIPT_PATH = %w(build main.js).freeze
|
15
|
+
|
16
|
+
NPM_LIST_COMMAND = %w(list).freeze
|
17
|
+
YARN_LIST_COMMAND = %w(list --pattern).freeze
|
18
|
+
NPM_LIST_PARAMETERS = %w(--prod).freeze
|
19
|
+
YARN_LIST_PARAMETERS = %w(--production).freeze
|
20
|
+
private_constant :NPM_LIST_COMMAND, :YARN_LIST_COMMAND, :NPM_LIST_PARAMETERS, :YARN_LIST_PARAMETERS
|
21
|
+
|
22
|
+
YARN_INSTALL_COMMAND = %w(install).freeze
|
23
|
+
YARN_INSTALL_PARAMETERS = %w(--silent).freeze
|
24
|
+
YARN_RUN_COMMAND = %w(run).freeze
|
25
|
+
YARN_RUN_SCRIPT_NAME = %w(build).freeze
|
26
|
+
private_constant :YARN_INSTALL_COMMAND, :YARN_INSTALL_PARAMETERS, :YARN_RUN_COMMAND, :YARN_RUN_SCRIPT_NAME
|
27
|
+
|
28
|
+
def create(directory_name, identifier, context)
|
29
|
+
Features::ArgoSetup.new(git_template: git_template).call(directory_name, identifier, context)
|
30
|
+
end
|
31
|
+
|
32
|
+
def config(context)
|
33
|
+
js_system = ShopifyCli::JsSystem.new(ctx: context)
|
34
|
+
if js_system.package_manager == "yarn"
|
35
|
+
run_yarn_install(context, js_system)
|
36
|
+
run_yarn_run_script(context, js_system)
|
37
|
+
end
|
38
|
+
filepath = File.join(context.root, SCRIPT_PATH)
|
39
|
+
context.abort(context.message("features.argo.missing_file_error")) unless File.exist?(filepath)
|
40
|
+
begin
|
41
|
+
{
|
42
|
+
renderer_version: extract_argo_renderer_version(context),
|
43
|
+
serialized_script: Base64.strict_encode64(File.read(filepath).chomp),
|
44
|
+
}
|
45
|
+
rescue StandardError
|
46
|
+
context.abort(context.message("features.argo.script_prepare_error"))
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
private
|
51
|
+
|
52
|
+
def extract_argo_renderer_version(context)
|
53
|
+
result = run_list_command(context)
|
54
|
+
found_version = find_version_number(context, result)
|
55
|
+
context.abort(
|
56
|
+
context.message("features.argo.dependencies.argo_renderer_package_invalid_version_error")
|
57
|
+
) if found_version.nil?
|
58
|
+
::Semantic::Version.new(found_version).to_s
|
59
|
+
rescue ArgumentError
|
60
|
+
context.abort(
|
61
|
+
context.message("features.argo.dependencies.argo_renderer_package_invalid_version_error")
|
62
|
+
)
|
63
|
+
end
|
64
|
+
|
65
|
+
def find_version_number(context, result)
|
66
|
+
packages = result.to_json.split('\n')
|
67
|
+
found_package = packages.find do |package|
|
68
|
+
package.match(/#{renderer_package_name}@/)
|
69
|
+
end
|
70
|
+
if found_package.nil?
|
71
|
+
error = "'#{renderer_package_name}' not found."
|
72
|
+
context.abort(
|
73
|
+
context.message("features.argo.dependencies.argo_missing_renderer_package_error", error)
|
74
|
+
)
|
75
|
+
end
|
76
|
+
found_package.split("@")[2]&.strip
|
77
|
+
end
|
78
|
+
|
79
|
+
def run_list_command(context)
|
80
|
+
js_system = ShopifyCli::JsSystem.new(ctx: context)
|
81
|
+
result, error, status = js_system.call(
|
82
|
+
yarn: YARN_LIST_COMMAND + [renderer_package_name] + YARN_LIST_PARAMETERS,
|
83
|
+
npm: NPM_LIST_COMMAND + [renderer_package_name] + NPM_LIST_PARAMETERS,
|
84
|
+
capture_response: true
|
85
|
+
)
|
86
|
+
context.abort(
|
87
|
+
context.message("features.argo.dependencies.argo_missing_renderer_package_error", error)
|
88
|
+
) unless status.success?
|
89
|
+
result
|
90
|
+
end
|
91
|
+
|
92
|
+
def run_yarn_install(context, js_system)
|
93
|
+
_result, error, status = js_system.call(
|
94
|
+
yarn: YARN_INSTALL_COMMAND + YARN_INSTALL_PARAMETERS,
|
95
|
+
npm: [],
|
96
|
+
capture_response: true
|
97
|
+
)
|
98
|
+
|
99
|
+
context.abort(
|
100
|
+
context.message("features.argo.dependencies.yarn_install_error", error)
|
101
|
+
) unless status.success?
|
102
|
+
end
|
103
|
+
|
104
|
+
def run_yarn_run_script(context, js_system)
|
105
|
+
_result, error, status = js_system.call(
|
106
|
+
yarn: YARN_RUN_COMMAND + YARN_RUN_SCRIPT_NAME,
|
107
|
+
npm: [],
|
108
|
+
capture_response: true
|
109
|
+
)
|
110
|
+
|
111
|
+
context.abort(
|
112
|
+
context.message("features.argo.dependencies.yarn_run_script_error", error)
|
113
|
+
) unless status.success?
|
114
|
+
end
|
115
|
+
end
|
116
|
+
end
|
117
|
+
end
|
@@ -3,7 +3,7 @@
|
|
3
3
|
module Extension
|
4
4
|
module Features
|
5
5
|
class ArgoConfig
|
6
|
-
CONFIG_FILE_NAME =
|
6
|
+
CONFIG_FILE_NAME = "extension.config.yml"
|
7
7
|
|
8
8
|
class << self
|
9
9
|
def parse_yaml(context, permitted_keys = [])
|
@@ -11,7 +11,7 @@ module Extension
|
|
11
11
|
|
12
12
|
return {} unless File.size?(file_name)
|
13
13
|
|
14
|
-
require
|
14
|
+
require "yaml" # takes 20ms, so deferred as late as possible.
|
15
15
|
begin
|
16
16
|
config = YAML.load_file(file_name)
|
17
17
|
|
@@ -21,7 +21,7 @@ module Extension
|
|
21
21
|
return {} if config.nil?
|
22
22
|
|
23
23
|
unless config.is_a?(Hash)
|
24
|
-
raise ShopifyCli::Abort, ShopifyCli::Context.message(
|
24
|
+
raise ShopifyCli::Abort, ShopifyCli::Context.message("core.yaml.error.not_hash", CONFIG_FILE_NAME)
|
25
25
|
end
|
26
26
|
|
27
27
|
config.transform_keys!(&:to_sym)
|
@@ -31,7 +31,7 @@ module Extension
|
|
31
31
|
rescue Psych::SyntaxError => e
|
32
32
|
raise(
|
33
33
|
ShopifyCli::Abort,
|
34
|
-
ShopifyCli::Context.message(
|
34
|
+
ShopifyCli::Context.message("core.yaml.error.invalid", CONFIG_FILE_NAME, e.message)
|
35
35
|
)
|
36
36
|
end
|
37
37
|
end
|
@@ -47,7 +47,7 @@ module Extension
|
|
47
47
|
raise(
|
48
48
|
ShopifyCli::Abort,
|
49
49
|
ShopifyCli::Context.message(
|
50
|
-
|
50
|
+
"features.argo.config.unpermitted_keys",
|
51
51
|
CONFIG_FILE_NAME,
|
52
52
|
unpermitted_keys.map { |k| "\n- #{k}" }.join
|
53
53
|
)
|
@@ -5,21 +5,21 @@ module Extension
|
|
5
5
|
class ArgoDependencies
|
6
6
|
def self.node_installed(min_major:, min_minor: nil)
|
7
7
|
-> (context) do
|
8
|
-
out, status = CLI::Kit::System.capture2(
|
9
|
-
context.abort(context.message(
|
8
|
+
out, status = CLI::Kit::System.capture2("node", "-v")
|
9
|
+
context.abort(context.message("features.argo.dependencies.node.node_not_installed")) unless status.success?
|
10
10
|
|
11
|
-
min_version =
|
11
|
+
min_version = "v" + min_major .to_s + "." + (min_minor.nil? ? "x" : min_minor.to_s) + ".x"
|
12
12
|
version = out.strip
|
13
13
|
parsed_version = version.match(/v(?<major>\d+).(?<minor>\d+).(?<patch>\d+)/)
|
14
14
|
|
15
15
|
unless min_major.nil? || parsed_version[:major].to_i >= min_major
|
16
|
-
context.abort(context.message(
|
16
|
+
context.abort(context.message("features.argo.dependencies.node.version_too_low", version, min_version))
|
17
17
|
end
|
18
18
|
|
19
19
|
return if parsed_version[:major].to_i > min_major
|
20
20
|
|
21
21
|
unless min_minor.nil? || parsed_version[:minor].to_i >= min_minor
|
22
|
-
context.abort(context.message(
|
22
|
+
context.abort(context.message("features.argo.dependencies.node.version_too_low", version, min_version))
|
23
23
|
end
|
24
24
|
end
|
25
25
|
end
|
@@ -5,8 +5,8 @@ module Extension
|
|
5
5
|
class ArgoSetup
|
6
6
|
include SmartProperties
|
7
7
|
|
8
|
-
GIT_DIRECTORY =
|
9
|
-
SCRIPTS_DIRECTORY =
|
8
|
+
GIT_DIRECTORY = ".git"
|
9
|
+
SCRIPTS_DIRECTORY = "scripts"
|
10
10
|
|
11
11
|
property! :git_template, accepts: String
|
12
12
|
property! :dependency_checks, default: []
|
@@ -5,7 +5,7 @@ module Extension
|
|
5
5
|
module ArgoSetupSteps
|
6
6
|
YARN_INITIALIZE_COMMAND = %w(generate).freeze
|
7
7
|
NPM_INITIALIZE_COMMAND = %w(run generate --).freeze
|
8
|
-
INITIALIZE_TYPE_PARAMETER =
|
8
|
+
INITIALIZE_TYPE_PARAMETER = "--type=%s"
|
9
9
|
|
10
10
|
def self.check_dependencies(dependency_checks)
|
11
11
|
ArgoSetupStep.always_successful do |context, _identifier, _directory_name, _js_system|
|
@@ -21,7 +21,7 @@ module Extension
|
|
21
21
|
ShopifyCli::Git.clone(git_template, directory_name, ctx: context)
|
22
22
|
context.root = File.join(context.root, directory_name)
|
23
23
|
rescue StandardError
|
24
|
-
context.puts(
|
24
|
+
context.puts("{{x}} Unable to clone the repository.")
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
@@ -34,8 +34,8 @@ module Extension
|
|
34
34
|
|
35
35
|
def self.initialize_project
|
36
36
|
ArgoSetupStep.default do |context, identifier, _directory_name, js_system|
|
37
|
-
frame_title = context.message(
|
38
|
-
failure_message = context.message(
|
37
|
+
frame_title = context.message("create.setup_project_frame_title")
|
38
|
+
failure_message = context.message("features.argo.initialization_error")
|
39
39
|
|
40
40
|
result = true
|
41
41
|
CLI::UI::Frame.open(frame_title, failure_text: failure_message) do
|
@@ -3,50 +3,44 @@
|
|
3
3
|
module Extension
|
4
4
|
module Forms
|
5
5
|
class Create < ShopifyCli::Form
|
6
|
-
flag_arguments :name, :type
|
6
|
+
flag_arguments :name, :type, :api_key
|
7
7
|
|
8
|
-
|
9
|
-
self.type = ask_type
|
10
|
-
self.name = ask_name
|
11
|
-
end
|
8
|
+
attr_reader :app
|
12
9
|
|
13
|
-
|
14
|
-
|
15
|
-
end
|
10
|
+
class ExtensionProjectDetails
|
11
|
+
include SmartProperties
|
16
12
|
|
17
|
-
|
13
|
+
property :app, accepts: Models::App
|
14
|
+
property :name, accepts: String
|
15
|
+
property :type, accepts: Models::SpecificationHandlers::Default
|
18
16
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
break_condition: -> (current_name) { Models::Registration.valid_title?(current_name) },
|
23
|
-
prompt_message: ctx.message('create.ask_name'),
|
24
|
-
reprompt_message: ctx.message('create.invalid_name', Models::Registration::MAX_TITLE_LENGTH)
|
25
|
-
)
|
17
|
+
def complete?
|
18
|
+
!!(app && name && type)
|
19
|
+
end
|
26
20
|
end
|
27
21
|
|
28
|
-
def
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
22
|
+
def ask
|
23
|
+
ShopifyCli::Result.wrap(ExtensionProjectDetails.new)
|
24
|
+
.then(&Questions::AskApp.new(ctx: ctx, api_key: api_key))
|
25
|
+
.then(&Questions::AskType.new(ctx: ctx, type: type))
|
26
|
+
.then(&Questions::AskName.new(ctx: ctx, name: name))
|
27
|
+
.unwrap { |e| raise e }
|
28
|
+
.tap do |project_details|
|
29
|
+
ctx.abort(ctx.message("create.incomplete_configuration")) unless project_details.complete?
|
30
|
+
|
31
|
+
self.app = project_details.app
|
32
|
+
self.type = project_details.type
|
33
|
+
self.name = project_details.name
|
35
34
|
end
|
36
|
-
end
|
37
35
|
end
|
38
36
|
|
39
|
-
def
|
40
|
-
|
41
|
-
reprompt = false
|
42
|
-
|
43
|
-
until break_condition.call(value)
|
44
|
-
ctx.puts(reprompt_message) if reprompt
|
45
|
-
value = CLI::UI::Prompt.ask(prompt_message)&.strip
|
46
|
-
reprompt = true
|
47
|
-
end
|
48
|
-
value
|
37
|
+
def directory_name
|
38
|
+
name.strip.gsub(/( )/, "_").downcase
|
49
39
|
end
|
40
|
+
|
41
|
+
private
|
42
|
+
|
43
|
+
attr_writer :app
|
50
44
|
end
|
51
45
|
end
|
52
46
|
end
|