Ver Fonte

Update ipv6 3.x to ip-address 4.0.0. Fix #459. Fix #460.

FelisCatus há 10 anos atrás
pai
commit
6ec929dc06

+ 1 - 1
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: []

+ 1 - 1
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"
   },

+ 1 - 1
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'

+ 0 - 1
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)