Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Merge pull request #65 from mocks-server/release
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
javierbrea authored Jun 14, 2020
2 parents defd015 + b593189 commit f41e209
Show file tree
Hide file tree
Showing 10 changed files with 1,903 additions and 1,809 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
### Removed

## [1.0.6] - 2020-06-14
### Changed
- Update dependencies

## [1.0.5] - 2020-04-10
### Changed
- Update dependencies
Expand Down
3,259 changes: 1,713 additions & 1,546 deletions package-lock.json

Large diffs are not rendered by default.

23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mocks-server/cypress-commands",
"version": "1.0.5",
"version": "1.0.6",
"description": "Extends Cypress' cy commands with methods for administrating mocks-server",
"keywords": [
"cypress",
Expand All @@ -27,7 +27,7 @@
"main": "index.js",
"scripts": {
"coveralls": "cat ./coverage/lcov.info | coveralls",
"lint": "eslint src test index.js jest.config.js test-e2e/cypress test-e2e/mocks test-e2e/app-fetch/public test-e2e/app-data-provider/src test-e2e/app-data-provider/webpack.config.js",
"lint": "eslint src test *.js jest.config.js test-e2e/cypress test-e2e/mocks test-e2e/app-fetch/public test-e2e/app-data-provider/src test-e2e/app-data-provider/webpack.config.js",
"lint-staged": "lint-staged",
"test": "jest",
"test-e2e": "cd test-e2e && npm run test:ci",
Expand All @@ -36,18 +36,18 @@
"test:ci": "npm run test && npm run test-e2e:ci"
},
"dependencies": {
"@mocks-server/admin-api-client": "2.0.2"
"@mocks-server/admin-api-client": "2.0.3"
},
"devDependencies": {
"babel-eslint": "10.1.0",
"coveralls": "3.0.9",
"eslint": "6.8.0",
"eslint-config-prettier": "6.10.1",
"eslint-plugin-prettier": "3.1.2",
"eslint": "7.2.0",
"eslint-config-prettier": "6.11.0",
"eslint-plugin-prettier": "3.1.3",
"husky": "4.2.5",
"jest": "25.3.0",
"lint-staged": "10.1.3",
"prettier": "2.0.4",
"jest": "26.0.1",
"lint-staged": "10.2.10",
"prettier": "2.0.5",
"sinon": "9.0.2"
},
"peerDependencies": {
Expand All @@ -59,8 +59,7 @@
"test-e2e/app-fetch/public/*.js": "eslint",
"test-e2e/mocks/**/*.js": "eslint",
"test-e2e/cypress/**/*.js": "eslint",
"jest.config.js": "eslint",
"index.js": "eslint",
"*.js": "eslint",
"src/**/*.js": "eslint",
"test/**/*.js": "eslint"
},
Expand All @@ -70,6 +69,6 @@
}
},
"engines": {
"node": "10.x || 12.x || 13.x"
"node": "12.x || 14.x"
}
}
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.organization=mocks-server
sonar.projectKey=mocks-server-cypress-commands
sonar.projectVersion=1.0.5
sonar.projectVersion=1.0.6

sonar.javascript.file.suffixes=.js
sonar.sourceEncoding=UTF-8
Expand Down
108 changes: 54 additions & 54 deletions test-e2e/app-data-provider/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions test-e2e/app-data-provider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"serve": "serve -l 3000"
},
"dependencies": {
"@data-provider/core": "2.1.2",
"@data-provider/axios": "2.1.1",
"jquery": "3.4.1",
"@data-provider/core": "2.5.0",
"@data-provider/axios": "2.1.2",
"jquery": "3.5.1",
"redux": "4.0.5"
},
"devDependencies": {
"serve": "11.3.0",
"webpack": "4.42.1",
"serve": "11.3.2",
"webpack": "4.43.0",
"webpack-cli": "3.3.11"
}
}
Loading

0 comments on commit f41e209

Please sign in to comment.