Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Map#concat #1402

Merged
merged 2 commits into from Oct 18, 2017
Merged

Conversation

philipp-spiess
Copy link
Contributor

#1373 made Map#concat an alias for Map#merge but defined the alias
before Map#merge was defined, resulting in Map#concat being
undefined.

This fixes the issue and adds a regression test.

immutable-js#1373 made `Map#concat` an alias for `Map#merge` but defined the alias
before `Map#merge` was defined, resulting in `Map#concat` being
undefined.

This fixes the issue and adds a regression test.
@leebyron
Copy link
Collaborator

Awesome, thank you for adding a test!

@leebyron leebyron merged commit 140c399 into immutable-js:master Oct 18, 2017
@philipp-spiess philipp-spiess deleted the philipp/map-concat branch October 18, 2017 21:33
@acusti
Copy link
Contributor

acusti commented Oct 24, 2017

Seems like this fix might be worth a new rc

errendir added a commit to errendir/immutable-js that referenced this pull request Dec 8, 2017
* facebook/master: (305 commits)
  Reduce repetition in COC link `CONTRIBUTING.md`
  Add CODE_OF_CONDUCT.md
  fix typo
  Add link to Code of Conduct in CONTRIBUTING
  Improved Flow support for Record subclasses (immutable-js#1414)
  Improve asImmutable() docs (immutable-js#1415)
  Only include version in require statement in Runkit instances. (immutable-js#1411)
  Add example for OrderedSet subtract. (immutable-js#1410)
  Fix code samples in Immutable.d.ts docs (immutable-js#1408)
  Adds perf tests for `Map.merge`. (immutable-js#1407)
  Move gulpfile into resources/
  Prettier: perf tests
  Prettier: include resources
  Prettify: Use es5 trailing commas
  Merge immutable-js#1403
  Document regression test steps. (immutable-js#1405)
  Demonstrates correct handling of Symbol keys in Map.mergeDeep when the Maps are nested, and initialized with Symbol KV tuples instead of plain JS object literals. (immutable-js#1404)
  Fix Map#concat (immutable-js#1402)
  test(ts-definitions): test Immutable.d.ts validity using tsc (immutable-js#1401)
  4.0.0-rc.9
  ...
errendir added a commit to errendir/immutable-js that referenced this pull request Dec 8, 2017
* facebook/master: (305 commits)
  Reduce repetition in COC link `CONTRIBUTING.md`
  Add CODE_OF_CONDUCT.md
  fix typo
  Add link to Code of Conduct in CONTRIBUTING
  Improved Flow support for Record subclasses (immutable-js#1414)
  Improve asImmutable() docs (immutable-js#1415)
  Only include version in require statement in Runkit instances. (immutable-js#1411)
  Add example for OrderedSet subtract. (immutable-js#1410)
  Fix code samples in Immutable.d.ts docs (immutable-js#1408)
  Adds perf tests for `Map.merge`. (immutable-js#1407)
  Move gulpfile into resources/
  Prettier: perf tests
  Prettier: include resources
  Prettify: Use es5 trailing commas
  Merge immutable-js#1403
  Document regression test steps. (immutable-js#1405)
  Demonstrates correct handling of Symbol keys in Map.mergeDeep when the Maps are nested, and initialized with Symbol KV tuples instead of plain JS object literals. (immutable-js#1404)
  Fix Map#concat (immutable-js#1402)
  test(ts-definitions): test Immutable.d.ts validity using tsc (immutable-js#1401)
  4.0.0-rc.9
  ...
@cchamberlain
Copy link
Contributor

This appears to still be broken in current rc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants