Skip to content

fix: Use -dir suffix for plugin package arguments #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2023
Merged

fix: Use -dir suffix for plugin package arguments #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions serve/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,12 @@ func (s *PluginServe) newCmdPluginPackage() *cobra.Command {
pluginDirectory := args[0]
pluginVersion := args[1]
distPath := path.Join(pluginDirectory, "dist")
if cmd.Flag("dist").Changed {
distPath = cmd.Flag("dist").Value.String()
if cmd.Flag("dist-dir").Changed {
distPath = cmd.Flag("dist-dir").Value.String()
}
docsPath := path.Join(pluginDirectory, "docs")
if cmd.Flag("docs").Changed {
docsPath = cmd.Flag("docs").Value.String()
if cmd.Flag("docs-dir").Changed {
docsPath = cmd.Flag("docs-dir").Value.String()
}
if err := os.MkdirAll(distPath, 0755); err != nil {
return err
Expand Down Expand Up @@ -247,7 +247,7 @@ func (s *PluginServe) newCmdPluginPackage() *cobra.Command {
return nil
},
}
cmd.Flags().String("dist", "", "dist directory to output the built plugin. (default: <plugin_directory>/dist)")
cmd.Flags().String("docs", "", "docs directory to copy to the dist directory. (default: <plugin_directory>/docs)")
cmd.Flags().StringP("dist-dir", "D", "", "dist directory to output the built plugin. (default: <plugin_directory>/dist)")
cmd.Flags().StringP("docs-dir", "", "", "docs directory containing markdown files to copy to the dist directory. (default: <plugin_directory>/docs)")
return cmd
}
2 changes: 1 addition & 1 deletion serve/package_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestPluginPackage(t *testing.T) {
srv := Plugin(p)
cmd := srv.newCmdPluginRoot()
distDir := t.TempDir()
cmd.SetArgs([]string{"package", "--dist", distDir, simplePluginPath, packageVersion})
cmd.SetArgs([]string{"package", "--dist-dir", distDir, simplePluginPath, packageVersion})
if err := cmd.Execute(); err != nil {
t.Fatal(err)
}
Expand Down