ci bugfix (#2730)

build/ci.sh

@@ -4,8 +4,8 @@ import { compileProps } from './compile-props'
 import { parseText, tokensToExp } from '../parsers/text'
 import { parseDirective } from '../parsers/directive'
 import { parseTemplate } from '../parsers/template'
-import { resolveAsset } from '../util/index'
 import {
+  resolveAsset,
   toArray,
   warn,
   remove,

src/global-api.js

@@ -1,17 +1,3 @@
-import {
-  set,
-  del,
-  nextTick,
-  mergeOptions,
-  classify,
-  toArray,
-  commonTagRE,
-  reservedTagRE,
-  warn,
-  isPlainObject,
-  extend
-} from './util/index'
-
 import config from './config'
 import directives from './directives/public/index'
 import elementDirectives from './directives/element/index'
@@ -27,6 +13,20 @@ import * as transition from './transition/index'
 import FragmentFactory from './fragment/factory'
 import internalDirectives from './directives/internal/index'
 
+const {
+  set,
+  del,
+  nextTick,
+  mergeOptions,
+  classify,
+  toArray,
+  commonTagRE,
+  reservedTagRE,
+  warn,
+  isPlainObject,
+  extend
+} = util
+
 export default function (Vue) {
   /**
    * Vue and every constructor that extends Vue has an

test/unit/specs/parsers/expression_spec.js

@@ -178,7 +178,7 @@ var testCases = [
     scope: {
       c: '\'c'
     },
-    expected: "a\'b\'c",
+    expected: "a'b'c",
     paths: ['c']
   },
   {