Skip to content

Commit 55e203d

Browse files
committed
moment.js official package should be "moment" instead of "momentjs",
modified bower, gruntfile & test config to reflect that
1 parent 018fcfd commit 55e203d

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Diff for: Gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = function (grunt) {
6767
compile_all_js: {
6868
src: [
6969
'<%= 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',
7171
'bower_components/humanize-duration/humanize-duration.js'
7272
],
7373
dest: '<%= dist_dir %>/assets/js/<%= pkg.name %>-all.min.js'

Diff for: bower.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"angular": ">= 1.0.7",
13-
"momentjs": "~2.9.0",
13+
"moment": "~2.9.0",
1414
"humanize-duration": "~2.8.0"
1515
},
1616
"devDependencies": {
@@ -22,5 +22,8 @@
2222
"ignore": [
2323
"node_modules",
2424
"bower_components"
25-
]
25+
],
26+
"resolutions": {
27+
"moment": "~2.9.0"
28+
}
2629
}

Diff for: config/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function(config){
66

77
files : [
88
'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',
1010
'bower_components/angular/angular.js',
1111
'bower_components/angular-mocks/angular-mocks.js',
1212
'app/js/*.js',

0 commit comments

Comments
 (0)