Merge branch 'master' into 3.0.0

Conflicts:
	package.json
This commit is contained in:
Sebastian McKenzie
2015-01-27 20:52:45 +11:00
2 changed files with 3 additions and 3 deletions

View File

@@ -42,11 +42,11 @@
"esutils": "1.1.6",
"esvalid": "1.1.0",
"fs-readdir-recursive": "0.1.0",
"lodash": "2.4.1",
"lodash": "3.0.0",
"output-file-sync": "^1.1.0",
"private": "0.1.6",
"regenerator-6to5": "0.8.9-6",
"regexpu": "1.0.0",
"regexpu": "1.1.0",
"roadrunner": "1.0.4",
"source-map": "0.1.43",
"source-map-support": "0.2.9"

View File

@@ -1,4 +1,4 @@
"use strict";
var string = "foo💩bar";
var match = string.match(/foo((?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uDC00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF]))bar/);
var match = string.match(/foo((?:[\0-\t\x0B\f\x0E-\u2027\u202A-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]))bar/);