Skip to content

Commit 87250b7

Browse files
committed
additional files
1 parent 90e2032 commit 87250b7

File tree

2 files changed

+24
-32
lines changed

2 files changed

+24
-32
lines changed

Gruntfile.js

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ module.exports = function(grunt) {
1010
"<%= grunt.template.today('yyyy-mm-dd') %>\n" +
1111
"<%= pkg.homepage ? '* ' + pkg.homepage + '\\n' : '' %>" +
1212
"* Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
13-
" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */\n",
13+
" Licensed <%= pkg.licenses.map(o => o['type']).join(', ') %> */\n",
1414
minbanner: "/*! <%= pkg.title || pkg.name %> v<%= pkg.version %> <%= grunt.template.today('yyyy-mm-dd') %> | " +
15-
"<%= pkg.homepage ? pkg.homepage : '' %> | (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %> | " +
16-
"Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */\n",
15+
"<%= pkg.homepage ? pkg.homepage : '' %> | (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %> | " +
16+
"Licensed <%= pkg.licenses.map(o => o['type']).join(', ') %> */\n",
1717
// Task configuration.
1818
concat: {
1919
options: {
@@ -50,20 +50,13 @@ module.exports = function(grunt) {
5050
]
5151
},
5252
},
53-
qunit: {
54-
options: {
55-
timeout: 30000,
56-
"--web-security": "no",
57-
coverage: {
58-
src: [ "src/<%= pkg.name %>.js" ],
59-
instrumentedFiles: "temp/",
60-
htmlReport: "build/report/coverage",
61-
lcovReport: "build/report/lcov",
62-
linesThresholdPct: 0
63-
}
64-
},
65-
files: ["test/**/*.html"]
66-
},
53+
qunit: {
54+
all: {
55+
options: {
56+
urls:["test/idle-timer.html"]
57+
}
58+
}
59+
},
6760
coveralls: {
6861
options: {
6962
// dont fail if coveralls fails
@@ -76,19 +69,22 @@ module.exports = function(grunt) {
7669
jshint: {
7770
gruntfile: {
7871
options: {
79-
jshintrc: ".jshintrc"
72+
jshintrc: ".jshintrc",
73+
reporterOutput: ""
8074
},
8175
src: "Gruntfile.js"
8276
},
8377
src: {
8478
options: {
85-
jshintrc: "src/.jshintrc"
79+
jshintrc: "src/.jshintrc",
80+
reporterOutput: ""
8681
},
8782
src: ["src/**/*.js"]
8883
},
8984
test: {
9085
options: {
91-
jshintrc: "test/.jshintrc"
86+
jshintrc: "test/.jshintrc",
87+
reporterOutput: ""
9288
},
9389
src: ["test/**/*.js"]
9490
},
@@ -112,7 +108,7 @@ module.exports = function(grunt) {
112108
// These plugins provide necessary tasks.
113109
grunt.loadNpmTasks("grunt-contrib-jshint");
114110
grunt.loadNpmTasks("grunt-coveralls");
115-
grunt.loadNpmTasks("grunt-qunit-istanbul");
111+
grunt.loadNpmTasks("grunt-contrib-qunit");
116112
grunt.loadNpmTasks("grunt-contrib-concat");
117113
grunt.loadNpmTasks("grunt-contrib-uglify");
118114
grunt.loadNpmTasks("grunt-contrib-watch");

package.json

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "dist/idle-timer.js",
44
"version": "1.1.0",
55
"engines": {
6-
"node": ">= 0.6.0"
6+
"node": ">= 10.0.0"
77
},
88
"scripts": {
99
"test": "grunt qunit"
@@ -13,15 +13,11 @@
1313
"url": "git://github.com/thorst/jquery-idletimer.git"
1414
},
1515
"devDependencies": {
16-
"grunt-contrib-jshint": "0.9.2",
17-
"grunt-contrib-concat": "0.3.0",
18-
"grunt-contrib-uglify": "0.4.0",
19-
"grunt-contrib-watch": "0.6.0",
20-
"grunt-coveralls": "0.3.0",
21-
"grunt-qunit-istanbul": "^0.4.0",
22-
"grunt": "0.4.2"
23-
},
24-
"dependencies": {
25-
16+
"grunt": "^1.1.0",
17+
"grunt-contrib-concat": "^1.0.1",
18+
"grunt-contrib-jshint": "^2.1.0",
19+
"grunt-contrib-qunit": "^4.0.0",
20+
"grunt-contrib-uglify": "^4.0.1",
21+
"grunt-contrib-watch": "^1.1.0"
2622
}
2723
}

0 commit comments

Comments
 (0)