Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 58bf117

Browse filesBrowse files
SteveSandersonMSSteveSandersonMS
committed
Update templates to domain-task 2.0.0. Fixes aspnet#166.
1 parent fc89747 commit 58bf117
Copy full SHA for 58bf117

File tree

Expand file treeCollapse file tree

9 files changed

+19
-14
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

9 files changed

+19
-14
lines changed
Open diff view settings
Collapse file

‎samples/react/MusicStore/ReactApp/store/AlbumDetails.ts‎

Copy file name to clipboardExpand all lines: samples/react/MusicStore/ReactApp/store/AlbumDetails.ts
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fetch } from 'domain-task/fetch';
1+
import { fetch, addTask } from 'domain-task';
22
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
33
import { ActionCreator } from './';
44
import { Genre } from './GenreList';
@@ -51,7 +51,7 @@ export const actionCreators = {
5151
requestAlbumDetails: (albumId: number): ActionCreator => (dispatch, getState) => {
5252
// Only load if it's not already loaded (or currently being loaded)
5353
if (albumId !== getState().albumDetails.requestedAlbumId) {
54-
fetch(`/api/albums/${ albumId }`)
54+
let fetchTask = fetch(`/api/albums/${ albumId }`)
5555
.then(results => results.json())
5656
.then(album => {
5757
// Only replace state if it's still the most recent request
@@ -60,6 +60,7 @@ export const actionCreators = {
6060
}
6161
});
6262

63+
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
6364
dispatch(new RequestAlbumDetails(albumId));
6465
}
6566
}
Collapse file

‎samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts‎

Copy file name to clipboardExpand all lines: samples/react/MusicStore/ReactApp/store/FeaturedAlbums.ts
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fetch } from 'domain-task/fetch';
1+
import { fetch, addTask } from 'domain-task';
22
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
33
import { ActionCreator } from './';
44

@@ -39,10 +39,11 @@ class ReceiveFeaturedAlbums extends Action {
3939
export const actionCreators = {
4040
requestFeaturedAlbums: (): ActionCreator => (dispatch, getState) => {
4141
if (!getState().featuredAlbums.isLoaded) {
42-
fetch('/api/albums/mostPopular')
42+
let fetchTask = fetch('/api/albums/mostPopular')
4343
.then(results => results.json())
4444
.then(albums => dispatch(new ReceiveFeaturedAlbums(albums)));
4545

46+
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
4647
return dispatch(new RequestFeaturedAlbums());
4748
}
4849
}
Collapse file

‎samples/react/MusicStore/ReactApp/store/GenreDetails.ts‎

Copy file name to clipboardExpand all lines: samples/react/MusicStore/ReactApp/store/GenreDetails.ts
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fetch } from 'domain-task/fetch';
1+
import { fetch, addTask } from 'domain-task';
22
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
33
import { ActionCreator } from './';
44
import { Album } from './FeaturedAlbums';
@@ -39,7 +39,7 @@ export const actionCreators = {
3939
requestGenreDetails: (genreId: number): ActionCreator => (dispatch, getState) => {
4040
// Only load if it's not already loaded (or currently being loaded)
4141
if (genreId !== getState().genreDetails.requestedGenreId) {
42-
fetch(`/api/genres/${ genreId }/albums`)
42+
let fetchTask = fetch(`/api/genres/${ genreId }/albums`)
4343
.then(results => results.json())
4444
.then(albums => {
4545
// Only replace state if it's still the most recent request
@@ -48,6 +48,7 @@ export const actionCreators = {
4848
}
4949
});
5050

51+
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
5152
dispatch(new RequestGenreDetails(genreId));
5253
}
5354
}
Collapse file

‎samples/react/MusicStore/ReactApp/store/GenreList.ts‎

Copy file name to clipboardExpand all lines: samples/react/MusicStore/ReactApp/store/GenreList.ts
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fetch } from 'domain-task/fetch';
1+
import { fetch, addTask } from 'domain-task';
22
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
33
import { ActionCreator } from './';
44

@@ -34,9 +34,10 @@ class ReceiveGenresList extends Action {
3434
export const actionCreators = {
3535
requestGenresList: (): ActionCreator => (dispatch, getState) => {
3636
if (!getState().genreList.isLoaded) {
37-
fetch('/api/genres')
37+
let fetchTask = fetch('/api/genres')
3838
.then(results => results.json())
3939
.then(genres => dispatch(new ReceiveGenresList(genres)));
40+
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
4041
}
4142
}
4243
};
Collapse file

‎samples/react/MusicStore/package.json‎

Copy file name to clipboardExpand all lines: samples/react/MusicStore/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"aspnet-webpack-react": "^1.0.1",
2626
"bootstrap": "^3.3.6",
2727
"domain-context": "^0.5.1",
28-
"domain-task": "^1.0.0",
28+
"domain-task": "^2.0.0",
2929
"history": "^2.0.0",
3030
"isomorphic-fetch": "^2.2.1",
3131
"memory-fs": "^0.3.0",
Collapse file

‎samples/react/ReactGrid/package.json‎

Copy file name to clipboardExpand all lines: samples/react/ReactGrid/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dependencies": {
55
"babel-core": "^6.4.5",
66
"bootstrap": "^3.3.5",
7-
"domain-task": "^1.0.0",
7+
"domain-task": "^2.0.0",
88
"formsy-react": "^0.17.0",
99
"formsy-react-components": "^0.6.3",
1010
"griddle-react": "^0.3.1",
Collapse file

‎templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts‎

Copy file name to clipboardExpand all lines: templates/ReactReduxSpa/ClientApp/store/WeatherForecasts.ts
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fetch } from 'domain-task/fetch';
1+
import { fetch, addTask } from 'domain-task';
22
import { typeName, isActionType, Action, Reducer } from 'redux-typed';
33
import { ActionCreator } from './';
44

@@ -45,12 +45,13 @@ export const actionCreators = {
4545
requestWeatherForecasts: (startDateIndex: number): ActionCreator => (dispatch, getState) => {
4646
// Only load data if it's something we don't already have (and are not already loading)
4747
if (startDateIndex !== getState().weatherForecasts.startDateIndex) {
48-
fetch(`/api/SampleData/WeatherForecasts?startDateIndex=${ startDateIndex }`)
48+
let fetchTask = fetch(`/api/SampleData/WeatherForecasts?startDateIndex=${ startDateIndex }`)
4949
.then(response => response.json())
5050
.then((data: WeatherForecast[]) => {
5151
dispatch(new ReceiveWeatherForecasts(startDateIndex, data));
5252
});
5353

54+
addTask(fetchTask); // Ensure server-side prerendering waits for this to complete
5455
dispatch(new RequestWeatherForecasts(startDateIndex));
5556
}
5657
}
Collapse file

‎templates/ReactReduxSpa/package.json‎

Copy file name to clipboardExpand all lines: templates/ReactReduxSpa/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"aspnet-prerendering": "^1.0.2",
2424
"aspnet-webpack": "^1.0.2",
2525
"babel-core": "^6.5.2",
26-
"domain-task": "^1.0.0",
26+
"domain-task": "^2.0.0",
2727
"react": "^15.0.1",
2828
"react-dom": "^15.0.1",
2929
"react-redux": "^4.4.4",
Collapse file

‎templates/yeoman/src/generator/package.json‎

Copy file name to clipboardExpand all lines: templates/yeoman/src/generator/package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-aspnetcore-spa",
3-
"version": "0.2.1",
3+
"version": "0.2.2",
44
"description": "Single-Page App templates for ASP.NET Core",
55
"author": "Microsoft",
66
"license": "Apache-2.0",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.