Skip to content

Commit

Permalink
Linter appeasement, version drop, scrapped extra transform for publis…
Browse files Browse the repository at this point in the history
…hing
  • Loading branch information
jfurfaro committed Jul 14, 2018
1 parent 0b9826e commit e0d6e31
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 27 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ module.exports = {
'space-infix-ops': 2,
strict: 2,
yoda: 2,
'react/jsx-curly-spacing': [2, {when: 'never', children: true}],
'react/no-unescaped-entities': 0
}
};
17 changes: 0 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ui",
"version": "1.0.0",
"version": "0.9.0",
"description": "UI kit based on ReactJS for TCG projects",
"main": "lib/index.js",
"files": [
Expand All @@ -10,6 +10,7 @@
"start": "docz dev",
"docs": "docz build",
"build": "webpack --mode production",
"test": "eslint src",
"prepublish": "npm run build"
},
"repository": {
Expand All @@ -27,7 +28,6 @@
"babel-eslint": "^8.2.3",
"babel-loader": "^7.1.4",
"babel-plugin-react-transform": "^3.0.0",
"babel-plugin-transform-decorators-legacy": "^1.3.5",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
Expand Down
15 changes: 8 additions & 7 deletions src/elements/Text/Text.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const Text = (props) => {
italic,
uppercase,
lowercase,
title,
subtitle,
// title,
// subtitle,

// font size
smallest,
Expand All @@ -40,11 +40,11 @@ const Text = (props) => {
other.classes
);

const tag = (heading)
const tag = heading
? `h${heading}`
: (span)
? 'span'
: 'p';
: span
? 'span'
: 'p';

const style = {};

Expand Down Expand Up @@ -77,6 +77,8 @@ Text.propTypes = {
children: PropTypes.node.isRequired,
/** Heading Level */
heading: PropTypes.string,
/** Span tag */
span: PropTypes.boolean,
/** String of class names */
classes: PropTypes.string,
/** Bold text */
Expand All @@ -101,7 +103,6 @@ Text.propTypes = {
larger: PropTypes.bool,
/** Extra extra large text */
largest: PropTypes.bool

};

export default Text;
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const config = {
node: 'current',
modules: false
}]],
plugins: ['transform-object-rest-spread', 'transform-decorators-legacy']
plugins: ['transform-object-rest-spread']
}
}
]
Expand Down

0 comments on commit e0d6e31

Please sign in to comment.