Skip to content

Patch fomantic-ui to workaround build issue #11244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 30, 2020
Merged

Patch fomantic-ui to workaround build issue #11244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3eb8a6
Patch fomantic-ui to workaround build issue
silverwind Apr 29, 2020
8256f58
copy instead of patch
silverwind Apr 29, 2020
6cb647d
update package-lock.json
silverwind Apr 29, 2020
ca69d8e
Update Makefile
silverwind Apr 29, 2020
9e298fe
Merge branch 'master' into patch-fomantic
zeripath Apr 29, 2020
5a7d4fc
Update web_src/fomantic/css.js
silverwind Apr 29, 2020
c44ec2d
Merge branch 'master' into patch-fomantic
lunny Apr 30, 2020
06eb08e
Merge branch 'master' into patch-fomantic
guillep2k Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ endif

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

FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables
FOMANTIC_CONFIGS := semantic.json web_src/fomantic/theme.config.less web_src/fomantic/_site/globals/site.variables web_src/fomantic/css.js
FOMANTIC_DEST := public/fomantic/semantic.min.js public/fomantic/semantic.min.css
FOMANTIC_DEST_DIR := public/fomantic

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

Expand Down Expand Up @@ -654,4 +655,4 @@ golangci-lint:
golangci-lint run --timeout 5m

# This endif closes the if at the top of the file
endif
endif
109 changes: 2 additions & 107 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"@primer/octicons": "9.6.0",
"babel-loader": "8.1.0",
"clipboard": "2.0.6",
"copy-webpack-plugin": "5.1.1",
"core-js": "3.6.5",
"css-loader": "3.5.2",
"cssnano": "4.1.10",
Expand Down
Loading