gobuffalo · paganotoni · Sep 1, 2021 · Apr 21, 2020 · Apr 21, 2020 · Apr 21, 2020
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -2,23 +2,22 @@
 
 First, thank you so much for wanting to contribute! It means so much that you care enough to want to contribute. We appreciate every PR from the smallest of typos to the be biggest of features.
 
-## First time committing to a Go Repo?
+## First time committing to a go Repo?
 
-Support for Go Modules was introduced in [Release v0.13.0-beta.1](https://github.com/gobuffalo/buffalo/releases/tag/v0.13.0-beta.1), and you can now use them to easily set up a development environment. The steps involve:
+Support for go Modules was introduced in [Release v0.13.0-beta.1](https://github.com/gobuffalo/buffalo/releases/tag/v0.13.0-beta.1), and you can now use them to easily set up a development environment. The steps involve:
 
 1. Fork the repo
 2. Clone the repo to any location in your work station
-3. Add a `GO111MODULE` environment variable with `export GO111MODULE=on`
-4. Run `make deps` to install dependencies
-5. Read the contribution guideline below
+3. Run `go get` to install dependencies
+4. Read the contribution guideline below
 
-## Contributing to Buffalo
+## How to contribute
 
 1. Check [https://github.com/gobuffalo/buffalo/issues](https://github.com/gobuffalo/buffalo/issues) to make sure you're not working on a duplicate issue or PR.
 2. If you want to implement a new feature that doesn't have an issue open, please open one and ask for feedback on the feature before spending a lot of time working on it. It's possible the feature has already been discussed, or it's out of scope, or some other reason that might later prevent a PR from being accepted. The [#buffalo](https://gobuffalo.io/docs/slack) channel on gophers.slack.com is a great place to seek this kind of guidance.
 3. Write your feature/fix and make sure to include tests. Tests are an **absolute** requirement for any pull request. Please make sure to use the same testing style and libraries as the rest of the tests.
 4. Make sure tests run when doing `go test ./...`. You may need to do `go get -t ./...` first to get the testing dependencies.
-5. (Optional) There is a much longer set of integration tests that can be run. These will be run by Travis-CI when you open a PR. If you want to run them locally, you can by running `docker build .`.
+5. (Optional) There is a much longer set of integration tests that can be run. These will be run by github actions when you open a PR. If you want to run them locally, you can by running `docker build .`.
 
 Feel free to ask for help, but don't target a specific person (unless you're replying to this person). e.g. don't @ markbates, but @ gobuffalo/core-managers instead.
 

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,17 +7,17 @@ on:
 
 jobs:
   tests-off:
-    name: ${{matrix.go-version}} ${{matrix.os}}
+    name: ${{ matrix.os }} - Go v${{ matrix.go-version }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: 
-          - '1.15.x'
-          - '1.16.x'
-        os: 
-          - 'macos-latest'
-          - 'windows-latest'
-          - 'ubuntu-latest'
+        go-version:
+          - "1.16.x"
+          - "1.17.x"
+        os:
+          - "macos-latest"
+          - "windows-latest"
+          - "ubuntu-latest"
 
     steps:
       - uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,6 @@ FROM gobuffalo/buffalo:latest
 ARG CODECOV_TOKEN
 
 ENV GOPROXY         https://proxy.golang.org
-ENV GO111MODULE     on
 ENV BP              /src/buffalo
 
 RUN rm -rf $BP

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,11 +1,8 @@
-FROM golang:latest
+FROM golang:1.17
 
 EXPOSE 3000
 
 ENV GOPROXY=https://proxy.golang.org
-ENV GO111MODULE=on
-
-RUN go version
 
 RUN apt-get update \
     && apt-get install -y -q build-essential sqlite3 libsqlite3-dev postgresql libpq-dev vim
@@ -32,9 +29,8 @@ RUN npm install -g --no-progress yarn \
 # Install golangci
 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
 # Installing buffalo binary
-RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.26 | sh 
+RUN go install github.com/gobuffalo/cli/cmd/buffalo@latest
 RUN go get github.com/gobuffalo/buffalo-pop/v2
-RUN buffalo version
 
 RUN mkdir /src
 WORKDIR /src
diff --git a/Dockerfile.slim.build b/Dockerfile.slim.build
@@ -1,7 +1,7 @@
-FROM golang:alpine
+FROM golang:1.17-alpine
+
 EXPOSE 3000
 
-ENV GO111MODULE=on
 ENV GOPROXY=https://proxy.golang.org 
 
 RUN apk add --no-cache --upgrade apk-tools \
@@ -16,10 +16,9 @@ RUN npm i -g --no-progress yarn \
     && yarn config set yarn-offline-mirror /npm-packages-offline-cache \
     && yarn config set yarn-offline-mirror-pruning true
 
-# Pulling docker binary from releases
-RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.26 | sh 
+# Installing buffalo binary
+RUN go install github.com/gobuffalo/cli/cmd/buffalo@latest
 RUN go get github.com/gobuffalo/buffalo-pop/v2
-RUN buffalo version
 
 RUN mkdir /src
 WORKDIR /src
diff --git a/Makefile b/Makefile
@@ -7,17 +7,10 @@ install: deps
 	make tidy
 
 tidy:
-ifeq ($(GO111MODULE),on)
 	$(GO_BIN) mod tidy
-else
-	echo skipping go mod tidy
-endif
 
 deps:
 	$(GO_BIN) get github.com/gobuffalo/release
-ifneq ($(GO111MODULE),on)
-	$(GO_BIN) get -tags ${TAGS} -u -t ./...
-endif
 	make tidy
 
 build:

diff --git a/README.md b/README.md
@@ -19,13 +19,12 @@ Buffalo **isn't just a framework**; it's a holistic web development environment
 
 ## ⚠️ Important
 
-Buffalo works only with Go 
-[modules](https://blog.golang.org/using-go-modules). `GOPATH` mode is likely to break most of the functionality of the Buffalo eco-system. Please see [this blog post](https://blog.gobuffalo.io/the-road-to-1-0-requiring-modules-5672c6b015e5) for more information.
+Buffalo works only with Go [modules](https://blog.golang.org/using-go-modules). `GOPATH` mode is likely to break most of the functionality of the Buffalo eco-system. Please see [this blog post](https://blog.gobuffalo.io/the-road-to-1-0-requiring-modules-5672c6b015e5) for more information.
 
 Also, the Buffalo team actively gives support to the last 2 versions of Go, which at the moment are:
 
-- 1.15.x
 - 1.16.x
+- 1.17.x
 
 While Buffalo `may` work on older versions, we encourage you to upgrade to latest 2 versions of Go for a better development experience.
 
@@ -34,9 +33,10 @@ While Buffalo `may` work on older versions, we encourage you to upgrade to lates
 Please visit [http://gobuffalo.io](http://gobuffalo.io) for the latest documentation, examples, and more.
 
 ### Quick Start
-* [Installation](http://gobuffalo.io/docs/installation)
-* [Create a new project](http://gobuffalo.io/docs/new-project)
-* [Examples](http://gobuffalo.io/docs/examples)
+
+- [Installation](http://gobuffalo.io/docs/installation)
+- [Create a new project](http://gobuffalo.io/docs/new-project)
+- [Examples](http://gobuffalo.io/docs/examples)
 
 ## Shoulders of Giants
 
@@ -58,7 +58,7 @@ Buffalo would not be possible if not for all of the great projects it depends on
 
 [github.com/gobuffalo/pop](https://github.com/gobuffalo/pop) - Accessing databases is nothing new in web applications. Pop, and its command line tool, Soda, were chosen because they strike a nice balance between simplifying common tasks, being idiomatic, and giving you the flexibility you need to build your app. Pop and Soda share the same core philosophies as Buffalo, so they were a natural choice.
 
-### Sessions, Cookies, WebSockets, and more...
+### Sessions, Cookies, WebSockets, and more
 
 [github.com/gorilla](https://github.com/gorilla) - The Gorilla toolkit is a great set of packages designed to improve upon the standard library for a variety of web-related packages. With these high-quality packages Buffalo can keep its "core" code to a minimum and focus on its goal of gluing them all together to make your life better.
 
@@ -71,10 +71,11 @@ Oh, yeah, everyone wants benchmarks! What would a web framework be without its b
 First, thank you so much for wanting to contribute! It means so much that you care enough to want to contribute. We appreciate every PR from the smallest of typos to the be biggest of features.
 
 **Here are the core rules to respect**:
-* If you have any question, please consider using the [Slack channel](https://gobuffalo.io/docs/slack) (*#buffalo*, *#buffalo_fr* or *#buffalo-dev* for contribution related questions) or [Stack Overflow](https://stackoverflow.com/questions/tagged/buffalo). We use GitHub issues for **bug reports and feature requests only**.
-* All contributors of this project are working on their free time: be patient and kind. :)
-* Consider opening an issue **BEFORE** creating a Pull request (PR): you won't lose your time on fixing non-existing bugs, or fixing the wrong bug. Also we can help you to produce the best PR!
-* All PRs **MUST** be opened against the *development* branch. If you want to write an hot-fix, we'll first fix the *development* branch before moving the patch to *master* branch.
+
+- If you have any question, please consider using the [Slack channel](https://gobuffalo.io/docs/slack) (-#buffalo-, *#buffalo_fr* or *#buffalo-dev* for contribution related questions) or [Stack Overflow](https://stackoverflow.com/questions/tagged/buffalo). We use GitHub issues for **bug reports and feature requests only**.
+- All contributors of this project are working on their free time: be patient and kind. :-
+- Consider opening an issue **BEFORE** creating a Pull request (PR): you won't lose your -ime on fixing non-existing bugs, or fixing the wrong bug. Also we can help you to produce the best PR!
+- All PRs **MUST** be opened against the *development* branch. If you want to write an ho--fix, we'll first fix the *development* branch before moving the patch to *master* branch.
 
 **WE WILL CLOSE ANY ISSUE OR PR NOT FOLLOWING THESE CORE RULES**.
 

diff --git a/SHOULDERS.md b/SHOULDERS.md
@@ -4,7 +4,6 @@ github.com/gobuffalo/buffalo does not try to reinvent the wheel! Instead, it use
 
 Thank you to the following **GIANTS**:
 
-
 * [cloud.google.com/go](https://godoc.org/cloud.google.com/go)
 
 * [dmitri.shuralyov.com/app/changes](https://godoc.org/dmitri.shuralyov.com/app/changes)

diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/gobuffalo/buffalo
 
-go 1.15
+go 1.16
 
 require (
-	github.com/BurntSushi/toml v0.3.1
+	github.com/BurntSushi/toml v0.4.1
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.12.0
 	github.com/gobuffalo/envy v1.9.0
@@ -17,7 +17,7 @@ require (
 	github.com/gobuffalo/nulls v0.4.0
 	github.com/gobuffalo/packd v1.0.0
 	github.com/gobuffalo/packr/v2 v2.8.1
-	github.com/gobuffalo/plush/v4 v4.1.5
+	github.com/gobuffalo/plush/v4 v4.1.6
 	github.com/gobuffalo/pop/v5 v5.3.4
 	github.com/gobuffalo/tags/v3 v3.1.0
 	github.com/gorilla/handlers v1.5.1

diff --git a/go.sum b/go.sum
@@ -37,8 +37,9 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
+github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
@@ -184,8 +185,8 @@ github.com/gobuffalo/packr/v2 v2.8.0/go.mod h1:PDk2k3vGevNE3SwVyVRgQCCXETC9SaONC
 github.com/gobuffalo/packr/v2 v2.8.1 h1:tkQpju6i3EtMXJ9uoF5GT6kB+LMTimDWD8Xvbz6zDVA=
 github.com/gobuffalo/packr/v2 v2.8.1/go.mod h1:c/PLlOuTU+p3SybaJATW3H6lX/iK7xEz5OeMf+NnJpg=
 github.com/gobuffalo/plush/v4 v4.0.0/go.mod h1:ErFS3UxKqEb8fpFJT7lYErfN/Nw6vHGiDMTjxpk5bQ0=
-github.com/gobuffalo/plush/v4 v4.1.5 h1:vXkdb99kUqlgJMcdW4KeewnZgwbo26heEDdTdJTTUi4=
-github.com/gobuffalo/plush/v4 v4.1.5/go.mod h1:ErFS3UxKqEb8fpFJT7lYErfN/Nw6vHGiDMTjxpk5bQ0=
+github.com/gobuffalo/plush/v4 v4.1.6 h1:oR66ytSOXB0sYtPYdQA4pUeqYjAMmeTV02Rv/9FRgFU=
+github.com/gobuffalo/plush/v4 v4.1.6/go.mod h1:ErFS3UxKqEb8fpFJT7lYErfN/Nw6vHGiDMTjxpk5bQ0=
 github.com/gobuffalo/pop/v5 v5.3.4 h1:VWH74icA8khG8SyWDAq6Ch00jcPiC4n436JMFh0lLm0=
 github.com/gobuffalo/pop/v5 v5.3.4/go.mod h1:UiVurv2aTKC7MuR27PnMrQjAazoLr8SoC/LuTKTS/tQ=
 github.com/gobuffalo/tags/v3 v3.0.2/go.mod h1:ZQeN6TCTiwAFnS0dNcbDtSgZDwNKSpqajvVtt6mlYpA=
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@ github.com/gobuffalo/buffalo does not try to reinvent the wheel! Instead, it use

		Thank you to the following GIANTS:


		* [cloud.google.com/go](https://godoc.org/cloud.google.com/go)

		* [dmitri.shuralyov.com/app/changes](https://godoc.org/dmitri.shuralyov.com/app/changes)
Expand Down