Merge branch '2.0.x' into feat-onroute

Author: Gcaufy

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "8"
+  - '10'
 
 matrix:
   include:
@@ -11,19 +11,19 @@ matrix:
 sudo: false
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "linux"                      ]] ; then sudo apt-get -qq update        ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" && ! $(which expect) ]] ; then sudo apt-get install -y expect ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx"                        ]] ; then stty cols 80                   ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx"                        ]] ; then brew update                    ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx"   && ! $(which expect) ]] ; then brew install expect            ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux"                      ]] ; then sudo apt-get -qq update        ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && ! $(which expect) ]] ; then sudo apt-get install -y expect ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"                        ]] ; then stty cols 80                   ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"                        ]] ; then brew update                    ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx"   && ! $(which expect) ]] ; then brew install expect            ; fi
 
 install:
-    - "npm install"
-    - "npm run bootstrap"
+  - 'npm install'
+  - 'npm run bootstrap'
 
 script:
-    - "npm run test"
-    - "npm run bootstrap:prod"
-    - "npm run test:build"
-    
-after_script: "npm install coveralls && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
+  - 'npm run test'
+  - 'npm run bootstrap:prod'
+  - 'npm run test:build'
+
+after_script: 'npm install coveralls && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage'

package.json

@@ -39,6 +39,7 @@
     "babel-preset-stage-1": "^6.16.0",
     "chai": "^4.1.2",
     "chalk": "^1.1.3",
+    "chokidar": "^3.4.0",
     "commitizen": "^3.1.1",
     "cz-conventional-changelog": "^2.1.0",
     "enquirer": "^2.3.0",

packages/cli/core/plugins/template/directives/v-on.js

@@ -198,7 +198,7 @@ exports = module.exports = function() {
      *  </template>
      */
     const eventCallee = parsedEvent.parsed.callee;
-    if (eventCallee && eventCallee.name) {
+    if (!modifiers.wxs && eventCallee && eventCallee.name) {
       const calleeChunks = eventCallee.name.split('.');
       const wxsBlock = ctx.sfc.wxs;
 
@@ -209,7 +209,6 @@ exports = module.exports = function() {
         wxsBlock.find(item => item.attrs.module === calleeChunks[0])
       ) {
         modifiers.wxs = true;
-
         this.hookUnique(
           'error-handler',
           'template',