Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion runs-msbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ for %%s in (
)

:notfound
echo Could not find MSBuild.exe. Make sure Visual Studio 2017 is installed and try again.
echo Could not find MSBuild.exe. Make sure Visual Studio 2019 is installed and try again.

:done
pause
4 changes: 2 additions & 2 deletions src/React.Core/JavaScriptEngineFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ protected virtual void InitialiseEngine(IJsEngine engine)
LoadUserScripts(engine);
if (!_config.LoadReact && _scriptLoadException == null)
{
// We expect to user to have loaded their own version of React in the scripts that
// were loaded above, let's ensure that's the case.
// We expect the user to have loaded their own version of React in the scripts that
// were loaded above, let's ensure that's the case.
EnsureReactLoaded(engine);
}
}
Expand Down
13 changes: 10 additions & 3 deletions src/React.Core/Resources/babel-legacy/package-lock.json

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

2 changes: 1 addition & 1 deletion src/React.Core/Resources/babel-legacy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"babel-preset-stage-0": "6.24.1",
"babel-standalone": "6.26.0",
"webpack": "4.33.0",
"webpack-cli": "3.3.2"
"webpack-cli": "3.3.3"
},
"author": "",
"license": "MIT"
Expand Down
13 changes: 10 additions & 3 deletions src/React.Core/package-lock.json

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

2 changes: 1 addition & 1 deletion src/React.Core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"react": "16.8.6",
"react-dom": "16.8.6",
"webpack": "4.33.0",
"webpack-cli": "3.3.2"
"webpack-cli": "3.3.3"
}
}
4 changes: 3 additions & 1 deletion src/React.Router/ReactRouterFunctions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ public class ReactRouterFunctions : RenderFunctionsBase
{
/// <summary>
/// The returned react router context, as a JSON string
/// A default value wards off deserialization exceptions
/// when server side rendering is disabled
/// </summary>
public string ReactRouterContext { get; private set; }
public string ReactRouterContext { get; private set; } = "{}";

/// <summary>
/// Implementation of PreRender
Expand Down
2 changes: 1 addition & 1 deletion src/React.Sample.Webpack.CoreMvc/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@Html.ReactRouter("RootComponent", new { initialComments = Model.Comments, page = Model.Page }, renderFunctions: chainedFunctions)
@{
ViewBag.ServerStyles = styledComponentsFunctions.RenderedStyles + reactJssFunctions.RenderedStyles;
ViewBag.HelmetTitle = helmetFunctions.RenderedHelmet.GetValueOrDefault("title");
ViewBag.HelmetTitle = helmetFunctions.RenderedHelmet?.GetValueOrDefault("title");
}
<script src="/dist/runtime.js"></script>
<script src="/dist/vendor.js"></script>
Expand Down
13 changes: 10 additions & 3 deletions src/React.Sample.Webpack.CoreMvc/package-lock.json

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

2 changes: 1 addition & 1 deletion src/React.Sample.Webpack.CoreMvc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
"babel-loader": "8.0.5",
"babel-runtime": "6.26.0",
"webpack": "4.33.0",
"webpack-cli": "3.3.2"
"webpack-cli": "3.3.3"
}
}