Skip to content

Commit

Permalink
house keeping
Browse files Browse the repository at this point in the history
* updated dependencies
* updated linting configs
* updated storybook to 6.0.0 beta
  • Loading branch information
South-Paw committed Jun 29, 2020
1 parent 55278c4 commit ffab801
Show file tree
Hide file tree
Showing 10 changed files with 1,342 additions and 1,159 deletions.
46 changes: 46 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"extends": ["airbnb-typescript", "plugin:prettier/recommended", "plugin:jest/recommended"],
"parserOptions": {
"project": "./tsconfig.json"
},
"rules": {
"import/named": "off",
"import/order": [
"error",
{
"groups": ["builtin", "external", "parent", "sibling", "index"],
"newlines-between": "never"
}
],
"import/prefer-default-export": "off",
"jsx-a11y/accessible-emoji": "off",
"no-console": "off",
"no-underscore-dangle": "off",
"react/jsx-curly-newline": "off",
"react/jsx-one-expression-per-line": "off",
"react/jsx-props-no-spreading": "off",
"react/jsx-wrap-multilines": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/indent": "off",
"@typescript-eslint/quotes": "off"
},
"overrides": [
{
"files": ["**/*.tsx"],
"rules": {
"react/prop-types": "off"
}
},
{
"files": ["**/*.stories.tsx"],
"rules": {
"import/no-extraneous-dependencies": "off"
}
}
],
"settings": {
"react": {
"version": "detect"
}
}
}
52 changes: 0 additions & 52 deletions .eslintrc.js

This file was deleted.

6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"endOfLine": "lf",
"printWidth": 120,
"singleQuote": true,
"trailingComma": "all"
}
7 changes: 0 additions & 7 deletions .prettierrc.js

This file was deleted.

25 changes: 2 additions & 23 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
const path = require('path');

module.exports = {
stories: ['../src/**/*.stories.(tsx|mdx)'],
addons: [
{
name: '@storybook/preset-typescript',
options: {
tsLoaderOptions: { configFile: path.resolve(__dirname, './tsconfig.json') },
tsDocgenLoaderOptions: { tsconfigPath: path.resolve(__dirname, './tsconfig.json') },
include: [path.resolve(__dirname, '../src')],
},
},
{
name: '@storybook/addon-docs',
options: {
configureJSX: true,
babelOptions: {},
sourceLoaderOptions: null,
},
},
'@storybook/addon-knobs/register',
'@storybook/addon-actions/register',
],
stories: ['../src/**/*.stories.@(tsx|mdx)'],
addons: ['@storybook/addon-docs', '@storybook/addon-knobs', '@storybook/addon-actions'],
};
1 change: 1 addition & 0 deletions .storybook/manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import { create } from '@storybook/theming/create';
addons.setConfig({
theme: create({
brandTitle: '🌶️ Spicy UI',
brandUrl: 'https://github.com/spicy-ui/core',
}),
});
6 changes: 0 additions & 6 deletions .storybook/tsconfig.json

This file was deleted.

2 changes: 1 addition & 1 deletion @types/styled-system__should-forward-prop/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable no-shadow */
/* eslint-disable no-shadow, @typescript-eslint/naming-convention */

declare module '@styled-system/should-forward-prop' {
type genericShouldForwardProp = (prop: string | number) => boolean;
Expand Down
49 changes: 28 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{
"name": "@spicy-ui/core",
"version": "0.0.1-alpha.2",
"version": "0.0.1-alpha.3",
"description": "A React component library to spice up your UI",
"keywords": [],
"keywords": [
"react",
"react-components",
"ui",
"ui-components",
"components",
"component-library",
"design-system",
"library",
"spicy",
"spicy-ui",
"styled-components"
],
"homepage": "https://github.com/spicy-ui/core",
"bugs": "https://github.com/spicy-ui/core/issues",
"license": "MIT",
Expand Down Expand Up @@ -34,7 +46,7 @@
"start:storybook": "start-storybook -p 9000",
"build": "tsdx build",
"build:storybook": "build-storybook",
"lint": "tsdx lint",
"lint": "eslint ./src",
"test": "tsdx test --passWithNoTests",
"prepublishOnly": "yarn build"
},
Expand All @@ -53,43 +65,38 @@
},
"devDependencies": {
"@babel/core": "^7.10.3",
"@storybook/addon-actions": "^5.3.19",
"@storybook/addon-docs": "^5.3.19",
"@storybook/addon-knobs": "^5.3.19",
"@storybook/preset-typescript": "^1.2.0",
"@storybook/react": "^5.3.19",
"@storybook/addon-actions": "^6.0.0-beta.37",
"@storybook/addon-docs": "^6.0.0-beta.37",
"@storybook/addon-knobs": "^6.0.0-beta.37",
"@storybook/react": "^6.0.0-beta.37",
"@types/color": "^3.0.1",
"@types/jest": "^26.0.0",
"@types/react": "^16.9.38",
"@types/jest": "^26.0.3",
"@types/react": "^16.9.41",
"@types/react-dom": "^16.9.8",
"@types/react-transition-group": "^4.4.0",
"@types/styled-components": "^5.1.0",
"@types/styled-system": "^5.1.9",
"@types/styled-system__css": "^5.0.11",
"@typescript-eslint/eslint-plugin": "^3.3.0",
"@typescript-eslint/parser": "^3.3.0",
"@typescript-eslint/eslint-plugin": "^3.4.0",
"@typescript-eslint/parser": "^3.4.0",
"babel-loader": "^8.1.0",
"color": "^3.1.2",
"eslint": "7.2.0",
"eslint": "^7.3.1",
"eslint-config-airbnb-typescript": "^8.0.2",
"eslint-config-prettier": "^6.11.0",
"eslint-config-react-app": "^5.2.1",
"eslint-plugin-flowtype": "^5.1.3",
"eslint-plugin-import": "^2.21.2",
"eslint-plugin-jest": "^23.16.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jest": "^23.17.1",
"eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react": "^7.20.1",
"eslint-plugin-react-hooks": "^4.0.4",
"fork-ts-checker-webpack-plugin": "^5.0.4",
"prettier": "^2.0.5",
"react": "^16.13.1",
"react-docgen-typescript-loader": "^3.7.2",
"react-dom": "^16.13.1",
"react-is": "^16.13.1",
"react-uid": "^2.3.0",
"rimraf": "^3.0.2",
"styled-components": "^5.1.1",
"ts-loader": "^7.0.5",
"tsdx": "^0.13.2",
"tslib": "^2.0.0",
"typescript": "^3.9.5"
Expand Down
Loading

0 comments on commit ffab801

Please sign in to comment.