From 3a26256a5c79fe787c4881a3e3ebf4b4af36c5ee Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Tue, 20 Mar 2018 17:16:41 +0100 Subject: [PATCH] chore(transition): expose transition --- core/src/components/nav/animations/ios.transition.ts | 2 +- core/src/components/nav/animations/md.transition.ts | 2 +- core/src/components/nav/nav.tsx | 2 +- core/src/components/nav/test/nav-controller.spec.ts | 2 +- core/src/{components/nav => utils}/transition.ts | 4 ++-- core/stencil.config.js | 5 +++-- 6 files changed, 9 insertions(+), 8 deletions(-) rename core/src/{components/nav => utils}/transition.ts (97%) diff --git a/core/src/components/nav/animations/ios.transition.ts b/core/src/components/nav/animations/ios.transition.ts index 4c64f39633c..297724940c8 100644 --- a/core/src/components/nav/animations/ios.transition.ts +++ b/core/src/components/nav/animations/ios.transition.ts @@ -1,5 +1,5 @@ import { Animation } from '../../../index'; -import { AnimationOptions } from '../transition'; +import { AnimationOptions } from '../../../utils/transition'; const DURATION = 500; const EASING = 'cubic-bezier(0.36,0.66,0.04,1)'; diff --git a/core/src/components/nav/animations/md.transition.ts b/core/src/components/nav/animations/md.transition.ts index 7554696fa7c..df3f781316f 100644 --- a/core/src/components/nav/animations/md.transition.ts +++ b/core/src/components/nav/animations/md.transition.ts @@ -1,5 +1,5 @@ import { Animation } from '../../../index'; -import { AnimationOptions } from '../transition'; +import { AnimationOptions } from '../../../utils/transition'; const TRANSLATEY = 'translateY'; const OFF_BOTTOM = '40px'; diff --git a/core/src/components/nav/nav.tsx b/core/src/components/nav/nav.tsx index 3ad22535c49..0f756c358b0 100644 --- a/core/src/components/nav/nav.tsx +++ b/core/src/components/nav/nav.tsx @@ -18,7 +18,7 @@ import { assert } from '../../utils/helpers'; import iosTransitionAnimation from './animations/ios.transition'; import mdTransitionAnimation from './animations/md.transition'; -import { AnimationOptions, ViewLifecycle, lifecycle, transition } from './transition'; +import { AnimationOptions, ViewLifecycle, lifecycle, transition } from '../../utils/transition'; @Component({ tag: 'ion-nav', diff --git a/core/src/components/nav/test/nav-controller.spec.ts b/core/src/components/nav/test/nav-controller.spec.ts index 875e01600a6..33522975d7c 100644 --- a/core/src/components/nav/test/nav-controller.spec.ts +++ b/core/src/components/nav/test/nav-controller.spec.ts @@ -5,7 +5,7 @@ import { AnimationControllerImpl } from '../../animation-controller/animation-co import { createConfigController } from '../../../global/config-controller'; import { NavDirection, NavOptions, ViewState } from '../nav-util'; -import { MyCustomEvent, mockLifecycle } from '../transition'; +import { mockLifecycle } from '../../../utils/transition'; describe('NavController', () => { diff --git a/core/src/components/nav/transition.ts b/core/src/utils/transition.ts similarity index 97% rename from core/src/components/nav/transition.ts rename to core/src/utils/transition.ts index 5074b606b2a..eaf64d814b8 100644 --- a/core/src/components/nav/transition.ts +++ b/core/src/utils/transition.ts @@ -1,5 +1,5 @@ -import { NavDirection } from './nav-util'; -import { Animation, AnimationBuilder } from '../..'; +import { Animation, AnimationBuilder } from '../'; +import { NavDirection } from '../components/nav/nav-util'; export let MyCustomEvent = CustomEvent; diff --git a/core/stencil.config.js b/core/stencil.config.js index 763398a1c0f..a72df513d22 100644 --- a/core/stencil.config.js +++ b/core/stencil.config.js @@ -4,8 +4,6 @@ const autoprefixer = require('autoprefixer'); exports.config = { namespace: 'Ionic', - generateDistribution: true, - generateWWW: false, bundles: [ { components: ['ion-animation-controller'] }, { components: ['ion-app', 'ion-content', 'ion-scroll', 'ion-footer', 'ion-header', 'ion-title', 'ion-toolbar'] }, @@ -67,6 +65,9 @@ exports.config = { ] }) ], + outputTargets: [ + { type: 'dist' } + ], copy: [{ src: '**/*.scss' }], preamble: '(C) Ionic http://ionicframework.com - MIT License', globalScript: 'src/global/ionic-global.ts',