tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 15:08:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
FelisCatus 2015-05-17 11:06:45 +08:00
parent 67bd3fc7f8
commit 6ec929dc06
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
omega-pac/grunt/browserify.coffee
View File

@ -4,7 +4,7 @@ module.exports =
'index.js': 'index.coffee' 'index.js': 'index.coffee'
options: options:
transform: ['coffeeify'] transform: ['coffeeify']
exclude: ['uglify-js', 'ipv6'] exclude: ['uglify-js', 'ip-address']
browserifyOptions: browserifyOptions:
extensions: '.coffee' extensions: '.coffee'
builtins: [] builtins: []

2
omega-pac/package.json
View File

@ -17,7 +17,7 @@
"minifyify": "^4.1.1" "minifyify": "^4.1.1"
}, },
"dependencies": { "dependencies": {
"ipv6": "beaugunderson/javascript-ipv6", "ip-address": "^4.0.0",
"tldjs": "^1.5.2", "tldjs": "^1.5.2",
"uglify-js": "^2.4.15" "uglify-js": "^2.4.15"
}, },

2
omega-pac/src/conditions.coffee
View File

@ -1,5 +1,5 @@
U2 = require 'uglify-js' U2 = require 'uglify-js'
IP = require 'ipv6' IP = require 'ip-address'
Url = require 'url' Url = require 'url'
{shExp2RegExp, escapeSlash} = require './shexp_utils' {shExp2RegExp, escapeSlash} = require './shexp_utils'
{AttachedCache} = require './utils' {AttachedCache} = require './utils'

1
omega-pac/test/conditions.coffee
View File

@ -294,7 +294,6 @@ describe 'Conditions', ->
new U2.AST_Return value: Conditions.compile(cond) new U2.AST_Return value: Conditions.compile(cond)
] ]
) )
console.log(Conditions.compile(cond).print_to_string())
eval('(' + testFunc.print_to_string() + ')') eval('(' + testFunc.print_to_string() + ')')
compiledFunc = ipToCompiledFunc('0.0.0.0', 0) compiledFunc = ipToCompiledFunc('0.0.0.0', 0)