Skip to content

Commit

Permalink
fix(lint): import order
Browse files Browse the repository at this point in the history
  • Loading branch information
manucorporat committed Apr 26, 2018
1 parent bf17a01 commit 8b1452c
Show file tree
Hide file tree
Showing 34 changed files with 45 additions and 42 deletions.
2 changes: 1 addition & 1 deletion core/src/components/action-sheet/action-sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@
import { ActionSheetButton, Animation, AnimationBuilder, Config, CssClassMap, Mode } from '../../interface';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, isCancel, present } from '../../utils/overlays';
import { createThemedClasses, getClassMap } from '../../utils/theme';

import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
import mdEnterAnimation from './animations/md.enter';
import mdLeaveAnimation from './animations/md.leave';


@Component({
tag: 'ion-action-sheet',
styleUrls: {
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/card-header/card-header.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Prop } from '@stencil/core';

import { createThemedClasses } from '../../utils/theme';
import { Mode } from '../../interface';
import { createThemedClasses } from '../../utils/theme';

@Component({
tag: 'ion-card-header',
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/datetime/datetime.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import {
updateDate
} from './datetime-util';

import { clamp, deferEvent } from '../../utils/helpers';
import { CssClassMap, PickerColumn, PickerOptions, StyleEvent } from '../../interface';
import { clamp, deferEvent } from '../../utils/helpers';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/fab-button/fab-button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Element, Prop } from '@stencil/core';
import { createThemedClasses, getElementClassMap } from '../../utils/theme';
import { CssClassMap, Mode } from '../../interface';
import { createThemedClasses, getElementClassMap } from '../../utils/theme';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/footer/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Prop } from '@stencil/core';

import { createThemedClasses } from '../../utils/theme';
import { Mode } from '../../interface';
import { createThemedClasses } from '../../utils/theme';

@Component({
tag: 'ion-footer',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Event, EventEmitter, Method } from '@stencil/core';
import { BlockerDelegate, GestureDelegate } from './gesture-controller-utils';
import { BlockerConfig, GestureConfig } from '../../interface';
import { BlockerDelegate, GestureDelegate } from './gesture-controller-utils';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/header/header.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Prop } from '@stencil/core';

import { createThemedClasses } from '../../utils/theme';
import { Mode } from '../../interface';
import { createThemedClasses } from '../../utils/theme';

@Component({
tag: 'ion-header',
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/item/item.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Element, Listen, Prop } from '@stencil/core';
import { createThemedClasses, getElementClassMap, openURL } from '../../utils/theme';
import { CssClassMap, Mode } from '../../interface';
import { createThemedClasses, getElementClassMap, openURL } from '../../utils/theme';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/loading/loading.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Animation, AnimationBuilder, Config, Mode } from '../../interface';
import { createThemedClasses, getClassMap } from '../../utils/theme';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { createThemedClasses, getClassMap } from '../../utils/theme';

import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/modal/modal.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Animation, AnimationBuilder, ComponentProps, ComponentRef, Config, FrameworkDelegate, Mode } from '../../interface';

import { createThemedClasses, getClassMap } from '../../utils/theme';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { attachComponent, detachComponent } from '../../utils/framework-delegate';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { createThemedClasses, getClassMap } from '../../utils/theme';

import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/nav/nav-interface.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ViewController } from './view-controller';
import { Animation, ComponentRef, FrameworkDelegate } from '../../interface';
import { ViewController } from './view-controller';

export { Nav } from './nav';

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/nav/nav.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Build, Component, Element, Event, EventEmitter, Method, Prop, Watch } from '@stencil/core';
import { Animation, ComponentProps, Config, FrameworkDelegate, GestureDetail, Mode, NavOutlet, QueueController, RouteID, RouteWrite, RouterDirection } from '../../interface';
import { NavComponent, NavDirection, NavOptions, NavResult, TransitionDoneFn, TransitionInstruction } from '../../interface';
import { assert } from '../../utils/helpers';
import { AnimationOptions, ViewLifecycle, lifecycle, transition } from '../../utils/transition';
import { NavComponent, NavDirection, NavOptions, NavResult, TransitionDoneFn, TransitionInstruction } from '../../interface';
import { ViewController, ViewState, convertToViews, matches } from './view-controller';

import iosTransitionAnimation from './animations/ios.transition';
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/nav/test/nav-controller.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { TestWindow } from '@stencil/core/dist/testing';
import { Config } from '../../../global/config';
import { AnimationControllerImpl } from '../../animation-controller/animation-controller';
import { Nav } from '../nav';
import { NavOptions } from '../nav-interface';
import { ViewController, ViewState } from '../view-controller';
import { Config } from '../../../global/config';



Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Listen, Method, Prop } from '@stencil/core';
import { OverlayController, createOverlay, dismissOverlay, getTopOverlay, removeLastOverlay } from '../../utils/overlays';
import { PickerOptions } from '../../interface';
import { OverlayController, createOverlay, dismissOverlay, getTopOverlay, removeLastOverlay } from '../../utils/overlays';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/picker/picker.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop, State } from '@stencil/core';
import { Animation, AnimationBuilder, Config, CssClassMap, Mode, PickerButton, PickerColumn } from '../../interface';

import { getClassMap } from '../../utils/theme';
import { OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { getClassMap } from '../../utils/theme';

import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/popover/popover.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Animation, AnimationBuilder, ComponentProps, ComponentRef, Config, FrameworkDelegate, Mode } from '../../interface';

import { createThemedClasses, getClassMap } from '../../utils/theme';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { attachComponent, detachComponent } from '../../utils/framework-delegate';
import { BACKDROP, OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { createThemedClasses, getClassMap } from '../../utils/theme';

import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/ripple-effect/ripple-effect.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Element, EventListenerEnable, Listen, Method, Prop, Watch } from '@stencil/core';
import { now } from '../../utils/helpers';
import { QueueController } from '../../interface';
import { now } from '../../utils/helpers';

@Component({
tag: 'ion-ripple-effect',
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/router/router.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Config, QueueController } from '../../interface';
import { flattenRouterTree, readRedirects, readRoutes } from './utils/parser';
import { readNavState, writeNavState } from './utils/dom';
import { chainToPath, generatePath, parsePath, readPath, writePath } from './utils/path';
import { RouteChain, RouteRedirect, RouterDirection, RouterEventDetail } from './utils/interface';
import { routeRedirect, routerIDsToChain, routerPathToChain } from './utils/matching';
import { flattenRouterTree, readRedirects, readRoutes } from './utils/parser';
import { chainToPath, generatePath, parsePath, readPath, writePath } from './utils/path';

@Component({
tag: 'ion-router'
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/router/test/e2e.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { TestWindow } from '@stencil/core/dist/testing';
import { RouteChain, RouteID } from '../utils/interface';
import { routerIDsToChain, routerPathToChain } from '../utils/matching';
import { mockRouteElement } from './parser.spec';
import { chainToPath, generatePath, parsePath } from '../utils/path';
import { flattenRouterTree, readRoutes } from '../utils/parser';
import { TestWindow } from '@stencil/core/dist/testing';
import { chainToPath, generatePath, parsePath } from '../utils/path';
import { mockRouteElement } from './parser.spec';

describe('ionic-conference-app', () => {

Expand Down
4 changes: 2 additions & 2 deletions core/src/components/router/test/parser.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { flattenRouterTree, readRedirects, readRoutes } from '../utils/parser';
import { RouteRedirect, RouteTree } from '../utils/interface';
import { TestWindow } from '@stencil/core/dist/testing';
import { RouteRedirect, RouteTree } from '../utils/interface';
import { flattenRouterTree, readRedirects, readRoutes } from '../utils/parser';

describe('parser', () => {

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/router/test/path.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { chainToPath, generatePath, parsePath } from '../utils/path';
import { RouteChain } from '../utils/interface';
import { chainToPath, generatePath, parsePath } from '../utils/path';

describe('parseURL', () => {
it('should parse empty path', () => {
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/router/utils/debug.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { generatePath } from './path';
import { RouteChain } from './interface';
import { generatePath } from './path';

export function printRoutes(routes: RouteChain[]) {
console.debug('%c[ion-core]', 'font-weight: bold', `registered ${routes.length} routes`);
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/searchbar/searchbar.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, Element, Event, EventEmitter, Prop, State, Watch } from '@stencil/core';

import { createThemedClasses } from '../../utils/theme';
import { debounceEvent } from '../../utils/helpers';
import { InputChangeEvent, Mode } from '../../interface';
import { debounceEvent } from '../../utils/helpers';
import { createThemedClasses } from '../../utils/theme';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/segment-button/segment-button.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Element, Event, EventEmitter, Prop } from '@stencil/core';
import { createThemedClasses, getElementClassMap } from '../../utils/theme';
import { Mode } from '../../interface';
import { createThemedClasses, getElementClassMap } from '../../utils/theme';

let ids = 0;

Expand Down
2 changes: 1 addition & 1 deletion core/src/components/spinner/spinner.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Prop } from '@stencil/core';
import { createThemedClasses } from '../../utils/theme';
import { Config, Mode } from '../../interface';
import { createThemedClasses } from '../../utils/theme';
import { SPINNERS, SpinnerConfig } from './spinner-configs';


Expand Down
2 changes: 1 addition & 1 deletion core/src/components/tabbar/tabbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Element, Listen, Prop, State, Watch } from '@stencil/core';
import { createThemedClasses } from '../../utils/theme';
import { Mode, QueueController } from '../../interface';
import { createThemedClasses } from '../../utils/theme';

export type TabbarLayout = 'icon-top' | 'icon-start' | 'icon-end' | 'icon-bottom' | 'icon-hide' | 'title-hide';
export type TabbarPlacement = 'top' | 'bottom';
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/textarea/textarea.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Component, Element, Event, EventEmitter, Prop, Watch } from '@stencil/core';

import { InputChangeEvent, Mode, StyleEvent } from '../../interface';
import { debounceEvent, deferEvent } from '../../utils/helpers';
import { createThemedClasses } from '../../utils/theme';
import { TextareaComponent } from '../input/input-base';
import { InputChangeEvent, Mode, StyleEvent } from '../../interface';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/title/title.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component } from '@stencil/core';
import { createThemedClasses } from '../../utils/theme';
import { Mode } from '../../interface';
import { createThemedClasses } from '../../utils/theme';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/toast/toast.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, Element, Event, EventEmitter, Listen, Method, Prop } from '@stencil/core';
import { Animation, AnimationBuilder, Config, Mode } from '../../interface';

import { createThemedClasses, getClassMap } from '../../utils/theme';
import { OverlayEventDetail, OverlayInterface, dismiss, eventMethod, present } from '../../utils/overlays';
import { createThemedClasses, getClassMap } from '../../utils/theme';

import iosEnterAnimation from './animations/ios.enter';
import iosLeaveAnimation from './animations/ios.leave';
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/toolbar/toolbar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, Prop } from '@stencil/core';
import { createThemedClasses } from '../../utils/theme';
import { Config, Mode } from '../../interface';
import { createThemedClasses } from '../../utils/theme';


@Component({
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/virtual-scroll/virtual-scroll.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Component, Element, EventListenerEnable, Listen, Method, Prop, Watch } from '@stencil/core';
import { QueueController } from '../../interface';
import { Cell, DomRenderFn, HeaderFn, ItemHeightFn,
ItemRenderFn, NodeHeightFn, Range,
VirtualNode, calcCells, calcHeightIndex, doRender,
findCellIndex, getRange, getShouldUpdate, getViewport,
inplaceUpdate, positionForIndex, resizeBuffer, updateVDom } from './virtual-scroll-utils';
import { QueueController } from '../../interface';


@Component({
Expand Down
4 changes: 2 additions & 2 deletions core/src/global/ionic-global.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'ionicons';
import { Config } from './config';
import { isIOS } from '../utils/platform';
import { configFromURL } from '../utils/config';
import { isIOS } from '../utils/platform';
import { Config } from './config';

const Ionic = (window as any).Ionic = (window as any).Ionic || {};
declare const Context: any;
Expand Down
2 changes: 1 addition & 1 deletion core/src/utils/show-hide-when-utils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isAndroid, isCordova, isElectron, isIOS, isIpad, isIphone, isPhablet, isTablet, matchMedia } from './platform';
import { Config, Mode } from '../interface';
import { isAndroid, isCordova, isElectron, isIOS, isIpad, isIphone, isPhablet, isTablet, matchMedia } from './platform';

export function updateTestResults(displayWhen: DisplayWhen) {
displayWhen.passesTest = getTestResult(displayWhen);
Expand Down
5 changes: 4 additions & 1 deletion core/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
"no-non-null-assertion": false,
"no-unnecessary-type-assertion": false,
"prefer-for-of": false,
"no-import-side-effect": false
"no-import-side-effect": false,
"ordered-imports": [true, {
"named-imports-order": "lowercase-last"
}]
}
}

0 comments on commit 8b1452c

Please sign in to comment.