Skip to content
This repository was archived by the owner on Mar 28, 2022. It is now read-only.

Commit 7f9f173

Browse files
authored
Merge pull request #36 from mocks-server/release
Release
2 parents 975d9a7 + 0af629c commit 7f9f173

File tree

16 files changed

+4568
-2881
lines changed

16 files changed

+4568
-2881
lines changed

.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"root": true,
23
"env": {
34
"node": true
45
},
@@ -18,6 +19,5 @@
1819
"no-undef": "error",
1920
"no-unused-vars": ["error", { "vars": "all", "args": "after-used", "ignoreRestSiblings": false }]
2021
},
21-
"extends": ["prettier"],
22-
"root": true
22+
"extends": ["prettier"]
2323
}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1010
### Fixed
1111
### Removed
1212

13+
## [2.0.3] - 2020-06-14
14+
### Changed
15+
- Update dependencies
16+
1317
## [2.0.2] - 2020-04-10
1418
### Changed
1519
- Update dependencies

package-lock.json

Lines changed: 3410 additions & 1831 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mocks-server/admin-api-client-data-provider",
3-
"version": "2.0.2",
3+
"version": "2.0.3",
44
"description": "Client of @mocks-server/plugin-admin-api built with @data-provider",
55
"keywords": [
66
"mocks-server-plugin",
@@ -24,7 +24,7 @@
2424
"module": "dist/index.esm.js",
2525
"scripts": {
2626
"build": "rollup --config",
27-
"lint": "eslint index.js test src jest.config.js test-e2e/browser/react-app/src test-e2e/browser/cypress test-e2e/browser/vanilla-app/public/main.js test-e2e/nodejs/es6/test test-e2e/nodejs/es6/index.js",
27+
"lint": "eslint *.js test src jest.config.js test-e2e/browser/react-app/src test-e2e/browser/cypress test-e2e/browser/vanilla-app/public/main.js test-e2e/nodejs/es6/test test-e2e/nodejs/es6/index.js --resolve-plugins-relative-to=.",
2828
"lint-staged": "lint-staged",
2929
"test": "jest",
3030
"test:coverage": "npm run test",
@@ -40,37 +40,36 @@
4040
"@data-provider/axios": "^2.0.0"
4141
},
4242
"dependencies": {
43-
"@mocks-server/admin-api-paths": "1.0.6"
43+
"@mocks-server/admin-api-paths": "1.0.7"
4444
},
4545
"devDependencies": {
46-
"@babel/preset-env": "7.9.5",
46+
"@babel/preset-env": "7.10.2",
47+
"@rollup/plugin-babel": "5.0.3",
48+
"@rollup/plugin-commonjs": "13.0.0",
49+
"@rollup/plugin-node-resolve": "8.0.1",
4750
"redux": "4.0.5",
48-
"@data-provider/core": "2.1.2",
49-
"@data-provider/axios": "2.1.1",
50-
"@rollup/plugin-commonjs": "11.0.2",
51-
"@rollup/plugin-node-resolve": "7.1.1",
51+
"@data-provider/core": "2.5.0",
52+
"@data-provider/axios": "2.1.2",
5253
"babel-eslint": "10.1.0",
53-
"babel-jest": "25.3.0",
54+
"babel-jest": "26.0.1",
5455
"babel-polyfill": "6.26.0",
5556
"coveralls": "3.0.9",
56-
"eslint": "6.8.0",
57-
"eslint-config-prettier": "6.10.1",
58-
"eslint-plugin-prettier": "3.1.2",
59-
"eslint-plugin-react": "7.19.0",
57+
"eslint": "7.2.0",
58+
"eslint-config-prettier": "6.11.0",
59+
"eslint-plugin-prettier": "3.1.3",
60+
"eslint-plugin-react": "7.20.0",
6061
"husky": "4.2.5",
61-
"jest": "25.3.0",
62-
"lint-staged": "10.1.3",
63-
"prettier": "2.0.4",
64-
"rollup": "2.4.0",
65-
"rollup-plugin-babel": "4.4.0",
66-
"rollup-plugin-uglify": "6.0.4",
62+
"jest": "26.0.1",
63+
"lint-staged": "10.2.10",
64+
"prettier": "2.0.5",
65+
"rollup": "2.16.1",
66+
"rollup-plugin-terser": "6.1.0",
6767
"sinon": "9.0.2"
6868
},
6969
"lint-staged": {
7070
"test/**/*.js": "eslint",
7171
"src/**/*.js": "eslint",
72-
"index.js": "eslint",
73-
"jest.config.js": "eslint",
72+
"*.js": "eslint",
7473
"test-e2e/browser/react-app/src/**/*.js": "eslint",
7574
"test-e2e/browser/cypress/**/*.js": "eslint",
7675
"test-e2e/browser/vanilla-app/public/main.js": "eslint",
@@ -83,6 +82,6 @@
8382
}
8483
},
8584
"engines": {
86-
"node": "10.x || 12.x || 13.x"
85+
"node": "12.x || 14.x"
8786
}
8887
}

rollup.config.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
const uglifier = require("rollup-plugin-uglify");
2-
const commonjs = require("@rollup/plugin-commonjs");
3-
const resolve = require("@rollup/plugin-node-resolve");
4-
const babel = require("rollup-plugin-babel");
1+
import commonjs from "@rollup/plugin-commonjs";
2+
import resolve from "@rollup/plugin-node-resolve";
3+
import babel from "@rollup/plugin-babel";
4+
import { terser } from "rollup-plugin-terser";
55

66
const BASE_CONFIG = {
77
input: "index.js",
8-
external: ["@data-provider/core", "@data-provider/axios", "@mocks-server/admin-api-paths"]
8+
external: ["@data-provider/core", "@data-provider/axios", "@mocks-server/admin-api-paths"],
99
};
1010

1111
const GLOBALS = {
1212
"@data-provider/core": "dataProvider",
1313
"@data-provider/axios": "dataProviderAxios",
14-
"@mocks-server/admin-api-paths": "pluginAdminApiPaths"
14+
"@mocks-server/admin-api-paths": "pluginAdminApiPaths",
1515
};
1616

1717
const BASE_PLUGINS = [
1818
resolve({
1919
mainFields: ["module", "main", "jsnext"],
2020
browser: true,
21-
preferBuiltins: true
21+
preferBuiltins: true,
2222
}),
2323
commonjs({
24-
include: "node_modules/**"
24+
include: "node_modules/**",
2525
}),
2626
babel({
2727
babelrc: false,
28-
presets: ["@babel/env"]
29-
})
28+
presets: ["@babel/env"],
29+
}),
3030
];
3131

3232
module.exports = [
3333
{
3434
...BASE_CONFIG,
3535
output: {
3636
file: "dist/index.cjs.js",
37-
format: "cjs"
37+
format: "cjs",
3838
},
39-
plugins: BASE_PLUGINS
39+
plugins: BASE_PLUGINS,
4040
},
4141
{
4242
...BASE_CONFIG,
4343
output: {
4444
file: "dist/index.umd.js",
4545
format: "umd",
4646
name: "mocksServerAdminApiClientDataProvider",
47-
globals: GLOBALS
47+
globals: GLOBALS,
4848
},
49-
plugins: [...BASE_PLUGINS, uglifier.uglify()]
49+
plugins: [...BASE_PLUGINS, terser()],
5050
},
5151
{
5252
...BASE_CONFIG,
5353
output: {
5454
file: "dist/index.esm.js",
5555
format: "esm",
56-
globals: GLOBALS
56+
globals: GLOBALS,
5757
},
58-
plugins: BASE_PLUGINS
59-
}
58+
plugins: BASE_PLUGINS,
59+
},
6060
];

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sonar.organization=mocks-server
22
sonar.projectKey=mocks-server-admin-api-client-data-provider
3-
sonar.projectVersion=2.0.2
3+
sonar.projectVersion=2.0.3
44

55
sonar.javascript.file.suffixes=.js
66
sonar.sourceEncoding=UTF-8

0 commit comments

Comments
 (0)