Merge remote-tracking branch 'facebook/master' into update-record-typ…

…ings

* facebook/master: (146 commits)
  Add descriptive titles (immutable-js#1244)
  expect setting Record property to throw (immutable-js#1194)
  Change the has method of Record to be a type guard (immutable-js#1232)
  Add back deleteIn() and removeIn() to Record (immutable-js#1179)
  Fix typo: change 'hiearchy' to 'hierarchy' (immutable-js#1222)
  Fix typo in OrderedMap#toKeyedSeq (immutable-js#1177)
  Fixes missing size property in flow types. (immutable-js#1173)
  Fix size of count() after filtering or flattening (immutable-js#1171)
  Support typescript strictNullChecks (immutable-js#1168)
  added links to header in docs immutable-js#356 (immutable-js#1164)
  Replace "an Collection" with "a Collection" everywhere (immutable-js#1163)
  Fix syntax highlighting and wrong variable names (immutable-js#1159)
  4.0.0-rc.2
  Adds back delete() and clear() to Record (immutable-js#1157)
  Improve filter typescript def to leverage predicate functions (immutable-js#1155)
  Improve type for reduce() (immutable-js#1156)
  Significant improvments to concat type definitions. (immutable-js#1153)
  Update README.md (immutable-js#1150)
  Add note for using with webpack
  Readme improvement pass
  ...

.eslintrc.json

@@ -0,0 +1,78 @@
+{
+  "root": true,
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "extends": [
+    "airbnb",
+    "prettier",
+    "prettier/react"
+  ],
+  "plugins": [
+    "react",
+    "prettier"
+  ],
+  "rules": {
+    "array-callback-return": "off",
+    "block-scoped-var": "off",
+    "class-methods-use-this": "off",
+    "consistent-return": "off",
+    "constructor-super": "off",
+    "default-case": "off",
+    "func-names": "off",
+    "no-bitwise": "off",
+    "no-cond-assign": "off",
+    "no-constant-condition": "off",
+    "no-continue": "off",
+    "no-else-return": "error",
+    "no-empty": "error",
+    "no-lonely-if": "error",
+    "no-multi-assign": "off",
+    "no-nested-ternary": "off",
+    "no-param-reassign": "off",
+    "no-plusplus": "off",
+    "no-prototype-builtins": "off",
+    "no-return-assign": "off",
+    "no-self-compare": "off",
+    "no-sequences": "off",
+    "no-shadow": "off",
+    "no-this-before-super": "off",
+    "no-underscore-dangle": "off",
+    "no-unused-expressions": "off",
+    "no-unused-vars": "error",
+    "no-use-before-define": "off",
+    "no-useless-concat": "error",
+    "no-var": "error",
+    "object-shorthand": "off",
+    "one-var": "error",
+    "operator-assignment": "error",
+    "prefer-rest-params": "off",
+    "prefer-spread": "off",
+    "prefer-template": "off",
+    "spaced-comment": "off",
+    "vars-on-top": "off",
+    "react/jsx-boolean-value": "off",
+    "react/jsx-filename-extension": "off",
+    "react/no-array-index-key": "off",
+    "react/no-danger": "off",
+    "react/no-multi-comp": "off",
+    "react/prefer-es6-class": "off",
+    "react/prefer-stateless-function": "off",
+    "react/prop-types": "off",
+    "react/self-closing-comp": "error",
+    "react/sort-comp": "off",
+    "import/newline-after-import": "error",
+    "import/no-extraneous-dependencies": "off",
+    "import/no-mutable-exports": "error",
+    "import/no-unresolved": "error",
+    "import/prefer-default-export": "off",
+    "jsx-a11y/no-static-element-interactions": "off",
+    "prettier/prettier": [
+      "error",
+      {
+        "singleQuote": true
+      }
+    ]
+  }
+}

.gitignore

@@ -1,15 +1,11 @@
 .*.haste_cache.*
 node_modules
-old
 npm-debug.log
+yarn-error.log
 .DS_Store
 *~
 *.swp
+.idea
 TODO
-build
-immutable.d.json
-readme.json
 /pages/out
-/pages/resources/immutable.d.json
-/pages/resources/readme.json
-.idea
+/pages/generated

.travis.yml

@@ -1,7 +1,9 @@
 sudo: false
 language: node_js
-node_js:
-    - '6'
+node_js: 7
+
+cache: yarn
+script: npm run test:travis
 
 env:
   global:
@@ -15,4 +17,11 @@ addons:
     packages:
       - g++-4.9
 
-after_success: npm run deploy
+deploy:
+- provider: script
+  skip_cleanup: true
+  script: npm run deploy
+  on:
+    tags: false
+    branch: master
+    repo: facebook/immutable-js

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Have a question?
 
-Please ask questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/immutable.js) instead of opening a Github Issue. There are more people on Stack Overflow who
+Please ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/immutable.js) instead of opening a Github Issue. There are more people on Stack Overflow who
 can answer questions, and good answers can be searchable and canonical.
 
 # Issues
@@ -32,6 +32,12 @@ your [pull requests](https://help.github.com/articles/creating-a-pull-request).
  6. Be sure to commit the generated JS in `/dist`.
  7. If you haven't already, complete the Contributor License Agreement ("CLA").
 
+## Documentation
+
+Documentation for Immutable.js (hosted at http://facebook.github.io/immutable-js)
+is developed in `pages/`. Run `npm start` to get a local copy in your browser
+while making edits.
+
 ## Contributor License Agreement ("CLA")
 
 In order to accept your pull request, we need you to submit a CLA. You only need