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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
dist
node_modules
typings
*.swp
npm-debug.log
src/**/*.js
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ <h1>Counter Demo</h1>
...and <a href="javascript:window.location.reload()">refresh</a> this page!
</div>
</div>
<script src="node_modules/react/dist/react.js"></script>
<script src="node_modules/react-dom/dist/react-dom.js"></script>
<script src="node_modules/react/umd/react.development.js"></script>
<script src="node_modules/react-dom/umd/react-dom.development.js"></script>
<script src="dist/bundle.js"></script>

<link rel="stylesheet" href="node_modules/zakalwe/zakalwe.css" />
Expand Down
68 changes: 35 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,52 +8,51 @@
"node": ">=7.0.0"
},
"scripts": {
"setup": "typings install",
"start": "http-server -c-1",
"build": "npm run setup && npm run test && webpack",
"build": "npm run test && webpack",
"watch": "webpack --watch",
"lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'",
"pretest": "npm run lint",
"test": "jest --coverage"
},
"typings": "typings/index.d.ts",
"author": "RJ Zaworski <rj@rjzaworski.com> (http://rjzaworski.com)",
"license": "ISC",
"dependencies": {
"react": "15.6.1",
"react-redux": "5.0.5",
"redux": "3.6.0",
"react": "16.0.0",
"react-redux": "5.0.6",
"redux": "3.7.2",
"redux-thunk": "2.2.0"
},
"devDependencies": {
"@types/jest": "20.0.4",
"@types/jest": "21.1.2",
"@types/minimist": "1.2.0",
"@types/node": "7.0.12",
"@types/react": "15.0.38",
"@types/react-dom": "15.5.1",
"@types/react-redux": "4.4.46",
"@types/semver": "5.3.31",
"@types/sinon": "2.1.2",
"babel-core": "6.14.0",
"babel-loader": "6.2.5",
"babel-polyfill": "6.20.0",
"babel-preset-es2015": "6.14.0",
"coveralls": "2.11.15",
"http-server": "0.9.0",
"jest": "20.0.4",
"jest-cli": "20.0.4",
"react-addons-test-utils": "15.6.0",
"react-dom": "15.6.1",
"react-test-renderer": "15.6.1",
"sinon": "2.3.8",
"source-map-loader": "0.1.5",
"ts-jest": "20.0.7",
"ts-loader": "2.3.0",
"tslint": "5.5.0",
"typescript": "2.4.1",
"typings": "2.1.1",
"webpack": "1.13.1",
"webpack-fail-plugin": "1.0.5",
"@types/node": "8.0.32",
"@types/react": "16.0.9",
"@types/react-addons-test-utils": "0.14.20",
"@types/react-dom": "16.0.0",
"@types/react-redux": "5.0.10",
"@types/semver": "5.4.0",
"@types/sinon": "2.3.5",
"babel-core": "6.26.0",
"babel-loader": "7.1.2",
"babel-polyfill": "6.26.0",
"babel-preset-es2015": "6.24.1",
"coveralls": "3.0.0",
"http-server": "0.10.0",
"jest": "21.2.1",
"jest-cli": "21.2.1",
"raf": "3.4.0",
"react-addons-test-utils": "15.6.2",
"react-dom": "16.0.0",
"react-test-renderer": "16.0.0",
"sinon": "4.0.1",
"source-map-loader": "0.2.2",
"ts-jest": "21.0.1",
"ts-loader": "2.3.7",
"tslint": "5.7.0",
"typescript": "2.5.3",
"webpack": "3.6.0",
"webpack-fail-plugin": "2.0.0",
"zakalwe": "1.0.3"
},
"jest": {
Expand All @@ -62,6 +61,9 @@
"tsx",
"js"
],
"setupFiles": [
"raf/polyfill"
],
"transform": {
"\\.(ts|tsx)$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
},
Expand Down
4 changes: 1 addition & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
"jsx": "react"
},
"files": [
"node_modules/@types/react-dom/index.d.ts",
"node_modules/@types/react/index.d.ts",
"typings/index.d.ts"
"node_modules/@types/react/index.d.ts"
]
}
10 changes: 0 additions & 10 deletions typings.json

This file was deleted.

8 changes: 2 additions & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {

resolve: {
// add '.ts' and '.tsx' as resolvable extensions.
extensions: ['', '.webpack.js', '.web.js', '.ts', '.tsx', '.js']
extensions: ['.webpack.js', '.web.js', '.ts', '.tsx', '.js']
},

plugins: [ failPlugin ],
Expand All @@ -21,12 +21,8 @@ module.exports = {
loaders: [
// all files with a '.ts' or '.tsx' extension will be handled by 'ts-loader'.
{ test: /\.tsx?$/, loader: 'babel-loader?presets[]=es2015!ts-loader' },
{ test: /\.js$/, enforce: 'pre', loader: 'source-map-loader' },
],

preloaders: [
// all output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
{ test: /\.js$/, loader: 'source-map-loader' }
]
},

// when importing a module whose path matches one of the following, just
Expand Down