Skip to content

Commit

Permalink
[misc] devendor fomantic-ui and rebuild upon src or config changes only
Browse files Browse the repository at this point in the history
Signed-off-by: Jakob Ackermann <[email protected]>
  • Loading branch information
das7pad committed Jan 6, 2020
1 parent 9bcd49d commit 6a012e9
Show file tree
Hide file tree
Showing 478 changed files with 22 additions and 98,821 deletions.
13 changes: 11 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,17 @@ $(JS_DEST): node_modules $(JS_SOURCES)
npx webpack

.PHONY: fomantic
fomantic: node-check node_modules
cd web_src/fomantic && npx gulp build
fomantic: $(FOMANTIC_DEST_DIR)
node_modules/fomantic-ui/src: node-check node_modules

# TODO(das7pad): replace with resolve.alias when building fomantic with webpack
node_modules/fomantic-ui/src/theme.config: node_modules/fomantic-ui/src
node_modules/fomantic-ui/src/theme.config: web_src/fomantic/theme.config.less
ln -s ../../../$< $@

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

.PHONY: css
css: node-check fomantic $(CSS_DEST)
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
"eslint": "6.7.2",
"eslint-config-airbnb-base": "14.0.0",
"eslint-plugin-import": "2.18.2",
"fomantic-ui": "2.8.3",
"gulp": "4.0.2",
"less": "3.10.3",
"postcss-cli": "6.1.3",
"style-loader": "1.0.1",
Expand All @@ -25,9 +27,7 @@
"terser-webpack-plugin": "2.2.1",
"updates": "9.3.0",
"webpack": "4.41.2",
"webpack-cli": "3.3.10",
"fomantic-ui": "2.8.3",
"gulp": "4.0.2"
"webpack-cli": "3.3.10"
},
"browserslist": [
"> 1%",
Expand Down
2 changes: 1 addition & 1 deletion semantic.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2.8.3",
"base": "web_src/fomantic",
"base": "node_modules/fomantic-ui",
"paths": {
"source": {
"config": "src/theme.config",
Expand Down
34 changes: 0 additions & 34 deletions web_src/fomantic/gulpfile.js

This file was deleted.

Loading

0 comments on commit 6a012e9

Please sign in to comment.