From be1d0816292a522d26dc141117e5a0da4d802d42 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Wed, 26 Jan 2022 14:26:10 +0000 Subject: [PATCH] build: fix css bundling bug with new esbuild local testing was being done with an older version of esbuild which didn't mind @tailwind statements before @imports (it complained, but did its job). On the latest version used in Docker builds, it would leave the @import statements intact which broke things like modals. --- Dockerfile | 2 +- Makefile | 4 ++-- css/base.css | 8 ++++---- go.mod | 3 ++- go.sum | 5 +++++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95da273..cab6e36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update -y \ && apt-get install build-essential python3-pip curl software-properties-common sed -y \ && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \ && apt-get install nodejs \ - && (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline swagger copy INTERNAL=off GOESBUILD=on) \ + && (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \ && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html diff --git a/Makefile b/Makefile index 77e840b..47f2da9 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ bundle-css: npx tailwindcss -i $(DATA)/web/css/bundle.css -o $(DATA)/web/css/bundle.css $(TAILWIND) # npx postcss -o $(DATA)/web/css/bundle.css $(DATA)/web/css/bundle.css -inline: +inline-css: cp html/crash.html $(DATA)/crash.html $(UNCSS) node scripts/inline.js root $(DATA) $(DATA)/crash.html $(DATA)/crash.html @@ -177,4 +177,4 @@ clean: -rm docs/docs.go docs/swagger.json docs/swagger.yaml go clean -all: configuration npm email typescript variants-html bundle-css inline swagger copy compile +all: configuration npm email typescript variants-html bundle-css inline-css swagger copy compile diff --git a/css/base.css b/css/base.css index 3c19391..fcaa3c0 100644 --- a/css/base.css +++ b/css/base.css @@ -1,13 +1,13 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - @import "remixicon.css"; @import "./modal.css"; @import "./dark.css"; @import "./tooltip.css"; @import "./loader.css"; +@tailwind base; +@tailwind components; +@tailwind utilities; + :root { --border-width-default: 2px; --border-width-2: 3px; diff --git a/go.mod b/go.mod index 3224ae5..6914e84 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( github.com/bwmarrin/discordgo v0.23.2 github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a + github.com/evanw/esbuild v0.14.14 // indirect github.com/fatih/color v1.13.0 github.com/fsnotify/fsnotify v1.5.1 github.com/getlantern/golog v0.0.0-20210606115803-bce9f9fe5a5f // indirect @@ -59,7 +60,7 @@ require ( github.com/xhit/go-simple-mail/v2 v2.10.0 golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect golang.org/x/net v0.0.0-20220107192237-5cfca573fb4d // indirect - golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect + golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect golang.org/x/tools v0.1.8 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/ini.v1 v1.66.2 diff --git a/go.sum b/go.sum index b7c50e6..6d783db 100644 --- a/go.sum +++ b/go.sum @@ -33,6 +33,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:M88ob4TyDnEqNuL3PgsE/p3bDujfspnulR+0dQWNYZs= github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:buzQsO8HHkZX2Q45fdfGH1xejPjuDQaXH8btcYMFzPM= +github.com/evanw/esbuild v0.14.14 h1:swuD1WwW1+EJTArWUCort1WRVA4bUXqFIa1PxY7v2Ds= +github.com/evanw/esbuild v0.14.14/go.mod h1:GG+zjdi59yh3ehDn4ZWfPcATxjPDUH53iU4ZJbp7dkY= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= @@ -362,10 +364,13 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=