Skip to content

Commit 830393d

Browse files
matskoIgorMinar
authored andcommitted
refactor(animations): support browser animation rendering (angular#14578)
1 parent 88755b0 commit 830393d

File tree

88 files changed

+3429
-1225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3429
-1225
lines changed

build.sh

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ cd `dirname $0`
77
PACKAGES=(core
88
compiler
99
common
10+
animations
1011
forms
1112
platform-browser
1213
platform-browser-dynamic
1314
http
1415
platform-server
1516
platform-webworker
1617
platform-webworker-dynamic
17-
animation
1818
upgrade
1919
router
2020
compiler-cli
@@ -161,6 +161,10 @@ do
161161
JS_STATIC_PATH_ES5=${DEST_MODULE}/${PACKAGE}/static.es5.js
162162
JS_UPGRADE_PATH=${DEST_MODULE}/${PACKAGE}/upgrade.js
163163
JS_UPGRADE_PATH_ES5=${DEST_MODULE}/${PACKAGE}/upgrade.es5.js
164+
JS_ANIMATIONS_PATH=${DEST_MODULE}/${PACKAGE}/animations.js
165+
JS_ANIMATIONS_PATH_ES5=${DEST_MODULE}/${PACKAGE}/animations.es5.js
166+
JS_ANIMATIONS_TESTING_PATH=${DEST_MODULE}/${PACKAGE}/animations/testing.js
167+
JS_ANIMATIONS_TESTING_PATH_ES5=${DEST_MODULE}/${PACKAGE}/animations/testing.es5.js
164168

165169
# UMD/ES5
166170
UMD_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}.umd.js
@@ -170,6 +174,9 @@ do
170174
UMD_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}.umd.min.js
171175
UMD_STATIC_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}-static.umd.min.js
172176
UMD_UPGRADE_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}-upgrade.umd.min.js
177+
UMD_ANIMATIONS_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}-animations.umd.js
178+
UMD_ANIMATIONS_ES5_MIN_PATH=${DEST_BUNDLES}/${PACKAGE}-animations.umd.min.js
179+
UMD_ANIMATIONS_TESTING_ES5_PATH=${DEST_BUNDLES}/${PACKAGE}-animations-testing.umd.js
173180

174181
if [[ ${PACKAGE} != router ]]; then
175182
LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
@@ -218,6 +225,16 @@ do
218225
$TSC -p ${SRCDIR}/tsconfig-testing.json
219226
fi
220227

228+
if [[ -e ${SRCDIR}/tsconfig-animations.json ]]; then
229+
echo "====== [${PACKAGE}]: COMPILING (ANIMATIONS): ${TSC} -p ${SRCDIR}/tsconfig-animations.json"
230+
$TSC -p ${SRCDIR}/tsconfig-animations.json
231+
232+
if [[ -e ${SRCDIR}/tsconfig-animations-testing.json ]]; then
233+
echo "====== [${PACKAGE}]: COMPILING (ANIMATION TESTING): ${TSC} -p ${SRCDIR}/tsconfig-animations-testing.json"
234+
$TSC -p ${SRCDIR}/tsconfig-animations-testing.json
235+
fi
236+
fi
237+
221238
if [[ -e ${SRCDIR}/tsconfig-static.json ]]; then
222239
echo "====== [${PACKAGE}]: COMPILING (STATIC): ${TSC} -p ${SRCDIR}/tsconfig-static.json"
223240
$TSC -p ${SRCDIR}/tsconfig-static.json
@@ -357,6 +374,58 @@ do
357374
mv ${UMD_UPGRADE_ES5_PATH}.tmp ${UMD_UPGRADE_ES5_PATH}
358375
$UGLIFYJS -c --screw-ie8 --comments -o ${UMD_UPGRADE_ES5_MIN_PATH} ${UMD_UPGRADE_ES5_PATH}
359376
fi
377+
378+
if [[ -d animations ]]; then
379+
echo "====== Rollup ${PACKAGE} animations"
380+
../../../node_modules/.bin/rollup -i ${DESTDIR}/animations/index.js -o ${DESTDIR}/animations.tmp.js
381+
382+
echo "====== Downleveling ${PACKAGE} ANIMATIONS to ES5/UMD"
383+
[[ -e ${SRCDIR}/.babelrc-animations ]] && cp ${SRCDIR}/.babelrc-animations ${DESTDIR}/.babelrc
384+
$BABELJS ${DESTDIR}/animations.tmp.js -o ${UMD_ANIMATIONS_ES5_PATH}
385+
rm -f ${DESTDIR}/.babelrc
386+
387+
echo "====== Move ${PACKAGE} animations typings"
388+
rsync -a --exclude=*.js --exclude=*.js.map ${DESTDIR}/animations/ ${DESTDIR}/typings/animations
389+
mv ${DESTDIR}/typings/animations/index.d.ts ${DESTDIR}/typings/animations/animations.d.ts
390+
mv ${DESTDIR}/typings/animations/index.metadata.json ${DESTDIR}/typings/animations/animations.metadata.json
391+
392+
echo "====== Rollup ${PACKAGE} animations/testing"
393+
../../../node_modules/.bin/rollup -i ${DESTDIR}/animations/testing/index.js -o ${DESTDIR}/animations-testing.tmp.js
394+
395+
echo "====== Downleveling ${PACKAGE} ANIMATIONS TESTING to ES5/UMD"
396+
[[ -e ${SRCDIR}/.babelrc-animations-testing ]] && cp ${SRCDIR}/.babelrc-animations-testing ${DESTDIR}/.babelrc
397+
$BABELJS ${DESTDIR}/animations-testing.tmp.js -o ${UMD_ANIMATIONS_TESTING_ES5_PATH}
398+
rm -f ${DESTDIR}/.babelrc
399+
400+
echo "====== Move ${PACKAGE} animations testing typings"
401+
rsync -a --exclude=*.js --exclude=*.js.map ${DESTDIR}/animations/testing/ ${DESTDIR}/typings/animations/testing
402+
mv ${DESTDIR}/typings/animations/testing/index.d.ts ${DESTDIR}/typings/animations/testing/testing.d.ts
403+
mv ${DESTDIR}/typings/animations/testing/index.metadata.json ${DESTDIR}/typings/animations/testing/testing.metadata.json
404+
405+
rm -rf ${DESTDIR}/animations
406+
407+
mkdir ${DESTDIR}/animations && [[ -d ${DEST_MODULE}/${PACKAGE} ]] || mkdir ${DEST_MODULE}/${PACKAGE}
408+
mkdir ${DESTDIR}/animations/testing
409+
410+
getPackageContents "${PACKAGE}" "animations" > ${DESTDIR}/animations/package.json
411+
412+
echo '{"typings": "../../typings/animations/testing/testing.d.ts", "main": "../../bundles/platform-browser-animations-testing.umd.js", "module": "../../@angular/platform-browser/animations/testing.es5.js", "es2015": "../../@angular/platform-browser/animations/testing.js"}' > ${DESTDIR}/animations/testing/package.json
413+
414+
mv ${DESTDIR}/animations.tmp.js ${JS_ANIMATIONS_PATH}
415+
$BABELJS ${JS_ANIMATIONS_PATH} -o ${JS_ANIMATIONS_PATH_ES5}
416+
cat ${LICENSE_BANNER} > ${UMD_ANIMATIONS_ES5_PATH}.tmp
417+
cat ${UMD_ANIMATIONS_ES5_PATH} >> ${UMD_ANIMATIONS_ES5_PATH}.tmp
418+
mv ${UMD_ANIMATIONS_ES5_PATH}.tmp ${UMD_ANIMATIONS_ES5_PATH}
419+
$UGLIFYJS -c --screw-ie8 --comments -o ${UMD_ANIMATIONS_ES5_MIN_PATH} ${UMD_ANIMATIONS_ES5_PATH}
420+
421+
mkdir ${DEST_MODULE}/${PACKAGE}/animations
422+
423+
mv ${DESTDIR}/animations-testing.tmp.js ${JS_ANIMATIONS_TESTING_PATH}
424+
$BABELJS ${JS_ANIMATIONS_TESTING_PATH} -o ${JS_ANIMATIONS_TESTING_PATH_ES5}
425+
cat ${LICENSE_BANNER} > ${UMD_ANIMATIONS_TESTING_ES5_PATH}.tmp
426+
cat ${UMD_ANIMATIONS_TESTING_ES5_PATH} >> ${UMD_ANIMATIONS_TESTING_ES5_PATH}.tmp
427+
mv ${UMD_ANIMATIONS_TESTING_ES5_PATH}.tmp ${UMD_ANIMATIONS_TESTING_ES5_PATH}
428+
fi
360429
) 2>&1 | grep -v "as external dependency"
361430

362431
fi

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ gulp.task('tools:build', loadTask('tools-build'));
3636
gulp.task('check-cycle', loadTask('check-cycle'));
3737
gulp.task('serve', loadTask('serve', 'default'));
3838
gulp.task('serve-examples', loadTask('serve', 'examples'));
39-
gulp.task('changelog', loadTask('changelog'));
39+
gulp.task('changelog', loadTask('changelog'));

modules/@angular/animation/package.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

modules/@angular/animation/src/animation.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

modules/@angular/animation/src/animation_module.ts

Lines changed: 0 additions & 35 deletions
This file was deleted.

modules/@angular/animation/src/dsl/animation_dsl_visitor.ts

Lines changed: 0 additions & 40 deletions
This file was deleted.

modules/@angular/animation/src/engine/animation_driver.ts

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)