Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies update #75

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Dependencies update #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28321b1
Changed some dependencies to SemVer 2.0(?) versioning syntax to updat…
miduku Aug 2, 2015
2ebfd46
update dependencies
miduku Aug 7, 2015
ee23f5b
remove es5 from .jshintrc since it's set default since v2
miduku Aug 7, 2015
8de7e37
get jquery.js AND jquery.min.js from latest build with changed folder…
miduku Aug 7, 2015
2adea87
get modernizr.js from git but since there's no good bower.js until v3…
miduku Aug 7, 2015
6ea48e5
grunt-contrib-connect back to v0.3.x: livereload didn't work properly
miduku Aug 7, 2015
5221c9d
added uglify to modernizr and modernizr.min.js to index.html
miduku Aug 7, 2015
88ee68b
forgot task for uglifying modernizr
miduku Aug 7, 2015
1528da7
latest grunt-contrib-cssmin no longer supports banner, do it with gru…
miduku Aug 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"node": true,
"browser": true,
"es5": true,
"esnext": true,
"bitwise": true,
"camelcase": true,
Expand Down
51 changes: 42 additions & 9 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,15 @@ module.exports = function (grunt) {
files: {
'<%= project.assets %>/js/scripts.min.js': '<%= project.js %>'
}
},
// uglify modernizr.js
temp: {
options: {
preserveComments: 'some'
},
files: {
'<%= project.assets %>/components/modernizr.min.js': '<%= project.assets %>/components/modernizr.js'
}
}
},

Expand All @@ -163,7 +172,8 @@ module.exports = function (grunt) {
},
dist: {
options: {
style: 'expanded'
style: 'expanded',
banner: '<%= tag.banner %>'
},
files: {
'<%= project.assets %>/css/style.unprefixed.css': '<%= project.css %>'
Expand Down Expand Up @@ -206,9 +216,6 @@ module.exports = function (grunt) {
*/
cssmin: {
dev: {
options: {
banner: '<%= tag.banner %>'
},
files: {
'<%= project.assets %>/css/style.min.css': [
'<%= project.src %>/components/normalize-css/normalize.css',
Expand All @@ -217,9 +224,6 @@ module.exports = function (grunt) {
}
},
dist: {
options: {
banner: '<%= tag.banner %>'
},
files: {
'<%= project.assets %>/css/style.min.css': [
'<%= project.src %>/components/normalize-css/normalize.css',
Expand All @@ -235,10 +239,38 @@ module.exports = function (grunt) {
*/
bower: {
dev: {
dest: '<%= project.assets %>/components/'
dest: '<%= project.assets %>/components/',
options: {
packageSpecific: {
jquery: {
files: [
'dist/*'
]
},
modernizr: {
files: [
'modernizr.js'
]
}
}
}
},
dist: {
dest: '<%= project.assets %>/components/'
dest: '<%= project.assets %>/components/',
options: {
packageSpecific: {
jquery: {
files: [
'dist/*'
]
},
modernizr: {
files: [
'modernizr.js'
]
}
}
}
}
},

Expand Down Expand Up @@ -291,6 +323,7 @@ module.exports = function (grunt) {
'autoprefixer:dev',
'cssmin:dev',
'jshint',
'uglify:temp',
'concat:dev',
'connect:livereload',
'open',
Expand Down
Loading