github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update aspnet-webpack-react to React 15

Browse Source 
^15.0.0 is enough

Update ReactGrid example to work with newest Griddle version

Several fixes to stop build.sh from failing
This commit is contained in:
Geir Sagberg
2016-08-12 11:42:19 +02:00
committed by SteveSandersonMS
parent 6d8767d141
commit 0ad0483935
10 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -36,3 +36,4 @@ npm-debug.log
# repo have to be excluded here. # repo have to be excluded here.
/templates/*/node_modules/ /templates/*/node_modules/
/templates/*/wwwroot/dist/ /templates/*/wwwroot/dist/
.vscode/

4
samples/react/ReactGrid/ReactApp/components/PeopleGrid.jsx
View File

@@ -5,6 +5,8 @@ import { fakeData } from '../data/fakeData.js';
import { columnMeta } from '../data/columnMeta.jsx'; import { columnMeta } from '../data/columnMeta.jsx';
const resultsPerPage = 10; const resultsPerPage = 10;
const fakeDataWithAction = fakeData.map(data => Object.assign(data, {actions: ''}));
export class PeopleGrid extends React.Component { export class PeopleGrid extends React.Component {
render() { render() {
var pageIndex = this.props.params ? (this.props.params.pageIndex || 1) - 1 : 0; var pageIndex = this.props.params ? (this.props.params.pageIndex || 1) - 1 : 0;
@@ -12,7 +14,7 @@ export class PeopleGrid extends React.Component {
<div> <div>
<h1>People</h1> <h1>People</h1>
<div id="table-area"> <div id="table-area">
<Griddle results={fakeData} <Griddle results={fakeDataWithAction}
columns={columnMeta.map(x => x.columnName)} columns={columnMeta.map(x => x.columnName)}
columnMetadata={columnMeta} columnMetadata={columnMeta}
resultsPerPage={resultsPerPage} resultsPerPage={resultsPerPage}

54
samples/react/ReactGrid/package.json
View File

@@ -2,38 +2,38 @@
"name": "ReactExample", "name": "ReactExample",
"version": "0.0.0", "version": "0.0.0",
"dependencies": { "dependencies": {
"babel-core": "^6.4.5", "babel-core": "^6.13.2",
"bootstrap": "^3.3.5", "bootstrap": "^3.3.7",
"domain-task": "^2.0.0", "domain-task": "^2.0.1",
"formsy-react": "^0.17.0", "formsy-react": "^0.18.1",
"formsy-react-components": "^0.6.3", "formsy-react-components": "^0.8.1",
"griddle-react": "^0.3.1", "griddle-react": "^0.6.1",
"history": "^1.12.6", "history": "^3.0.0",
"memory-fs": "^0.3.0", "memory-fs": "^0.3.0",
"react": "^0.14.7", "react": "^15.3.0",
"react-dom": "^0.14.7", "react-dom": "^15.3.0",
"react-router": "^2.0.0-rc5", "react-router": "^2.6.1",
"require-from-string": "^1.1.0", "require-from-string": "^1.2.0",
"underscore": "^1.8.3", "underscore": "^1.8.3",
"webpack-externals-plugin": "^1.0.0" "webpack-externals-plugin": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {
"aspnet-prerendering": "^1.0.0", "aspnet-prerendering": "^1.0.4",
"aspnet-webpack": "^1.0.3", "aspnet-webpack": "^1.0.9",
"aspnet-webpack-react": "^1.0.1", "aspnet-webpack-react": "^1.0.1",
"babel-loader": "^6.2.1", "babel-loader": "^6.2.4",
"babel-plugin-react-transform": "^2.0.0", "babel-plugin-react-transform": "^2.0.2",
"babel-preset-es2015": "^6.3.13", "babel-preset-es2015": "^6.13.2",
"babel-preset-react": "^6.3.13", "babel-preset-react": "^6.11.1",
"css-loader": "^0.21.0", "css-loader": "^0.23.1",
"express": "^4.13.4", "express": "^4.14.0",
"extract-text-webpack-plugin": "^0.8.2", "extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.4", "file-loader": "^0.9.0",
"react-transform-hmr": "^1.0.1", "react-transform-hmr": "^1.0.4",
"style-loader": "^0.13.0", "style-loader": "^0.13.1",
"url-loader": "^0.5.6", "url-loader": "^0.5.7",
"webpack": "^1.12.2", "webpack": "^1.13.1",
"webpack-dev-middleware": "^1.5.1", "webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.6.4" "webpack-hot-middleware": "^2.12.2"
} }
} }

3
src/Microsoft.AspNetCore.AngularServices/npm/package.json
View File

@@ -5,7 +5,7 @@
"main": "./dist/Exports", "main": "./dist/Exports",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "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", "typings": "dist/Exports",
"author": "Microsoft", "author": "Microsoft",
@@ -17,6 +17,7 @@
"devDependencies": { "devDependencies": {
"es6-shim": "^0.35.0", "es6-shim": "^0.35.0",
"reflect-metadata": "^0.1.2", "reflect-metadata": "^0.1.2",
"rimraf": "^2.5.4",
"systemjs-builder": "^0.14.11", "systemjs-builder": "^0.14.11",
"typescript": "^1.8.10", "typescript": "^1.8.10",
"zone.js": "^0.6.10" "zone.js": "^0.6.10"

3
src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/package.json
View File

@@ -5,12 +5,13 @@
"main": "main.js", "main": "main.js",
"typings": "main.d.ts", "typings": "main.d.ts",
"scripts": { "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" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"author": "Microsoft", "author": "Microsoft",
"license": "Apache-2.0", "license": "Apache-2.0",
"devDependencies": { "devDependencies": {
"rimraf": "^2.5.4",
"typescript": "^1.8.10" "typescript": "^1.8.10"
} }
} }

2
src/Microsoft.AspNetCore.ReactServices/npm/redux-typed/src/StrongActions.ts
View File

@@ -38,5 +38,5 @@ export interface Reducer<TState> extends Function {
} }
export interface ActionCreatorGeneric<TState> extends Function { export interface ActionCreatorGeneric<TState> extends Function {
(dispatch: Dispatch, getState: () => TState): any; (dispatch: Dispatch<TState>, getState: () => TState): any;
} }

3
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-prerendering/package.json
View File

@@ -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.", "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", "main": "index.js",
"scripts": { "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" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"author": "Microsoft", "author": "Microsoft",
@@ -14,6 +14,7 @@
"es6-promise": "^3.1.2" "es6-promise": "^3.1.2"
}, },
"devDependencies": { "devDependencies": {
"rimraf": "^2.5.4",
"typescript": "^1.8.10" "typescript": "^1.8.10"
} }
} }

5
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack-react/package.json
View File

@@ -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.", "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", "main": "index.js",
"scripts": { "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" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"author": "Microsoft", "author": "Microsoft",
@@ -15,11 +15,12 @@
"babel-plugin-react-transform": "^2.0.2", "babel-plugin-react-transform": "^2.0.2",
"babel-preset-es2015": "^6.6.0", "babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0", "babel-preset-react": "^6.5.0",
"react": "^0.14.7", "react": "^15.0.0",
"react-transform-hmr": "^1.0.4", "react-transform-hmr": "^1.0.4",
"webpack": "^1.12.14" "webpack": "^1.12.14"
}, },
"devDependencies": { "devDependencies": {
"rimraf": "^2.5.4",
"typescript": "^1.8.10" "typescript": "^1.8.10"
} }
} }

4
src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
View File

@@ -19,7 +19,7 @@
"webpack-externals-plugin": "^1.0.0" "webpack-externals-plugin": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {
"typescript": "^1.8.10", "rimraf": "^2.5.4",
"rimraf": "^2.5.2" "typescript": "^1.8.10"
} }
} }

3
src/Microsoft.AspNetCore.SpaServices/npm/domain-task/package.json
View File

@@ -4,7 +4,7 @@
"description": "Tracks outstanding operations for a logical thread of execution", "description": "Tracks outstanding operations for a logical thread of execution",
"main": "index.js", "main": "index.js",
"scripts": { "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" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"author": "Microsoft", "author": "Microsoft",
@@ -14,6 +14,7 @@
"isomorphic-fetch": "^2.2.1" "isomorphic-fetch": "^2.2.1"
}, },
"devDependencies": { "devDependencies": {
"rimraf": "^2.5.4",
"typescript": "^1.8.10" "typescript": "^1.8.10"
} }
} }