Skip to content

Commit 2d7b224

Browse files
committed
try update libs
note: angular-ui/ui-router#2219
1 parent 13613c7 commit 2d7b224

File tree

7 files changed

+49
-46
lines changed

7 files changed

+49
-46
lines changed

omega-build/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"version": "0.0.1",
44
"private": true,
55
"devDependencies": {
6-
"grunt": "~0.4.1",
7-
"grunt-hub": "^0.7.0"
6+
"grunt": "^1.0.3",
7+
"grunt-hub": "^1.0.0"
88
},
99
"scripts": {
1010
"deps": "npm install && (cd ../omega-pac && npm install) && (cd ../omega-target && npm install) && (cd ../omega-web && npm install && bower install) && (cd ../omega-target-chromium-extension/ && npm install)",

omega-pac/package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,23 @@
55
"main": "./index.js",
66
"devDependencies": {
77
"chai": "~1.9.1",
8-
"coffee-script": "^1.7.1",
98
"coffeeify": "^0.7.0",
109
"coffeelint": "^1.16.0",
11-
"grunt": "^0.4.5",
12-
"grunt-browserify": "^3.0.0",
13-
"grunt-coffeelint": "^0.0.13",
14-
"grunt-contrib-coffee": "^0.11.1",
15-
"grunt-contrib-watch": "^0.6.1",
16-
"grunt-mocha-test": "~0.11.0",
17-
"load-grunt-config": "^0.13.1",
10+
"coffeescript": "^1.7.1",
11+
"grunt": "^1.0.3",
12+
"grunt-browserify": "^5.3.0",
13+
"grunt-coffeelint": "0.0.16",
14+
"grunt-contrib-coffee": "^2.0.0",
15+
"grunt-contrib-watch": "^1.1.0",
16+
"grunt-mocha-test": "^0.13.3",
17+
"load-grunt-config": "^1.0.1",
1818
"lolex": "^1.4.0",
19-
"minifyify": "^4.1.1"
19+
"minifyify": "^7.3.5"
2020
},
2121
"dependencies": {
22-
"ip-address": "^4.0.0",
23-
"tldjs": "^1.5.2",
22+
"ip-address": "^5.8.9",
23+
"mocha": "^5.2.0",
24+
"tldjs": "^2.3.1",
2425
"uglify-js": "^2.4.15"
2526
},
2627
"browser": {

omega-pac/src/conditions.coffee

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ module.exports = exports =
185185
parseIp: (ip) ->
186186
if ip.charCodeAt(0) == '['.charCodeAt(0)
187187
ip = ip.substr 1, ip.length - 2
188-
addr = new IP.v4.Address(ip)
188+
addr = new IP.Address4(ip)
189189
if not addr.isValid()
190-
addr = new IP.v6.Address(ip)
190+
addr = new IP.Address6(ip)
191191
if not addr.isValid()
192192
return null
193193
return addr
194194
normalizeIp: (addr) ->
195195
return (addr.correctForm ? addr.canonicalForm).call(addr)
196-
ipv6Max: new IP.v6.Address('::/0').endAddress().canonicalForm()
196+
ipv6Max: new IP.Address6('::/0').endAddress().canonicalForm()
197197

198198
localHosts: ["127.0.0.1", "[::1]", "localhost"]
199199

@@ -479,9 +479,9 @@ module.exports = exports =
479479
throw new Error "Invalid IP address #{addr}"
480480
cache.normalized = @normalizeIp cache.addr
481481
mask = if cache.addr.v4
482-
new IP.v4.Address('255.255.255.255/' + cache.addr.subnetMask)
482+
new IP.Address4('255.255.255.255/' + cache.addr.subnetMask)
483483
else
484-
new IP.v6.Address(@ipv6Max + '/' + cache.addr.subnetMask)
484+
new IP.Address6(@ipv6Max + '/' + cache.addr.subnetMask)
485485
cache.mask = @normalizeIp mask.startAddress()
486486
cache
487487
match: (condition, request, cache) ->

omega-target-chromium-extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "./index",
66
"devDependencies": {
77
"chai": "~1.9.1",
8-
"coffee-script": "^1.7.1",
8+
"coffeescript": "^1.7.1",
99
"coffeeify": "^0.7.0",
1010
"coffeelint": "^1.16.0",
1111
"grunt": "^0.4.5",

omega-target/package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
"main": "./index.js",
66
"devDependencies": {
77
"chai": "^1.10.0",
8-
"coffee-script": "^1.8.0",
9-
"coffeeify": "^0.7.0",
10-
"coffeelint": "^1.16.0",
11-
"grunt": "^0.4.5",
12-
"grunt-browserify": "^3.0.0",
13-
"grunt-coffeelint": "^0.0.13",
14-
"grunt-contrib-coffee": "^0.11.1",
15-
"grunt-contrib-watch": "^0.6.1",
16-
"grunt-mocha-test": "~0.11.0",
17-
"load-grunt-config": "^0.13.1",
18-
"minifyify": "^4.1.1",
8+
"coffeeify": "^1.2.0",
9+
"coffeelint": "^2.1.0",
10+
"coffeescript": "^1.12.7",
11+
"grunt": "^1.0.3",
12+
"grunt-browserify": "^5.3.0",
13+
"grunt-coffeelint": "^0.0.16",
14+
"grunt-contrib-coffee": "^2.0.0",
15+
"grunt-contrib-watch": "^1.1.0",
16+
"grunt-mocha-test": "^0.13.0",
17+
"load-grunt-config": "^1.0.1",
18+
"minifyify": "^7.3.5",
19+
"mocha": "^1.20.0",
1920
"sinon": "^1.12.2",
2021
"sinon-chai": "^2.6.0"
2122
},

omega-web/bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
"angular-sanitize": "~1.7.2",
2929

3030
"angular-bootstrap": "~0.12.0",
31-
"angular-ui-router": "~0.2.18",
31+
"angular-ui-router": "~1.0.20",
3232
"bootstrap": "~3.3.2",
3333
"script.js": "~2.5.3",
34-
"ngprogress": "~1.0.4",
35-
"angular-ui-sortable": "~0.13.3",
34+
"ngprogress": "~1.1.3",
35+
"angular-ui-sortable": "~0.19.0",
3636
"jsondiffpatch": "~0.1.7",
3737
"angular-spectrum-colorpicker": "~1.3.5",
3838
"blob": "*",

omega-web/package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
"private": true,
55
"devDependencies": {
66
"chai": "~1.9.1",
7-
"coffeelint": "^1.16.0",
8-
"grunt": "^0.4.5",
9-
"grunt-autoprefixer": "^1.0.1",
7+
"coffeelint": "^2.1.0",
8+
"grunt": "^1.0.3",
9+
"grunt-autoprefixer": "^3.0.4",
1010
"grunt-bower-task": "^0.5.0",
11-
"grunt-coffeelint": "^0.0.13",
12-
"grunt-contrib-coffee": "^0.11.1",
13-
"grunt-contrib-concat": "^0.5.0",
14-
"grunt-contrib-copy": "^0.5.0",
15-
"grunt-contrib-jade": "^0.12.0",
16-
"grunt-contrib-less": "^0.11.4",
17-
"grunt-contrib-watch": "^0.6.1",
18-
"grunt-mocha-test": "~0.11.0",
19-
"grunt-ng-annotate": "^0.3.2",
20-
"load-grunt-config": "^0.13.1",
11+
"grunt-coffeelint": "0.0.16",
12+
"grunt-contrib-coffee": "^2.0.0",
13+
"grunt-contrib-concat": "^1.0.1",
14+
"grunt-contrib-copy": "^1.0.0",
15+
"grunt-contrib-jade": "^1.0.0",
16+
"grunt-contrib-less": "^2.0.0",
17+
"grunt-contrib-watch": "^1.1.0",
18+
"grunt-mocha-test": "^0.13.3",
19+
"grunt-ng-annotate": "^3.0.0",
20+
"load-grunt-config": "^1.0.1",
21+
"mocha": "^5.2.0",
2122
"omega-pac": "../omega-pac"
2223
},
2324
"scripts": {

0 commit comments

Comments
 (0)