Skip to content

Commit 14b7232

Browse files
Merge pull request #142 from TimeWarpEngineering/Cramer-2019-05-15
Preview 6 update
2 parents 694229b + 3f27a57 commit 14b7232

56 files changed

Lines changed: 488 additions & 328 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Directory.Build.props

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828

2929
<!--Versions of packages used across the solution-->
3030
<PropertyGroup Label="Package Versions">
31-
<BlazorPreviewVersion>preview5-19227-01</BlazorPreviewVersion>
32-
<MicrosoftAspNetCoreVersion>3.0.0-preview5-19227-01</MicrosoftAspNetCoreVersion>
31+
<BlazorPreviewVersion>preview6.19307.2</BlazorPreviewVersion>
32+
<MicrosoftAspNetCoreVersion>3.0.0-preview6.19307.2</MicrosoftAspNetCoreVersion>
3333
<MicrosoftAspNetCoreBlazorVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftAspNetCoreBlazorVersion>
3434
<MicrosoftAspNetCoreComponentsBrowserVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftAspNetCoreComponentsBrowserVersion>
3535
<MicrosoftAspNetCoreMvcNewtonsoftJsonVersion>$(MicrosoftAspNetCoreBlazorVersion)</MicrosoftAspNetCoreMvcNewtonsoftJsonVersion>
3636
<MicrosoftAspNetCoreTestHostVersion>$(MicrosoftAspNetCoreVersion)</MicrosoftAspNetCoreTestHostVersion>
37-
<MicrosoftExtensionsFileProvidersEmbeddedVersion>3.0.0-preview5.19227.9</MicrosoftExtensionsFileProvidersEmbeddedVersion>
38-
<MicrosoftExtensionsLoggingAbstractionsVersion>3.0.0-preview5.19227.9</MicrosoftExtensionsLoggingAbstractionsVersion>
39-
<MicrosoftSourceLinkGitHubVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkGitHubVersion>
37+
<MicrosoftExtensionsFileProvidersEmbeddedVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsFileProvidersEmbeddedVersion>
38+
<MicrosoftExtensionsLoggingAbstractionsVersion>3.0.0-preview6.19304.6</MicrosoftExtensionsLoggingAbstractionsVersion>
39+
<MicrosoftSourceLinkGitHubVersion>1.0.0-beta2-19270-01</MicrosoftSourceLinkGitHubVersion>
4040

41-
<AnyCloneVersion>1.0.31</AnyCloneVersion>
41+
<AnyCloneVersion>1.0.34</AnyCloneVersion>
4242
<BlazorExtensionsLoggingVersion>0.1.11</BlazorExtensionsLoggingVersion>
4343
<FixieVersion>2.0.4</FixieVersion>
4444
<FixieConsoleVersion>2.0.4</FixieConsoleVersion>
@@ -49,8 +49,7 @@
4949
<SeleniumSupportVersion>3.141.0</SeleniumSupportVersion>
5050
<SeleniumWebDriverVersion>3.141.0</SeleniumWebDriverVersion>
5151
<ShouldlyVersion>3.0.2</ShouldlyVersion>
52-
<TypeSupportVersion>1.0.73</TypeSupportVersion>
53-
52+
<TypeSupportVersion>1.0.91-TimeWarp-2019-06-25</TypeSupportVersion>
5453
</PropertyGroup>
5554

5655
<!--This is to add the SHA for the commit to your assembly InformationalVersion -->

Documentation/Api/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
###############
2+
# temp file #
3+
###############
4+
*.yml
5+
.manifest

Documentation/Backlog/Done.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
- [x] Update RouteManager to subscribe to Route Change and update the URL if not already there.
1+
- [x] Update RouteManager to subscribe to Route Change and update the URL if not already there.
2+
- [x] Search with powergrep for "<LangVersion>"
3+
if blazor-state\Directory.Build.props has `<LangVersion>preview</LangVersion>` then do we need it in all the others?
4+
- [x] Extract common items to Directory.Build.props
5+
- [x] ReduxDevToolsBehavoir uses the pipeline but we probably don't care to log those interaction.
6+
So Maybe we should add a Filter to ignore logging some request IReduxAction marker or something?
7+
- [x] Move ReduxDevToolsBehavoir to top of pipeline.
8+
So when doing time travel we can disable actions from actually being executed.
9+
- [x] Move JavaScriptInterop Folder out of Behaviors (It isn't a behavior) although ReduxDevTools depends on it.
10+
This will let dev tools go back to pages.

Documentation/Backlog/Rejected.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- [ ] Implement DevTools Handlers (Currently only Jump works)
2+
See the MobX example for how to implement more ReduxDevTools functionality
3+
https://github.com/zalmoxisus/mobx-remotedev/blob/master/src/monitorActions.js
4+
> I have changed my mind. The fancy stuff in ReduxDevTools I don't really use and is not high ROI

Documentation/Backlog/Todo.md

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,13 @@
1-
- [ ] Move ReduxDevToolsBehavoir to top of pipeline.
2-
So when doing time travel we can disable actions from actually being executed.
3-
4-
- [ ] Move JavaScriptInterop Folder out of Behaviors (It isn't a behavior) although ReduxDevTools depends on it.
5-
6-
This will let dev tools go back to pages.
7-
8-
- [ ] Implement DevTools Handlers (Currently only Jump works)
9-
See the MobX example for how to implement more ReduxDevTools functionality
10-
https://github.com/zalmoxisus/mobx-remotedev/blob/master/src/monitorActions.js
11-
121
- [ ] Improve usefulness of ILogger.
132
- [ ] Document all public interfaces
143
- [ ] Check visibility on classes props etc... private public internal etc..
154
- [ ] Convert js to ts. See Blazor package for example and Logging.
165
- [ ] Consider splitting Packages for DevTools as production we will not want to deploy that.Blazor-State-ReduxDevTools
176
- [ ] Review TODOs in source
18-
- [ ] Update Samples to latest templates
19-
- [ ] Extract common items to Directory.Build.props
20-
- [ ] ReduxDevToolsBehavoir uses the pipeline but we probably don't care to log those interaction.
21-
So Maybe we should add a Filter to ignore logging some request IReduxAction marker or something?
7+
- [ ] Update Samples to latest templates (Samples have been removed the template is the sample)
8+
229
- [ ] CodeMaid Clean all before publish ()
2310

24-
- [ ] Update Source link to the now .net foundation version. https://github.com/dotnet/sourcelink/
11+
- [ ] Update Source link to the new .net foundation version. https://github.com/dotnet/sourcelink/
2512

2613
- [ ] Add documentation on installing Selenium java and chromedriver.exe etc.
27-
- [ ] Search with powergrep for "<LangVersion>"
28-
if blazor-state\Directory.Build.props has `<LangVersion>latest</LangVersion>` then do we need it in all the others?
29-
30-
- [ ] Automate deployment to MyGet of template nuget.
31-
- [ ] Add vsts vsts.ci.yaml into the template project.
32-
- [ ] Update global.json to latest
33-
- [ ] Add DualMode.js to the template.
34-
- [ ] Write Console App that updates the version for all of Blazor-State
35-
I think changes in like 4 or 5 places.
36-
37-
38-
- [ ] Create Pull Request template to show what each pull request should have. Investigate if I can get AzureDevOps to default to that template.
39-
- [ ] Add Javascript project to the template.

ReleaseNotes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Release Notes

source/BlazorState.Js/src/Initialize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function Initialize() {
1818
console.log("Initialize BlazorState");
1919
if (typeof window !== 'undefined' && !window[BlazorStateName]) {
2020
window[BlazorStateName] = new BlazorState();
21-
window[ReduxDevToolsFactoryName] = ReduxDevToolsFactory;
2221
window[InitializeJavaScriptInteropName] = InitializeJavaScriptInterop;
22+
window[ReduxDevToolsFactoryName] = ReduxDevToolsFactory;
2323
}
2424
}
2525

source/BlazorState.Js/src/ReduxDevTools.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class ReduxDevTools {
1818
persist: false, // persist states on page reloading
1919
export: false, // export history of actions in a file
2020
import: false, // import history of actions from a file
21-
jump: true, // jump back and forth (time traveling)
21+
jump: false, // jump back and forth (time traveling)
2222
skip: false, // skip (cancel) actions
2323
reorder: false, // drag and drop actions in the history list
2424
dispatch: false, // dispatch custom actions or action creators
@@ -59,19 +59,19 @@ export class ReduxDevTools {
5959
var dispatchRequests = {
6060
'COMMIT': undefined,
6161
'IMPORT_STATE': undefined,
62-
'JUMP_TO_ACTION': 'BlazorState.Pipeline.ReduxDevTools.Features.JumpToState.JumpToStateRequest',
63-
'JUMP_TO_STATE': 'BlazorState.Pipeline.ReduxDevTools.Features.JumpToState.JumpToStateRequest',
62+
'JUMP_TO_ACTION': 'BlazorState.Pipeline.ReduxDevTools.JumpToStateRequest',
63+
'JUMP_TO_STATE': 'BlazorState.Pipeline.ReduxDevTools.JumpToStateRequest',
6464
'RESET': undefined,
6565
'ROLLBACK': undefined,
6666
'TOGGLE_ACTION': undefined
6767
};
6868
var blazorRequestType;
6969
switch (message.type) {
7070
case 'START':
71-
blazorRequestType = 'BlazorState.Pipeline.ReduxDevTools.Features.Start.StartRequest';
71+
blazorRequestType = 'BlazorState.Pipeline.ReduxDevTools.StartRequest';
7272
break;
7373
case 'STOP':
74-
//blazorRequestType = 'BlazorState.Pipeline.ReduxDevTools.Features.Stop.StopRequest';
74+
//blazorRequestType = 'BlazorState.Pipeline.ReduxDevTools.StopRequest';
7575
break;
7676
case 'DISPATCH':
7777
blazorRequestType = dispatchRequests[message.payload.type];

source/BlazorState/BlazorState.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
99
https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
1010
</RestoreAdditionalProjectSources>
11+
<RestoreAdditionalProjectSources>
12+
https://www.myget.org/F/timewarp-enterprises/api/v3/index.json;
13+
</RestoreAdditionalProjectSources>
1114
<RazorLangVersion>3.0</RazorLangVersion>
1215
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
1316
</PropertyGroup>

source/BlazorState/Components/BlazorStateComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public BlazorStateComponent()
4545
/// <summary>
4646
/// Exposes StateHasChanged
4747
/// </summary>
48-
public void ReRender() => StateHasChanged();
48+
public void ReRender() => base.Invoke(StateHasChanged);
4949

5050
/// <summary>
5151
/// Place a Subscription for the calling component

0 commit comments

Comments
 (0)