Merge pull request #366 from mudita/stable

Merge stable to master

package.json

@@ -26,8 +26,8 @@
     "app:test:coverage": "lerna run --scope @mudita/mudita-center-app test:coverage",
     "app:test:e2e": "lerna run --scope @mudita/mudita-center-app test:e2e",
     "app:prerelease": "lerna run --scope @mudita/mudita-center-app prerelease",
-    "app:storybook:serve": "lerna run --scope @mudita/mudita-center-app storybook:serve --",
-    "app:storybook:build": "lerna run --scope @mudita/mudita-center-app storybook:build --",
+    "app:storybook:serve": "lerna run --scope @mudita/mudita-center-app storybook:serve",
+    "app:storybook:build": "lerna run --scope @mudita/mudita-center-app storybook:build",
     "app:dist": "lerna run --scope @mudita/mudita-center-app dist",
     "app:dist:all": "lerna run --scope @mudita/mudita-center-app dist:all",
     "app:electron:rebuild-serialport": "lerna run --scope @mudita/mudita-center-app electron:rebuild-serialport --",
@@ -59,14 +59,14 @@
   },
   "homepage": "https://github.com/Mudita/mudita-center",
   "devDependencies": {
-    "@mudita/eslint-config": "^1.0.14",
+    "@mudita/eslint-config": "1.0.14",
     "@types/react-syntax-highlighter": "^13.5.2",
     "eslint-plugin-license-header": "^0.2.0",
     "husky": "^4.3.8",
     "lerna": "^4.0.0",
     "lint-staged": "^10.5.4",
-    "prettier": "^2.2.1",
-    "typescript": "^4.2.4"
+    "prettier": "^2.3.2",
+    "typescript": "^4.3.5"
   },
   "engines": {
     "node": "14.17.3",

packages/app/.babelrc

@@ -1,6 +1,9 @@
 {
   "presets": ["@babel/preset-env", "@babel/react"],
   "plugins": [
+    ["@babel/plugin-proposal-class-properties", { "loose": true }],
+    ["@babel/plugin-proposal-private-methods", { "loose": true }],
+    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
     [
       "babel-plugin-styled-components",
       {

packages/app/.storybook/webpack.config.js

@@ -12,6 +12,8 @@ module.exports = ({ config }) => {
   config.module.rules[0].use[0].options.plugins = [
     // use @babel/plugin-proposal-class-properties for class arrow functions
     require.resolve("@babel/plugin-proposal-class-properties"),
+    require.resolve("@babel/plugin-proposal-private-methods"),
+    require.resolve("@babel/plugin-proposal-private-property-in-object"),
   ]
   // Prefer Gatsby ES6 entrypoint (module) over commonjs (main) entrypoint
   config.resolve.mainFields = ["browser", "module", "main"]
@@ -25,7 +27,11 @@ module.exports = ({ config }) => {
     loader: require.resolve("babel-loader"),
     options: {
       presets: [["react-app", { flow: false, typescript: true }]],
-      plugins: [require.resolve("@babel/plugin-proposal-class-properties")],
+      plugins: [
+        require.resolve("@babel/plugin-proposal-class-properties"),
+        require.resolve("@babel/plugin-proposal-private-methods"),
+        require.resolve("@babel/plugin-proposal-private-property-in-object"),
+      ],
     },
   })
 

packages/app/jest.coverage.json

@@ -1,10 +1,10 @@
 {
   "coverageThreshold": {
     "global": {
-      "lines": 66.23,
-      "statements": 64.33,
-      "functions": 47.39,
-      "branches": 63.230000000000004
+      "lines": 66.71,
+      "statements": 64.87,
+      "functions": 48.46,
+      "branches": 63.61
     }
   }
 }