Skip to content

Commit ddb8c19

Browse files
ProskyneteProskynete
authored
Merge pull request #17 from Proskynete/dev
From dev to master
2 parents c1d6334 + 92f8b5d commit ddb8c19

File tree

12 files changed

+324
-206
lines changed

12 files changed

+324
-206
lines changed

‎.babelrc‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
{
22
"presets": [
3-
[
4-
"@babel/preset-env", { "targets": { "node": "current" }}
5-
]
3+
[
4+
"@babel/preset-env",
5+
{
6+
"useBuiltIns": "entry"
7+
}
8+
],
9+
"@babel/preset-react"
610
],
711
"plugins": [
8-
"@babel/plugin-proposal-object-rest-spread",
9-
"@babel/plugin-transform-react-jsx"
12+
[
13+
"@babel/plugin-transform-runtime",
14+
{
15+
"regenerator": true
16+
}
17+
]
1018
]
11-
}
19+
}

‎.eslintrc‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.eslintrc.json‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
{
2+
"extends": ["airbnb", "prettier", "prettier/react"],
3+
"plugins": ["prettier", "react-hooks"],
4+
"rules": {
5+
"no-nested-ternary": [0],
6+
"react-hooks/exhaustive-deps": "off",
7+
"import/imports-first": ["error", "absolute-first"],
8+
"import/newline-after-import": "error",
9+
"react/no-did-update-set-state": "error",
10+
"react/no-unknown-property": "error",
11+
"react/no-unused-prop-types": "error",
12+
"react/react-in-jsx-scope": "error",
13+
"space-in-parens": [0, "never"],
14+
"template-curly-spacing": [2, "never"],
15+
"array-bracket-spacing": [2, "never"],
16+
"computed-property-spacing": [2, "never"],
17+
"quotes": [1, "single", "avoid-escape"],
18+
"semi": [0, "never"],
19+
"prefer-const": 1,
20+
"react/prefer-es6-class": 0,
21+
"react/prop-types": [1],
22+
"react/no-array-index-key": [1],
23+
"class-methods-use-this": [1],
24+
"no-undef": [1],
25+
"no-case-declarations": [1],
26+
"no-return-assign": [1],
27+
"no-param-reassign": [1],
28+
"import/prefer-default-export": "off",
29+
"no-shadow": [1],
30+
"camelcase": [1],
31+
"no-underscore-dangle": [0, "always"],
32+
"react/jsx-props-no-spreading": [0, {}],
33+
"jsx-a11y/label-has-associated-control": [0, {
34+
"labelComponents": [],
35+
"labelAttributes": [],
36+
"controlComponents": [],
37+
"assert": "both",
38+
"depth": 3
39+
}],
40+
"jsx-a11y/label-has-for": [2, {
41+
"required": {
42+
"every": ["id"]
43+
}
44+
}],
45+
"object-curly-spacing": [
46+
"error",
47+
"always",
48+
{
49+
"arraysInObjects": true,
50+
"objectsInObjects": true
51+
}
52+
],
53+
"jsx-a11y/anchor-is-valid": [
54+
"error",
55+
{
56+
"components": ["Link"],
57+
"specialLink": ["hrefLeft", "hrefRight", "to"],
58+
"aspects": ["noHref", "invalidHref", "preferButton"]
59+
}
60+
],
61+
"react/jsx-curly-spacing": [
62+
2,
63+
{
64+
"when": "never"
65+
}
66+
],
67+
"react/jsx-no-bind": [
68+
"error",
69+
{
70+
"allowArrowFunctions": true,
71+
"allowBind": false,
72+
"ignoreRefs": true
73+
}
74+
],
75+
"react/jsx-filename-extension": [
76+
1,
77+
{
78+
"extensions": [".js", ".jsx"]
79+
}
80+
],
81+
"no-multiple-empty-lines": [
82+
2,
83+
{
84+
"max": 1,
85+
"maxEOF": 0,
86+
"maxBOF": 0
87+
}
88+
],
89+
"no-use-before-define": [
90+
2,
91+
{
92+
"functions": false
93+
}
94+
]
95+
},
96+
"globals": {
97+
"window": true,
98+
"document": true,
99+
"localStorage": true,
100+
"FormData": true,
101+
"FileReader": true,
102+
"Blob": true,
103+
"navigator": true
104+
},
105+
"parser": "babel-eslint",
106+
"settings": {
107+
"import/resolver": "meteor"
108+
}
109+
}

‎.prettierrc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"arrowParens": "always",
3+
"bracketSpacing": true,
4+
"htmlWhitespaceSensitivity": "css",
5+
"insertPragma": false,
6+
"jsxBracketSameLine": false,
7+
"jsxSingleQuote": true,
8+
"proseWrap": "preserve",
9+
"quoteProps": "as-needed",
10+
"requirePragma": false,
11+
"semi": true,
12+
"singleQuote": true,
13+
"tabWidth": 2,
14+
"trailingComma": "all",
15+
"useTabs": true,
16+
"vueIndentScriptAndStyle": false,
17+
"printWidth": 80
18+
}

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22

33
node_js:
4-
- 10
4+
- 12
55

66
install:
77
- npm install

‎package.json‎

Lines changed: 72 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,74 @@
11
{
2-
"name": "vertical-timeline-component-react",
3-
"version": "1.2.1",
4-
"description": "A simple component for create a vertical timeline with Reactjs",
5-
"main": "build/index.js",
6-
"repository": "https://github.com/Proskynete/vertical-timeline-component-react",
7-
"author": {
8-
"name": "Eduardo Alvarez",
9-
"email": "eduardo.a1993@gmail.com"
10-
},
11-
"license": "MIT",
12-
"scripts": {
13-
"build": "webpack --mode production",
14-
"lint": "npm run lint:js",
15-
"lint:js": "eslint ./src/components/ --ignore-path .gitignore",
16-
"lint:js-fix": "eslint ./src/components/ --ignore-path .gitignore --fix",
17-
"start": "webpack --mode development --watch",
18-
"test": "jest",
19-
"test:coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls",
20-
"test:coverage": "jest --coverage",
21-
"test:watch": "jest --watchAll"
22-
},
23-
"keywords": [
24-
"React",
25-
"Reactjs",
26-
"Vertical Timeline Component React",
27-
"Vertical Timeline"
28-
],
29-
"peerDependencies": {
30-
"react": "^16.12.0"
31-
},
32-
"dependencies": {
33-
"chai": "^4.2.0",
34-
"chai-enzyme": "^1.0.0-beta.1",
35-
"coveralls": "^3.0.3",
36-
"enzyme": "^3.9.0",
37-
"enzyme-adapter-react-16": "^1.12.1",
38-
"jest": "^24.7.1",
39-
"path": "^0.12.7",
40-
"prop-types": "^15.7.2",
41-
"react": "^16.12.0",
42-
"react-dom": "^16.12.0",
43-
"styled-components": "^4.4.1",
44-
"webpack": "^4.41.5",
45-
"webpack-cli": "^3.3.10"
46-
},
47-
"devDependencies": {
48-
"@babel/core": "^7.0.0",
49-
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
50-
"@babel/plugin-transform-react-jsx": "^7.0.0",
51-
"@babel/preset-env": "^7.0.0",
52-
"babel-jest": "^24.7.1",
53-
"babel-loader": "^8.0.0",
54-
"eslint": "^5.16.0",
55-
"eslint-config-airbnb": "^17.1.0",
56-
"eslint-import-resolver-webpack": "^0.11.1",
57-
"eslint-plugin-import": "^2.17.2",
58-
"eslint-plugin-jsx-a11y": "^6.2.1",
59-
"eslint-plugin-react": "^7.12.4",
60-
"react-test-renderer": "^16.8.6"
61-
}
2+
"name": "vertical-timeline-component-react",
3+
"version": "1.2.3",
4+
"description": "A simple component for create a vertical timeline with Reactjs",
5+
"main": "build/index.js",
6+
"repository": "https://github.com/Proskynete/vertical-timeline-component-react",
7+
"author": {
8+
"name": "Eduardo Alvarez",
9+
"email": "eduardo.a1993@gmail.com"
10+
},
11+
"license": "MIT",
12+
"scripts": {
13+
"build": "webpack --mode production",
14+
"start": "webpack --mode development --watch",
15+
"lint": "eslint ./src --ignore-path .gitignore",
16+
"lint:fix": "eslint --fix ./src --ignore-path .gitignore",
17+
"prettier:check": "prettier --check ./src/**/*.js",
18+
"prettier:format": "prettier --config .prettierrc --write ./src/**/*.js",
19+
"test": "jest",
20+
"test:coveralls": "jest --coverage --coverageReporters=text-lcov | coveralls",
21+
"test:coverage": "jest --coverage",
22+
"test:watch": "jest --watchAll"
23+
},
24+
"keywords": [
25+
"React",
26+
"Reactjs",
27+
"Vertical Timeline Component React",
28+
"Vertical Timeline"
29+
],
30+
"publishConfig": {
31+
"registry": "https://npm.pkg.github.com/"
32+
},
33+
"peerDependencies": {
34+
"react": "^16.13.1"
35+
},
36+
"dependencies": {
37+
"chai": "^4.2.0",
38+
"chai-enzyme": "^1.0.0-beta.1",
39+
"coveralls": "^3.1.0",
40+
"enzyme": "^3.9.0",
41+
"enzyme-adapter-react-16": "^1.12.1",
42+
"jest": "^26.0.1",
43+
"path": "^0.12.7",
44+
"prop-types": "^15.7.2",
45+
"react": "^16.13.1",
46+
"react-dom": "^16.13.1",
47+
"styled-components": "^5.1.1",
48+
"webpack": "^4.43.0",
49+
"webpack-cli": "^3.3.12"
50+
},
51+
"devDependencies": {
52+
"@babel/core": "^7.6.4",
53+
"@babel/plugin-transform-runtime": "^7.9.0",
54+
"@babel/polyfill": "^7.8.7",
55+
"@babel/preset-env": "^7.6.3",
56+
"@babel/preset-react": "^7.6.3",
57+
"@babel/runtime": "^7.9.0",
58+
"babel-eslint": "^10.0.3",
59+
"babel-jest": "^26.0.1",
60+
"babel-loader": "^8.0.0",
61+
"eslint": "7.2.0",
62+
"eslint-config-airbnb": "^18.2.0",
63+
"eslint-config-airbnb-base": "^14.2.0",
64+
"eslint-config-prettier": "^6.11.0",
65+
"eslint-import-resolver-alias": "^1.1.2",
66+
"eslint-import-resolver-meteor": "^0.4.0",
67+
"eslint-plugin-import": "^2.21.2",
68+
"eslint-plugin-jsx-a11y": "^6.2.3",
69+
"eslint-plugin-prettier": "^3.1.3",
70+
"eslint-plugin-react": "^7.20.0",
71+
"eslint-plugin-react-hooks": "0.0.0-33c3af284",
72+
"react-test-renderer": "^16.8.6"
73+
}
6274
}

‎src/components/content/index.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ const ContainerComponent = styled.div`
1717
`;
1818

1919
const Content = (props) => {
20-
const { children } = props;
20+
const { children } = props;
2121

22-
return (
23-
<ContainerComponent className="content-component">
24-
{children}
25-
</ContainerComponent>
26-
);
22+
return (
23+
<ContainerComponent className='content-component'>
24+
{children}
25+
</ContainerComponent>
26+
);
2727
};
2828

2929
Content.propTypes = {
30-
children: PropTypes.node.isRequired,
30+
children: PropTypes.node.isRequired,
3131
};
3232

3333
export default Content;

‎src/components/content_body/index.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ const BodyComponentTitle = styled.p`
3535
`;
3636

3737
const ContentBody = (props) => {
38-
const { title, children } = props;
39-
40-
return (
41-
<BodyComponent className="body-component">
42-
<BodyComponentTitle className="title-body-component">
43-
{title}
44-
</BodyComponentTitle>
45-
{children}
46-
</BodyComponent>
47-
);
38+
const { title, children } = props;
39+
40+
return (
41+
<BodyComponent className='body-component'>
42+
<BodyComponentTitle className='title-body-component'>
43+
{title}
44+
</BodyComponentTitle>
45+
{children}
46+
</BodyComponent>
47+
);
4848
};
4949

5050
ContentBody.propTypes = {
51-
title: PropTypes.string.isRequired,
52-
children: PropTypes.node.isRequired,
51+
title: PropTypes.string.isRequired,
52+
children: PropTypes.node.isRequired,
5353
};
5454

5555
export default ContentBody;

0 commit comments

Comments
 (0)