这是indexloc提供的服务，不要输入任何密码
Skip to content

chore: fix formatting #927

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

Closed
wants to merge 2 commits into from
Closed

chore: fix formatting #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af9cf65
fix formatting
samchouse Mar 23, 2022
af1bea2
Merge branch 'main' of https://github.com/vercel/turborepo into chore…
samchouse Mar 23, 2022
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
1 change: 0 additions & 1 deletion cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

TURBO_VERSION = $(shell head -n 1 version.txt)
TURBO_TAG = $(shell cat version.txt | sed -n '2 p')

Expand Down
3 changes: 2 additions & 1 deletion cli/internal/analytics/analytics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"sync"
"time"

"github.com/vercel/turborepo/cli/internal/util"

"github.com/google/uuid"
"github.com/hashicorp/go-hclog"
"github.com/mitchellh/mapstructure"
"github.com/vercel/turborepo/cli/internal/util"
)

type Events = []map[string]interface{}
Expand Down
1 change: 1 addition & 0 deletions cli/internal/backends/backends.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package backends

import (
"errors"

"github.com/vercel/turborepo/cli/internal/api"
"github.com/vercel/turborepo/cli/internal/backends/nodejs"
"github.com/vercel/turborepo/cli/internal/fs"
Expand Down
1 change: 1 addition & 0 deletions cli/internal/cache/cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/vercel/turborepo/cli/internal/analytics"
"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/ui"

"golang.org/x/sync/errgroup"
)

Expand Down
1 change: 1 addition & 0 deletions cli/internal/cache/cache_fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/vercel/turborepo/cli/internal/analytics"
"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/fs"

"golang.org/x/sync/errgroup"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/internal/cache/cache_http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"io"
"io/ioutil"
log "log"
"log"
"net/http"
"os"
"path"
Expand Down
3 changes: 1 addition & 2 deletions cli/internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/vercel/turborepo/cli/internal/client"
"github.com/vercel/turborepo/cli/internal/fs"

hclog "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-hclog"
"github.com/kelseyhightower/envconfig"
"github.com/mattn/go-isatty"
"github.com/mitchellh/cli"
Expand Down Expand Up @@ -73,7 +73,6 @@ type CacheConfig struct {
// flags have been set. Users can pass in flags when calling a subcommand, or set env vars
// with the prefix 'TURBO_'. If both values are set, the env var value will be used.
func ParseAndValidate(args []string, ui cli.Ui, turboVersion string) (c *Config, err error) {

// Special check for ./turbo invocation without any args
// Return the help message
if len(args) == 0 {
Expand Down
2 changes: 1 addition & 1 deletion cli/internal/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/vercel/turborepo/cli/internal/util"

"github.com/Masterminds/semver"
mapset "github.com/deckarep/golang-set"
"github.com/deckarep/golang-set"
"github.com/pyr-sh/dag"
gitignore "github.com/sabhiram/go-gitignore"
"golang.org/x/sync/errgroup"
Expand Down
1 change: 1 addition & 0 deletions cli/internal/fs/hash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"io"
"os"
"strconv"

"github.com/vercel/turborepo/cli/internal/xxhash"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/internal/globby/globby.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package globby

import (
"github.com/vercel/turborepo/cli/internal/fs"

"path/filepath"
"strings"

"github.com/vercel/turborepo/cli/internal/fs"

"github.com/bmatcuk/doublestar/v4"
)

Expand Down
1 change: 1 addition & 0 deletions cli/internal/info/bin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"os"
"strings"

"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/ui"

Expand Down
1 change: 1 addition & 0 deletions cli/internal/login/link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"os/exec"
"path/filepath"
"strings"

"github.com/vercel/turborepo/cli/internal/client"
"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/fs"
Expand Down
2 changes: 1 addition & 1 deletion cli/internal/login/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"os/signal"
"strings"

"github.com/pkg/errors"
"github.com/vercel/turborepo/cli/internal/client"
"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/ui"
Expand All @@ -19,6 +18,7 @@ import (

"github.com/fatih/color"
"github.com/mitchellh/cli"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)

Expand Down
3 changes: 2 additions & 1 deletion cli/internal/login/login_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"os"
"testing"

"github.com/hashicorp/go-hclog"
"github.com/vercel/turborepo/cli/internal/client"
"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/ui"

"github.com/hashicorp/go-hclog"
)

type dummyClient struct {
Expand Down
1 change: 1 addition & 0 deletions cli/internal/login/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package login
import (
"fmt"
"strings"

"github.com/vercel/turborepo/cli/internal/config"
"github.com/vercel/turborepo/cli/internal/ui"
"github.com/vercel/turborepo/cli/internal/util"
Expand Down
3 changes: 1 addition & 2 deletions cli/internal/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ import (
"github.com/vercel/turborepo/cli/internal/util"
"github.com/vercel/turborepo/cli/internal/util/browser"

"github.com/pyr-sh/dag"

"github.com/fatih/color"
"github.com/hashicorp/go-hclog"
"github.com/mitchellh/cli"
"github.com/pkg/errors"
"github.com/pyr-sh/dag"
)

const TOPOLOGICAL_PIPELINE_DELIMITER = "^"
Expand Down
3 changes: 1 addition & 2 deletions cli/internal/run/run_state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import (

"github.com/vercel/turborepo/cli/internal/fs"
"github.com/vercel/turborepo/cli/internal/ui"
"github.com/vercel/turborepo/cli/internal/ui/term"
"github.com/vercel/turborepo/cli/internal/util"

cursor "github.com/vercel/turborepo/cli/internal/ui/term"

"github.com/google/chrometracing"
"github.com/mitchellh/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/internal/run/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"reflect"
"testing"

"github.com/mitchellh/cli"
"github.com/vercel/turborepo/cli/internal/fs"

"github.com/mitchellh/cli"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/internal/scm/scm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package scm
import (
"path/filepath"

"github.com/pkg/errors"

"github.com/vercel/turborepo/cli/internal/fs"

"github.com/pkg/errors"
)

var ErrFallback = errors.New("cannot find a .git folder. Falling back to manual file hashing (which may be slower). If you are running this build in a pruned directory, you can ignore this message. Otherwise, please initialize a git repository in the root of your monorepo")
Expand Down
7 changes: 4 additions & 3 deletions cli/internal/scope/scope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ import (
"fmt"
"strings"

"github.com/hashicorp/go-hclog"
"github.com/mitchellh/cli"
"github.com/pkg/errors"
"github.com/vercel/turborepo/cli/internal/context"
"github.com/vercel/turborepo/cli/internal/fs"
"github.com/vercel/turborepo/cli/internal/scm"
scope_filter "github.com/vercel/turborepo/cli/internal/scope/filter"
"github.com/vercel/turborepo/cli/internal/util"
"github.com/vercel/turborepo/cli/internal/util/filter"

"github.com/hashicorp/go-hclog"
"github.com/mitchellh/cli"
"github.com/pkg/errors"
)

type Opts struct {
Expand Down
5 changes: 3 additions & 2 deletions cli/internal/scope/scope_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import (
"strings"
"testing"

"github.com/hashicorp/go-hclog"
"github.com/pyr-sh/dag"
"github.com/vercel/turborepo/cli/internal/context"
"github.com/vercel/turborepo/cli/internal/fs"
"github.com/vercel/turborepo/cli/internal/ui"
"github.com/vercel/turborepo/cli/internal/util"

"github.com/hashicorp/go-hclog"
"github.com/pyr-sh/dag"
)

type mockSCM struct {
Expand Down
1 change: 1 addition & 0 deletions cli/internal/util/printf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"io"
"os"

"github.com/vercel/turborepo/cli/internal/ui"
)

Expand Down