Merge release/2.2.2 into main branch (#1044)

* Migrates Tabs component to TS  and CSS modules (#1038)

* remove jest mock functions from stories (#1040)

* Fixes storybook webpack config (#1042)

* re-write components without styled-components (#1043)

Author: github-actions[bot]

.eslintrc

@@ -23,7 +23,7 @@
       "env": {
         "browser": true
       },
-      "parser": "babel-eslint",
+      "parser": "@typescript-eslint/parser",
       "plugins": [ "babel", "react", "react-hooks" ],
       "rules": {
         "babel/semi": 2,
@@ -112,6 +112,12 @@
         "react-hooks/rules-of-hooks": "error",
         "semi": 0
       }
+    },
+    {
+      "files": "**/*.{ts,tsx}",
+      "rules": {
+        "react/require-default-props": "off"
+      }
     }
   ],
   "settings": {
@@ -123,6 +129,7 @@
   },
   "rules": {
     "@typescript-eslint/explicit-function-return-type": "off",
+    "@typescript-eslint/no-empty-function": "off",
     "class-methods-use-this": 0,
     "function-paren-newline": ["error", "consistent"],
     "func-names": ["error", "never"],

.storybook/webpack.config.js

@@ -3,7 +3,18 @@ const path = require('path');
 module.exports = function({ config }) {
   config.module.rules.push({
     test: /\.scss$/,
-    use: ['style-loader', 'css-loader', 'sass-loader'],
+    use: [
+      'style-loader',
+      {
+        loader: 'css-loader',
+        options: {
+          modules: {
+            mode: (path) => path.endsWith('.module.scss') ? 'local' : 'global'
+          }
+        }
+      },
+      'sass-loader'
+    ],
     include: path.resolve(__dirname, '../')
   });
 

build-storybook.log

@@ -1,6 +1,6 @@
 {
   "name": "@user-interviews/ui-design-system",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "dependencies": {
     "@tiptap/core": "^2.0.3",
     "@tiptap/extension-bold": "^2.0.3",
@@ -18,6 +18,7 @@
     "@tiptap/extension-text": "^2.0.3",
     "@tiptap/pm": "^2.0.3",
     "@tiptap/react": "^2.0.3",
+    "@types/testing-library__jest-dom": "^6.0.0",
     "@typescript-eslint/eslint-plugin": "^2",
     "@typescript-eslint/parser": "^2",
     "react-bootstrap": "^2.5.0",
@@ -36,7 +37,7 @@
     "build-storybook-docs": "storybook build -s public --docs",
     "build-ts": "tsc",
     "chromatic": "npx chromatic",
-    "lint": "eslint . --ext .js,.jsx",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "prepublishOnly": "yarn build",
     "rs:link": "bin/link-rs",
     "rs:link:watch": "nodemon",
@@ -73,8 +74,7 @@
     "react-dom": "^16.12.0",
     "react-modal": "^3.12.1",
     "react-popper": "^2.2.3",
-    "react-tracking": "^8.1.0",
-    "styled-components": "^5.3.3"
+    "react-tracking": "^8.1.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
@@ -106,10 +106,11 @@
     "@storybook/addons": "7.4.1",
     "@storybook/react": "7.4.1",
     "@storybook/react-webpack5": "7.4.1",
-    "@testing-library/jest-dom": "^5.15.0",
+    "@testing-library/jest-dom": "^6.1.3",
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^3.2.1",
     "@testing-library/user-event": "^13.5.0",
+    "@types/jest": "^29.5.5",
     "@types/react": "16.14.0",
     "@types/react-dom": "^16.0.0",
     "babel-eslint": "^10.0.3",
@@ -148,7 +149,6 @@
     "storybook": "7.4.1",
     "storybook-addon-designs": "6.3.1",
     "style-loader": "^1.1.3",
-    "styled-components": "^5.3.3",
     "typescript": "^4.9.5",
     "webpack": "^5.80.0",
     "yalc": "^1.0.0-pre.53"
@@ -159,8 +159,7 @@
     "jackspeak": "2.1.1",
     "make-dir": "4.0.0",
     "normalize-package-data": "^3.0.0",
-    "semver": "^7.5.3",
-    "styled-components": "^5"
+    "semver": "^7.5.3"
   },
   "description": "UI Storybook design system",
   "files": [