summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-11-01 15:59:56 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2015-11-01 15:59:56 +0100
commit759c9b5d6792cdecf14e7e5971feb07947b6c4e4 (patch)
tree7a111d356c86e3ab4d975a17422ac847d6cda3b3 /js
parent457e1d9bd192a4462bb09a2b6e193e921995039d (diff)
remove cachebuster
Diffstat (limited to 'js')
-rw-r--r--js/Gruntfile.js89
1 files changed, 14 insertions, 75 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index 34899a60b..c48d3b73c 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -24,7 +24,6 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-ng-annotate');
grunt.loadNpmTasks('grunt-protractor-runner');
grunt.loadNpmTasks('grunt-protractor-webdriver');
- grunt.loadNpmTasks('grunt-cachebuster');
grunt.initConfig({
meta: {
@@ -62,8 +61,7 @@ module.exports = function (grunt) {
uglify: {
app: {
files: {
- '<%= meta.production %>app.min.js':
- ['<%= meta.production %>app.js']
+ '<%= meta.production %>app.min.js': ['<%= meta.production %>app.js']
}
},
options: {
@@ -75,16 +73,18 @@ module.exports = function (grunt) {
sourceMap: true
},
news: {
- files: {'../css/news.min.css': [
- '../css/app.css',
- '../css/content.css',
- '../css/custom.css',
- '../css/shortcuts.css',
- '../css/mobile.css',
- '../css/navigation.css',
- '../css/settings.css',
- '../css/explore.css'
- ]}
+ files: {
+ '../css/news.min.css': [
+ '../css/app.css',
+ '../css/content.css',
+ '../css/custom.css',
+ '../css/shortcuts.css',
+ '../css/mobile.css',
+ '../css/navigation.css',
+ '../css/settings.css',
+ '../css/explore.css'
+ ]
+ }
}
},
wrap: {
@@ -193,9 +193,7 @@ module.exports = function (grunt) {
},
/* jshint camelcase: false */
protractor_webdriver: {
- app: {
-
- }
+ app: {}
},
protractor: {
firefox: {
@@ -220,65 +218,6 @@ module.exports = function (grunt) {
base: '../../../'
}
}
- },
- cachebuster: {
- build: {
- options: {
- format: 'json',
- basedir: '..'
- },
- src: [
- '../**',
- // js
- '!../js/**',
- '../js/build/*.min.js',
- '../js/vendor/**/*.min.js',
- '!../js/vendor/jquery/**',
- '!../js/vendor/js-url/lib/**',
- '!../js/vendor/angular-mocks/**',
- // css
- '!../css/**',
- '../css/*.min.css',
- // l10n
- '!../l10n/**',
- // appinfo
- '!../appinfo/checksum.json',
- // build
- '!../build/**',
- // vendor
- '!../vendor/ezyang/htmlpurifier/**',
- '../vendor/ezyang/htmlpurifier/**/*.php',
- '../vendor/ezyang/htmlpurifier/**/*.json',
- '!../vendor/ezyang/htmlpurifier/extras/**',
- '!../vendor/ezyang/htmlpurifier/maintenance/**',
- '!../vendor/ezyang/htmlpurifier/plugins/**',
- '!../vendor/ezyang/htmlpurifier/maintenance/**',
- '!../vendor/ezyang/htmlpurifier/configdoc/**',
- '!../vendor/ezyang/htmlpurifier/benchmarks/**',
- '!../vendor/ezyang/htmlpurifier/smoketests/**',
- '!../vendor/fguillot/picofeed/**',
- '../vendor/fguillot/picofeed/**/*.php',
- '../vendor/fguillot/picofeed/**/*.json',
- '!../vendor/pear/net_url2/**',
- '../vendor/pear/net_url2/**/*.php',
- '../vendor/pear/net_url2/**/*.json',
- // bin
- '!../bin/updater/dist',
- '!../**/*.pyc',
- '!../**/PKG_INFO',
- '!../**/__pycache__',
- '!../bin/git/**',
- // generic
- '!../**/*.md',
- '!../**/phpunit*',
- '!../**/*.log',
- '!../**/*.sw',
- '!../**/Makefile',
- '!../**/docs/**',
- '!../**/tests/**',
- ],
- dest: '../appinfo/checksum.json'
- }
}
});