Skip to content

Commit

Permalink
chore: upgrade all deps
Browse files Browse the repository at this point in the history
BREAKING CHANGE: this upgrades all deps
  • Loading branch information
Tom Ashworth committed Apr 26, 2017
1 parent 4705fc9 commit af8a3af
Show file tree
Hide file tree
Showing 7 changed files with 5,575 additions and 43 deletions.
7 changes: 4 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ included in the project:
git checkout -b <topic-branch-name>
```

4. Commit your changes in logical chunks. Please adhere to these [git commit
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
or your code is unlikely be merged into the main project. Use Git's
4. Commit your changes in logical chunks. Please adhere to the [Angular Commit
Message Conventions](https://gist.github.com/stephenparish/9941e89d80e2bc58a153)
to allow release notes to be generated or your code is unlikely be merged into
the main project. Use Git's
[interactive rebase](https://help.github.com/articles/interactive-rebase)
feature to tidy up your commits before making them public.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install --save flight-with-observe
To develop this module, clone the repository and run:

```
$ npm install && npm test
$ yarn install && yarn test
```

If the tests pass, you have a working environment. You shouldn't need any external dependencies.
Expand Down
13 changes: 1 addition & 12 deletions config/karma.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

var constants = require('./constants');
var webpackConfig = require('./webpack.config.test');
// entry is determined by karma config 'files' array
webpackConfig.entry = {};

module.exports = function (config) {
config.set({
Expand Down Expand Up @@ -33,15 +31,6 @@ module.exports = function (config) {
},
reporters: [ 'dots' ],
singleRun: true,
webpack: webpackConfig,
webpackMiddleware: {
stats: {
assetsSort: 'name',
colors: true,
children: false,
chunks: false,
modules: false
}
}
webpack: webpackConfig
});
};
22 changes: 16 additions & 6 deletions config/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
var webpack = require('webpack');

var DedupePlugin = webpack.optimize.DedupePlugin;
var OccurenceOrderPlugin = webpack.optimize.OccurenceOrderPlugin;

var plugins = [
new DedupePlugin(),
new OccurenceOrderPlugin()
new webpack.optimize.OccurrenceOrderPlugin()
];

module.exports = {
Expand All @@ -15,7 +11,21 @@ module.exports = {
{
test: /\.jsx?$/,
exclude: /node_modules/,
loader: 'babel-loader'
use: {
loader: 'babel-loader',
options: {
presets: [
['env', {
targets: {
browsers: [
'> 1%',
'last 2 versions'
]
}
}]
]
}
}
}
]
},
Expand Down
44 changes: 24 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,38 @@
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
},
"devDependencies": {
"babel-core": "^5.8.24",
"babel-eslint": "^4.1.1",
"babel-loader": "^5.3.2",
"babel-plugin-typecheck": "^1.2.0",
"babel-runtime": "^5.8.20",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.0.0",
"babel-plugin-typecheck": "^3.9.0",
"babel-preset-env": "^1.4.0",
"babel-runtime": "^6.23.0",
"chai": "^3.2.0",
"eslint": "^1.3.1",
"eslint-config-standard": "^4.3.1",
"eslint-config-standard-react": "^1.0.4",
"eslint-plugin-react": "^3.3.1",
"eslint-plugin-standard": "^1.3.0",
"eslint": "^3.19.0",
"eslint-config-standard": "^10.2.1",
"eslint-config-standard-react": "^5.0.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^6.10.3",
"eslint-plugin-standard": "^3.0.1",
"flightjs": "^1.5.1",
"immutable": "^3.7.5",
"jasmine-core": "^2.3.4",
"jquery": "^2.1.4",
"karma": "^0.13.9",
"karma-chrome-launcher": "^0.2.0",
"karma-cli": "^0.1.0",
"karma-firefox-launcher": "^0.1.6",
"karma-jasmine": "^0.3.6",
"karma-mocha": "^0.2.0",
"jquery": "^3.2.1",
"karma": "^1.6.0",
"karma-chrome-launcher": "^2.0.0",
"karma-cli": "^1.0.1",
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
"karma-mocha": "^1.3.0",
"karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^1.7.0",
"mocha": "^2.3.2",
"karma-webpack": "^2.0.3",
"mocha": "^3.3.0",
"object-assign": "^4.0.1",
"semantic-release": "^6.3.2",
"semantic-release-cli": "^3.0.3",
"webpack": "^1.12.1"
"webpack": "^2.4.1"
},
"dependencies": {
"rxjs": "^5.3.0"
Expand Down
1 change: 0 additions & 1 deletion src/specs.context.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@

const specsContext = require.context('.', true, /.+\.spec\.js$/);
specsContext.keys().forEach(specsContext);
module.exports = specsContext;
Loading

0 comments on commit af8a3af

Please sign in to comment.