Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Commit

Permalink
Upgraded deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Voronov committed Aug 31, 2017
1 parent d050ad0 commit 104d9c1
Show file tree
Hide file tree
Showing 18 changed files with 2,318 additions and 1,574 deletions.
4 changes: 1 addition & 3 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"presets": [
"es2017",
"es2016",
"es2015",
"env",
"react"
],
"plugins": [
Expand Down
7 changes: 3 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["airbnb", "plugin:lodash/recommended"],
"extends": ["airbnb"],
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
Expand All @@ -11,8 +11,6 @@
},
"plugins": [
"react",
"lodash",
"promise",
"mocha"
],
"rules": {
Expand All @@ -29,6 +27,7 @@
"react/jsx-indent-props": [2, 4],
"react/forbid-prop-types": 0,
"react/require-default-props": 0,
"lodash/prefer-lodash-method": 0
"jsx-a11y/href-no-hash": "off",
"jsx-a11y/label-has-for": 0
}
}
76 changes: 38 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,56 +42,56 @@
"uuid": "3.0.1"
},
"devDependencies": {
"babel-eslint": "^7.1.1",
"babel-plugin-transform-node-env-inline": "^6.8.0",
"babel-preset-es2015": "^6.22.0",
"babel-preset-es2016": "^6.22.0",
"babel-preset-es2017": "^6.16.0",
"babel-preset-react": "^6.16.0",
"autoprefixer": "^7.1.3",
"babel-eslint": "^7.2.3",
"babel-istanbul": "^0.12.2",
"babel-plugin-transform-node-env-inline": "^0.2.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-register": "^6.26.0",
"babelify": "^7.3.0",
"browserify": "^13.3.0",
"chai": "^3.5.0",
"css-modulesify": "^0.27.1",
"css-mqpacker": "^5.0.1",
"del": "^2.2.2",
"browserify": "^14.4.0",
"chai": "^4.1.1",
"css-modulesify": "^0.28.0",
"css-mqpacker": "^6.0.1",
"del": "^3.0.0",
"env-manager": "^0.2.4",
"eslint-config-airbnb": "^14.0.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^3.0.2",
"eslint-plugin-lodash": "^2.2.5",
"eslint-plugin-mocha": "^4.8.0",
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-react": "^6.9.0",
"fs.extra": "^1.3.2",
"esdoc-es7-plugin": "0.0.3",
"eslint": "^4.5.0",
"eslint-config-airbnb": "^15.1.0",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^6.0.2",
"eslint-plugin-mocha": "^4.11.0",
"eslint-plugin-react": "^7.3.0",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.1",
"gulp-concat": "^2.6.1",
"gulp-concat": "^2.6.0",
"gulp-cssnano": "^2.1.2",
"gulp-eslint": "^3.0.1",
"gulp-esdoc": "^0.4.1",
"gulp-eslint": "^4.0.0",
"gulp-if": "^2.0.2",
"gulp-inject": "^4.2.0",
"gulp-load-plugins": "^1.4.0",
"gulp-mocha": "^3.0.1",
"gulp-postcss": "^6.2.0",
"gulp-sourcemaps": "^2.2.3",
"gulp-inject": "^4.0.0",
"gulp-load-plugins": "^1.5.0",
"gulp-mocha": "^4.3.1",
"gulp-postcss": "^7.0.0",
"gulp-sourcemaps": "^2.6.1",
"gulp-tasks-registrator": "^0.3.1",
"gulp-uglify": "^2.1.0",
"gulp-uglify": "^3.0.0",
"gulp-util": "^3.0.8",
"gulp-webserver": "^0.9.1",
"laggard": "^0.1.0",
"merge-stream": "^1.0.1",
"postcss-assets": "^4.1.0",
"postcss-each": "^0.9.3",
"postcss-import": "^9.0.0",
"postcss-mixins": "^5.4.1",
"postcss-nested": "^1.0.0",
"minimist": "^1.2.0",
"postcss-assets": "^4.2.0",
"postcss-each": "^0.10.0",
"postcss-import": "^10.0.0",
"postcss-mixins": "^6.1.0",
"postcss-nested": "^2.1.2",
"postcss-reference": "^1.0.3",
"postcss-simple-vars": "^3.0.0",
"run-sequence": "^1.2.2",
"sinon": "^1.17.7",
"postcss-simple-vars": "^4.1.0",
"run-sequence": "^2.1.0",
"sinon": "^1.17.3",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"vinyl-transform": "^1.0.0",
"watchify": "^3.8.0"
"watchify": "^3.9.0"
}
}
4 changes: 2 additions & 2 deletions src/scripts/infrastructure/utils/contracts.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import isNil from 'lodash/isNil';

/**
/**
* Checks for a condition; if the condition is false,
* follows the escalation policy set for the analyzer.
* @param {string} message - A message to display if the condition is not met..
Expand All @@ -12,7 +12,7 @@ export function assert(message, condition) {
}
}

/**
/**
* Specifies a precondition contract for the enclosing method or property,
* and displays a message if the condition for the contract fails.
* @param {string} name - The method / property name to display if the condition is false.
Expand Down
12 changes: 6 additions & 6 deletions src/scripts/ui/actions/authentication.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ export default composeClass({

login(username, password) {
this.authSrvc
.login(username, password)
.then(credentials => this.loginComplete(credentials))
.catch(err => this.loginFail(err));
.login(username, password)
.then(credentials => this.loginComplete(credentials))
.catch(err => this.loginFail(err));

return null;
},

logout() {
this.authSrvc
.logout()
.then(() => this.logoutComplete())
.catch(err => this.logoutFail(err));
.logout()
.then(() => this.logoutComplete())
.catch(err => this.logoutFail(err));

return this;
}
Expand Down
8 changes: 4 additions & 4 deletions src/scripts/ui/components/pages/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ export default React.createClass({
onClick={this._onInfoClick}
>
Click me
</Button>
</Button>
<Button
bsStyle="success"
onClick={this._onSuccessClick}
>
Click me
</Button>
</Button>
<Button
bsStyle="warning"
onClick={this._onWarningClick}
>
Click me
</Button>
</Button>
<Button
bsStyle="danger"
onClick={this._onErrorClick}
>
Click me
</Button>
</Button>
</ButtonToolbar>
</Jumbotron>
</div>
Expand Down
18 changes: 14 additions & 4 deletions src/scripts/ui/components/pages/login/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,31 @@ export default React.createClass({
<div
className="form-group"
>
<label htmlFor="inputUsername" className="sr-only">Username</label>
<label
htmlFor="inputUsername"
className="sr-only"
>
Username
</label>
<input
type="text"
id="inputUsername"
className="form-control"
placeholder="Username" required=""
autoFocus=""
placeholder="Username"
required=""
onChange={e => this._handleChange('username', e.target.value)}
{...attrs}
/>
</div>
<div
className="form-group"
>
<label htmlFor="inputPassword" className="sr-only">Password</label>
<label
htmlFor="inputPassword"
className="sr-only"
>
Password
</label>
<input
type="password"
id="inputPassword"
Expand Down
1 change: 0 additions & 1 deletion src/styles/main.css
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
@import resolve("bootstrap/dist/css/bootstrap.css");
@import resolve("bootstrap/dist/css/bootstrap-theme.css");
2 changes: 1 addition & 1 deletion tasks/build/doc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default function factory($, env) {
return function task() {
return $.gulp.src(env.paths.input.scripts )
return $.gulp.src(env.paths.input.scripts)
.pipe($.esdoc({
destination: env.paths.doc
}));
Expand Down
6 changes: 3 additions & 3 deletions tasks/build/html.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export default function factory($, env) {
return function task() {
const target = $.gulp.src(env.paths.input.html + '/index.html');
const target = $.gulp.src(`${env.paths.input.html}/index.html`);
const sources = $.gulp.src([
env.paths.output.scripts + '/**/*.js',
env.paths.output.styles + '/**/*.css'
`${env.paths.output.scripts}/**/*.js`,
`${env.paths.output.styles}/**/*.css`
], { read: false });

return target
Expand Down
10 changes: 5 additions & 5 deletions tasks/build/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ export default function factory($, env) {
return $.gulp.src([
path.join(env.paths.input.styles, '/**/*.css')
])
.pipe($.postcss(postcssDefaultPlugins(env)))
.pipe($.if(env.build.minify, $.cssnano()))
.pipe($.concat('global.css'))
.pipe($.gulp.dest(env.paths.output.styles))
.on('error', done);
.pipe($.postcss(postcssDefaultPlugins(env)))
.pipe($.if(env.build.minify, $.cssnano()))
.pipe($.concat('global.css'))
.pipe($.gulp.dest(env.paths.output.styles))
.on('error', done);
};
}
2 changes: 1 addition & 1 deletion tasks/clean/html.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default function factory($, env) {
return function task(done) {
return $.delete([env.paths.output.html + '/*.html'], done);
return $.delete([`${env.paths.output.html}/*.html`], done);
};
}
2 changes: 1 addition & 1 deletion tasks/clean/scripts.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default function factory($, env) {
return function task(done) {
return $.delete([env.paths.output.scripts + '/**/*.js'], done);
return $.delete([`${env.paths.output.scripts}/**/*.js`], done);
};
}
2 changes: 1 addition & 1 deletion tasks/clean/styles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default function factory($, env) {
return function task(done) {
return $.delete([env.paths.output.styles + '/**/*.css'], done);
return $.delete([`${env.paths.output.styles}/**/*.css`], done);
};
}
2 changes: 1 addition & 1 deletion tasks/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function factory($, env) {
.pipe($.mocha({
reporter: env.test.report || 'spec',
recursive: true,
port: env.test.port
compilers: 'js:babel-core/register'
}));
};
}
4 changes: 2 additions & 2 deletions tasks/watch.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export default function factory($, env) {
return function task(done) {
if (env.development.watch) {
$.gulp.watch(env.paths.input.styles + '/**/*.css', ['build:styles']);
$.gulp.watch(env.paths.input.html + '/**/*.html', ['build:html']);
$.gulp.watch(`${env.paths.input.styles}/**/*.css`, ['build:styles']);
$.gulp.watch(`${env.paths.input.html}/**/*.html`, ['build:html']);
} else {
done();
}
Expand Down
1 change: 1 addition & 0 deletions tools/logger.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/no-extraneous-dependencies, class-methods-use-this */
import gutil from 'gulp-util';

class Logger {
Expand Down
Loading

0 comments on commit 104d9c1

Please sign in to comment.