Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/counter/containers/App.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {Observable} from 'rxjs';
import {AsyncPipe} from 'angular2/common';
import {Counter} from '../components/Counter';
import * as CounterActions from '../actions/CounterActions';
import {NgRedux} from '../../../src';
import {NgRedux} from 'ng2-redux';

import {RootState} from '../store/configureStore';

Expand Down
3 changes: 1 addition & 2 deletions examples/counter/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {bootstrap} from 'angular2/platform/browser';
import {App} from './containers/App';
import configureStore from './store/configureStore';
import {provider} from '../../src';
import {NgRedux} from '../../src';
import {provider} from 'ng2-redux';

const devTools = require('./devTools');
const store = configureStore();
Expand Down
16 changes: 10 additions & 6 deletions examples/counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"main": "server.js",
"scripts": {
"postinstall": "typings install",
"start": "node server.js"
"start": "webpack-dev-server -d --inline --progress --no-info --config webpack.config.js",
"dev": "webpack-dev-server -d --inline --progress --no-info --config webpack.dev.config.js"
},
"repository": {
"type": "git",
Expand All @@ -23,20 +24,23 @@
},
"homepage": "https://github.com/wbuchwalter/ng2-redux#readme",
"dependencies": {
"es6-shim": "^0.35.0",
"angular2": "2.0.0-beta.15",
"es6-shim": "0.35.0",
"ng2-redux": "^2.2.2-beta.2",
"react": "^0.14.8",
"redux": "^3.4.0",
"redux-devtools": "^2.1.0",
"redux-logger": "^2.6.1",
"redux-thunk": "^0.1.0",
"reflect-metadata": "^0.1.3",
"redux-thunk": "^2.0.1",
"reflect-metadata": "0.1.2",
"rtts_assert": "2.0.0-alpha.30",
"rxjs": "^5.0.0-beta.2",
"zone.js": "^0.6.2"
"rxjs": "^5.0.0-beta.6",
"zone.js": "^0.6.10"
},
"devDependencies": {
"babel-core": "^5.5.8",
"babel-loader": "^5.1.4",
"cross-env": "^1.0.7",
"node-libs-browser": "^0.5.2",
"ts-loader": "^0.8.1",
"typescript": "^1.8.7",
Expand Down
2 changes: 1 addition & 1 deletion examples/counter/server.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var webpack = require('webpack');
var WebpackDevServer = require('webpack-dev-server');
var config = require('./webpack.config');
var config = require('./webpack.dev.config');

new WebpackDevServer(webpack(config), {
publicPath: config.output.publicPath,
Expand Down
6 changes: 3 additions & 3 deletions examples/counter/store/configureStore.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import * as Redux from 'redux';
const {createStore, applyMiddleware, compose} = Redux;
const thunk = require('redux-thunk');
const thunk = require('redux-thunk').default;
import reducer from '../reducers/index';
const devTools = require('redux-devtools').devTools;

export interface RootState {
counter: number;
}

const finalCreateStore = <Redux.CreateStore<RootState>>compose(
const finalCreateStore = <Redux.StoreEnhancerStoreCreator<RootState>>compose(
applyMiddleware(thunk),
devTools()
)(createStore);

export default () => {
return finalCreateStore(reducer);
return finalCreateStore(reducer, {counter:0} as RootState);
}
40 changes: 19 additions & 21 deletions examples/counter/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
{
"version": "1.6.2",
"compilerOptions": {
"target": "es5",
"module": "commonjs",
"declaration": false,
"noImplicitAny": false,
"removeComments": true,
"noLib": false,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"sourceMap": true,
"listFiles": true,
"moduleResolution": "node",
"outDir": "dist"
},
"exclude": [
"node_modules",
"dist",
"typings/main",
"typings/main.d.ts"
]
"compileOnSave": false,
"buildOnSave": false,
"compilerOptions": {
"module": "commonjs",
"moduleResolution": "node",
"target": "es5",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"noImplicitAny": false,
"removeComments": false,
"sourceMap": true
},
"exclude": [
"node_modules",
"dist",
"typings/main",
"typings/main.d.ts"

]
}
7 changes: 5 additions & 2 deletions examples/counter/typings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@
"name": "counter-redux",
"version": false,
"ambientDependencies": {
"es6-shim": "registry:dt/es6-shim#0.31.2+20160215162030",
"redux-logger": "registry:dt/redux-logger#2.6.0+20160316155526"
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#4de74cb527395c13ba20b438c3a7a419ad931f1c",
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#366b936e62a6244a15f011e0ee0559b903d1dd65"
},
"dependencies": {
"redux-thunk": "registry:npm/redux-thunk#1.0.4+20160207154919"
}

}
1 change: 0 additions & 1 deletion examples/counter/vendor.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'es6-shim';
import 'angular2/bundles/angular2-polyfills'
import 'angular2/bootstrap'
import 'angular2/platform/browser'
import 'angular2/platform/common_dom'
import 'angular2/core'
Expand Down
9 changes: 3 additions & 6 deletions examples/counter/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,10 @@ module.exports = {
plugins: [
new webpack.NoErrorsPlugin()
],
resolve: {
extensions: ['', '.js', '.ts'],
fallback: __dirname + '/../../node_modules',
alias: {
angular2$: __dirname + '/../../node_modules/angular2'
}
resolve: {
extensions: ['', '.webpack.js', '.web.js', '.ts', '.js']
},

module: {
loaders: [
{ test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ },
Expand Down
1 change: 0 additions & 1 deletion examples/counter/webpack.d.ts

This file was deleted.

40 changes: 40 additions & 0 deletions examples/counter/webpack.dev.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
var path = require('path');
var webpack = require('webpack');

module.exports = {
devtool: 'source-map',
entry: [
'./vendor.ts',
'./index'
],
output: {
path: path.join(__dirname, 'dist'),
filename: 'bundle.js',
publicPath: '/static/'
},
plugins: [
new webpack.NoErrorsPlugin()
],
resolve: {
extensions: ['', '.webpack.js', '.web.js', '.ts', '.js'],
fallback: __dirname + '/../../node_modules',
root: [
__dirname + '/../../node_modules',
'node_modules'
],
alias: {
angular2$: __dirname + '/../../node_modules/angular2',
'ng2-redux$':__dirname + '/../../src'
}
},

module: {
loaders: [
{ test: /\.ts$/, loader: 'ts-loader', exclude: /node_modules/ },
{ test: /\.js$/, loader: 'babel', exclude: /node_modules/ }
]
},
noParse: [
/rtts_assert\/src\/rtts_assert/
]
};