Skip to content

Commit 608ccc3

Browse files
authored
Drop fomantic build (go-gitea#33845)
We would never update or build fomantic again, we have forked it as a private library long time ago. So just put the JS and CSS files in "fomantic/build" into git. And use "import" to use them. Remove "form.js", rewrite "tab" component. All source code is from official Fomantic UI build. Will apply patches in separate PRs.
1 parent a92d5f6 commit 608ccc3

30 files changed

+12864
-25343
lines changed

.dockerignore

+1-12
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,7 @@ cpu.out
7979
/public/assets/fonts
8080
/public/assets/img/avatar
8181
/vendor
82-
/web_src/fomantic/node_modules
83-
/web_src/fomantic/build/*
84-
!/web_src/fomantic/build/semantic.js
85-
!/web_src/fomantic/build/semantic.css
86-
!/web_src/fomantic/build/themes
87-
/web_src/fomantic/build/themes/*
88-
!/web_src/fomantic/build/themes/default
89-
/web_src/fomantic/build/themes/default/assets/*
90-
!/web_src/fomantic/build/themes/default/assets/fonts
91-
/web_src/fomantic/build/themes/default/assets/fonts/*
92-
!/web_src/fomantic/build/themes/default/assets/fonts/icons.woff2
93-
!/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
82+
/web_src/fomantic
9483
/VERSION
9584
/.air
9685
/.go-licenses

.gitattributes

-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@
55
/public/assets/img/svg/*.svg linguist-generated
66
/templates/swagger/v1_json.tmpl linguist-generated
77
/vendor/** -text -eol linguist-vendored
8-
/web_src/fomantic/build/** linguist-generated
9-
/web_src/fomantic/_site/globals/site.variables linguist-language=Less
108
/web_src/js/vendor/** -text -eol linguist-vendored
119
Dockerfile.* linguist-language=Dockerfile

.gitignore

-12
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,6 @@ cpu.out
8484
/public/assets/fonts
8585
/public/assets/licenses.txt
8686
/vendor
87-
/web_src/fomantic/node_modules
88-
/web_src/fomantic/build/*
89-
!/web_src/fomantic/build/semantic.js
90-
!/web_src/fomantic/build/semantic.css
91-
!/web_src/fomantic/build/themes
92-
/web_src/fomantic/build/themes/*
93-
!/web_src/fomantic/build/themes/default
94-
/web_src/fomantic/build/themes/default/assets/*
95-
!/web_src/fomantic/build/themes/default/assets/fonts
96-
/web_src/fomantic/build/themes/default/assets/fonts/*
97-
!/web_src/fomantic/build/themes/default/assets/fonts/icons.woff2
98-
!/web_src/fomantic/build/themes/default/assets/fonts/outline-icons.woff2
9987
/VERSION
10088
/.air
10189
/.go-licenses

Makefile

+1-16
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ LINUX_ARCHS ?= linux/amd64,linux/386,linux/arm-5,linux/arm-6,linux/arm64
115115
GO_TEST_PACKAGES ?= $(filter-out $(shell $(GO) list code.gitea.io/gitea/models/migrations/...) code.gitea.io/gitea/tests/integration/migration-test code.gitea.io/gitea/tests code.gitea.io/gitea/tests/integration code.gitea.io/gitea/tests/e2e,$(shell $(GO) list ./... | grep -v /vendor/))
116116
MIGRATE_TEST_PACKAGES ?= $(shell $(GO) list code.gitea.io/gitea/models/migrations/...)
117117

118-
FOMANTIC_WORK_DIR := web_src/fomantic
119-
120118
WEBPACK_SOURCES := $(shell find web_src/js web_src/css -type f)
121119
WEBPACK_CONFIGS := webpack.config.js tailwind.config.js
122120
WEBPACK_DEST := public/assets/js/index.js public/assets/css/index.css
@@ -140,7 +138,7 @@ TAGS_EVIDENCE := $(MAKE_EVIDENCE_DIR)/tags
140138

141139
TEST_TAGS ?= $(TAGS_SPLIT) sqlite sqlite_unlock_notify
142140

143-
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(FOMANTIC_WORK_DIR)/node_modules $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
141+
TAR_EXCLUDES := .git data indexers queues log node_modules $(EXECUTABLE) $(DIST) $(MAKE_EVIDENCE_DIR) $(AIR_TMP_DIR) $(GO_LICENSE_TMP_DIR)
144142

145143
GO_DIRS := build cmd models modules routers services tests
146144
WEB_DIRS := web_src/js web_src/css
@@ -847,19 +845,6 @@ update-py: node-check | node_modules ## update py dependencies
847845
poetry install
848846
@touch .venv
849847

850-
.PHONY: fomantic
851-
fomantic: ## build fomantic files
852-
rm -rf $(FOMANTIC_WORK_DIR)/build
853-
cd $(FOMANTIC_WORK_DIR) && npm install --no-save
854-
cp -f $(FOMANTIC_WORK_DIR)/theme.config.less $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/theme.config
855-
cp -rf $(FOMANTIC_WORK_DIR)/_site $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/src/
856-
$(SED_INPLACE) -e 's/ overrideBrowserslist\r/ overrideBrowserslist: ["defaults"]\r/g' $(FOMANTIC_WORK_DIR)/node_modules/fomantic-ui/tasks/config/tasks.js
857-
cd $(FOMANTIC_WORK_DIR) && npx gulp -f node_modules/fomantic-ui/gulpfile.js build
858-
# fomantic uses "touchstart" as click event for some browsers, it's not ideal, so we force fomantic to always use "click" as click event
859-
$(SED_INPLACE) -e 's/clickEvent[ \t]*=/clickEvent = "click", unstableClickEvent =/g' $(FOMANTIC_WORK_DIR)/build/semantic.js
860-
$(SED_INPLACE) -e 's/\r//g' $(FOMANTIC_WORK_DIR)/build/semantic.css $(FOMANTIC_WORK_DIR)/build/semantic.js
861-
rm -f $(FOMANTIC_WORK_DIR)/build/*.min.*
862-
863848
.PHONY: webpack
864849
webpack: $(WEBPACK_DEST) ## build webpack files
865850

web_src/css/form.css

+4
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ textarea:focus,
273273
width: 50%;
274274
}
275275

276+
.ui.form.left-right-form .inline.field .ui.dropdown input.search {
277+
width: 100%;
278+
}
279+
276280
.ui.form.left-right-form .inline.field .inline-right {
277281
display: inline-flex;
278282
flex-direction: column;

web_src/css/index.css

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
@import "./modules/checkbox.css";
1919
@import "./modules/dimmer.css";
2020
@import "./modules/modal.css";
21+
@import "./modules/tab.css";
2122

2223
@import "./modules/tippy.css";
2324
@import "./modules/breadcrumb.css";

web_src/css/modules/tab.css

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.ui.tab {
2+
display: none;
3+
}
4+
5+
.ui.tab.active {
6+
display: block;
7+
}

web_src/fomantic/.npmrc

-7
This file was deleted.

0 commit comments

Comments
 (0)