diff --git a/.gitignore b/.gitignore
index 62ebab8f..06cc11a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ npm-debug.log
# repo have to be excluded here.
/templates/*/node_modules/
/templates/*/wwwroot/dist/
+.vscode/
diff --git a/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx b/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx
index a9dbec1c..e3cd3fcf 100644
--- a/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx
+++ b/samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx
@@ -5,6 +5,8 @@ import { fakeData } from '../data/fakeData.js';
import { columnMeta } from '../data/columnMeta.jsx';
const resultsPerPage = 10;
+const fakeDataWithAction = fakeData.map(data => Object.assign(data, {actions: ''}));
+
export class PeopleGrid extends React.Component {
render() {
var pageIndex = this.props.params ? (this.props.params.pageIndex || 1) - 1 : 0;
@@ -12,7 +14,7 @@ export class PeopleGrid extends React.Component {
People
- x.columnName)}
columnMetadata={columnMeta}
resultsPerPage={resultsPerPage}
diff --git a/samples/react/ReactGrid/package.json b/samples/react/ReactGrid/package.json
index 123cc473..9329a550 100644
--- a/samples/react/ReactGrid/package.json
+++ b/samples/react/ReactGrid/package.json
@@ -2,38 +2,38 @@
"name": "ReactExample",
"version": "0.0.0",
"dependencies": {
- "babel-core": "^6.4.5",
- "bootstrap": "^3.3.5",
- "domain-task": "^2.0.0",
- "formsy-react": "^0.17.0",
- "formsy-react-components": "^0.6.3",
- "griddle-react": "^0.3.1",
- "history": "^1.12.6",
+ "babel-core": "^6.13.2",
+ "bootstrap": "^3.3.7",
+ "domain-task": "^2.0.1",
+ "formsy-react": "^0.18.1",
+ "formsy-react-components": "^0.8.1",
+ "griddle-react": "^0.6.1",
+ "history": "^3.0.0",
"memory-fs": "^0.3.0",
- "react": "^0.14.7",
- "react-dom": "^0.14.7",
- "react-router": "^2.0.0-rc5",
- "require-from-string": "^1.1.0",
+ "react": "^15.3.0",
+ "react-dom": "^15.3.0",
+ "react-router": "^2.6.1",
+ "require-from-string": "^1.2.0",
"underscore": "^1.8.3",
"webpack-externals-plugin": "^1.0.0"
},
"devDependencies": {
- "aspnet-prerendering": "^1.0.0",
- "aspnet-webpack": "^1.0.3",
+ "aspnet-prerendering": "^1.0.4",
+ "aspnet-webpack": "^1.0.9",
"aspnet-webpack-react": "^1.0.1",
- "babel-loader": "^6.2.1",
- "babel-plugin-react-transform": "^2.0.0",
- "babel-preset-es2015": "^6.3.13",
- "babel-preset-react": "^6.3.13",
- "css-loader": "^0.21.0",
- "express": "^4.13.4",
- "extract-text-webpack-plugin": "^0.8.2",
- "file-loader": "^0.8.4",
- "react-transform-hmr": "^1.0.1",
- "style-loader": "^0.13.0",
- "url-loader": "^0.5.6",
- "webpack": "^1.12.2",
- "webpack-dev-middleware": "^1.5.1",
- "webpack-hot-middleware": "^2.6.4"
+ "babel-loader": "^6.2.4",
+ "babel-plugin-react-transform": "^2.0.2",
+ "babel-preset-es2015": "^6.13.2",
+ "babel-preset-react": "^6.11.1",
+ "css-loader": "^0.23.1",
+ "express": "^4.14.0",
+ "extract-text-webpack-plugin": "^1.0.1",
+ "file-loader": "^0.9.0",
+ "react-transform-hmr": "^1.0.4",
+ "style-loader": "^0.13.1",
+ "url-loader": "^0.5.7",
+ "webpack": "^1.13.1",
+ "webpack-dev-middleware": "^1.6.1",
+ "webpack-hot-middleware": "^2.12.2"
}
}
diff --git a/src/Microsoft.AspNetCore.AngularServices/npm/package.json b/src/Microsoft.AspNetCore.AngularServices/npm/package.json
index 8f7c19ed..10c3f776 100644
--- a/src/Microsoft.AspNetCore.AngularServices/npm/package.json
+++ b/src/Microsoft.AspNetCore.AngularServices/npm/package.json
@@ -5,7 +5,7 @@
"main": "./dist/Exports",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
- "prepublish": "tsd install && tsc && node build.js"
+ "prepublish": "rimraf *.d.ts dist/*.d.ts && tsd install && tsc && node build.js"
},
"typings": "dist/Exports",
"author": "Microsoft",
@@ -17,6 +17,7 @@
"devDependencies": {
"es6-shim": "^0.35.0",
"reflect-metadata": "^0.1.2",
+ "rimraf": "^2.5.4",
"systemjs-builder": "^0.14.11",
"typescript": "^1.8.10",
"zone.js": "^0.6.10"
diff --git a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
index 1baee3ac..b7962420 100644
--- a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
+++ b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
@@ -5,12 +5,13 @@
"main": "main.js",
"typings": "main.d.ts",
"scripts": {
- "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"redux-typed\"'",
+ "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"redux-typed\"'",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Microsoft",
"license": "Apache-2.0",
"devDependencies": {
+ "rimraf": "^2.5.4",
"typescript": "^1.8.10"
}
}
diff --git a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts
index 55893bf7..f14c9121 100644
--- a/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts
+++ b/src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts
@@ -38,5 +38,5 @@ export interface Reducer extends Function {
}
export interface ActionCreatorGeneric extends Function {
- (dispatch: Dispatch, getState: () => TState): any;
+ (dispatch: Dispatch, getState: () => TState): any;
}
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
index 11bd4ecb..156a6f1e 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
@@ -4,7 +4,7 @@
"description": "Helpers for server-side rendering of JavaScript applications in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
"main": "index.js",
"scripts": {
- "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
+ "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-prerendering\"'",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Microsoft",
@@ -14,6 +14,7 @@
"es6-promise": "^3.1.2"
},
"devDependencies": {
+ "rimraf": "^2.5.4",
"typescript": "^1.8.10"
}
}
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
index 419c0586..3b9fd5e2 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
@@ -4,7 +4,7 @@
"description": "Helpers for using Webpack with React in ASP.NET Core projects. Works in conjunction with the Microsoft.AspNetCore.SpaServices NuGet package.",
"main": "index.js",
"scripts": {
- "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",
+ "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"aspnet-webpack-react\"'",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Microsoft",
@@ -15,11 +15,12 @@
"babel-plugin-react-transform": "^2.0.2",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
- "react": "^0.14.7",
+ "react": "^15.0.0",
"react-transform-hmr": "^1.0.4",
"webpack": "^1.12.14"
},
"devDependencies": {
+ "rimraf": "^2.5.4",
"typescript": "^1.8.10"
}
}
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
index 8980b92f..327d65d5 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
@@ -19,7 +19,7 @@
"webpack-externals-plugin": "^1.0.0"
},
"devDependencies": {
- "typescript": "^1.8.10",
- "rimraf": "^2.5.2"
+ "rimraf": "^2.5.4",
+ "typescript": "^1.8.10"
}
}
diff --git a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
index 0bceb713..a55fcd81 100644
--- a/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
+++ b/src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
@@ -4,7 +4,7 @@
"description": "Tracks outstanding operations for a logical thread of execution",
"main": "index.js",
"scripts": {
- "prepublish": "tsd update && tsc && echo 'Finished building NPM package \"domain-task\"'",
+ "prepublish": "rimraf *.d.ts && tsd update && tsc && echo 'Finished building NPM package \"domain-task\"'",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Microsoft",
@@ -14,6 +14,7 @@
"isomorphic-fetch": "^2.2.1"
},
"devDependencies": {
+ "rimraf": "^2.5.4",
"typescript": "^1.8.10"
}
}