Skip to content

Updated the project so that it works with .NET 6 #79

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

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Updated the project so that it works with .NET 6 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
71e0f56
Set DisableInternalBinLog = true in MSBuildParams following FAKE #2748
mardukbp May 2, 2025
bbcafe7
Set contextIsolation = false. Otherwise the application does not work…
mardukbp May 2, 2025
9df7420
Created global.json in order to use .NET SDK 6
mardukbp May 2, 2025
ad72cff
- Created index.html because without it dist/.renderer-index-template…
mardukbp May 2, 2025
6aa135b
electron-webpack requires webpack 4
mardukbp May 2, 2025
28bf4b8
Updated sass-loader
mardukbp May 2, 2025
ffbe06c
Use electron-extension-installer instead of electron-devtools-install…
mardukbp May 2, 2025
f1a67fb
Do not use devtron, since it does not work
mardukbp May 2, 2025
490a686
Always use the light theme on app start, since nativeTheme cannot be …
mardukbp May 2, 2025
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
6 changes: 5 additions & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ Target.create "Clean" (fun _ ->

Target.create "DotnetRestore" (fun _ ->
DotNet.restore
(DotNet.Options.withWorkingDirectory __SOURCE_DIRECTORY__)
(DotNet.Options.withWorkingDirectory __SOURCE_DIRECTORY__
>> fun args -> {
args with
MSBuildParams = { args.MSBuildParams with DisableInternalBinLog = true }
})
"fable-elmish-electron-demo.sln"
)

Expand Down
5 changes: 5 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sdk": {
"version": "6.0.428"
}
}
10 changes: 6 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.41",
"autosuggest-highlight": "^3.1",
"electron-extension-installer": "^1.2.0",
"match-sorter": "^4.0",
"mdi-material-ui": "^6.11.0",
"react": "^16.12.0",
Expand All @@ -35,18 +36,19 @@
"devDependencies": {
"@babel/core": "^7.8.4",
"bufferutil": "^4.0",
"devtron": "^1.4",
"electron": "^22.3.25",
"electron-builder": "^24.13.3",
"electron-devtools-installer": "^2.2",
"electron-webpack": "^2.8",
"electron-window-state": "^5.0",
"fable-compiler": "^2.4.13",
"fable-loader": "^2.1",
"html-webpack-plugin": "^4.3.0",
"node-sass": "^9.0.0",
"remotedev": "^0.2",
"sass-loader": "^8.0.2",
"sass-loader": "^10",
"utf-8-validate": "^5.0",
"webpack": "^5.94.0"
"webpack": "^4",
"webpack-cli": "^3",
"webpack-dev-server": "^3"
}
}
7 changes: 3 additions & 4 deletions src/Main/DevTools.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ open Fable.Core.JsInterop
open Electron

let private installDevTools (extensionRef: obj) (forceDownload: bool) : JS.Promise<string> =
importDefault "electron-devtools-installer"
importDefault "electron-extension-installer"

let private REACT_DEVELOPER_TOOLS : obj =
import "REACT_DEVELOPER_TOOLS" "electron-devtools-installer"
import "REACT_DEVELOPER_TOOLS" "electron-extension-installer"

let private REDUX_DEVTOOLS : obj =
import "REDUX_DEVTOOLS" "electron-devtools-installer"
import "REDUX_DEVTOOLS" "electron-extension-installer"

let private installDevTool extensionRef =
promise {
Expand All @@ -24,7 +24,6 @@ let private installDevTool extensionRef =
let installAllDevTools (win: BrowserWindow) =
installDevTool REACT_DEVELOPER_TOOLS
installDevTool REDUX_DEVTOOLS
win.webContents.executeJavaScript("require('devtron').install()")

let uninstallAllDevTools (win: BrowserWindow) =
main.BrowserWindow.removeDevToolsExtension("React Developer Tools")
Expand Down
1 change: 1 addition & 0 deletions src/Main/Main.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ let createMainWindow () =
o.autoHideMenuBar <- true
o.webPreferences <- jsOptions<WebPreferences>(fun w ->
w.nodeIntegration <- true
w.contextIsolation <- false
)
o.show <- false
))
Expand Down
13 changes: 7 additions & 6 deletions src/Renderer/App.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,12 +306,13 @@ let RootView = FunctionComponent.Of((fun (model, dispatch) ->
), "RootView", memoEqualsButFunctions)

let updateSystemTheme dispatch =
let dispatchCurrentMode () =
if renderer.remote.nativeTheme.shouldUseDarkColors
then dispatch (SetSystemThemeMode Dark)
else dispatch (SetSystemThemeMode Light)
renderer.remote.nativeTheme.onUpdated(fun _ -> dispatchCurrentMode ()) |> ignore
dispatchCurrentMode ()
dispatch (SetSystemThemeMode Light)
// let dispatchCurrentMode () =
// if renderer.remote.nativeTheme.shouldUseDarkColors
// then dispatch (SetSystemThemeMode Dark)
// else dispatch (SetSystemThemeMode Light)
// renderer.remote.nativeTheme.onUpdated(fun _ -> dispatchCurrentMode ()) |> ignore
// dispatchCurrentMode ()

let init () =
let m =
Expand Down
9 changes: 9 additions & 0 deletions static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
</head>
<body>
<div id="app"></div>
</body>
</html>
8 changes: 7 additions & 1 deletion webpack.additions.renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
var path = require("path");
var HtmlWebpackPlugin = require('html-webpack-plugin');

function resolve(filePath) {
return path.join(__dirname, filePath)
}

module.exports = {
entry: [resolve("src/Renderer/Renderer.fsproj"), resolve("src/Renderer/scss/main.scss")],
entry: [resolve("src/Renderer/Renderer.fsproj"), resolve("src/Renderer/scss/main.scss"), resolve('static/index.html')],
output: {
filename: "renderer.js"
},
plugins: [
new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'static/index.html')
})
],
module: {
rules: [
{
Expand Down