Use canonical imports

.travis.yml

@@ -5,6 +5,7 @@ services:
 addons:
   postgresql: "9.4"
 language: go
+go_import_path: "miniflux.app"
 go:
   - "1.10"
 before_install:

Makefile

@@ -8,22 +8,22 @@ DB_URL := postgres://postgres:postgres@localhost/miniflux_test?sslmode=disable
 
 linux:
 	@ go generate
-	@ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-amd64 main.go
+	@ GOOS=linux GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-amd64 main.go
 
 linux-arm:
 	@ go generate
-	@ GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv8 main.go
+	@ GOOS=linux GOARCH=arm64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv8 main.go
-	@ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv7 main.go
+	@ GOOS=linux GOARCH=arm GOARM=7 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv7 main.go
-	@ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv6 main.go
+	@ GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv6 main.go
-	@ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv5 main.go
+	@ GOOS=linux GOARCH=arm GOARM=5 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-linux-armv5 main.go
 
 darwin:
 	@ go generate
-	@ GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 'github.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-darwin-amd64 main.go
+	@ GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-darwin-amd64 main.go
 
 freebsd:
 	@ go generate
-	@ GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w -X 'githug.com/miniflux/miniflux/version.Version=$(VERSION)' -X 'github.com/miniflux/miniflux/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-freebsd-amd64 main.go
+	@ GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w -X 'miniflux.app/version.Version=$(VERSION)' -X 'miniflux.app/version.BuildDate=$(BUILD_DATE)'" -o $(APP)-freebsd-amd64 main.go
 
 build: linux linux-arm darwin freebsd
 

README.md

@@ -1,7 +1,7 @@
 Miniflux 2
 ==========
 [![Build Status](https://travis-ci.org/miniflux/miniflux.svg?branch=master)](https://travis-ci.org/miniflux/miniflux)
-[![GoDoc](https://godoc.org/github.com/miniflux/miniflux?status.svg)](https://godoc.org/github.com/miniflux/miniflux)
+[![GoDoc](https://godoc.org/miniflux.app?status.svg)](https://godoc.org/miniflux.app)
 [![Documentation Status](https://readthedocs.org/projects/miniflux/badge/?version=latest)](https://docs.miniflux.app/)
 
 Miniflux is a minimalist and opinionated feed reader:

api/category.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"errors"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
 )
 
 // CreateCategory is the API handler to create a new category.

api/controller.go

@@ -2,11 +2,11 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
-	"github.com/miniflux/miniflux/reader/feed"
+	"miniflux.app/reader/feed"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 // Controller holds all handlers for the API.

api/doc.go

@@ -7,4 +7,4 @@
 Package api implements API endpoints for Miniflux application.
 
 */
-package api
+package api // import "miniflux.app/api"

api/entry.go

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"errors"
 	"net/http"
 	"time"
 
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 // GetFeedEntry is the API handler to get a single feed entry.

api/feed.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"errors"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
 )
 
 // CreateFeed is the API handler to create a new feed.

api/icon.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"errors"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
 )
 
 // FeedIcon returns a feed icon.

api/opml.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
-	"github.com/miniflux/miniflux/http/response/xml"
+	"miniflux.app/http/response/xml"
-	"github.com/miniflux/miniflux/reader/opml"
+	"miniflux.app/reader/opml"
 )
 
 // Export is the API handler that export feeds to OPML.

api/payload.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"encoding/json"
 	"fmt"
 	"io"
 
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
 )
 
 type feedIcon struct {

api/payload_test.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"testing"
 
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
 )
 
 func TestUpdateFeedURL(t *testing.T) {

api/subscription.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"errors"
 	"fmt"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
-	"github.com/miniflux/miniflux/reader/subscription"
+	"miniflux.app/reader/subscription"
 )
 
 // GetSubscriptions is the API handler to find subscriptions.

api/user.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package api
+package api // import "miniflux.app/api"
 
 import (
 	"errors"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
 )
 
 // CurrentUser is the API handler to retrieve the authenticated user.

cli/ask_credentials.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cli
+package cli // import "miniflux.app/cli"
 
 import (
 	"bufio"

cli/cli.go

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cli
+package cli // import "miniflux.app/cli"
 
 import (
 	"flag"
 	"fmt"
 
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/daemon"
+	"miniflux.app/daemon"
-	"github.com/miniflux/miniflux/database"
+	"miniflux.app/database"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
-	"github.com/miniflux/miniflux/version"
+	"miniflux.app/version"
 )
 
 // Parse parses command line arguments.

cli/create_admin.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cli
+package cli // import "miniflux.app/cli"
 
 import (
 	"fmt"
 	"os"
 
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 func createAdmin(store *storage.Storage) {

cli/doc.go

@@ -7,4 +7,4 @@
 Package cli implements command line arguments for Miniflux application.
 
 */
-package cli
+package cli // import "miniflux.app/cli"

cli/flush_sessions.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cli
+package cli // import "miniflux.app/cli"
 
 import (
 	"fmt"
 	"os"
 
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 func flushSessions(store *storage.Storage) {

cli/info.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cli
+package cli // import "miniflux.app/cli"
 
 import (
 	"fmt"
 	"runtime"
 
-	"github.com/miniflux/miniflux/version"
+	"miniflux.app/version"
 )
 
 func info() {

cli/reset_password.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cli
+package cli // import "miniflux.app/cli"
 
 import (
 	"fmt"
 	"os"
 
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 func resetPassword(store *storage.Storage) {

config/config.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package config
+package config // import "miniflux.app/config"
 
 import (
 	"net/url"
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 const (

config/config_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package config
+package config // import "miniflux.app/config"
 
 import (
 	"os"

config/doc.go

@@ -7,4 +7,4 @@
 Package config handles configuration values for Miniflux application.
 
 */
-package config
+package config // import "miniflux.app/config"

crypto/crypto.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package crypto
+package crypto // import "miniflux.app/crypto"
 
 import (
 	"crypto/rand"

crypto/doc.go

@@ -7,4 +7,4 @@
 Package crypto implements helpers related to cryptography.
 
 */
-package crypto
+package crypto // import "miniflux.app/crypto"

daemon/daemon.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package daemon
+package daemon // import "miniflux.app/daemon"
 
 import (
 	"context"
@@ -12,12 +12,12 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/locale"
+	"miniflux.app/locale"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/reader/feed"
+	"miniflux.app/reader/feed"
-	"github.com/miniflux/miniflux/scheduler"
+	"miniflux.app/scheduler"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 // Run starts the daemon.

daemon/doc.go

@@ -7,4 +7,4 @@
 Package daemon handles the main application process.
 
 */
-package daemon
+package daemon // import "miniflux.app/daemon"

daemon/routes.go

@@ -2,21 +2,21 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package daemon
+package daemon // import "miniflux.app/daemon"
 
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux/api"
+	"miniflux.app/api"
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/fever"
+	"miniflux.app/fever"
-	"github.com/miniflux/miniflux/locale"
+	"miniflux.app/locale"
-	"github.com/miniflux/miniflux/middleware"
+	"miniflux.app/middleware"
-	"github.com/miniflux/miniflux/reader/feed"
+	"miniflux.app/reader/feed"
-	"github.com/miniflux/miniflux/scheduler"
+	"miniflux.app/scheduler"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
-	"github.com/miniflux/miniflux/template"
+	"miniflux.app/template"
-	"github.com/miniflux/miniflux/ui"
+	"miniflux.app/ui"
 
 	"github.com/gorilla/mux"
 )

daemon/server.go

@@ -2,19 +2,19 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package daemon
+package daemon // import "miniflux.app/daemon"
 
 import (
 	"crypto/tls"
 	"net/http"
 	"time"
 
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/locale"
+	"miniflux.app/locale"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/reader/feed"
+	"miniflux.app/reader/feed"
-	"github.com/miniflux/miniflux/scheduler"
+	"miniflux.app/scheduler"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 
 	"golang.org/x/crypto/acme/autocert"
 )

database/database.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package database
+package database // import "miniflux.app/database"
 
 import (
 	"database/sql"

database/migration.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package database
+package database // import "miniflux.app/database"
 
 import (
 	"database/sql"
 	"fmt"
 	"strconv"
 
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 const schemaVersion = 20

database/sql.go

@@ -1,6 +1,6 @@
 // Code generated by go generate; DO NOT EDIT.
 
-package database
+package database // import "miniflux.app/database"
 
 var SqlMap = map[string]string{
 	"schema_version_1": `create table schema_version (

doc.go

@@ -4,7 +4,7 @@
 
 /*
 
-Package main implements a feed reader application.
+Miniflux is a feed reader application.
 
 */
-package main
+package main // import "miniflux.app"

errors/doc.go

@@ -7,4 +7,4 @@
 Package errors handles localized errors.
 
 */
-package errors
+package errors // import "miniflux.app/errors"

errors/errors.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package errors
+package errors // import "miniflux.app/errors"
 
 import (
 	"fmt"
 
-	"github.com/miniflux/miniflux/locale"
+	"miniflux.app/locale"
 )
 
 // LocalizedError represents an error than could be translated to another language.

fever/doc.go

@@ -7,4 +7,4 @@
 Package fever implements Fever API endpoints.
 
 */
-package fever
+package fever // import "miniflux.app/fever"

fever/fever.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package fever
+package fever // import "miniflux.app/fever"
 
 import (
 	"net/http"
@@ -10,14 +10,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/http/context"
+	"miniflux.app/http/context"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
-	"github.com/miniflux/miniflux/integration"
+	"miniflux.app/integration"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 type baseResponse struct {

filter/doc.go

@@ -7,4 +7,4 @@
 Package filter implements a content filter to rewrite image links.
 
 */
-package filter
+package filter // import "miniflux.app/filter"

filter/image_proxy_filter.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package filter
+package filter // import "miniflux.app/filter"
 
 import (
 	"encoding/base64"
 	"strings"
 
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/http/route"
+	"miniflux.app/http/route"
-	"github.com/miniflux/miniflux/url"
+	"miniflux.app/url"
 
 	"github.com/PuerkitoBio/goquery"
 	"github.com/gorilla/mux"

filter/image_proxy_filter_test.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package filter
+package filter // import "miniflux.app/filter"
 
 import (
 	"net/http"
 	"os"
 	"testing"
 
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
 
 	"github.com/gorilla/mux"
 )

generate.go

@@ -24,7 +24,7 @@ import (
 
 const tpl = `// Code generated by go generate; DO NOT EDIT.
 
-package {{ .Package }}
+package {{ .Package }} // import "miniflux.app/{{ .ImportPath }}"
 
 var {{ .Map }} = map[string]string{
 {{ range $constant, $content := .Files }}` + "\t" + `"{{ $constant }}": ` + "`{{ $content }}`" + `,
@@ -38,9 +38,11 @@ var {{ .Map }}Checksums = map[string]string{
 var bundleTpl = template.Must(template.New("").Parse(tpl))
 
 type Bundle struct {
-	Package, Map string
+	Package    string
-	Files        map[string]string
+	Map        string
-	Checksums    map[string]string
+	ImportPath string
+	Files      map[string]string
+	Checksums  map[string]string
 }
 
 func (b *Bundle) Write(filename string) {
@@ -53,12 +55,13 @@ func (b *Bundle) Write(filename string) {
 	bundleTpl.Execute(f, b)
 }
 
-func NewBundle(pkg, mapName string) *Bundle {
+func NewBundle(pkg, mapName, importPath string) *Bundle {
 	return &Bundle{
-		Package:   pkg,
+		Package:    pkg,
-		Map:       mapName,
+		Map:        mapName,
-		Files:     make(map[string]string),
+		ImportPath: importPath,
-		Checksums: make(map[string]string),
+		Files:      make(map[string]string),
+		Checksums:  make(map[string]string),
 	}
 }
 
@@ -97,7 +100,7 @@ func concat(files []string) string {
 }
 
 func generateJSBundle(bundleFile string, bundleFiles map[string][]string, prefixes, suffixes map[string]string) {
-	bundle := NewBundle("static", "Javascripts")
+	bundle := NewBundle("static", "Javascripts", "ui/static")
 	m := minify.New()
 	m.AddFunc("text/javascript", js.Minify)
 
@@ -127,7 +130,7 @@ func generateJSBundle(bundleFile string, bundleFiles map[string][]string, prefix
 }
 
 func generateCSSBundle(bundleFile string, themes map[string][]string) {
-	bundle := NewBundle("static", "Stylesheets")
+	bundle := NewBundle("static", "Stylesheets", "ui/static")
 	m := minify.New()
 	m.AddFunc("text/css", css.Minify)
 
@@ -146,7 +149,7 @@ func generateCSSBundle(bundleFile string, themes map[string][]string) {
 }
 
 func generateBinaryBundle(bundleFile string, srcFiles []string) {
-	bundle := NewBundle("static", "Binaries")
+	bundle := NewBundle("static", "Binaries", "ui/static")
 
 	for _, srcFile := range srcFiles {
 		data := readFile(srcFile)
@@ -161,7 +164,7 @@ func generateBinaryBundle(bundleFile string, srcFiles []string) {
 }
 
 func generateBundle(bundleFile, pkg, mapName string, srcFiles []string) {
-	bundle := NewBundle(pkg, mapName)
+	bundle := NewBundle(pkg, mapName, pkg)
 
 	for _, srcFile := range srcFiles {
 		data := readFile(srcFile)

http/client/client.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package client
+package client // import "miniflux.app/http/client"
 
 import (
 	"bytes"
@@ -18,10 +18,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/miniflux/miniflux/errors"
+	"miniflux.app/errors"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/timer"
+	"miniflux.app/timer"
-	"github.com/miniflux/miniflux/version"
+	"miniflux.app/version"
 )
 
 const (

http/client/response.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package client
+package client // import "miniflux.app/http/client"
 
 import (
 	"io"
 	"mime"
 	"strings"
 
-	"github.com/miniflux/miniflux/logger"
 	"golang.org/x/net/html/charset"
+	"miniflux.app/logger"
 )
 
 // Response wraps a server response.

http/client/response_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package client
+package client // import "miniflux.app/http/client"
 
 import "testing"
 

http/context/context.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package context
+package context // import "miniflux.app/http/context"
 
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux/middleware"
+	"miniflux.app/middleware"
 )
 
 // Context contains helper functions related to the current request.

http/cookie/cookie.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package cookie
+package cookie // import "miniflux.app/http/cookie"
 
 import (
 	"net/http"

http/request/request.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package request
+package request // import "miniflux.app/http/request"
 
 import (
 	"fmt"

http/request/request_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package request
+package request // import "miniflux.app/http/request"
 
 import (
 	"net/http"

http/response/html/html.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package html
+package html // import "miniflux.app/http/response/html"
 
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/response"
+	"miniflux.app/http/response"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // OK writes a standard HTML response.

http/response/json/json.go

@@ -2,15 +2,15 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package json
+package json // import "miniflux.app/http/response/json"
 
 import (
 	"encoding/json"
 	"errors"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/response"
+	"miniflux.app/http/response"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // OK sends a JSON response with the status code 200.

http/response/response.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package response
+package response // import "miniflux.app/http/response"
 
 import (
 	"compress/flate"

http/response/xml/xml.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package xml
+package xml // import "miniflux.app/http/response/xml"
 
 import (
 	"fmt"

http/route/route.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package route
+package route // import "miniflux.app/http/route"
 
 import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // Path returns the defined route based on given arguments.

integration/doc.go

@@ -7,4 +7,4 @@
 Package integration implements API clients for third-party services.
 
 */
-package integration
+package integration // import "miniflux.app/integration"

integration/instapaper/instapaper.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package instapaper
+package instapaper // import "miniflux.app/integration/instapaper"
 
 import (
 	"fmt"
 	"net/url"
 
-	"github.com/miniflux/miniflux/http/client"
+	"miniflux.app/http/client"
 )
 
 // Client represents an Instapaper client.

integration/integration.go

@@ -2,17 +2,17 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package integration
+package integration // import "miniflux.app/integration"
 
 import (
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/integration/instapaper"
+	"miniflux.app/integration/instapaper"
-	"github.com/miniflux/miniflux/integration/nunuxkeeper"
+	"miniflux.app/integration/nunuxkeeper"
-	"github.com/miniflux/miniflux/integration/pinboard"
+	"miniflux.app/integration/pinboard"
-	"github.com/miniflux/miniflux/integration/pocket"
+	"miniflux.app/integration/pocket"
-	"github.com/miniflux/miniflux/integration/wallabag"
+	"miniflux.app/integration/wallabag"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
 )
 
 // SendEntry send the entry to the activated providers.

integration/nunuxkeeper/nunuxkeeper.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package nunuxkeeper
+package nunuxkeeper // import "miniflux.app/integration/nunuxkeeper"
 
 import (
 	"fmt"
 	"net/url"
 	"path"
 
-	"github.com/miniflux/miniflux/http/client"
+	"miniflux.app/http/client"
 )
 
 // Document structure of a Nununx Keeper document

integration/pinboard/pinboard.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package pinboard
+package pinboard // import "miniflux.app/integration/pinboard"
 
 import (
 	"fmt"
 	"net/url"
 
-	"github.com/miniflux/miniflux/http/client"
+	"miniflux.app/http/client"
 )
 
 // Client represents a Pinboard client.

integration/pocket/connector.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package pocket
+package pocket // import "miniflux.app/integration/pocket"
 
 import (
 	"errors"
@@ -10,7 +10,7 @@ import (
 	"io/ioutil"
 	"net/url"
 
-	"github.com/miniflux/miniflux/http/client"
+	"miniflux.app/http/client"
 )
 
 // Connector manages the authorization flow with Pocket to get a personal access token.

integration/pocket/pocket.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package pocket
+package pocket // import "miniflux.app/integration/pocket"
 
 import (
 	"fmt"
 
-	"github.com/miniflux/miniflux/http/client"
+	"miniflux.app/http/client"
 )
 
 // Client represents a Pocket client.

integration/wallabag/wallabag.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package wallabag
+package wallabag // import "miniflux.app/integration/wallabag"
 
 import (
 	"encoding/json"
@@ -10,7 +10,7 @@ import (
 	"io"
 	"net/url"
 
-	"github.com/miniflux/miniflux/http/client"
+	"miniflux.app/http/client"
 )
 
 // Client represents a Wallabag client.

locale/doc.go

@@ -7,4 +7,4 @@
 Package locale handles the internationalization of the application.
 
 */
-package locale
+package locale // import "miniflux.app/locale"

locale/language.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package locale
+package locale // import "miniflux.app/locale"
 
 import "fmt"
 

locale/locale.go

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package locale
+package locale // import "miniflux.app/locale"
 
-import "github.com/miniflux/miniflux/logger"
+import "miniflux.app/logger"
 
 // Translation is the translation mapping table.
 type Translation map[string]interface{}

locale/locale_test.go

@@ -1,7 +1,7 @@
 // Copyright 2017 Frédéric Guillot. All rights reserved.
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
-package locale
+package locale // import "miniflux.app/locale"
 
 import "testing"
 

locale/plurals.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package locale
+package locale // import "miniflux.app/locale"
 
 // See https://localization-guide.readthedocs.io/en/latest/l10n/pluralforms.html
 // And http://www.unicode.org/cldr/charts/29/supplemental/language_plural_rules.html

locale/translations.go

@@ -1,6 +1,6 @@
 // Code generated by go generate; DO NOT EDIT.
 
-package locale
+package locale // import "miniflux.app/locale"
 
 var translations = map[string]string{
 	"de_DE": `{

locale/translator.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package locale
+package locale // import "miniflux.app/locale"
 
 import (
 	"encoding/json"

logger/doc.go

@@ -7,4 +7,4 @@
 Package logger handles application log messages with different levels.
 
 */
-package logger
+package logger // import "miniflux.app/logger"

logger/logger.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package logger
+package logger // import "miniflux.app/logger"
 
 import (
 	"fmt"

main.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package main
+package main // import "miniflux.app"
 
 //go:generate go run generate.go
 //go:generate gofmt -s -w database/sql.go
@@ -14,7 +14,7 @@ package main
 //go:generate gofmt -s -w locale/translations.go
 
 import (
-	"github.com/miniflux/miniflux/cli"
+	"miniflux.app/cli"
 )
 
 func main() {

middleware/app_session.go

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"context"
 	"errors"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/cookie"
+	"miniflux.app/http/cookie"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response/html"
+	"miniflux.app/http/response/html"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
 )
 
 // AppSession handles application session middleware.

middleware/basic_auth.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"context"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // BasicAuth handles HTTP basic authentication.

middleware/common_headers.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"net/http"

middleware/context_keys.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 // ContextKey represents a context key.
 type ContextKey struct {

middleware/fever.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"context"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/response/json"
+	"miniflux.app/http/response/json"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // FeverAuth handles Fever API authentication.

middleware/header_config.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"net/http"

middleware/logging.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
 )
 
 // Logging logs the HTTP request.

middleware/middleware.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"github.com/gorilla/mux"
-	"github.com/miniflux/miniflux/config"
+	"miniflux.app/config"
-	"github.com/miniflux/miniflux/storage"
+	"miniflux.app/storage"
 )
 
 // Middleware handles different middleware handlers.

middleware/user_session.go

@@ -2,18 +2,18 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package middleware
+package middleware // import "miniflux.app/middleware"
 
 import (
 	"context"
 	"net/http"
 
-	"github.com/miniflux/miniflux/http/cookie"
+	"miniflux.app/http/cookie"
-	"github.com/miniflux/miniflux/http/request"
+	"miniflux.app/http/request"
-	"github.com/miniflux/miniflux/http/response"
+	"miniflux.app/http/response"
-	"github.com/miniflux/miniflux/http/route"
+	"miniflux.app/http/route"
-	"github.com/miniflux/miniflux/logger"
+	"miniflux.app/logger"
-	"github.com/miniflux/miniflux/model"
+	"miniflux.app/model"
 
 	"github.com/gorilla/mux"
 )

model/app_session.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"database/sql/driver"

model/category.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"errors"

model/category_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import "testing"
 

model/doc.go

@@ -7,4 +7,4 @@
 Package model contains all data structures used by the application.
 
 */
-package model
+package model // import "miniflux.app/model"

model/enclosure.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 // Enclosure represents an attachment.
 type Enclosure struct {

model/entry.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"fmt"

model/entry_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import "testing"
 

model/feed.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"fmt"

model/icon.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"encoding/base64"

model/integration.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 // Integration represents user integration settings.
 type Integration struct {

model/job.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 // Job represents a payload sent to the processing queue.
 type Job struct {

model/theme.go

@@ -2,9 +2,9 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
-import "github.com/miniflux/miniflux/errors"
+import "miniflux.app/errors"
 
 // Themes returns the list of available themes.
 func Themes() map[string]string {

model/theme_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import "testing"
 

model/user.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"errors"
 	"time"
 
-	"github.com/miniflux/miniflux/timezone"
+	"miniflux.app/timezone"
 )
 
 // User represents a user in the system.

model/user_session.go

@@ -2,13 +2,13 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import (
 	"fmt"
 	"time"
 
-	"github.com/miniflux/miniflux/timezone"
+	"miniflux.app/timezone"
 )
 
 // UserSession represents a user session in the system.

model/user_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package model
+package model // import "miniflux.app/model"
 
 import "testing"
 

oauth2/doc.go

@@ -7,4 +7,4 @@
 Package oauth2 abstracts different OAuth2 providers.
 
 */
-package oauth2
+package oauth2 // import "miniflux.app/oauth2"

oauth2/google.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package oauth2
+package oauth2 // import "miniflux.app/oauth2"
 
 import (
 	"context"

oauth2/manager.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package oauth2
+package oauth2 // import "miniflux.app/oauth2"
 
 import "errors"