feat: upgrade everything and remove CJS/UMD entries

Closes #41, Closes #70 BREAKING CHANGE: If you're using the CJS module format, you now have to get `matchSorter` from the `default` property.
kentcdodds · Jul 19, 2019 · fe94fc6 · fe94fc6
1 parent 2c9a471
commit fe94fc6
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 183 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -11,9 +11,9 @@ never done that before, that's great! Check this free short video tutorial to
 learn how: http://kcd.im/pull-request
 -->
 
-* `match-sorter` version:
-* `node` version:
-* `npm` (or `yarn`) version:
+- `match-sorter` version:
+- `node` version:
+- `npm` (or `yarn`) version:
 
 Relevant code or config
 

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -34,9 +34,9 @@ merge of your pull request!
 
 <!-- to check an item, place an "x" in the box like so: "- [x] Documentation" -->
 
-* [ ] Documentation
-* [ ] Tests
-* [ ] Ready to be merged <!-- In your opinion, is this ready to be merged as soon as it's reviewed? -->
-* [ ] Added myself to contributors table <!-- this is optional, see the contributing guidelines for instructions -->
+- [ ] Documentation
+- [ ] Tests
+- [ ] Ready to be merged <!-- In your opinion, is this ready to be merged as soon as it's reviewed? -->
+- [ ] Added myself to contributors table <!-- this is optional, see the contributing guidelines for instructions -->
 
 <!-- feel free to add additional comments -->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -28,39 +28,12 @@ Thanks for being willing to contribute!
 > branch. Whenever you want to update your version of `master`, do a regular
 > `git pull`.
 
-## Add yourself as a contributor
-
-This project follows the [all contributors][all-contributors] specification.
-To add yourself to the table of contributors on the `README.md`, please use the
-automated script as part of your PR:
-
-```console
-npm run add-contributor
-```
-
-Follow the prompt and commit `.all-contributorsrc` and `README.md` in the PR.
-If you've already added yourself to the list and are making
-a new type of contribution, you can run it again and select the added
-contribution type.
-
 ## Committing and Pushing changes
 
 Please make sure to run the tests before you commit your changes. You can run
 `npm run test:update` which will update any snapshots that need updating.
 Make sure to include those changes (if they exist) in your commit.
 
-### opt into git hooks
-
-There are git hooks set up with this project that are automatically installed
-when you install dependencies. They're really handy, but are turned off by
-default (so as to not hinder new contributors). You can opt into these by
-creating a file called `.opt-in` at the root of the project and putting this
-inside:
-
-```
-pre-commit
-```
-
 ## Help needed
 
 Please checkout the [the open issues][issues]

diff --git a/README.md b/README.md
diff --git a/other/CODE_OF_CONDUCT.md b/other/CODE_OF_CONDUCT.md
@@ -14,21 +14,21 @@ orientation.
 Examples of behavior that contributes to creating a positive environment
 include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
+- The use of sexualized language or imagery and unwelcome sexual attention or
   advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
   address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Our Responsibilities

diff --git a/other/EXAMPLES.md b/other/EXAMPLES.md
@@ -1,4 +1,4 @@
 # Examples
 
-* [With React-Select](https://jsbin.com/vewoka/edit?js,output)
-* [Basic example](https://jsbin.com/bihepe/edit?html,js,console)
+- [Basic example](https://codesandbox.io/s/inspiring-voice-4msg5)
+- [With Downshift](https://codesandbox.io/s/react-codesandbox-jnuq8)
diff --git a/other/ROADMAP.md b/other/ROADMAP.md
diff --git a/other/__tests__/dist-test.js b/other/__tests__/dist-test.js
diff --git a/other/jest.config.js b/other/jest.config.js
diff --git a/package.json b/package.json
@@ -3,20 +3,15 @@
   "version": "0.0.0-semantically-released",
   "description": "Simple, expected, and deterministic best-match sorting of an array in JavaScript",
   "main": "dist/match-sorter.cjs.js",
-  "jsnext:main": "dist/match-sorter.esm.js",
   "module": "dist/match-sorter.esm.js",
   "scripts": {
-    "add-contributor": "kcd-scripts contributors add",
     "build": "kcd-scripts build --bundle --environment BUILD_NAME:matchSorter",
     "lint": "kcd-scripts lint",
     "test": "kcd-scripts test",
     "test:cover": "kcd-scripts test --coverage",
     "test:update": "npm run test:cover -s -- --updateSnapshot",
-    "test:build": "kcd-scripts test --config other/jest.config.js --no-watch",
-    "build-and-test": "npm run build -s && npm run test:build -s",
-    "validate": "kcd-scripts validate lint,build-and-test,test:cover",
-    "setup": "npm install && npm run validate",
-    "precommit": "kcd-scripts precommit"
+    "validate": "kcd-scripts validate",
+    "setup": "npm install && npm run validate"
   },
   "files": [
     "dist"
@@ -30,14 +25,16 @@
   ],
   "author": "Kent C. Dodds <[email protected]> (http://kentcdodds.com/)",
   "license": "MIT",
-  "bundledDependencies": [
-    "remove-accents"
-  ],
   "dependencies": {
     "remove-accents": "0.4.2"
   },
   "devDependencies": {
-    "kcd-scripts": "^0.38.1"
+    "kcd-scripts": "^1.5.2"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "kcd-scripts pre-commit"
+    }
   },
   "eslintConfig": {
     "extends": [

diff --git a/src/__tests__/index.js b/src/__tests__/index.js
@@ -1,6 +1,3 @@
-// have to disable eslint for the next line because we have to
-// do weird things to make things work with UMD
-// eslint-disable-next-line import/default,import/named
 import matchSorter, {rankings} from '../'
 
 const tests = {

diff --git a/src/cjs-entry.js b/src/cjs-entry.js
diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,7 @@
 /**
  * @name match-sorter
  * @license MIT license.
- * @copyright (c) 2017 Kent C. Dodds
+ * @copyright (c) 2019 Kent C. Dodds
  * @author Kent C. Dodds <[email protected]>
  */
 import removeAccents from 'remove-accents'

diff --git a/src/umd-entry.js b/src/umd-entry.js