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 0ad0483

Browse filesBrowse files
geirsagbergSteveSandersonMS
geirsagberg
authored and
SteveSandersonMS
committed
Update aspnet-webpack-react to React 15
^15.0.0 is enough Update ReactGrid example to work with newest Griddle version Several fixes to stop build.sh from failing
1 parent 6d8767d commit 0ad0483
Copy full SHA for 0ad0483

File tree

Expand file treeCollapse file tree

10 files changed

+45
-37
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

10 files changed

+45
-37
lines changed
Open diff view settings
Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ npm-debug.log
3636
# repo have to be excluded here.
3737
/templates/*/node_modules/
3838
/templates/*/wwwroot/dist/
39+
.vscode/
Collapse file

‎samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx‎

Copy file name to clipboardExpand all lines: samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ import { fakeData } from '../data/fakeData.js';
55
import { columnMeta } from '../data/columnMeta.jsx';
66
const resultsPerPage = 10;
77

8+
const fakeDataWithAction = fakeData.map(data => Object.assign(data, {actions: ''}));
9+
810
export class PeopleGrid extends React.Component {
911
render() {
1012
var pageIndex = this.props.params ? (this.props.params.pageIndex || 1) - 1 : 0;
1113
return (
1214
<div>
1315
<h1>People</h1>
1416
<div id="table-area">
15-
<Griddle results={fakeData}
17+
<Griddle results={fakeDataWithAction}
1618
columns={columnMeta.map(x => x.columnName)}
1719
columnMetadata={columnMeta}
1820
resultsPerPage={resultsPerPage}
Collapse file

‎samples/react/ReactGrid/package.json‎

Copy file name to clipboardExpand all lines: samples/react/ReactGrid/package.json
+27-27Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@
22
"name": "ReactExample",
33
"version": "0.0.0",
44
"dependencies": {
5-
"babel-core": "^6.4.5",
6-
"bootstrap": "^3.3.5",
7-
"domain-task": "^2.0.0",
8-
"formsy-react": "^0.17.0",
9-
"formsy-react-components": "^0.6.3",
10-
"griddle-react": "^0.3.1",
11-
"history": "^1.12.6",
5+
"babel-core": "^6.13.2",
6+
"bootstrap": "^3.3.7",
7+
"domain-task": "^2.0.1",
8+
"formsy-react": "^0.18.1",
9+
"formsy-react-components": "^0.8.1",
10+
"griddle-react": "^0.6.1",
11+
"history": "^3.0.0",
1212
"memory-fs": "^0.3.0",
13-
"react": "^0.14.7",
14-
"react-dom": "^0.14.7",
15-
"react-router": "^2.0.0-rc5",
16-
"require-from-string": "^1.1.0",
13+
"react": "^15.3.0",
14+
"react-dom": "^15.3.0",
15+
"react-router": "^2.6.1",
16+
"require-from-string": "^1.2.0",
1717
"underscore": "^1.8.3",
1818
"webpack-externals-plugin": "^1.0.0"
1919
},
2020
"devDependencies": {
21-
"aspnet-prerendering": "^1.0.0",
22-
"aspnet-webpack": "^1.0.3",
21+
"aspnet-prerendering": "^1.0.4",
22+
"aspnet-webpack": "^1.0.9",
2323
"aspnet-webpack-react": "^1.0.1",
24-
"babel-loader": "^6.2.1",
25-
"babel-plugin-react-transform": "^2.0.0",
26-
"babel-preset-es2015": "^6.3.13",
27-
"babel-preset-react": "^6.3.13",
28-
"css-loader": "^0.21.0",
29-
"express": "^4.13.4",
30-
"extract-text-webpack-plugin": "^0.8.2",
31-
"file-loader": "^0.8.4",
32-
"react-transform-hmr": "^1.0.1",
33-
"style-loader": "^0.13.0",
34-
"url-loader": "^0.5.6",
35-
"webpack": "^1.12.2",
36-
"webpack-dev-middleware": "^1.5.1",
37-
"webpack-hot-middleware": "^2.6.4"
24+
"babel-loader": "^6.2.4",
25+
"babel-plugin-react-transform": "^2.0.2",
26+
"babel-preset-es2015": "^6.13.2",
27+
"babel-preset-react": "^6.11.1",
28+
"css-loader": "^0.23.1",
29+
"express": "^4.14.0",
30+
"extract-text-webpack-plugin": "^1.0.1",
31+
"file-loader": "^0.9.0",
32+
"react-transform-hmr": "^1.0.4",
33+
"style-loader": "^0.13.1",
34+
"url-loader": "^0.5.7",
35+
"webpack": "^1.13.1",
36+
"webpack-dev-middleware": "^1.6.1",
37+
"webpack-hot-middleware": "^2.12.2"
3838
}
3939
}
Collapse file

‎src/Microsoft.AspNetCore.AngularServices/npm/package.json‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.AngularServices/npm/package.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "./dist/Exports",
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1",
8-
"prepublish": "tsd install && tsc && node build.js"
8+
"prepublish": "rimraf *.d.ts dist/*.d.ts && tsd install && tsc && node build.js"
99
},
1010
"typings": "dist/Exports",
1111
"author": "Microsoft",
@@ -17,6 +17,7 @@
1717
"devDependencies": {
1818
"es6-shim": "^0.35.0",
1919
"reflect-metadata": "^0.1.2",
20+
"rimraf": "^2.5.4",
2021
"systemjs-builder": "^0.14.11",
2122
"typescript": "^1.8.10",
2223
"zone.js": "^0.6.10"
Collapse file

‎src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
"main": "main.js",
66
"typings": "main.d.ts",
77
"scripts": {
8-
"prepublish": "tsd update && tsc && echo 'Finished building NPM package \"redux-typed\"'",
8+
"prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"redux-typed\"'",
99
"test": "echo \"Error: no test specified\" && exit 1"
1010
},
1111
"author": "Microsoft",
1212
"license": "Apache-2.0",
1313
"devDependencies": {
14+
"rimraf": "^2.5.4",
1415
"typescript": "^1.8.10"
1516
}
1617
}
Collapse file

‎src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ export interface Reducer<TState> extends Function {
3838
}
3939

4040
export interface ActionCreatorGeneric<TState> extends Function {
41-
(dispatch: Dispatch, getState: () => TState): any;
41+
(dispatch: Dispatch<TState>, getState: () => TState): any;
4242
}
Collapse file

‎src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
55
"main": "index.js",
66
"scripts": {
7-
"prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
7+
"prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
88
"test": "echo \"Error: no test specified\" && exit 1"
99
},
1010
"author": "Microsoft",
@@ -14,6 +14,7 @@
1414
"es6-promise": "^3.1.2"
1515
},
1616
"devDependencies": {
17+
"rimraf": "^2.5.4",
1718
"typescript": "^1.8.10"
1819
}
1920
}
Collapse file

‎src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
55
"main": "index.js",
66
"scripts": {
7-
"prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",
7+
"prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",
88
"test": "echo \"Error: no test specified\" && exit 1"
99
},
1010
"author": "Microsoft",
@@ -15,11 +15,12 @@
1515
"babel-plugin-react-transform": "^2.0.2",
1616
"babel-preset-es2015": "^6.6.0",
1717
"babel-preset-react": "^6.5.0",
18-
"react": "^0.14.7",
18+
"react": "^15.0.0",
1919
"react-transform-hmr": "^1.0.4",
2020
"webpack": "^1.12.14"
2121
},
2222
"devDependencies": {
23+
"rimraf": "^2.5.4",
2324
"typescript": "^1.8.10"
2425
}
2526
}
Collapse file

‎src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"webpack-externals-plugin": "^1.0.0"
2020
},
2121
"devDependencies": {
22-
"typescript": "^1.8.10",
23-
"rimraf": "^2.5.2"
22+
"rimraf": "^2.5.4",
23+
"typescript": "^1.8.10"
2424
}
2525
}
Collapse file

‎src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json‎

Copy file name to clipboardExpand all lines: src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Tracks outstanding operations for a logical thread of execution",
55
"main": "index.js",
66
"scripts": {
7-
"prepublish": "tsd update && tsc && echo 'Finished building NPM package \"domain-task\"'",
7+
"prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"domain-task\"'",
88
"test": "echo \"Error: no test specified\" && exit 1"
99
},
1010
"author": "Microsoft",
@@ -14,6 +14,7 @@
1414
"isomorphic-fetch": "^2.2.1"
1515
},
1616
"devDependencies": {
17+
"rimraf": "^2.5.4",
1718
"typescript": "^1.8.10"
1819
}
1920
}

0 commit comments

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