Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jsx-eslint/eslint-plugin-react
base: v6.10.0
Choose a base ref
...
head repository: jsx-eslint/eslint-plugin-react
compare: v6.10.1
Choose a head ref
  • 11 commits
  • 9 files changed
  • 8 contributors

Commits on Feb 15, 2017

  1. [Fix] jsx-indent with tabs (fixes #1057)

    Kent C. Dodds committed Feb 15, 2017
    5
    Copy the full SHA
    6e5f688 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. Merge pull request #1058 from kentcdodds/pr/jsx-indent-tabs-fix

    [Fix] jsx-indent with tabs
    lencioni committed Feb 16, 2017
    Copy the full SHA
    a4b6a85 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2017

  1. Fix error caused by templates in ConditionalExpressions (jsx-indent)

    Template strings are constructed differently from other tokens in
    espree. Other tokens are created by the Token class and are thus
    Token class objects. They look like this:
    
    ```
    Token {
      type: 'String',
      value: '"bar"',
      start: 44,
      end: 49,
      loc:
       SourceLocation {
         start: Position { line: 4, column: 11 },
         end: Position { line: 4, column: 16 } },
      range: [ 44, 49 ] }
    ```
    
    Template tokens, however, are constructed differently and end up as
    plain JavaScript objects, which look like this:
    
    ```
    { type: 'Template',
      value: '`bar`',
      loc:
       { start: Position { line: 4, column: 11 },
         end: Position { line: 4, column: 16 } },
      range: [ 44, 49 ] }
    ```
    
    See: [espree's token-translator.js](https://github.com/eslint/espree/blob/58f75be6b89d8904b6366ed368045cb02c4a4e33/lib/token-translator.js#L43)
    
    As a result of this different construction, the `start` and `end`
    properties are not present on the template token object. To correct this
    I've changed to using the `range` property, which I infer to be more
    proper given the method it is being passed into is called
    `getNodeByRangeIndex`. I also think we can safely rely on `range` being
    present on all token types.
    
    Fixes #1061
    iancmyers committed Feb 17, 2017
    Copy the full SHA
    c6f4a5e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1077 from iancmyers/fix-jsx-indent-template-condi…

    …tional
    
    Fix error caused by templates in ConditionalExpressions (jsx-indent)
    ljharb committed Feb 17, 2017
    Copy the full SHA
    22f3638 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. Update void-dom-elements-no-children

    This ensures that the rule only checks for a `createElement` call from
    React. It will also prevent the rule from failing when it hits a
    `createElement` that only has an element as an argument.
    jomasti committed Feb 21, 2017
    Copy the full SHA
    416deff View commit details
    Browse the repository at this point in the history
  2. Fix jsx-indent single line jsx

    Also adds test
    Roy Sutton committed Feb 21, 2017
    Copy the full SHA
    7863a5c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1081 from webOS101/jsx-indent-fix

    Fix jsx-indent single line jsx
    ljharb committed Feb 21, 2017
    Copy the full SHA
    c45ab86 View commit details
    Browse the repository at this point in the history
  4. [Fix] Update void-dom-elements-no-children createElement checks

    Merge pull request #1080 from jomasti/issue-1073
    ljharb committed Feb 21, 2017
    Copy the full SHA
    8148833 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. Bug fix for false positives with no-multi-comp

    Previously, when createElement was destructured from React, it would
    cause any function defined in the file to be flagged as a React
    Component. This change makes it such that the function must call
    createElement to be considered a component.
    
    Fixes #1088
    
    ---
    
    Review: Use object.assign with sourceType: module in the added test over
    babel-eslint.
    benstepp committed Feb 23, 2017
    Copy the full SHA
    c038899 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Merge pull request #1089 from benstepp/bs-multicomp-false-positives

    Bug fix for false positives with no-multi-comp
    ljharb committed Feb 24, 2017
    Copy the full SHA
    b646485 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. Copy the full SHA
    ab03af8 View commit details
    Browse the repository at this point in the history