Skip to content

Commit 6a012e9

Browse files
committed
[misc] devendor fomantic-ui and rebuild upon src or config changes only
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
1 parent 9bcd49d commit 6a012e9

File tree

478 files changed

+22
-98821
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

478 files changed

+22
-98821
lines changed

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,17 @@ $(JS_DEST): node_modules $(JS_SOURCES)
464464
npx webpack
465465

466466
.PHONY: fomantic
467-
fomantic: node-check node_modules
468-
cd web_src/fomantic && npx gulp build
467+
fomantic: $(FOMANTIC_DEST_DIR)
468+
node_modules/fomantic-ui/src: node-check node_modules
469+
470+
# TODO(das7pad): replace with resolve.alias when building fomantic with webpack
471+
node_modules/fomantic-ui/src/theme.config: node_modules/fomantic-ui/src
472+
node_modules/fomantic-ui/src/theme.config: web_src/fomantic/theme.config.less
473+
ln -s ../../../$< $@
474+
475+
$(FOMANTIC_DEST_DIR): node_modules/fomantic-ui/src
476+
$(FOMANTIC_DEST_DIR): node_modules/fomantic-ui/src/theme.config
477+
npx gulp -f node_modules/fomantic-ui/gulpfile.js build
469478

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"eslint": "6.7.2",
1818
"eslint-config-airbnb-base": "14.0.0",
1919
"eslint-plugin-import": "2.18.2",
20+
"fomantic-ui": "2.8.3",
21+
"gulp": "4.0.2",
2022
"less": "3.10.3",
2123
"postcss-cli": "6.1.3",
2224
"style-loader": "1.0.1",
@@ -25,9 +27,7 @@
2527
"terser-webpack-plugin": "2.2.1",
2628
"updates": "9.3.0",
2729
"webpack": "4.41.2",
28-
"webpack-cli": "3.3.10",
29-
"fomantic-ui": "2.8.3",
30-
"gulp": "4.0.2"
30+
"webpack-cli": "3.3.10"
3131
},
3232
"browserslist": [
3333
"> 1%",

semantic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"version": "2.8.3",
3-
"base": "web_src/fomantic",
3+
"base": "node_modules/fomantic-ui",
44
"paths": {
55
"source": {
66
"config": "src/theme.config",

web_src/fomantic/gulpfile.js

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)