diff --git a/.dockerignore b/.dockerignore
index 80cbeb040cf87..fc7da40dbe99c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -75,10 +75,8 @@ cpu.out
/yarn.lock
/yarn-error.log
/npm-debug.log*
-/public/assets/js
-/public/assets/css
-/public/assets/fonts
-/public/assets/img/webpack
+/public/assets/*
+!/public/assets/img
/vendor
/web_src/fomantic/node_modules
/web_src/fomantic/build/*
diff --git a/.gitignore b/.gitignore
index 6b699e08700f3..2a5f013dde2ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,10 +72,8 @@ cpu.out
/yarn.lock
/yarn-error.log
/npm-debug.log*
-/public/assets/js
-/public/assets/css
-/public/assets/fonts
-/public/assets/img/webpack
+/public/assets/*
+!/public/assets/img
/vendor
/web_src/fomantic/node_modules
/web_src/fomantic/build/*
diff --git a/Makefile b/Makefile
index 167f56c6b9266..7e1bdcd2a161b 100644
--- a/Makefile
+++ b/Makefile
@@ -116,8 +116,7 @@ FOMANTIC_WORK_DIR := web_src/fomantic
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
WEBPACK_CONFIGS := webpack.config.js
-WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
-WEBPACK_DEST_ENTRIES := public/assets/js public/assets/css public/assets/fonts public/assets/img/webpack
+WEBPACK_DEST := public/assets/index.js public/assets/index.css
BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
BINDATA_HASH := $(addsuffix .hash,$(BINDATA_DEST))
@@ -271,8 +270,9 @@ node-check:
fi
.PHONY: clean-all
-clean-all: clean
- rm -rf $(WEBPACK_DEST_ENTRIES) node_modules
+clean-all:
+ $(eval WEBPACK_ASSETS := $(filter-out public/assets/img, $(wildcard public/assets/*)))
+ @rm -rf $(WEBPACK_ASSETS) node_modules
.PHONY: clean
clean:
@@ -433,7 +433,6 @@ watch:
.PHONY: watch-frontend
watch-frontend: node-check node_modules
- @rm -rf $(WEBPACK_DEST_ENTRIES)
NODE_ENV=development npx webpack --watch --progress
.PHONY: watch-backend
@@ -950,7 +949,6 @@ webpack: $(WEBPACK_DEST)
$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) package-lock.json
@$(MAKE) -s node-check node_modules
- rm -rf $(WEBPACK_DEST_ENTRIES)
npx webpack
@touch $(WEBPACK_DEST)
diff --git a/package-lock.json b/package-lock.json
index 87288565bc943..fdcbd94bd1bcd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,6 @@
"escape-goat": "4.0.0",
"fast-glob": "3.3.0",
"jquery": "3.7.0",
- "jquery.are-you-sure": "1.9.0",
"katex": "0.16.8",
"license-checker-webpack-plugin": "0.2.1",
"lightningcss-loader": "2.1.0",
@@ -6511,17 +6510,6 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
"integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
},
- "node_modules/jquery.are-you-sure": {
- "version": "1.9.0",
- "resolved": "https://registry.npmjs.org/jquery.are-you-sure/-/jquery.are-you-sure-1.9.0.tgz",
- "integrity": "sha512-2r0uFx8CyAopjeHGOdvvwpFP921TnW1+v1uJXcAWQYHYGB1tryTDhQY+5u6HsVeMwbWiRTKVZFWnLaFpDvIqZQ==",
- "dependencies": {
- "jquery": ">=1.4.2"
- },
- "engines": {
- "node": ">=0.8.0"
- }
- },
"node_modules/js-levenshtein-esm": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/js-levenshtein-esm/-/js-levenshtein-esm-1.2.0.tgz",
diff --git a/package.json b/package.json
index 571de3acf526b..5620726f25afb 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
"escape-goat": "4.0.0",
"fast-glob": "3.3.0",
"jquery": "3.7.0",
- "jquery.are-you-sure": "1.9.0",
"katex": "0.16.8",
"license-checker-webpack-plugin": "0.2.1",
"lightningcss-loader": "2.1.0",
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
index e3cac806a4d91..2b1922d31a906 100644
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -25,7 +25,7 @@
{{end}}
{{end}}
-
+
{{template "custom/footer" .}}