Skip to content

Commit

Permalink
Merge pull request #145 from sergiitk/chore/dependencies-update-major
Browse files Browse the repository at this point in the history
[CLEANUP chore-dependencies] Major npm dependency upgrades
  • Loading branch information
sergiitk authored Jul 12, 2020
2 parents 44f85c4 + 52cb38a commit 743021f
Show file tree
Hide file tree
Showing 10 changed files with 566 additions and 702 deletions.
18 changes: 9 additions & 9 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
'extends': 'airbnb-base',
'rules': {
extends: 'airbnb-base',
rules: {
// https://blog.neufund.org/why-we-have-banned-default-exports-and-you-should-do-the-same-d51fdc2cf2ad
'import/prefer-default-export': 'off',
'import/no-default-export': 'error',
Expand All @@ -9,19 +9,19 @@ module.exports = {
'no-restricted-syntax': [
'error',
{
'selector': 'ForInStatement',
'message': 'for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.'
selector: 'ForInStatement',
message: 'for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.',
},
{
'selector': 'LabeledStatement',
'message': 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.'
selector: 'LabeledStatement',
message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.',
},
{
'selector': 'WithStatement',
'message': '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.'
selector: 'WithStatement',
message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.',
},
],
// Because base cases are awesome.
'no-continue': 'off',
},
}
};
4 changes: 1 addition & 3 deletions Dockerfile-test-acceptance
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ RUN npm config set scripts-prepend-node-path true \
RUN yarn install --frozen-lockfile

# ---------- Acceptance test image from here
# https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md

# Installs latest Chromium 79.0.3945.88-r0 available in Apline 3.11:
# Installs latest Chromium 81.0.4044.113-r0 available in Apline 3.11:
# Alpine: https://github.com/nodejs/docker-node/blob/8b8ee/12/alpine3.11/Dockerfile
# Chromium: https://pkgs.alpinelinux.org/package/v3.11/community/x86_64/chromium
RUN apk update && apk upgrade && \
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"@babel/core": "^7.4.5",
"@babel/preset-env": "^7.4.5",
"@babel/preset-react": "^7.0.0",
"@semantic-release/changelog": "^3.0.2",
"@semantic-release/git": "^8.0.0",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"ava": "^3.0.0",
"babel-loader": "^8.0.6",
"babel-polyfill": "^6.26.0",
Expand All @@ -64,7 +64,7 @@
"codecov": "^3.5.0",
"conventional-changelog-ember": "^2.0.2",
"css-loader": "^3.4.2",
"eslint": "^6.8.0",
"eslint": "^7.4.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-plugin-ava": "^10.0.0",
Expand All @@ -79,18 +79,18 @@
"nyc": "^15.0.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"prop-types": "^15.7.2",
"puppeteer-core": "2.0.0",
"puppeteer-core": "5.0.0",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"sass-loader": "^8.0.2",
"semantic-release": "^16.0.2",
"sinon": "^8.1.0",
"sass-loader": "^9.0.2",
"semantic-release": "^17.1.1",
"sinon": "^9.0.2",
"sinon-chai": "^3.3.0",
"style-loader": "^1.1.3",
"tap-xunit": "^2.4.1",
"webpack": "^4.33.0",
"webpack-cli": "^3.3.3",
"webpack-merge": "^4.2.1"
"webpack-merge": "^5.0.9"
},
"nodemonConfig": {
"verbose": true,
Expand Down
48 changes: 24 additions & 24 deletions src/assets/javascripts/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
'extends': 'airbnb',
'rules': {
extends: 'airbnb',
rules: {
// Because we build assets in dev mode and then publish to prod.
'import/no-extraneous-dependencies': 'off',
// https://blog.neufund.org/why-we-have-banned-default-exports-and-you-should-do-the-same-d51fdc2cf2ad
Expand All @@ -15,33 +15,33 @@ module.exports = {
'object-curly-newline': [
'error',
{
'ObjectExpression': {
'minProperties': 4,
'multiline': true,
'consistent': true
ObjectExpression: {
minProperties: 4,
multiline: true,
consistent: true,
},
// Only changeing this: don't require newlines in object destruction.
// This is not convenient with required props and state destruction
'ObjectPattern': {
'minProperties': 20,
'multiline': true,
'consistent': true
ObjectPattern: {
minProperties: 20,
multiline: true,
consistent: true,
},
'ImportDeclaration': {
'minProperties': 4,
'multiline': true,
'consistent': true
ImportDeclaration: {
minProperties: 4,
multiline: true,
consistent: true,
},
'ExportDeclaration': {
'minProperties': 4,
'multiline': true,
'consistent': true
}
}
ExportDeclaration: {
minProperties: 4,
multiline: true,
consistent: true,
},
},
],
},
'env': {
'browser': true,
'node': true,
env: {
browser: true,
node: true,
},
}
};
4 changes: 2 additions & 2 deletions src/controllers/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
'rules': {
rules: {
// Allow controllers to ommit static method declaration for web bound methods.
'class-methods-use-this': 'off',
},
}
};
22 changes: 12 additions & 10 deletions src/tasks/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
module.exports = {
'rules': {
rules: {
// Don't requre `this` in task hooks for consitency.
'class-methods-use-this': ["error", { "exceptMethods": [
"onRunError",
"onRunSkip",
"onRunSuccess",
"onStart",
"onStop",
"run",
]}],
'class-methods-use-this': ['error', {
exceptMethods: [
'onRunError',
'onRunSkip',
'onRunSuccess',
'onStart',
'onStop',
'run',
],
}],
},
}
};
2 changes: 1 addition & 1 deletion test/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ module.exports = {
// We use chai: expect(this).to.be.ok
'no-unused-expressions': 'off',
},
}
};
2 changes: 1 addition & 1 deletion webpack.dev.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable import/no-extraneous-dependencies */
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
/* eslint-enable */
const common = require('./webpack.common.js');

Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable import/no-extraneous-dependencies */
const merge = require('webpack-merge');
const { merge } = require('webpack-merge');
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
/* eslint-enable */
const common = require('./webpack.common.js');
Expand Down
Loading

0 comments on commit 743021f

Please sign in to comment.