Replace packr with go:embed (#118)

Author: InfiniteStash

.dockerignore

@@ -11,9 +11,6 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-# Packr2 artifacts
-**/*-packr.go
-
 ####
 # Visual Studio Code
 ####
@@ -59,7 +56,6 @@ stash-box
 dist
 
 pkg/models/generated_*.go
-packrd
 # TODO - we'll add this in later
 vendor
 docker

.github/workflows/build.yml

@@ -92,11 +92,6 @@ jobs:
       if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
       run: make ui-only
 
-    - name: Bundle static assets
-      run: |
-        go get -u github.com/gobuffalo/packr/v2/[email protected]
-        make packr
-
     - name: Crosscompile binaries
       run: make cross-compile
 

.gitignore

@@ -11,9 +11,6 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-# Packr2 artifacts
-**/*-packr.go
-
 ####
 # Visual Studio Code
 ####
@@ -61,6 +58,5 @@ dist
 stash-box-config.yml
 
 pkg/models/generated_*.go
-packrd
 # TODO - we'll add this in later
 vendor

Makefile

@@ -23,13 +23,7 @@ endif
 build: pre-build
 	go build $(OUTPUT) -v -ldflags "-X 'github.com/stashapp/stash-box/pkg/api.version=$(STASH_BOX_VERSION)' -X 'github.com/stashapp/stash-box/pkg/api.buildstamp=$(BUILD_DATE)' -X 'github.com/stashapp/stash-box/pkg/api.githash=$(GITHASH)'"
 
-install:
-	packr2 install
-
-clean:
-	packr2 clean
-
-# Regenerates GraphQL files and packr files
+# Regenerates GraphQL files
 .PHONY: generate
 generate:
 	go generate
@@ -90,19 +84,10 @@ lint: vet staticcheck errcheck
 pre-ui:
 	cd frontend && yarn install --frozen-lockfile
 
-.PHONY: ui ui-only
-ui-only:
+.PHONY: ui
+ui:
 	cd frontend && yarn build
 
-ui: ui-only
-	packr2
-
-# just repacks the packr files - use when updating migrations and packed files without
-# rebuilding the UI
-.PHONY: packr
-packr:
-	packr2
-
 # runs tests and checks on the UI and builds it
 .PHONY: ui-validate
 ui-validate:

README.md

@@ -116,9 +116,6 @@ Join the [Discord server](https://discord.gg/2TsNFKt).
 
 * [Revive](https://github.com/mgechev/revive) - Configurable linter
     * Go Install: `go get github.com/mgechev/revive`
-* [Packr2](https://github.com/gobuffalo/packr/tree/v2.0.2/v2) - Static asset bundler
-    * Go Install: `go get github.com/gobuffalo/packr/v2/[email protected]`
-    * [Binary Download](https://github.com/gobuffalo/packr/releases)
 * [Yarn](https://yarnpkg.com/en/docs/install) - Yarn package manager
 
 NOTE: You may need to run the `go get` commands outside the project directory to avoid modifying the projects module file.
@@ -141,8 +138,7 @@ TODO
 ## Commands
 
 * `make generate` - Generate Go GraphQL files. This should be run if the graphql schema has changed.
-* `make ui` - Builds the UI and regenerates the packr2 files.
-* `make packr` - Regenerates the packr2 files. Run this if schema migration files have changed and you don't want to rebuild the UI.
+* `make ui` - Builds the UI.
 * `make build` - Builds the binary
 * `make vet` - Run `go vet`
 * `make lint` - Run the linter

docker/build/x86_64/Dockerfile

@@ -13,16 +13,7 @@ RUN apt-get update && \
     apt-get install -y nodejs yarn xz-utils --no-install-recommends || exit 1; \
 	rm -rf /var/lib/apt/lists/*;
 
-ENV PACKR2_VERSION=2.0.2
-ENV PACKR2_SHA=f95ff4c96d7a28813220df030ad91700b8464fe292ab3e1dc9582305c2a338d2
-ENV PACKR2_DOWNLOAD_FILE=packr_${PACKR2_VERSION}_linux_amd64.tar.gz
-ENV PACKR2_DOWNLOAD_URL=https://github.com/gobuffalo/packr/releases/download/v${PACKR2_VERSION}/${PACKR2_DOWNLOAD_FILE}
-
 WORKDIR /
-RUN wget ${PACKR2_DOWNLOAD_URL}; \
-	echo "$PACKR2_SHA $PACKR2_DOWNLOAD_FILE" | sha256sum -c - || exit 1; \
-	tar -xzf $PACKR2_DOWNLOAD_FILE -C /usr/bin/ packr2; \
-	rm $PACKR2_DOWNLOAD_FILE;
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

go.mod

@@ -8,29 +8,20 @@ require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/disintegration/imaging v1.6.2
 	github.com/go-chi/chi v4.0.2+incompatible
-	github.com/gobuffalo/envy v1.9.0 // indirect
-	github.com/gobuffalo/genny v0.2.0 // indirect
-	github.com/gobuffalo/gogen v0.2.0 // indirect
-	github.com/gobuffalo/logger v1.0.3 // indirect
-	github.com/gobuffalo/mapi v1.2.1 // indirect
-	github.com/gobuffalo/packd v1.0.0 // indirect
-	github.com/gobuffalo/packr/v2 v2.0.2
-	github.com/gofrs/uuid v3.2.0+incompatible
-	github.com/golang-migrate/migrate/v4 v4.9.1
+	github.com/gofrs/uuid v4.0.0+incompatible
+	github.com/golang-migrate/migrate/v4 v4.15.0-beta.1
 	github.com/gorilla/sessions v1.1.3
 	github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/jmoiron/sqlx v1.2.0
-	github.com/karrick/godirwalk v1.16.1 // indirect
+	github.com/jmoiron/sqlx v1.3.1
 	github.com/kisielk/errcheck v1.6.0
-	github.com/lib/pq v1.3.0
-	github.com/markbates/oncer v1.0.0 // indirect
+	github.com/lib/pq v1.10.0
 	github.com/minio/minio-go/v7 v7.0.7
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/rogpeppe/go-internal v1.8.0 // indirect
 	github.com/rs/cors v1.6.0
 	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/afero v1.2.0 // indirect
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
 	github.com/stretchr/testify v1.7.0 // indirect
@@ -39,8 +30,6 @@ require (
 	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
 	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8
 	golang.org/x/sys v0.0.0-20210521203332-0cec03c779c1 // indirect
-	golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
 	golang.org/x/tools v0.1.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	honnef.co/go/tools v0.2.0
 )