diff --git a/omega-pac/grunt/browserify.coffee b/omega-pac/grunt/browserify.coffee index ce730a9..0c3fb2c 100644 --- a/omega-pac/grunt/browserify.coffee +++ b/omega-pac/grunt/browserify.coffee @@ -4,7 +4,7 @@ module.exports = 'index.js': 'index.coffee' options: transform: ['coffeeify'] - exclude: ['uglify-js', 'ipv6'] + exclude: ['uglify-js', 'ip-address'] browserifyOptions: extensions: '.coffee' builtins: [] diff --git a/omega-pac/package.json b/omega-pac/package.json index 1bdf2b4..9b04d5f 100644 --- a/omega-pac/package.json +++ b/omega-pac/package.json @@ -17,7 +17,7 @@ "minifyify": "^4.1.1" }, "dependencies": { - "ipv6": "beaugunderson/javascript-ipv6", + "ip-address": "^4.0.0", "tldjs": "^1.5.2", "uglify-js": "^2.4.15" }, diff --git a/omega-pac/src/conditions.coffee b/omega-pac/src/conditions.coffee index d609a3b..144c1a2 100644 --- a/omega-pac/src/conditions.coffee +++ b/omega-pac/src/conditions.coffee @@ -1,5 +1,5 @@ U2 = require 'uglify-js' -IP = require 'ipv6' +IP = require 'ip-address' Url = require 'url' {shExp2RegExp, escapeSlash} = require './shexp_utils' {AttachedCache} = require './utils' diff --git a/omega-pac/test/conditions.coffee b/omega-pac/test/conditions.coffee index 60fc85d..bec1ff2 100644 --- a/omega-pac/test/conditions.coffee +++ b/omega-pac/test/conditions.coffee @@ -294,7 +294,6 @@ describe 'Conditions', -> new U2.AST_Return value: Conditions.compile(cond) ] ) - console.log(Conditions.compile(cond).print_to_string()) eval('(' + testFunc.print_to_string() + ')') compiledFunc = ipToCompiledFunc('0.0.0.0', 0)