Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update JS deps #26

Merged
merged 6 commits into from
May 30, 2021
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
16 changes: 9 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
module.exports = {
root: true,
extends: ['airbnb-base', 'plugin:prettier/recommended'],
settings: {
'import/resolver': ['node'],
},
};
const { generateConfig } = require('@kocal/eslint-config-generator');

const config = generateConfig();

// We don't need @babel/eslint-parser as we don't use Babel
delete config.parser;
delete config.parserOptions;

module.exports = config;
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
COMPOSER_MEMORY_LIMIT: -1

PHP_VERSION_DEFAULT: 7.3
NODE_VERSION: 10.x
NODE_VERSION: 14.x

jobs:
static_analysis:
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:

- run: yarn install --frozen-lockfile

- run: yarn eslint
- run: yarn lint

test:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn lint-staged --relative
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"authors": [
{
"name": "Hugo Alliaume",
"email": "[email protected]"
"email": "[email protected]"
}
],
"config": {
Expand Down
36 changes: 14 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,26 @@
"private": true,
"version": "0.0.0-development",
"description": "Test your emails with Behat and Cypress, when using the Symfony Mailer component.",
"repository": "https://github.com/Kocal/MailtrapTesting.git",
"author": "Hugo Alliaume <[email protected]>",
"repository": "https://github.com/Kocal/SymfonyMailerTesting",
"author": "Hugo Alliaume <[email protected]>",
"license": "MIT",
"scripts": {
"eslint": "eslint *.js src tests --ext .js,.vue",
"prettier": "prettier"
"lint": "eslint *.js src tests --ext .js,.vue",
"prettier": "prettier",
"prepare": "husky install"
},
"peerDependencies": {
"cypress": "^4.0.0"
"cypress": ">=4.0.0"
},
"devDependencies": {
"cypress": "^4.5.0",
"eslint": "^6.8.0",
"eslint-config-airbnb-base": "^14.1.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-chai-friendly": "^0.6.0",
"eslint-plugin-cypress": "^2.10.3",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-mocha": "^6.3.0",
"eslint-plugin-prettier": "^3.1.3",
"husky": "^4.2.5",
"lint-staged": "^10.2.2",
"@kocal/eslint-config-generator": "^2.0.3",
"cypress": "^7.4.0",
"eslint": "^7.27.0",
"eslint-plugin-chai-friendly": "^0.7.1",
"eslint-plugin-cypress": "^2.11.3",
"eslint-plugin-mocha": "^9.0.0",
"husky": "^6.0.0",
"lint-staged": "^11.0.0",
"prettier": "^2.0.5"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged --relative",
"post-commit": "git update-index --again"
}
}
}
Loading