From e0d6e31085cf62a8f0bf09b45fe85a5da975cc75 Mon Sep 17 00:00:00 2001 From: Joe Furfaro Date: Fri, 13 Jul 2018 17:35:56 -0700 Subject: [PATCH] Linter appeasement, version drop, scrapped extra transform for publishing --- .eslintrc.js | 1 + package-lock.json | 17 ----------------- package.json | 4 ++-- src/elements/Text/Text.js | 15 ++++++++------- webpack.config.js | 2 +- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9f1fdfa..2439cd4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -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 } }; diff --git a/package-lock.json b/package-lock.json index 3c2f429..2234b14 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4408,12 +4408,6 @@ "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=", "dev": true }, - "babel-plugin-syntax-decorators": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz", - "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=", - "dev": true - }, "babel-plugin-syntax-dynamic-import": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", @@ -4473,17 +4467,6 @@ "babel-template": "^6.24.1" } }, - "babel-plugin-transform-decorators-legacy": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz", - "integrity": "sha512-jYHwjzRXRelYQ1uGm353zNzf3QmtdCfvJbuYTZ4gKveK7M9H1fs3a5AKdY1JUDl0z97E30ukORW1dzhWvsabtA==", - "dev": true, - "requires": { - "babel-plugin-syntax-decorators": "^6.1.18", - "babel-runtime": "^6.2.0", - "babel-template": "^6.3.0" - } - }, "babel-plugin-transform-dynamic-import": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-dynamic-import/-/babel-plugin-transform-dynamic-import-2.0.0.tgz", diff --git a/package.json b/package.json index 7583341..e83ae2e 100644 --- a/package.json +++ b/package.json @@ -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": [ @@ -10,6 +10,7 @@ "start": "docz dev", "docs": "docz build", "build": "webpack --mode production", + "test": "eslint src", "prepublish": "npm run build" }, "repository": { @@ -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", diff --git a/src/elements/Text/Text.js b/src/elements/Text/Text.js index e9b2838..89986f8 100644 --- a/src/elements/Text/Text.js +++ b/src/elements/Text/Text.js @@ -21,8 +21,8 @@ const Text = (props) => { italic, uppercase, lowercase, - title, - subtitle, + // title, + // subtitle, // font size smallest, @@ -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 = {}; @@ -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 */ @@ -101,7 +103,6 @@ Text.propTypes = { larger: PropTypes.bool, /** Extra extra large text */ largest: PropTypes.bool - }; export default Text; diff --git a/webpack.config.js b/webpack.config.js index aaadd0d..c75e366 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -27,7 +27,7 @@ const config = { node: 'current', modules: false }]], - plugins: ['transform-object-rest-spread', 'transform-decorators-legacy'] + plugins: ['transform-object-rest-spread'] } } ]