Skip to content
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

Jump to bottom

Safeupdate - Fix CSS #18

Merged
merged 15 commits into from
Oct 14, 2020
Merged

Safeupdate - Fix CSS #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2e661d8
make it build
brase Jun 3, 2020
129c465
shows date in title
brase Jun 3, 2020
409b431
Merge branch 'master' of github.com:murocast/castos
brase Jun 4, 2020
ceebe7b
better date format
brase Jun 4, 2020
ed79e5a
tools update
brase Jun 18, 2020
6f45fbc
paket update
brase Jun 18, 2020
ae8d420
logging smapi method as debug
brase Jun 22, 2020
9bbed9c
update steps safe2
brase Oct 14, 2020
efee62c
npm update
brase Oct 14, 2020
cc1f89b
Merge branch 'master' into safeupdate
brase Oct 14, 2020
01bbddb
updated github actions
brase Oct 14, 2020
36abf89
removed comments
brase Oct 14, 2020
640824a
default is bundle
brase Oct 14, 2020
ef72646
enabled css bundling and added missing dependencies
brase Oct 14, 2020
8913926
Merge branch 'master' of github.com:murocast/castos into safeupdate
brase Oct 14, 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
18 changes: 18 additions & 0 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.

3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"@babel/plugin-transform-runtime": "^7.11.5",
"@babel/preset-env": "^7.11.5",
"@babel/runtime": "^7.11.2",
"@fortawesome/fontawesome-free": "^5.10.2",
"open-sans-fonts": "^1.5.1",
"babel-loader": "^8.0.5",
"bulma": "^0.7.1",
"copy-webpack-plugin": "^6.2.1",
"core-js": "^3.3.2",
"css-loader": "^4.3.0",
Expand Down
8 changes: 6 additions & 2 deletions webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ var CONFIG = {
// See https://github.com/jantimon/html-webpack-plugin
indexHtmlTemplate: './src/Client/index.html',
fsharpEntry: './src/Client/Client.fsproj',
cssEntry: './src/Client/style.scss',
outputDir: './deploy/public',
assetsDir: './src/Client/public',
devServerPort: 8080,
Expand Down Expand Up @@ -68,8 +69,11 @@ module.exports = {
// have a faster HMR support. In production bundle styles together
// with the code because the MiniCssExtractPlugin will extract the
// CSS in a separate files.
entry: {
app: resolve(CONFIG.fsharpEntry)
entry: isProduction ? {
app: [resolve(CONFIG.fsharpEntry), resolve(CONFIG.cssEntry)]
} : {
app: resolve(CONFIG.fsharpEntry),
style: resolve(CONFIG.cssEntry)
},
// Add a hash to the output file name in production
// to prevent browser caching if code changes
Expand Down