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

Commit

Permalink
#! update dependecies
Browse files Browse the repository at this point in the history
  • Loading branch information
mjancarik committed Jan 1, 2019
1 parent eb2f62f commit 01bbb92
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 70 deletions.
89 changes: 46 additions & 43 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,51 @@
module.exports = {
'extends': ['eslint:recommended', 'plugin:react/recommended', 'prettier', 'prettier/react'],
'parser': 'babel-eslint',
'rules': {
'prettier/prettier': [
'error', {
singleQuote: true,
semi: true,
jsxBracketSameLine: true
}
],
'extends': ['eslint:recommended', 'plugin:react/recommended', 'prettier', 'prettier/react'],
'parser': 'babel-eslint',
'rules': {
'prettier/prettier': [
'error', {
singleQuote: true,
semi: true,
jsxBracketSameLine: true
}
],

'no-console': ['error', {
allow: ['warn', 'error']
}],
'no-console': ['error', {
allow: ['warn', 'error']
}],

'react/prop-types': 0,
'react/wrap-multilines': 0
},
'plugins': [
'prettier',
'jest',
'react',
'jasmine'
],
'settings': {
'ecmascript': 2015,
'jsx': true
},
'parserOptions': {
'sourceType': 'module',
'ecmaVersion': 6,
'ecmaFeatures': {
'jsx': true
}
},
'env': {
'browser': true,
'node': true,
'es6': true,
'jasmine': true,
'jest/globals': true
},
'globals': {
'$Debug': true,
'$IMA': true
'react/prop-types': 0,
'react/wrap-multilines': 0
},
'plugins': [
'prettier',
'jest',
'react',
'jasmine'
],
'settings': {
'ecmascript': 2015,
'jsx': true,
'react': {
version: '16'
}
},
'parserOptions': {
'sourceType': 'module',
'ecmaVersion': 6,
'ecmaFeatures': {
'jsx': true
}
},
'env': {
'browser': true,
'node': true,
'es6': true,
'jasmine': true,
'jest/globals': true
},
'globals': {
'$Debug': true,
'$IMA': true
}
};
50 changes: 23 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "IMA.js-skeleton",
"version": "0.15.0",
"version": "0.16.0",
"description": "Isomorphic javascript application",
"main": "build/server.js",
"scripts": {
Expand All @@ -21,20 +21,16 @@
"JavaScript"
],
"author": "Miroslav Jancarik <[email protected]>",
"contributors": [
{
"name": "Martin Urban",
"email": "[email protected]"
},
{
"name": "Martin Jurča",
"email": "[email protected]"
},
{
"name": "Ondřej Baše",
"email": "[email protected]"
}
],
"contributors": [{
"name": "Martin Urban",
"email": "[email protected]"
}, {
"name": "Martin Jurča",
"email": "[email protected]"
}, {
"name": "Ondřej Baše",
"email": "[email protected]"
}],
"repository": {
"type": "git",
"url": "https://github.com/seznam/IMA.js-skeleton.git"
Expand All @@ -45,18 +41,18 @@
"license": "MIT",
"devDependencies": {
"babel-eslint": "10.0.1",
"enzyme": "3.7.0",
"enzyme-adapter-react-16": "1.7.0",
"enzyme": "3.8.0",
"enzyme-adapter-react-16": "1.7.1",
"enzyme-to-json": "^3.3.5",
"eslint": "5.9.0",
"eslint": "5.11.1",
"eslint-config-prettier": "3.3.0",
"eslint-plugin-jasmine": "2.10.1",
"eslint-plugin-jest": "22.1.2",
"eslint-plugin-prettier": "3.0.0",
"eslint-plugin-react": "7.11.1",
"ima-examples": "^0.16.0-alpha.1",
"ima-gulp-task-loader": "^0.15.0",
"ima-gulp-tasks": "^0.16.0-alpha.5",
"eslint-plugin-prettier": "3.0.1",
"eslint-plugin-react": "7.12.0",
"ima-examples": "^0.16.0",
"ima-gulp-task-loader": "^0.16.0",
"ima-gulp-tasks": "^0.16.0",
"jest": "23.6.0",
"prettier": "1.15.3"
},
Expand All @@ -67,13 +63,13 @@
"express": "4.16.4",
"express-http-proxy": "1.5.0",
"helmet": "3.15.0",
"ima": "0.16.0-alpha.10",
"ima-server": "0.16.0-alpha.1",
"ima": "0.16.0",
"ima-server": "0.16.0",
"method-override": "3.0.0",
"multer": "1.4.1",
"prop-types": "15.6.2",
"react": "16.6.3",
"react-dom": "16.6.3",
"react": "16.7.0",
"react-dom": "16.7.0",
"serve-favicon": "2.5.0"
}
}

0 comments on commit 01bbb92

Please sign in to comment.