Skip to content

Commit

Permalink
Use npm to manage fomantic and only build needed components (go-gitea…
Browse files Browse the repository at this point in the history
…#9561)

* Use npm to manage fomantic

* Only build needed semantic components

* Fix make

* Don't import fonts from google sites since we have loaded

* [misc] devendor fomantic-ui and rebuild upon src or config changes only

Signed-off-by: Jakob Ackermann <[email protected]>

* Change sort alphabetically of semantic components

* Fix trailing slash

* fix makefile

* Remove dependency to gulp from package.json

* Fix something

* Simplife the makefile

* add missed fomantic compnent

Co-authored-by: Jakob Ackermann <[email protected]>
  • Loading branch information
lunny and das7pad authored Jan 21, 2020
1 parent e7322a1 commit 5cf241b
Show file tree
Hide file tree
Showing 43 changed files with 10,402 additions and 113,452 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ coverage.all
/yarn.lock
/public/js
/public/css
/public/fomantic

# Snapcraft
snap/.snapcraft/
Expand Down
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/tem

JS_DEST_DIR := public/js
CSS_DEST_DIR := public/css
FOMANTIC_DEST_DIR := public/fomantic

TAGS ?=

Expand Down Expand Up @@ -138,7 +139,7 @@ node-check:

.PHONY: clean-all
clean-all: clean
rm -rf $(JS_DEST_DIR) $(CSS_DEST_DIR)
rm -rf $(JS_DEST_DIR) $(CSS_DEST_DIR) $(FOMANTIC_DEST_DIR)

.PHONY: clean
clean:
Expand Down Expand Up @@ -474,14 +475,21 @@ npm-update: node-check node_modules
npm install --package-lock

.PHONY: js
js: node-check $(JS_DEST)
js: node-check fomantic $(JS_DEST)

$(JS_DEST): node_modules $(JS_SOURCES)
npx eslint web_src/js webpack.config.js
npx webpack

.PHONY: fomantic
fomantic: node-check $(FOMANTIC_DEST_DIR)

$(FOMANTIC_DEST_DIR): node_modules semantic.json web_src/fomantic/theme.config.less
cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config
npx gulp -f node_modules/fomantic-ui/gulpfile.js build

.PHONY: css
css: node-check $(CSS_DEST)
css: node-check fomantic $(CSS_DEST)

$(CSS_DEST): node_modules $(CSS_SOURCES)
npx stylelint web_src/less
Expand Down
Loading

0 comments on commit 5cf241b

Please sign in to comment.