-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #62 from mavogel/ionicbeta22-migration
Migration for ionic@beta.22
- Loading branch information
Showing
7 changed files
with
59 additions
and
195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,138 +1,41 @@ | ||
| /****************************************************************************** | ||
| * Gulpfile | ||
| * Be sure to run `npm install` for `gulp` and the following tasks to be | ||
| * available from the command line. All tasks are run using `gulp taskName`. | ||
| ******************************************************************************/ | ||
| var gulp = require('gulp'), | ||
| webpack = require('webpack'), | ||
| sass = require('gulp-sass'), | ||
| autoprefixer = require('gulp-autoprefixer'), | ||
| watch = require('gulp-watch'), | ||
| del = require('del'); | ||
|
|
||
|
|
||
| var IONIC_DIR = "node_modules/ionic-angular/" | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * watch | ||
| * Build the app and watch for source file changes. | ||
| ******************************************************************************/ | ||
| gulp.task('watch', ['sass', 'copy.fonts', 'copy.html'], function(done) { | ||
| watch('www/app/**/*.scss', function(){ | ||
| gulp.start('sass'); | ||
| }); | ||
| watch('www/app/**/*.html', function(){ | ||
| gulp.start('copy.html'); | ||
| }); | ||
| bundle(true, done); | ||
| }); | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * build | ||
| * Build the app once, without watching for source file changes. | ||
| ******************************************************************************/ | ||
| gulp.task('build', ['sass', 'copy.fonts', 'copy.html'], function(done) { | ||
| bundle(false, done); | ||
| }); | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * sass | ||
| * Convert Sass files to a single bundled CSS file. Uses auto-prefixer | ||
| * to automatically add required vendor prefixes when needed. | ||
| ******************************************************************************/ | ||
| gulp.task('sass', function(){ | ||
| var autoprefixerOpts = { | ||
| browsers: [ | ||
| 'last 2 versions', | ||
| 'iOS >= 7', | ||
| 'Android >= 4', | ||
| 'Explorer >= 10', | ||
| 'ExplorerMobile >= 11' | ||
| ], | ||
| cascade: false | ||
| }; | ||
|
|
||
| return gulp.src('app/theme/app.+(ios|md).scss') | ||
| .pipe(sass({ | ||
| includePaths: [ | ||
| IONIC_DIR, | ||
| 'node_modules/ionicons/dist/scss' | ||
| ] | ||
| })) | ||
| .on('error', function(err){ | ||
| console.error(err.message); | ||
| this.emit('end'); | ||
| }) | ||
| .pipe(autoprefixer(autoprefixerOpts)) | ||
| .pipe(gulp.dest('www/build/css')) | ||
| }); | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * copy.fonts | ||
| * Copy Ionic font files to build directory. | ||
| ******************************************************************************/ | ||
| gulp.task('copy.fonts', function() { | ||
| return gulp.src(IONIC_DIR + 'fonts/**/*.+(ttf|woff|woff2)') | ||
| .pipe(gulp.dest('www/build/fonts')); | ||
| }); | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * copy.html | ||
| * Copy html files to build directory. | ||
| ******************************************************************************/ | ||
| gulp.task('copy.html', function(){ | ||
| return gulp.src('app/**/*.html') | ||
| .pipe(gulp.dest('www/build')); | ||
| var gulp = require('gulp'), | ||
| gulpWatch = require('gulp-watch'), | ||
| del = require('del'), | ||
| argv = process.argv; | ||
|
|
||
| /** | ||
| * Ionic Gulp tasks, for more information on each see | ||
| * https://github.com/driftyco/ionic-gulp-tasks | ||
| */ | ||
| var buildWebpack = require('ionic-gulp-webpack-build'); | ||
| var buildSass = require('ionic-gulp-sass-build'); | ||
| var copyHTML = require('ionic-gulp-html-copy'); | ||
| var copyFonts = require('ionic-gulp-fonts-copy'); | ||
|
|
||
| gulp.task('watch', ['sass', 'html', 'fonts'], function(){ | ||
| gulpWatch('app/**/*.scss', function(){ gulp.start('sass'); }); | ||
| gulpWatch('app/**/*.html', function(){ gulp.start('html'); }); | ||
| return buildWebpack({ watch: true }); | ||
| }); | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * clean | ||
| * Delete previous build files. | ||
| ******************************************************************************/ | ||
| gulp.task('clean', function(done) { | ||
| del(['www/build'], done); | ||
| gulp.task('build', ['sass', 'html', 'fonts'], buildWebpack); | ||
| gulp.task('sass', buildSass); | ||
| gulp.task('html', copyHTML); | ||
| gulp.task('fonts', copyFonts); | ||
| gulp.task('clean', function(done){ | ||
| del('www/build', done); | ||
| }); | ||
|
|
||
|
|
||
| /****************************************************************************** | ||
| * Bundle | ||
| * Transpiles source files and bundles them into build directory using webpack. | ||
| ******************************************************************************/ | ||
| function bundle(watch, cb) { | ||
| // prevent gulp calling done callback more than once when watching | ||
| var firstTime = true; | ||
|
|
||
| // load webpack config | ||
| var config = require('./webpack.config.js'); | ||
|
|
||
| // https://github.com/webpack/docs/wiki/node.js-api#statstojsonoptions | ||
| var statsOptions = { | ||
| 'colors': true, | ||
| 'modules': false, | ||
| 'chunks': false, | ||
| 'exclude': ['node_modules'] | ||
| } | ||
|
|
||
| var compiler = webpack(config); | ||
| if (watch) { | ||
| compiler.watch(null, compileHandler); | ||
| } else { | ||
| compiler.run(compileHandler); | ||
| } | ||
|
|
||
| function compileHandler(err, stats){ | ||
| if (firstTime) { | ||
| firstTime = false; | ||
| cb(); | ||
| } | ||
|
|
||
| // print build stats and errors | ||
| console.log(stats.toString(statsOptions)); | ||
| } | ||
| } | ||
| /** | ||
| * Ionic hooks | ||
| * Add ':before' or ':after' to any Ionic project command name to run the specified | ||
| * tasks before or after the command. | ||
| */ | ||
| gulp.task('serve:before', ['watch']); | ||
| gulp.task('emulate:before', ['build']); | ||
| gulp.task('deploy:before', ['build']); | ||
|
|
||
| // we want to 'watch' when livereloading | ||
| var shouldWatch = argv.indexOf('-l') > -1 || argv.indexOf('--livereload') > -1; | ||
| gulp.task('run:before', [shouldWatch ? 'watch' : 'build']); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "name": "clicker", | ||
| "app_id": "", | ||
| "v2": true, | ||
| "typescript": true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,19 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en" dir="ltr"> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <title>Ionic</title> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"> | ||
| <meta name="format-detection" content="telephone=no"> | ||
| <meta name="msapplication-tap-highlight" content="no"> | ||
|
|
||
| <link ios-href="build/css/app.ios.css" rel="stylesheet"> | ||
| <link md-href="build/css/app.md.css" rel="stylesheet"> | ||
| <link wp-href="build/css/app.wp.css" rel="stylesheet"> | ||
| </head> | ||
| <body> | ||
|
|
||
| <!-- this Ionic's root component and where the app will load --> | ||
| <ion-app></ion-app> | ||
|
|
||
| <script src="cordova.js"></script> | ||
| <script src="build/js/app.bundle.js"></script> | ||
| </body> | ||
| </html> | ||
| </html> |