From 9fc7fceda4a87775606d136025e11c469a824125 Mon Sep 17 00:00:00 2001 From: Keivan Beigi Date: Thu, 14 Jan 2016 18:48:11 -0800 Subject: [PATCH] updated npm packages --- gulp/less.js | 9 --------- gulp/paths.js | 24 ------------------------ gulp/phantom.js | 14 -------------- webpack.config.js | 6 ------ 4 files changed, 53 deletions(-) delete mode 100644 gulp/phantom.js diff --git a/gulp/less.js b/gulp/less.js index a1e008380..76e04b8dc 100644 --- a/gulp/less.js +++ b/gulp/less.js @@ -7,7 +7,6 @@ var autoprefixer = require('autoprefixer-core'); var livereload = require('gulp-livereload'); var print = require('gulp-print'); -var phantom = require('./phantom'); var paths = require('./paths'); var errorHandler = require('./errorHandler'); @@ -29,14 +28,6 @@ gulp.task('less', function() { paths.src.root + 'System/Info/info.less' ]; - if (phantom) { - src = [ - paths.src.content + 'Bootstrap/bootstrap.less', - paths.src.content + 'Vendor/vendor.less', - paths.src.content + 'sonarr.less' - ]; - } - return gulp.src(src) .pipe(print()) .pipe(sourcemaps.init()) diff --git a/gulp/paths.js b/gulp/paths.js index c9fc7711d..e05aa1d2b 100644 --- a/gulp/paths.js +++ b/gulp/paths.js @@ -1,5 +1,3 @@ -var phantom = require('./phantom'); - var paths = { src : { root : './src/UI/', @@ -20,26 +18,4 @@ var paths = { } }; -if (phantom) { - paths = { - src : { - root : './UI.Phantom/', - templates : './UI.Phantom/**/*.hbs', - html : './UI.Phantom/*.html', - partials : './UI.Phantom/**/*Partial.hbs', - scripts : './UI.Phantom/**/*.js', - less : ['./UI.Phantom/**/*.less'], - content : './UI.Phantom/Content/', - images : './UI.Phantom/Content/Images/**/*', - exclude : { - libs : '!./UI.Phantom/JsLibraries/**' - } - }, - dest : { - root : './_output/UI.Phantom/', - content : './_output/UI.Phantom/Content/' - } - }; -} - module.exports = paths; diff --git a/gulp/phantom.js b/gulp/phantom.js deleted file mode 100644 index 54c0620e5..000000000 --- a/gulp/phantom.js +++ /dev/null @@ -1,14 +0,0 @@ -// Switch to phantom. -// Example: -// gulp --phantom - -var phantom = false; -process.argv.forEach(function(val, index, array) { - if (val === '--phantom') { - phantom = true; - } -}); - -console.log('Phantom:', phantom); - -module.exports = phantom; \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index aee88a18a..5a15477c9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,18 +1,12 @@ var path = require('path'); var stylish = require('jshint-stylish'); var webpack = require('webpack'); -var phantom = require('./gulp/phantom'); var uglifyJsPlugin = new webpack.optimize.UglifyJsPlugin(); var uiFolder = 'UI'; var root = path.join(__dirname, 'src', uiFolder); -if (phantom) { - uiFolder = 'UI.Phantom'; - root = path.join(__dirname, uiFolder); -} - module.exports = { devtool : '#source-map', watchOptions : { poll: true },