Skip to content

Commit 312f015

Browse files
committed
Merge branch 'master' into debugger
# Conflicts: # src/Nightwatch.fs
2 parents c721a15 + fbaea6c commit 312f015

File tree

4 files changed

+366
-16
lines changed

4 files changed

+366
-16
lines changed

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"build": "fable-splitter -c splitter.config.js --define RELEASE",
77
"start": "fable-splitter -c splitter.config.js -w --define DEBUG",
88
"compile-for-test": "fable-splitter -c splitter.config.js --define TEST",
9-
"cold-start": "fable-splitter -c splitter.config.js --define DEBUG"
9+
"cold-start": "fable-splitter -c splitter.config.js --define DEBUG",
10+
"remotedev": "remotedev --hostname=localhost --port=8000"
1011
},
1112
"dependencies": {
1213
"buffer": "5.0.8",
@@ -18,6 +19,7 @@
1819
"devDependencies": {
1920
"appium": "1.7.2",
2021
"babel-core": "6.26.0",
21-
"fable-splitter": "0.1.21"
22+
"fable-splitter": "0.1.21",
23+
"remotedev-server": "^0.2.4"
2224
}
2325
}

paket.lock

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ NUGET
2323
Fable.Core (>= 1.2.4) - restriction: >= netstandard1.6
2424
Fable.PowerPack (>= 1.3) - restriction: >= netstandard1.6
2525
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
26+
Fable.Elmish.Debugger (1.0.1)
27+
Fable.Core (>= 1.3.1) - restriction: >= netstandard1.6
28+
Fable.Elmish (>= 1.0) - restriction: >= netstandard1.6
29+
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
2630
Fable.Elmish.HMR (1.0)
2731
Fable.Core (>= 1.2.4) - restriction: >= netstandard1.6
2832
Fable.Elmish (>= 0.9.2) - restriction: >= netstandard1.6

src/Nightwatch.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Program.mkProgram App.init App.update App.view
2424
#if RELEASE
2525
#else
2626
|> Program.withConsoleTrace
27-
|> Program.withDebugger
27+
|> Program.withDebuggerAt (Remote("localhost",8000))
2828
|> Program.withHMR
2929
#endif
3030
|> Program.withReactNative "nightwatch"

0 commit comments

Comments
 (0)