feat(UIView): warn user when using transition as resolve token

src/components/UIView.tsx

@@ -107,6 +107,11 @@ export interface UIViewState {
   props?: any;
 }
 
+export const TransitionPropCollisionError = new Error(
+  '`transition` cannot be used as resolve token. ' +
+    'Please rename your resolve to avoid conflicts with the router transition.',
+);
+
 export class UIView extends Component<UIViewProps, UIViewState> {
   // This object contains all the metadata for this UIView
   uiViewData: ActiveUIView;
@@ -237,12 +242,16 @@ export class UIView extends Component<UIViewProps, UIViewState> {
 
       let ctx = new ResolveContext(newConfig.path);
       trans = ctx.getResolvable(Transition).data;
-      let stringTokens = trans
+      let stringTokens: string[] = trans
         .getResolveTokens()
         .filter(x => typeof x === 'string');
       resolves = stringTokens
         .map(token => [token, trans.injector().get(token)])
         .reduce(applyPairs, {});
+
+      if (stringTokens.indexOf('transition') !== -1) {
+        throw TransitionPropCollisionError;
+      }
     }
 
     this.uiViewData.config = newConfig;

src/components/__tests__/UIView.test.tsx

@@ -11,6 +11,7 @@ import {
   ReactStateDeclaration,
   memoryLocationPlugin,
   servicesPlugin,
+  TransitionPropCollisionError,
 } from '../../index';
 
 const states = [
@@ -156,6 +157,25 @@ describe('<UIView>', () => {
       });
     });
 
+    it('throws if a resolve uses the token `transition`', async () => {
+      const Comp = () => <span>component</span>;
+      router.stateRegistry.register({
+        name: '__state',
+        component: Comp,
+        resolve: [{ token: 'transition', resolveFn: () => null }],
+      });
+
+      await router.stateService.go('__state');
+
+      expect(() => {
+        const wrapper = mount(
+          <UIRouter router={router}>
+            <UIView />
+          </UIRouter>,
+        );
+      }).toThrow(TransitionPropCollisionError);
+    });
+
     it('renders nested State Components', () => {
       return router.stateService.go('parent.child').then(() => {
         const wrapper = mount(