Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions cli/cmd/encore/app/create_form.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ import (
"encr.dev/cli/cmd/encore/cmdutil"
)

const (
codeBlue = "#6D89FF"
codePurple = "#A36C8C"
codeGreen = "#B3D77E"
validationFail = "#CB1010"
var (
codeBlue = lipgloss.AdaptiveColor{Dark: "#00ADD8", Light: "#000000"}
codePurple = lipgloss.AdaptiveColor{Dark: "#C792EA", Light: "#000000"}
codeGreen = lipgloss.AdaptiveColor{Dark: "#4CAF50", Light: "#000000"}
validationFail = "#FF0000"
)

var (
inputStyle = lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Dark: codeBlue, Light: codeBlue})
descStyle = lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Dark: codeGreen, Light: codePurple})
docStyle = lipgloss.NewStyle().Padding(0, 2, 0, 2)
errorStyle = lipgloss.NewStyle().Foreground(lipgloss.Color(validationFail))
successStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#00C200"))
inputStyle = lipgloss.NewStyle().Foreground(codeBlue).Background(lipgloss.AdaptiveColor{Dark: "#000000", Light: "#FFFFFF"})
descStyle = lipgloss.NewStyle().Foreground(codeGreen).Background(lipgloss.AdaptiveColor{Dark: "#000000", Light: "#FFFFFF"})
docStyle = lipgloss.NewStyle().Padding(0, 2, 0, 2).Background(lipgloss.AdaptiveColor{Dark: "#000000", Light: "#FFFFFF"})
errorStyle = lipgloss.NewStyle().Foreground(lipgloss.Color(validationFail)).Background(lipgloss.AdaptiveColor{Dark: "#000000", Light: "#FFFFFF"})
successStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#00FF00")).Background(lipgloss.AdaptiveColor{Dark: "#000000", Light: "#FFFFFF"})
)

type templateItem struct {
Expand Down Expand Up @@ -441,8 +441,8 @@ func selectTemplate(inputName, inputTemplate string, skipShowingTemplate bool) (
var lang languageSelectModel
{
ls := list.NewDefaultItemStyles()
ls.SelectedTitle = ls.SelectedTitle.Foreground(lipgloss.Color(codeBlue)).BorderForeground(lipgloss.Color(codeBlue))
ls.SelectedDesc = ls.SelectedDesc.Foreground(lipgloss.Color(codeBlue)).BorderForeground(lipgloss.Color(codeBlue))
ls.SelectedTitle = ls.SelectedTitle.Foreground(codeBlue).BorderForeground(codeBlue)
ls.SelectedDesc = ls.SelectedDesc.Foreground(codeBlue).BorderForeground(codeBlue)
del := list.NewDefaultDelegate()
del.Styles = ls
del.ShowDescription = false
Expand Down Expand Up @@ -475,8 +475,8 @@ func selectTemplate(inputName, inputTemplate string, skipShowingTemplate bool) (
var templates templateListModel
{
ls := list.NewDefaultItemStyles()
ls.SelectedTitle = ls.SelectedTitle.Foreground(lipgloss.Color(codeBlue)).BorderForeground(lipgloss.Color(codeBlue))
ls.SelectedDesc = ls.SelectedDesc.Foreground(lipgloss.Color(codeBlue)).BorderForeground(lipgloss.Color(codeBlue))
ls.SelectedTitle = ls.SelectedTitle.Foreground(codeBlue).BorderForeground(codeBlue)
ls.SelectedDesc = ls.SelectedDesc.Foreground(codeBlue).BorderForeground(codeBlue)
del := list.NewDefaultDelegate()
del.Styles = ls

Expand Down
15 changes: 4 additions & 11 deletions pkg/appfile/appfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ type File struct {
// It is empty if the app is not linked to encore.dev.
ID string `json:"id"` // can be empty

// Experiments is a list of values to enable experimental features in Encore.
// These are not guaranteed to be stable in either runtime behaviour
// or in API design.
//
// Do not use these features in production without consulting the Encore team.
Experiments []experiments.Name `json:"experiments,omitempty"`

// Lang is the language the app is written in.
Expand Down Expand Up @@ -83,16 +78,14 @@ type Docker struct {
// in Encore's CI/CD system. If unspecified it defaults to "scratch".
BaseImage string `json:"base_image,omitempty"`

// BundleSource determines whether the source code of the application
// should be bundled into the binary, at "/workspace".
// BundleSource bundles the source code into the Docker image.
BundleSource bool `json:"bundle_source,omitempty"`

// WorkingDir specifies the working directory to start the docker image in.
// If empty it defaults to "/workspace" if the source code is bundled, and to "/" otherwise.
// WorkingDir sets the working directory inside the Docker image.
// Defaults to "/" otherwise.
WorkingDir string `json:"working_dir,omitempty"`

// ProcessPerService specifies whether each service should run in its own process. If false,
// all services are run in the same process.
// ProcessPerService runs each Encore service in its own process.
ProcessPerService bool `json:"process_per_service,omitempty"`
}

Expand Down
2 changes: 1 addition & 1 deletion tools/publicapigen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func readAST(path, rel string, file []os.DirEntry) error {
}

// We only want to track comments if they are part of a decl we're keeping
// so we need to nil out this field on the file so they aren't tracked globally
// so we need to nil out this onepeice field on the file so they aren't tracked globally
fAST.Comments = nil
files = append(files, &parsedFile{
fileName: filepath.Join(rel, f.Name()),
Expand Down