Skip to content

Commit

Permalink
Merge branch 'master' into debugger
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/Nightwatch.fs
  • Loading branch information
forki committed Feb 14, 2018
2 parents c721a15 + fbaea6c commit 76b821b
Show file tree
Hide file tree
Showing 4 changed files with 366 additions and 16 deletions.
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"build": "fable-splitter -c splitter.config.js --define RELEASE",
"start": "fable-splitter -c splitter.config.js -w --define DEBUG",
"compile-for-test": "fable-splitter -c splitter.config.js --define TEST",
"cold-start": "fable-splitter -c splitter.config.js --define DEBUG"
"cold-start": "fable-splitter -c splitter.config.js --define DEBUG",
"remotedev": "remotedev --hostname=localhost --port=8000"
},
"dependencies": {
"buffer": "5.0.8",
Expand All @@ -18,6 +19,7 @@
"devDependencies": {
"appium": "1.7.2",
"babel-core": "6.26.0",
"fable-splitter": "0.1.21"
"fable-splitter": "0.1.21",
"remotedev-server": "^0.2.4"
}
}
4 changes: 4 additions & 0 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ NUGET
Fable.Core (>= 1.2.4) - restriction: >= netstandard1.6
Fable.PowerPack (>= 1.3) - restriction: >= netstandard1.6
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
Fable.Elmish.Debugger (1.0.1)
Fable.Core (>= 1.3.1) - restriction: >= netstandard1.6
Fable.Elmish (>= 1.0) - restriction: >= netstandard1.6
FSharp.Core (>= 4.2.3) - restriction: >= netstandard1.6
Fable.Elmish.HMR (1.0)
Fable.Core (>= 1.2.4) - restriction: >= netstandard1.6
Fable.Elmish (>= 0.9.2) - restriction: >= netstandard1.6
Expand Down
2 changes: 1 addition & 1 deletion src/Nightwatch.fs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Program.mkProgram App.init App.update App.view
#if RELEASE
#else
|> Program.withConsoleTrace
|> Program.withDebugger
|> Program.withDebuggerAt (Debugger.ConnectionOptions.Remote("localhost",8000))
|> Program.withHMR
#endif
|> Program.withReactNative "nightwatch"
Expand Down
Loading

0 comments on commit 76b821b

Please sign in to comment.