Merge pull request #4735 from withspectrum/2.7.4

2.7.4

Author: brianlovin

.flowconfig

@@ -17,7 +17,6 @@ suppress_comment=.*\\$FlowIssue
 esproposal.class_instance_fields=enable
 module.system.node.resolve_dirname=node_modules
 module.system.node.resolve_dirname=.
-module.file_ext=.web.js
 module.file_ext=.js
 module.file_ext=.jsx
 module.file_ext=.json

shared/clients/draft-js/links-decorator/index.web.js renamed to shared/clients/draft-js/links-decorator/index.js

@@ -1,6 +1,6 @@
 // @flow
 import { genKey, ContentBlock } from 'draft-js';
-import mentionsDecorator from '../index.web.js';
+import mentionsDecorator from '../index';
 import type { ContentBlock as ContentBlockType } from 'draft-js/lib/ContentBlock';
 
 type Mention = string;

shared/clients/draft-js/mentions-decorator/index.web.js renamed to shared/clients/draft-js/mentions-decorator/index.js

@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
-import mentionsDecorator from '../mentions-decorator/index.web';
-import linksDecorator from '../links-decorator/index.web';
+import mentionsDecorator from '../mentions-decorator/index';
+import linksDecorator from '../links-decorator/index';
 import { Line, Paragraph, BlockQuote } from 'src/components/message/style';
 import type { Node } from 'react';
 import type { KeyObj, KeysObj, DataObj } from './types';

shared/clients/draft-js/mentions-decorator/test/mentions-decorator.test.js

@@ -1,7 +1,7 @@
 // @flow
-import { messageRenderer } from '../renderer.web';
-import mentionsDecorator from '../../mentions-decorator/index.web';
-import linksDecorator from '../../links-decorator/index.web';
+import { messageRenderer } from '../renderer';
+import mentionsDecorator from '../../mentions-decorator/index';
+import linksDecorator from '../../links-decorator/index';
 
 describe('messageRenderer', () => {
   it('should render certain blocks', () => {

shared/clients/draft-js/message/renderer.web.js renamed to shared/clients/draft-js/message/renderer.js

@@ -10,7 +10,7 @@ import {
   QuoteWrapperGradient,
   QuotedParagraph,
 } from './style';
-import { messageRenderer } from 'shared/clients/draft-js/message/renderer.web';
+import { messageRenderer } from 'shared/clients/draft-js/message/renderer';
 import { draftOnlyContainsEmoji } from 'shared/only-contains-emoji';
 import { Byline, Name, Username } from './style';
 import { isShort } from 'shared/clients/draft-js/utils/isShort';