Skip to content

Commit

Permalink
refactor: this reverts module import aliasing (#858)
Browse files Browse the repository at this point in the history
Revert is needed so that source files can be used by flow for flow checking. With import aliasing flow isnt happy. Goes back to using relative imports and reverts #784. Removes babel import resolver plugin.
priyajeet authored Feb 14, 2019

Verified

This commit was signed with the committer’s verified signature.
1 parent a1784ef commit 5db989e
Showing 294 changed files with 809 additions and 836 deletions.
5 changes: 0 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -20,11 +20,6 @@ module.exports = {
'react/no-array-index-key': 'off', // fixme
'react/no-this-in-sfc': 'off',
},
settings: {
'import/resolver': {
'babel-module': {},
},
},
globals: {
shallow: true,
mount: true,
2 changes: 1 addition & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ esproposal.export_star_as=enable
module.file_ext=.js
module.file_ext=.scss
module.system.node.resolve_dirname=node_modules
module.system.node.resolve_dirname=./src
module.system.node.resolve_dirname=src
module.name_mapper.extension='scss' -> '<PROJECT_ROOT>/flow/SCSSFlowStub.js.flow'
module.name_mapper.extension='css' -> '<PROJECT_ROOT>/flow/SCSSFlowStub.js.flow'
module.name_mapper='react-intl-locale-data' -> '<PROJECT_ROOT>/flow/WebpackI18N.js.flow'
15 changes: 0 additions & 15 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -15,21 +15,6 @@ module.exports = {
'@babel/plugin-transform-object-assign',
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-object-rest-spread',
[
'module-resolver',
{
alias: {
api: './src/api',
common: './src/common',
components: './src/components',
elements: './src/elements',
features: './src/features',
icons: './src/icons',
styles: './src/styles',
utils: './src/utils',
},
},
],
],
env: {
dev: {
2 changes: 1 addition & 1 deletion examples/src/AvatarImageExample.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/src/ContentExplorerExamples.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';

import { ContentExplorer } from 'features/content-explorer';
import { ContentExplorer } from '../../src/features/content-explorer';

const INITIAL_FOLDERS_PATH = [
{
4 changes: 2 additions & 2 deletions examples/src/ContentExplorerModalContainerExamples.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';

import Button from 'components/button';
import { ContentExplorerModalContainer } from 'features/content-explorer';
import Button from '../../src/components/button';
import { ContentExplorerModalContainer } from '../../src/features/content-explorer';

const INITIAL_FOLDERS_PATH = [
{
2 changes: 1 addition & 1 deletion examples/src/ContentExplorerMultiSelectExamples.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';

import { ContentExplorer } from 'features/content-explorer';
import { ContentExplorer } from '../../src/features/content-explorer';

import './ContentExplorerMultiSelectExamples.scss';

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';

import Button from 'components/button';
import { ContentExplorerModalContainer } from 'features/content-explorer';
import Button from '../../src/components/button';
import { ContentExplorerModalContainer } from '../../src/features/content-explorer';

import './ContentExplorerMultiSelectModalContainerExamples.scss';

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* eslint-disable no-unused-expressions */
import * as React from 'react';

import { Menu, SubmenuItem, MenuItem } from 'components/menu';
import ContextMenu from 'components/context-menu';
import { Menu, SubmenuItem, MenuItem } from '../../src/components/menu';
import ContextMenu from '../../src/components/context-menu';

class ContextMenuWithSubmenuWithBoundariesElementExample extends React.Component {
state = {
8 changes: 4 additions & 4 deletions examples/src/DraftJSMentionSelectorExamples.js
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { ContentState, EditorState } from 'draft-js';

import Avatar from 'components/avatar';
import Section from 'components/section';
import PrimaryButton from 'components/primary-button';
import { DraftMentionDecorator } from 'components/form-elements/draft-js-mention-selector';
import Avatar from '../../src/components/avatar';
import Section from '../../src/components/section';
import PrimaryButton from '../../src/components/primary-button';
import { DraftMentionDecorator } from '../../src/components/form-elements/draft-js-mention-selector';

import MentionSelectorContainer from './MentionSelectorContainer';

2 changes: 1 addition & 1 deletion examples/src/MentionSelectorContainer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';

import DraftJSMentionSelector from 'components/form-elements/draft-js-mention-selector';
import DraftJSMentionSelector from '../../src/components/form-elements/draft-js-mention-selector';

const contactData = [
{ email: 'ken@streetfighter.com', id: '1', name: 'Ken' },
4 changes: 2 additions & 2 deletions examples/src/MetadataExamples.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import uniqueId from 'lodash/uniqueId';

import MetadataInstanceEditor from 'features/metadata-instance-editor/MetadataInstanceEditor';
import LoadingIndicator from 'components/loading-indicator';
import MetadataInstanceEditor from '../../src/features/metadata-instance-editor/MetadataInstanceEditor';
import LoadingIndicator from '../../src/components/loading-indicator';

// Templates
const template0 = {
4 changes: 2 additions & 2 deletions examples/src/NewFolderModalExamples.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';

import Button from 'components/button';
import { NewFolderModal } from 'features/content-explorer';
import Button from '../../src/components/button';
import { NewFolderModal } from '../../src/features/content-explorer';

class NewFolderModalExamples extends Component {
constructor(props) {
6 changes: 3 additions & 3 deletions examples/src/NotificationsWrapperExample.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { Component } from 'react';

import Button from 'components/button';
import PrimaryButton from 'components/primary-button';
import { Notification, NotificationsWrapper } from 'components/notification';
import Button from '../../src/components/button';
import PrimaryButton from '../../src/components/primary-button';
import { Notification, NotificationsWrapper } from '../../src/components/notification';

class NotificationsWrapperExample extends Component {
state = {
4 changes: 2 additions & 2 deletions examples/src/ProgressBarExamples.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';

import Button from 'components/button';
import ProgressBar from 'components/progress-bar';
import Button from '../../src/components/button';
import ProgressBar from '../../src/components/progress-bar';

class ProgressBarExamples extends Component {
constructor(props) {
4 changes: 2 additions & 2 deletions examples/src/SecurityCloudGameExamples.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import Section from 'components/section';
import SecurityCloudGame from 'features/security-cloud-game';
import Section from '../../src/components/section';
import SecurityCloudGame from '../../src/features/security-cloud-game';

const SecurityCloudGameExamples = () => {
return (
20 changes: 14 additions & 6 deletions examples/src/SelectableTableExamples.js
Original file line number Diff line number Diff line change
@@ -2,12 +2,20 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Set } from 'immutable';

import Button from 'components/button';
import ContextMenu from 'components/context-menu';
import DropdownMenu from 'components/dropdown-menu';
import { Menu, MenuItem } from 'components/menu';
import { HotkeyLayer, HotkeyRecord } from 'components/hotkeys';
import { Table, TableBody, TableCell, TableHeader, TableHeaderCell, TableRow, makeSelectable } from 'components/table';
import Button from '../../src/components/button';
import ContextMenu from '../../src/components/context-menu';
import DropdownMenu from '../../src/components/dropdown-menu';
import { Menu, MenuItem } from '../../src/components/menu';
import { HotkeyLayer, HotkeyRecord } from '../../src/components/hotkeys';
import {
Table,
TableBody,
TableCell,
TableHeader,
TableHeaderCell,
TableRow,
makeSelectable,
} from '../../src/components/table';

const columnHeaders = ['First Name', 'Last Name', 'Email'];

Loading

0 comments on commit 5db989e

Please sign in to comment.