Merge branch 'dev' into 'master'

Release 3.1.1

See merge request turris/reforis/foris-js!75

babel.config.js

@@ -5,21 +5,5 @@ module.exports = {
     ],
     plugins: [
         "@babel/plugin-transform-runtime",
-        "@babel/plugin-syntax-export-default-from",
-        ["module-resolver", {
-            root: ["./src"],
-            alias: {
-                test: "./test",
-                underscore: "lodash",
-            },
-        }],
     ],
-    env: {
-        development: {
-            ignore: ["**/__tests__/**", "**/__mocks__/**"],
-        },
-        test: {
-            ignore: [],
-        },
-    },
 };

jest.config.js

@@ -12,6 +12,9 @@ module.exports = {
         "<rootDir>/src/testUtils",
         "<rootDir>/src/",
     ],
+    moduleNameMapper: {
+        "\\.(css|less)$": "<rootDir>/src/__mocks__/styleMock.js",
+    },
     clearMocks: true,
     collectCoverageFrom: ["src/**/*.{js,jsx}"],
     coverageDirectory: "coverage",
@@ -24,10 +27,6 @@ module.exports = {
     globals: {
         TZ: "utc",
     },
-    transform: {
-        "^.+\\.js$": "babel-jest",
-        "^.+\\.css$": "jest-transform-css",
-    },
     transformIgnorePatterns: [
         "node_modules/(?!(react-datetime)/)",
     ],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "foris",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Set of components and utils for Foris and its plugins.",
   "author": "CZ.NIC, z.s.p.o.",
   "repository": {
@@ -14,56 +14,41 @@
   "license": "GPL-3.0",
   "main": "./src/index.js",
   "dependencies": {
-    "axios": "^0.19.0",
+    "axios": "^0.19.1",
-    "jest-transform-css": "^2.0.0",
+    "immutability-helper": "3.0.1",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.25",
+    "pdfmake": "^0.1.63",
-    "prop-types": "^15.7.2",
+    "qrcode.react": "^0.9.3",
     "react-datetime": "^2.16.3",
-    "react-router": "^5.0.1",
+    "react-router": "^5.1.2",
     "react-uid": "^2.2.0"
   },
   "peerDependencies": {
-    "immutability-helper": "3.0.1",
+    "bootstrap": "4.4.1",
-    "pdfmake": "^0.1.63",
+    "prop-types": "15.7.2",
-    "qrcode.react": "^0.9.3",
     "react": "16.9.0",
     "react-dom": "16.9.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
+    "@babel/cli": "^7.7.7",
-    "@babel/core": "^7.4.5",
+    "@babel/core": "^7.7.7",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/plugin-transform-runtime": "^7.7.6",
-    "@babel/plugin-syntax-export-default-from": "^7.2.0",
+    "@babel/preset-env": "^7.7.7",
-    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-env": "^7.4.5",
+    "@fortawesome/fontawesome-free": "^5.12.0",
-    "@babel/preset-react": "^7.0.0",
-    "@fortawesome/fontawesome-free": "^5.11.2",
     "@testing-library/react": "^8.0.9",
-    "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.6",
-    "babel-plugin-module-resolver": "^3.2.0",
-    "babel-plugin-react-transform": "^3.0.0",
     "babel-polyfill": "^6.26.0",
-    "bootstrap": "^4.3.1",
+    "eslint": "^6.8.0",
-    "copy-webpack-plugin": "^5.1.1",
-    "css-loader": "^3.2.0",
-    "eslint": "^6.1.0",
     "eslint-config-reforis": "^1.0.0",
-    "file-loader": "^4.2.0",
+    "jest": "^24.9.0",
-    "immutability-helper": "3.0.1",
+    "jest-mock-axios": "^3.2.0",
-    "jest": "^24.8.0",
+    "moment-timezone": "^0.5.27",
-    "jest-mock-axios": "^3.0.0",
+    "prop-types": "15.7.2",
-    "moment": "^2.24.0",
-    "moment-timezone": "^0.5.25",
-    "pdfmake": "^0.1.63",
-    "qrcode.react": "^0.9.3",
     "react": "16.9.0",
     "react-dom": "16.9.0",
-    "react-styleguidist": "^10.3.2",
+    "react-styleguidist": "^10.4.2",
-    "snapshot-diff": "^0.5.1",
+    "snapshot-diff": "^0.5.1"
-    "style-loader": "^1.0.0",
-    "webpack": "^4.41.0"
   },
   "scripts": {
     "lint": "eslint src",

src/__mocks__/styleMock.js

@@ -0,0 +1,8 @@
+/*
+ * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/)
+ *
+ * This is free software, licensed under the GNU General Public License v3.
+ * See /LICENSE for more information.
+ */
+
+module.exports = {};