Skip to content

Commit 310699b

Browse files
silverwindSorienzeripathlunnyguillep2k
authored
Patch fomantic-ui to workaround build issue (#11244)
* Patch fomantic-ui to workaround build issue Better workaround than #10653 for fomantic/Fomantic-UI#1356. It does not seem like we're getting a new Fomantic-UI release anytime soon, so this patches it after node_modules installation. Fixes: #11243 Fixes: #10679 * copy instead of patch * update package-lock.json * Update Makefile Co-Authored-By: Sorien <[email protected]> * Update web_src/fomantic/css.js Co-Authored-By: zeripath <[email protected]> Co-authored-by: Sorien <[email protected]> Co-authored-by: zeripath <[email protected]> Co-authored-by: Lunny Xiao <[email protected]> Co-authored-by: guillep2k <[email protected]>
1 parent bfda0f3 commit 310699b

File tree

5 files changed

+266
-116
lines changed

5 files changed

+266
-116
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ endif
107107

108108
GO_SOURCES_OWN := $(filter-out vendor/% %/bindata.go, $(GO_SOURCES))
109109

110-
FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables
110+
FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables web_src/fomantic/css.js
111111
FOMANTIC_DEST := public/fomantic/semantic.min.js public/fomantic/semantic.min.css
112112
FOMANTIC_DEST_DIR := public/fomantic
113113

@@ -589,7 +589,8 @@ fomantic: $(FOMANTIC_DEST)
589589
$(FOMANTIC_DEST): $(FOMANTIC_CONFIGS) package-lock.json | node_modules
590590
rm -rf $(FOMANTIC_DEST_DIR)
591591
cp web_src/fomantic/theme.config.less node_modules/fomantic-ui/src/theme.config
592-
cp web_src/fomantic/_site/globals/* node_modules/fomantic-ui/src/_site/globals/
592+
cp -r web_src/fomantic/_site/* node_modules/fomantic-ui/src/_site/
593+
cp web_src/fomantic/css.js node_modules/fomantic-ui/tasks/build/css.js
593594
npx gulp -f node_modules/fomantic-ui/gulpfile.js build
594595
@touch $(FOMANTIC_DEST)
595596

@@ -654,4 +655,4 @@ golangci-lint:
654655
golangci-lint run --timeout 5m
655656

656657
# This endif closes the if at the top of the file
657-
endif
658+
endif

package-lock.json

Lines changed: 2 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"@primer/octicons": "9.6.0",
1414
"babel-loader": "8.1.0",
1515
"clipboard": "2.0.6",
16-
"copy-webpack-plugin": "5.1.1",
1716
"core-js": "3.6.5",
1817
"css-loader": "3.5.2",
1918
"cssnano": "4.1.10",

0 commit comments

Comments
 (0)