Merge branch 'master' into master

Author: roggervalf

.babelrc

@@ -1,4 +1,11 @@
 {
-  "presets": ["es2015", "react", "stage-0"],
-  "plugins": ["transform-decorators-legacy"],
+  "plugins": [["@babel/plugin-proposal-decorators", { "legacy": true }],
+  "@babel/plugin-proposal-class-properties"
+    ],
+  "presets": [
+    ["@babel/preset-env", {
+      "modules": false
+    }],
+    "@babel/preset-react"
+  ]
 }

.eslintignore

@@ -0,0 +1,6 @@
+# Dependency directories
+node_modules/
+
+build/
+dist/
+standalone/

.eslintrc

@@ -0,0 +1,62 @@
+{
+  "parser": "babel-eslint",
+  "extends": [
+    "standard",
+    "standard-react",
+    "prettier",
+    "eslint:recommended"
+  ],
+  "env": {
+    "es6": true,
+    "jest": true
+  },
+  "plugins": [
+    "react",
+    "prettier"
+  ],
+  "parserOptions": {
+    "sourceType": "module",
+    "ecmaVersion": 2018,
+    "ecmaFeatures": {
+      "impliedStrict": true,
+      "jsx": true,
+      "arrowFunctions": true,
+      "blockBindings": true,
+      "defaultParams": true,
+      "destructuring": true,
+      "forOf": true,
+      "generators": true,
+      "objectLiteralComputedProperties": true,
+      "objectLiteralShorthandMethods": true,
+      "objectLiteralShorthandProperties": true,
+      "experimentalObjectRestSpread": true,
+      "restParams": true,
+      "spread": true,
+      "templateStrings": true,
+      "modules": true,
+      "classes": true
+    }
+  },
+  "rules": {
+    // don't force es6 functions to include space before paren
+    "space-before-function-paren": 0,
+
+    // allow specifying true explicitly for boolean props
+    "react/jsx-boolean-value": 0,
+
+    "max-len": [2, {"code":120,"ignoreComments":true}],
+
+    "prettier/prettier": [
+      "error",
+      {
+        "singleQuote": false,
+        "trailingComma": "es5",
+        "tabWidth": 2,
+        "printWidth": 80,
+        "semi": true,
+        "bracketSpacing": true,
+        "jsxBracketSameLine": false
+      }
+    ]
+  }
+}

.gitignore

@@ -10,5 +10,5 @@
 
 # files
 node_modules/
-example/dist/
 dist/
+build/

.travis.yml

@@ -3,26 +3,37 @@ cache:
   directories:
     - node_modules
 node_js:
-  - "8"
+  - 12
 notifications:
   email:
     recipients:
       - aron.helser@kitware.com
     on_success: change
     on_failure: always
 install:
-  - npm install
+  - yarn
 
 script:
-  - npm run build
+  - yarn build
   - git config --global user.name "Travis CI"
   - git config --global user.email "aron.helser@kitware.com"
-  - export GIT_PUBLISH_URL=https://${GH_TOKEN}@github.com/wwayne/react-tooltip.git
-  - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then npm run gh-pages -- --repo ${GIT_PUBLISH_URL}; fi
+  - cd example
+  - yarn
+  - yarn build
+  - cd ..
 
 after_success:
-  - npm run semantic-release
-
+  - yarn semantic-release
+  
+deploy:
+  provider: pages
+  local_dir: example/build
+  skip_cleanup: true
+  token: $GH_TOKEN
+  keep_history: true
+  on:
+    branch: master  
+  
 branches:
   except:
     - "/^v\\d+\\.\\d+\\.\\d+$/"

Makefile

@@ -7,18 +7,32 @@
 [download-image]: https://img.shields.io/npm/dm/react-tooltip.svg?style=flat-square
 [download-url]: https://npmjs.org/package/react-tooltip
 
+## Demo
+
+[![Edit ReactTooltip](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/heuristic-curran-bddeu?fontsize=14&hidenavigation=1&theme=dark)
+
 ## Maintainers
 
-[huumanoid](https://github.com/huumanoid)
+[aronhelser](https://github.com/aronhelser) Passive maintainer - accepting PRs and doing minor testing, but not fixing issues or doing active development.
+
+[Rogger794](https://github.com/Rogger794) Active maintainer - accepting PRs and doing minor testing, fixing issues or doing active development.
 
-[aronhelser](https://github.com/aronhelser)
+[huumanoid](https://github.com/huumanoid) (inactive)
+
+We would gladly accept a new maintainer to help out!
 
 ## Installation
 
 ```sh
 npm install react-tooltip
 ```
 
+or
+
+```sh
+yarn add react-tooltip
+```
+
 ## Usage
 **Using NPM**
 
@@ -29,20 +43,20 @@ import ReactTooltip from 'react-tooltip'
 ```
 
 2 . Add data-tip = "your placeholder" to your element
+
 ```jsx
 <p data-tip="hello world">Tooltip</p>
 ```
 
 3 . Include react-tooltip component
 
-
 ```js
 <ReactTooltip />
 ```
 
 **Standalone**
 
-You can import `node_modules/react-tooltip/standalone/react-tooltip.min.js` into your page. Please make sure that you have already imported `react` and `react-dom` into your page.
+You can import `node_modules/react-tooltip/dist/index.js` into your page. Please make sure that you have already imported `react` and `react-dom` into your page.
 
 ## Options
 Notes:
@@ -84,9 +98,6 @@ className	|   data-class  |  String  |   | extra custom class, can use !importan
 
 The `html` option allows a tooltip to directly display raw HTML. This is a security risk if any of that content is supplied by the user. Any user-supplied content must be sanitized, using a package like [sanitize-html-react](https://www.npmjs.com/package/sanitize-html-react). We chose not to include sanitization after discovering it [increased our package size](https://github.com/wwayne/react-tooltip/issues/429) too much - we don't want to penalize people who don't use the `html` option.
 
-## Using react component as tooltip
-Check the example [React-tooltip Test](https://react-tooltip.netlify.com/)
-
 ##### Note:
 1. **data-tip** is necessary, because `<ReactTooltip />` finds the tooltip via this attribute
 2. **data-for** corresponds to the **id** of `<ReactTooltip />`

README.md

@@ -1,36 +1,50 @@
-var sass = require('node-sass')
-var fs = require('fs')
-var path = require('path')
+var sass = require("node-sass");
+var fs = require("fs");
+var path = require("path");
 
-function transferSass () {
-  sass.render({
-    file: path.resolve(__dirname, '../src/index.scss'),
-    outputStyle: 'compressed'
-  }, function (err, result) {
-    if (err) {
-      console.log(err)
-      return
-    }
-    var cssSource = result.css.toString()
-    fs.writeFile(path.resolve(__dirname, '../src/style.js'), "export default '" + cssSource.replace(/\n/g, '') + "'", function (err) {
+function transferSass() {
+  sass.render(
+    {
+      file: path.resolve(__dirname, "../src/index.scss"),
+      outputStyle: "compressed",
+    },
+    function(err, result) {
       if (err) {
-        console.error(err)
+        console.log(err);
+        return;
       }
-      console.log('css file has been transformed to JS successful')
-      fs.writeFile(path.resolve(__dirname, '../src/style.css'), cssSource, function (err) {
-        if (err) {
-          console.error(err)
+      var cssSource = result.css.toString();
+      fs.writeFile(
+        path.resolve(__dirname, "../src/style.js"),
+        "export default '" + cssSource.replace(/\n/g, "") + "'",
+        function(err) {
+          if (err) {
+            console.error(err);
+          }
+          console.log("css file has been transformed to JS successful");
+          fs.writeFile(
+            path.resolve(__dirname, "../src/style.css"),
+            cssSource,
+            function(err) {
+              if (err) {
+                console.error(err);
+              }
+              console.log("css file has been transformed successful");
+              process.exit();
+            }
+          );
         }
-        console.log('css file has been transformed successful')
-        process.exit()
-      })
-    })
-  })
+      );
+    }
+  );
 }
 
-transferSass()
+transferSass();
 
-fs.watch(path.resolve(__dirname, '../src/index.scss'), function (event, filename) {
-  console.log(event, filename)
-  transferSass()
-})
+fs.watch(path.resolve(__dirname, "../src/index.scss"), function(
+  event,
+  filename
+) {
+  console.log(event, filename);
+  transferSass();
+});

bin/transferSass.js

@@ -4,24 +4,31 @@ This doc needs help! Please submit your PR...
 
 ## Commit messages
 
-We are using semantic-release to automate the release process, and this depends on a specific format for commit messages. Please run `npm run commit` to use `commitizen` to properly format your commit messages so they can be automatically processed and included in release notes.
+We are using semantic-release to automate the release process, and this depends on a specific format for commit messages. Please run `yarn commit` to use `commitizen` to properly format your commit messages so they can be automatically processed and included in release notes.
 
 ## Pull request testing
 
 Some notes on testing and releasing.
 * For a PR, follow Github's command-line instructions for retrieving the branch with the changes.
-* `make dev` starts a development server, open `http://localhost:8888` to see the example website.
+* To start a development server:
+
+```sh
+yarn build
+cd example
+yarn
+yarn start
+```
+
 * Provide feedback on the PR about your results.
 
 ## Doing a release
 
 We are using semantic-release instead of this:
 
-* `make deploy` updates the files in the `standalone` directory
 * update the version number in `package.json`
-    - Fixes update the patch number, features update the minor number.
-    - Major version update is reserved for API breaking changes, not just additions. 
-* `npm run github-changes -- -n 3.X.Y` to update the changelog
+  - Fixes update the patch number, features update the minor number.
+  - Major version update is reserved for API breaking changes, not just additions.
+* `yarn github-changes -- -n 3.X.Y` to update the changelog
 * `git add`, `git commit` and `git push` to get the version to master.
 * `git tag -a 3.X.Y -m 3.X.Y` `git push --tags`
 * `npm publish`