From bd6350f43ec946451d8e7ac61b4bcd79c15e2ec5 Mon Sep 17 00:00:00 2001 From: Dan Bucholtz Date: Mon, 19 Sep 2016 16:23:19 -0500 Subject: [PATCH] chore(demos): scrollbar fixs --- demos/package.json | 7 ++-- demos/src/action-sheet/main.html | 4 ++- demos/src/alert/main.html | 4 ++- demos/src/button/main.html | 4 ++- demos/src/checkbox/app.component.ts | 2 +- demos/src/checkbox/main.html | 4 ++- demos/src/chip/main.html | 4 ++- demos/src/config/main.html | 4 ++- demos/src/datetime/main.html | 4 ++- demos/src/events/main.html | 4 ++- demos/src/hide-when/main.html | 4 ++- demos/src/icon/main.html | 4 ++- demos/src/infinite-scroll/main.html | 4 ++- demos/src/input/main.html | 4 ++- demos/src/item-reorder/main.html | 4 ++- demos/src/item-sliding/main.html | 4 ++- demos/src/item/main.html | 4 ++- demos/src/label/main.html | 4 ++- demos/src/list/main.html | 4 ++- demos/src/loading/main.html | 3 +- demos/src/local-storage/main.html | 4 ++- demos/src/menu/main.html | 4 ++- demos/src/modal/main.html | 4 ++- demos/src/nav-params/main.html | 4 ++- demos/src/navbar/main.html | 4 ++- demos/src/navigation/main.html | 4 ++- demos/src/platform/main.html | 4 ++- demos/src/popover/main.html | 3 +- demos/src/radio/main.html | 4 ++- demos/src/range/main.html | 4 ++- demos/src/refresher/main.html | 4 ++- demos/src/scroll/main.html | 4 ++- demos/src/searchbar/main.html | 4 ++- demos/src/segment/main.html | 4 ++- demos/src/select/main.html | 4 ++- demos/src/show-when/main.html | 4 ++- demos/src/slides/main.html | 4 ++- demos/src/tabs/main.html | 3 +- demos/src/textarea/main.html | 4 ++- demos/src/title/main.html | 4 ++- demos/src/toast/main.html | 4 ++- demos/src/toggle/main.html | 4 ++- demos/src/toolbar/main.html | 4 ++- scripts/gulp/tasks/demos.ts | 51 +++++++++-------------------- 44 files changed, 141 insertions(+), 80 deletions(-) diff --git a/demos/package.json b/demos/package.json index d5f5f4f0e6..6fe53ea493 100644 --- a/demos/package.json +++ b/demos/package.json @@ -6,11 +6,12 @@ "author": "Ionic Team (http://ionic.io)", "license": "MIT", "dependencies": { - "ionic-angular": "nightly", - "ionicons": "3.0.0" + "ionic-angular": "2.0.0-beta.11-201609161747", + "ionicons": "3.0.0", + "rxjs": "5.0.0-beta.12" }, "devDependencies": { "@angular/compiler-cli": "0.6.2", - "typescript": "2.0.2" + "typescript": "rc" } } diff --git a/demos/src/action-sheet/main.html b/demos/src/action-sheet/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/action-sheet/main.html +++ b/demos/src/action-sheet/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/alert/main.html b/demos/src/alert/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/alert/main.html +++ b/demos/src/alert/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/button/main.html b/demos/src/button/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/button/main.html +++ b/demos/src/button/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/checkbox/app.component.ts b/demos/src/checkbox/app.component.ts index 8e85bcae09..96d9603df8 100644 --- a/demos/src/checkbox/app.component.ts +++ b/demos/src/checkbox/app.component.ts @@ -1,4 +1,4 @@ -import { Component, NgModule } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ diff --git a/demos/src/checkbox/main.html b/demos/src/checkbox/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/checkbox/main.html +++ b/demos/src/checkbox/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/chip/main.html b/demos/src/chip/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/chip/main.html +++ b/demos/src/chip/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/config/main.html b/demos/src/config/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/config/main.html +++ b/demos/src/config/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/datetime/main.html b/demos/src/datetime/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/datetime/main.html +++ b/demos/src/datetime/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/events/main.html b/demos/src/events/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/events/main.html +++ b/demos/src/events/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/hide-when/main.html b/demos/src/hide-when/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/hide-when/main.html +++ b/demos/src/hide-when/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/icon/main.html b/demos/src/icon/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/icon/main.html +++ b/demos/src/icon/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/infinite-scroll/main.html b/demos/src/infinite-scroll/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/infinite-scroll/main.html +++ b/demos/src/infinite-scroll/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/input/main.html b/demos/src/input/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/input/main.html +++ b/demos/src/input/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/item-reorder/main.html b/demos/src/item-reorder/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/item-reorder/main.html +++ b/demos/src/item-reorder/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/item-sliding/main.html b/demos/src/item-sliding/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/item-sliding/main.html +++ b/demos/src/item-sliding/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/item/main.html b/demos/src/item/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/item/main.html +++ b/demos/src/item/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/label/main.html b/demos/src/label/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/label/main.html +++ b/demos/src/label/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/list/main.html b/demos/src/list/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/list/main.html +++ b/demos/src/list/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/loading/main.html b/demos/src/loading/main.html index d6e3c64cf0..add7e30f1b 100644 --- a/demos/src/loading/main.html +++ b/demos/src/loading/main.html @@ -7,11 +7,12 @@ - + + diff --git a/demos/src/local-storage/main.html b/demos/src/local-storage/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/local-storage/main.html +++ b/demos/src/local-storage/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/menu/main.html b/demos/src/menu/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/menu/main.html +++ b/demos/src/menu/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/modal/main.html b/demos/src/modal/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/modal/main.html +++ b/demos/src/modal/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/nav-params/main.html b/demos/src/nav-params/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/nav-params/main.html +++ b/demos/src/nav-params/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/navbar/main.html b/demos/src/navbar/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/navbar/main.html +++ b/demos/src/navbar/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/navigation/main.html b/demos/src/navigation/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/navigation/main.html +++ b/demos/src/navigation/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/platform/main.html b/demos/src/platform/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/platform/main.html +++ b/demos/src/platform/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/popover/main.html b/demos/src/popover/main.html index d6e3c64cf0..add7e30f1b 100644 --- a/demos/src/popover/main.html +++ b/demos/src/popover/main.html @@ -7,11 +7,12 @@ - + + diff --git a/demos/src/radio/main.html b/demos/src/radio/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/radio/main.html +++ b/demos/src/radio/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/range/main.html b/demos/src/range/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/range/main.html +++ b/demos/src/range/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/refresher/main.html b/demos/src/refresher/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/refresher/main.html +++ b/demos/src/refresher/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/scroll/main.html b/demos/src/scroll/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/scroll/main.html +++ b/demos/src/scroll/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/searchbar/main.html b/demos/src/searchbar/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/searchbar/main.html +++ b/demos/src/searchbar/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/segment/main.html b/demos/src/segment/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/segment/main.html +++ b/demos/src/segment/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/select/main.html b/demos/src/select/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/select/main.html +++ b/demos/src/select/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/show-when/main.html b/demos/src/show-when/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/show-when/main.html +++ b/demos/src/show-when/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/slides/main.html b/demos/src/slides/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/slides/main.html +++ b/demos/src/slides/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/tabs/main.html b/demos/src/tabs/main.html index 68e683fe2c..add7e30f1b 100644 --- a/demos/src/tabs/main.html +++ b/demos/src/tabs/main.html @@ -7,11 +7,12 @@ - + + diff --git a/demos/src/textarea/main.html b/demos/src/textarea/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/textarea/main.html +++ b/demos/src/textarea/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/title/main.html b/demos/src/title/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/title/main.html +++ b/demos/src/title/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/toast/main.html b/demos/src/toast/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/toast/main.html +++ b/demos/src/toast/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/toggle/main.html b/demos/src/toggle/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/toggle/main.html +++ b/demos/src/toggle/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/demos/src/toolbar/main.html b/demos/src/toolbar/main.html index 712272c23a..add7e30f1b 100644 --- a/demos/src/toolbar/main.html +++ b/demos/src/toolbar/main.html @@ -6,11 +6,13 @@ - + + + diff --git a/scripts/gulp/tasks/demos.ts b/scripts/gulp/tasks/demos.ts index c0dce0066d..d58640eb9d 100644 --- a/scripts/gulp/tasks/demos.ts +++ b/scripts/gulp/tasks/demos.ts @@ -4,6 +4,7 @@ import * as glob from 'glob'; import { task } from 'gulp'; import * as rollup from 'rollup'; import * as nodeResolve from 'rollup-plugin-node-resolve'; +import * as commonjs from 'rollup-plugin-commonjs'; import { DEMOS_ROOT, DEMOS_SRC_ROOT} from '../constants'; import { compileSass, copyFonts, createTimestamp, deleteFiles, runNgc, setSassIonicVersion } from '../util'; @@ -60,13 +61,18 @@ function rollupTests() { } function recursiveRollupHelper(files: string[]) { + let start; if (!files) { return Promise.reject(new Error('list of files is null')); } else if ( files.length === 0) { return Promise.resolve(); } else { - const outputFileName = join(dirname(files[0]), 'main.es6.js'); + const outputFileName = join(dirname(files[0]), 'main.bundle.js'); + start = Date.now(); return bundle(files[0], outputFileName).then(() => { + const end = Date.now(); + const seconds = (end - start) / 1000; + console.log(`Took ${seconds} seconds to process ${files[0]}`); const remainingFiles = files.concat(); remainingFiles.shift(); return recursiveRollupHelper(remainingFiles); @@ -81,7 +87,7 @@ function bundle(inputFile: string, outputFile: string): Promise { return rollup.rollup({ entry: inputFile, plugins: [ - rollupNG2(), + commonjs(), nodeResolve({ module: true, jsnext: true, @@ -94,29 +100,9 @@ function bundle(inputFile: string, outputFile: string): Promise { format: 'iife', dest: outputFile, }); - }).then(() => { - // transpile the file - console.log('Starting transpile to ES5 ...'); - const es5BundleName = join(dirname(outputFile), 'main.bundle.js'); - return transpile(outputFile, es5BundleName); }); } -function transpile(inputFile: string, outputFile: string) { - console.log(`Transpiling ${inputFile}`); - return new Promise((resolve, reject) => { - const command = `./node_modules/.bin/tsc --out ${outputFile} --target es5 --allowJs --sourceMap ${inputFile}`; - exec(command, (err, stdout, stderr) => { - if (err) { - console.log(stdout); - console.log(stderr); - reject(err); - } else { - resolve(); - } - }); - }); -} function buildDemos(done: Function) { doNpmInstall() @@ -127,24 +113,19 @@ function buildDemos(done: Function) { }).then(() => { done(); }).catch(err => { + console.log('ERRROR: ', err.message); done(err); }); } -export function rollupNG2() { - return { - name: 'rollupNG2', - - resolveId(id: string) { - if (id.startsWith('rxjs/')) { - return `${process.cwd()}/demos/node_modules/rxjs-es/${id.split('rxjs/').pop()}.js`; - } - } - }; -} - function cleanDemos(done: Function) { - deleteFiles([`${DEMOS_SRC_ROOT}/**/*.js`, `${DEMOS_SRC_ROOT}/**/*.d.ts`, `${DEMOS_SRC_ROOT}/**/*.ngfactory.ts`, `${DEMOS_SRC_ROOT}/**/*.metadata.json`], done); + deleteFiles([`${DEMOS_SRC_ROOT}/**/*.js`, + `${DEMOS_SRC_ROOT}/**/*.d.ts`, + `${DEMOS_SRC_ROOT}/**/*.ngfactory.ts`, + `${DEMOS_SRC_ROOT}/**/*.metadata.json`, + `${DEMOS_ROOT}/css`, + `${DEMOS_ROOT}/fonts`, + ], done); } task('demos.build', ['demos.sass', 'demos.fonts'], (done: Function) => {