🌐 AI搜索 & 代理 主页
Skip to content

Commit 9c6e693

Browse files
colinrotherhamcolinrotherham
committed
Update packages
Also fix broken promises tests
1 parent 7bf1722 commit 9c6e693

File tree

5 files changed

+48
-35
lines changed

5 files changed

+48
-35
lines changed

‎Gruntfile.js‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,25 @@ module.exports = function(grunt) {
154154
}
155155
},
156156

157-
sed: {
157+
replace: {
158158
version: {
159-
pattern: '%VERSION%',
160-
replacement: '<%= version %>',
161-
recursive: true,
162-
path: '<%= buildDir %>'
159+
options: {
160+
patterns: [
161+
{
162+
match: '%VERSION%',
163+
replacement: '<%= version %>',
164+
}
165+
],
166+
usePrefix: false
167+
},
168+
files: [
169+
{
170+
expand: true,
171+
flatten: true,
172+
src: '<%= buildDir %>/**/*.js',
173+
dest: '<%= buildDir %>'
174+
}
175+
]
163176
}
164177
},
165178

@@ -309,14 +322,14 @@ module.exports = function(grunt) {
309322
'uglify:typeaheadMin',
310323
'uglify:bundle',
311324
'uglify:bundleMin',
312-
'sed:version'
325+
'replace:version'
313326
]);
314327

315328
// load tasks
316329
// ----------
317330

318331
grunt.loadNpmTasks('grunt-umd');
319-
grunt.loadNpmTasks('grunt-sed');
332+
grunt.loadNpmTasks('grunt-replace');
320333
grunt.loadNpmTasks('grunt-exec');
321334
grunt.loadNpmTasks('grunt-step');
322335
grunt.loadNpmTasks('grunt-concurrent');

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "1.0.1",
44
"main": "dist/typeahead.bundle.js",
55
"dependencies": {
6-
"jquery": ">=1.7"
6+
"jquery": ">=1.11"
77
},
88
"devDependencies": {
9-
"jquery": "~1.7",
9+
"jquery": "~1.11",
1010
"jasmine-ajax": "~1.3.1",
1111
"jasmine-jquery": "~1.7.0"
1212
},
1313
"resolutions": {
14-
"jquery": "1.7.2"
14+
"jquery": "1.11.3"
1515
}
1616
}

‎karma.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = function(config) {
1818
},
1919

2020
files: [
21-
'bower_components/jquery/jquery.js',
21+
'bower_components/jquery/dist/jquery.js',
2222
'./node_modules/phantomjs-polyfill/bind-polyfill.js',
2323
'src/common/utils.js',
2424
'src/bloodhound/version.js',

‎package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,32 @@
3636
],
3737
"license": "MIT",
3838
"dependencies": {
39-
"jquery": ">=1.7"
39+
"jquery": ">=1.11"
4040
},
4141
"devDependencies": {
42-
"chai": "^3.3.0",
42+
"chai": "^3.5.0",
4343
"colors": "^1.1.2",
44-
"grunt": "~0.4",
44+
"grunt": "~1.0.1",
4545
"grunt-concurrent": "^2.0.3",
46-
"grunt-contrib-clean": "^0.6.0",
47-
"grunt-contrib-concat": "^0.5.1",
48-
"grunt-contrib-connect": "^0.11.2",
49-
"grunt-contrib-jshint": "^0.11.3",
50-
"grunt-contrib-uglify": "^0.9.2",
51-
"grunt-contrib-watch": "^0.6.1",
52-
"grunt-exec": "~0.4.5",
53-
"grunt-sed": "~0.1",
54-
"grunt-step": "~0.2.0",
46+
"grunt-contrib-clean": "^1.0.0",
47+
"grunt-contrib-concat": "^1.0.1",
48+
"grunt-contrib-connect": "^1.0.2",
49+
"grunt-contrib-jshint": "^1.1.0",
50+
"grunt-contrib-uglify": "^2.0.0",
51+
"grunt-contrib-watch": "^1.0.0",
52+
"grunt-exec": "~1.0.1",
53+
"grunt-replace": "^1.0.1",
54+
"grunt-step": "~1.0.0",
5555
"grunt-umd": "^2.3.3",
56-
"karma": "^0.13.14",
57-
"karma-chrome-launcher": "^0.2.1",
58-
"karma-coverage": "^0.5.2",
59-
"karma-firefox-launcher": "^0.1.3",
56+
"karma": "^1.3.0",
57+
"karma-chrome-launcher": "^2.0.0",
58+
"karma-coverage": "^1.1.1",
59+
"karma-firefox-launcher": "^1.0.0",
6060
"karma-jasmine": "^0.1.6",
61-
"karma-opera-launcher": "^0.3.0",
62-
"karma-phantomjs-launcher": "^0.2.1",
63-
"karma-safari-launcher": "^0.1.1",
64-
"mocha": "^2.3.3",
61+
"karma-opera-launcher": "^1.0.0",
62+
"karma-phantomjs-launcher": "^1.0.2",
63+
"karma-safari-launcher": "^1.0.0",
64+
"mocha": "^3.2.0",
6565
"node-static": "^0.7.7",
6666
"phantomjs": "^2.1.7",
6767
"semver": "^5.0.3",

‎test/bloodhound/options_parser_spec.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ describe('options parser', function() {
118118

119119
waits(0);
120120
runs(function() {
121-
expect(errDeferred.isRejected()).toBe(true);
122-
expect(successDeferred.isResolved()).toBe(true);
121+
expect(errDeferred.state()).toBe('rejected');
122+
expect(successDeferred.state()).toBe('resolved');
123123
});
124124

125125
function errTransport(q, success, error) { error(); }
@@ -183,8 +183,8 @@ describe('options parser', function() {
183183

184184
waits(0);
185185
runs(function() {
186-
expect(errDeferred.isRejected()).toBe(true);
187-
expect(successDeferred.isResolved()).toBe(true);
186+
expect(errDeferred.state()).toBe('rejected');
187+
expect(successDeferred.state()).toBe('resolved');
188188
});
189189

190190
function errTransport(q, success, error) { error(); }

0 commit comments

Comments
 (0)