File tree 3 files changed +7
-4
lines changed
3 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ module.exports = function (grunt) {
67
67
compile_all_js : {
68
68
src : [
69
69
'<%= dist_dir %>/<%= pkg.name %>.min.js' ,
70
- 'bower_components/momentjs /min/moment-with-locales.min.js' ,
70
+ 'bower_components/moment /min/moment-with-locales.min.js' ,
71
71
'bower_components/humanize-duration/humanize-duration.js'
72
72
] ,
73
73
dest : '<%= dist_dir %>/assets/js/<%= pkg.name %>-all.min.js'
Original file line number Diff line number Diff line change 10
10
},
11
11
"dependencies" : {
12
12
"angular" : " >= 1.0.7" ,
13
- "momentjs " : " ~2.9.0" ,
13
+ "moment " : " ~2.9.0" ,
14
14
"humanize-duration" : " ~2.8.0"
15
15
},
16
16
"devDependencies" : {
22
22
"ignore" : [
23
23
" node_modules" ,
24
24
" bower_components"
25
- ]
25
+ ],
26
+ "resolutions" : {
27
+ "moment" : " ~2.9.0"
28
+ }
26
29
}
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ module.exports = function(config){
6
6
7
7
files : [
8
8
'bower_components/humanize-duration/humanize-duration.js' ,
9
- 'bower_components/momentjs /min/moment-with-locales.js' ,
9
+ 'bower_components/moment /min/moment-with-locales.js' ,
10
10
'bower_components/angular/angular.js' ,
11
11
'bower_components/angular-mocks/angular-mocks.js' ,
12
12
'app/js/*.js' ,
You can’t perform that action at this time.
0 commit comments