Merge pull request #22 from Giveth/conflict-resolve

Prettier + some icons

Author: aminlatifi

.eslintrc

@@ -0,0 +1,12 @@
+{
+  "extends": [
+    "next/core-web-vitals",
+    "plugin:@next/next/recommended",
+    "plugin:prettier/recommended"  ],
+  "rules": {},
+  "settings": {
+    "import/resolver": {
+      "typescript": {}
+    }
+  }
+}

.prettierrc.json

@@ -0,0 +1,9 @@
+{
+  "singleQuote": true,
+  "useTabs": true,
+  "tabWidth": 4,
+  "semi": true,
+  "jsxSingleQuote": true,
+  "trailingComma": "all",
+  "arrowParens": "avoid"
+}

.storybook/main.js

@@ -1,12 +1,16 @@
 module.exports = {
+  "typescript": { reactDocgen: false },
   "stories": [
     "../src/**/*.stories.mdx",
     "../src/**/*.stories.@(js|jsx|ts|tsx)"
   ],
   "addons": [
     "@storybook/addon-links",
-    'storybook-addon-designs',
-    "@storybook/addon-essentials",
-    "@storybook/preset-create-react-app",
-  ]
+    "@storybook/addon-essentials"
+  ],
+  "framework": "@storybook/react",
+  "core": {
+    "builder": "webpack5"
+  }
 }
+

.storybook/webpack.config.js

@@ -1,75 +1,47 @@
 {
   "name": "@giveth/ui-design-system",
-  "version": "1.2.30",
-  "files": [ "/lib"],
+  "version": "1.2.36",
+  "files": [
+    "/lib"
+  ],
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
   "types": "./lib/esm/index.d.ts",
   "dependencies": {
-    "styled-components": "^5.3.1",
-    "@types/styled-components": "^5.1.14"
-  },
-  "peerDependencies": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "next": "12.0.7",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "styled-components": "^5.3.1"
   },
   "scripts": {
     "build": "rm -rf lib;yarn build:esm && yarn build:cjs",
     "build:esm": "tsc",
     "build:cjs": "tsc --module commonjs --outDir lib/cjs",
     "storybook": "start-storybook -p 6006 -s public",
     "build-storybook": "build-storybook -s public",
-    "prepare": "npm run build"
-  },
-  "eslintConfig": {
-    "extends": "react-app",
-    "overrides": [
-      {
-        "files": [
-          "**/*.stories.*"
-        ],
-        "rules": {
-          "import/no-anonymous-default-export": "off"
-        }
-      }
-    ]
+    "prepare": "npm run build",
+    "lint": "eslint . --ext .ts --ext .tsx",
+    "lint:fix": "eslint . --ext .ts --ext .tsx --fix"
   },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "plugins": [
-    "@semantic-release/commit-analyzer",
-    "@semantic-release/release-notes-generator",
-    "@semantic-release/changelog",
-    "@semantic-release/github",
-    "@semantic-release/npm",
-    "@semantic-release/git"
-  ],
   "devDependencies": {
-    "@storybook/addon-actions": "^6.3.9",
-    "@storybook/addon-essentials": "^6.3.9",
-    "@storybook/addon-links": "^6.3.9",
-    "@storybook/node-logger": "^6.3.9",
-    "@storybook/preset-create-react-app": "^3.2.0",
-    "@storybook/react": "^6.3.9",
-    "semantic-release": "^18.0.0",
-    "typescript": "^4.1.2",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/react": "^11.1.0",
-    "@testing-library/user-event": "^12.1.10",
-    "@types/jest": "^26.0.15",
-    "@types/node": "^12.0.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0"
+    "@babel/core": "^7.16.7",
+    "@storybook/addon-actions": "^6.4.9",
+    "@storybook/addon-essentials": "^6.4.9",
+    "@storybook/addon-links": "^6.4.9",
+    "@storybook/builder-webpack5": "^6.4.9",
+    "@storybook/manager-webpack5": "^6.4.9",
+    "@storybook/react": "^6.4.9",
+    "@types/node": "17.0.5",
+    "@types/react": "17.0.38",
+    "@types/styled-components": "^5.1.14",
+    "babel-loader": "^8.2.3",
+    "eslint": "8.5.0",
+    "eslint-config-next": "12.0.7",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-storybook": "^0.5.5",
+    "prettier": "^2.5.1",
+    "eslint-config-prettier": "^8.3.0",
+    "typescript": "4.5.4"
   },
   "release": {
     "branches": [