From 246e035eca4f6f9c9984660fbd35e7ac4ac533b6 Mon Sep 17 00:00:00 2001 From: Dmitry Semenov Date: Tue, 8 Jan 2019 16:43:38 +0200 Subject: [PATCH] devDependencies upd --- Gruntfile.js | 25 ------------------------- package.json | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 39 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index a636cbf7f..ebdfccdde 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -22,11 +22,6 @@ module.exports = function(grunt) { "markdown: redcarpet \r\n"+ "kramdown: \r\n"+ " input: GFM \r\n"; - - var awsDefaults = {}; - if( grunt.file.exists('./aws-keys.json') ) { - awsDefaults = grunt.file.readJSON('./aws-keys.json'); - } grunt.initConfig({ @@ -170,24 +165,6 @@ module.exports = function(grunt) { 'src/css/default-skin/default-skin.svg': 'src/css/default-skin/default-skin.svg' } } - }, - - aws_s3: { - options: { - accessKeyId: awsDefaults ? awsDefaults.AWSAccessKeyId : '', // Use the variables - secretAccessKey: awsDefaults ? awsDefaults.AWSSecretKey : '', // You can also use env variables - region: 'eu-west-1', - uploadConcurrency: 5, // 5 simultaneous uploads - downloadConcurrency: 5 // 5 simultaneous downloads - }, - main: { - options: { - bucket: 'photoswipe' - }, - files: [ - { expand: true, cwd: 'dist/', src: ['**'], dest: 'pswp/dist/', params: {CacheControl: 'max-age=86400'} } - ] - } } @@ -273,7 +250,6 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-jekyll'); grunt.loadNpmTasks('grunt-contrib-cssmin'); - grunt.loadNpmTasks('grunt-aws-s3'); grunt.loadNpmTasks('grunt-svgmin'); // Default task. @@ -282,6 +258,5 @@ module.exports = function(grunt) { grunt.registerTask('production', ['sass', 'autoprefixer', 'pswpbuild', 'uglify', 'copy', 'cssmin', 'jekyll:production']); grunt.registerTask('nosite', ['sass', 'autoprefixer', 'pswpbuild', 'uglify']); grunt.registerTask('hint', ['jshint']); - grunt.registerTask('awsupload', ['aws_s3']); }; \ No newline at end of file diff --git a/package.json b/package.json index 389c0e489..6a2b0cfe9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "photoswipe", - "version": "4.1.2", + "version": "4.1.3", "engines": { "node": ">= 0.8.0" }, @@ -8,19 +8,18 @@ "test": "grunt jshint" }, "devDependencies": { - "grunt": "~0.4.5", + "grunt": "~1.0.3", "grunt-autoprefixer": "^3.0.3", - "grunt-aws-s3": "^0.14.2", - "grunt-contrib-clean": "~0.7.0", - "grunt-contrib-concat": "~0.5.1", - "grunt-contrib-copy": "^0.8.2", - "grunt-contrib-cssmin": "^0.14.0", - "grunt-contrib-jshint": "~0.11.3", - "grunt-contrib-uglify": "~0.11.0", - "grunt-contrib-watch": "~0.6.1", - "grunt-jekyll": "~0.4.3", - "grunt-sass": "^1.1.0", - "grunt-svgmin": "^3.1.0" + "grunt-contrib-clean": "~2.0.0", + "grunt-contrib-concat": "~1.0.1", + "grunt-contrib-copy": "^1.0.0", + "grunt-contrib-cssmin": "^3.0.0", + "grunt-contrib-jshint": "~2.0.0", + "grunt-contrib-uglify": "~4.0.0", + "grunt-contrib-watch": "~1.1.0", + "grunt-jekyll": "~1.0.0", + "grunt-sass": "^3.0.2", + "grunt-svgmin": "^5.0.0" }, "repository": { "type": "git", @@ -30,7 +29,7 @@ "bugs": { "url": "https://github.com/dimsemenov/Photoswipe/issues" }, - "homepage": "http://photoswipe.com", + "homepage": "https://photoswipe.com", "main": "dist/photoswipe.js", "keywords": [ "gallery",