Fix: upgrade vue-eslint-parser (#34)

* Fix: upgrade vue-eslint-parser
  - Make correct ASTs about self-closing elements (fixes #29)
  - Improve the integration with eslint-plugin-import (refs #21)
* add comments to integration test

Author: mysticatea

Diff for: .gitignore

@@ -1,4 +1,5 @@
 /.nyc_output
 /coverage
+/tests/integrations/*/node_modules
 /node_modules
 /test.*

Diff for: .vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.tabSize": 2
+}

Diff for: package-lock.json

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "scripts": {
     "start": "npm run test:simple -- --watch --growl",
-    "test:base": "mocha tests --recursive",
+    "test:base": "mocha \"tests/lib/**/*.js\" \"tests/integrations/*.js\" --timeout 60000",
     "test:simple": "npm run test:base -- --reporter nyan",
     "test": "nyc npm run test:base",
     "lint": "eslint .",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "requireindex": "^1.1.0",
-    "vue-eslint-parser": "mysticatea/vue-eslint-parser#v1.1.0-4"
+    "vue-eslint-parser": "^1.1.0-6"
   },
   "devDependencies": {
     "@types/node": "^4.2.6",

Diff for: package.json

@@ -0,0 +1,5 @@
+{
+    "env": {
+        "mocha": true
+    }
+}

Diff for: tests/.eslintrc.json

@@ -0,0 +1,39 @@
+/**
+ * @author Toru Nagashima <https://github.com/mysticatea>
+ * @copyright 2017 Toru Nagashima. All rights reserved.
+ * See LICENSE file in root directory for full license.
+ */
+'use strict'
+
+// -----------------------------------------------------------------------------
+// Requirements
+// -----------------------------------------------------------------------------
+
+const cp = require('child_process')
+const path = require('path')
+
+// -----------------------------------------------------------------------------
+// Tests
+// -----------------------------------------------------------------------------
+
+const ESLINT = `.${path.sep}node_modules${path.sep}.bin${path.sep}eslint`
+
+describe('Integration with eslint-plugin-import', () => {
+  let originalCwd
+
+  before(() => {
+    originalCwd = process.cwd()
+    process.chdir(path.join(__dirname, 'eslint-plugin-import'))
+    cp.execSync('npm i', { stdio: 'inherit', env: { npm_config_package_lock: 'false' }})
+  })
+  after(() => {
+    process.chdir(originalCwd)
+  })
+
+  // https://github.com/vuejs/eslint-plugin-vue/issues/21#issuecomment-308957697
+  // eslint-plugin-vue had been breaking eslint-plugin-import if people use both at the same time.
+  // This test is in order to prevent the regression.
+  it('should lint without errors', () => {
+    cp.execSync(`${ESLINT} a.vue`, { stdio: 'inherit' })
+  })
+})

Diff for: tests/integrations/eslint-plugin-import.js

@@ -0,0 +1,22 @@
+{
+    "root": true,
+    "parserOptions": {
+        "sourceType": "module",
+        "ecmaVersion": 2015
+    },
+    "parser": "vue-eslint-parser",
+    "plugins": [
+        "import",
+        "vue"
+    ],
+    "rules": {
+        "import/default": "warn",
+        "import/namespace": "warn"
+    },
+    "settings": {
+        "import/extensions": [
+            ".js",
+            ".vue"
+        ]
+    }
+}

Diff for: tests/integrations/eslint-plugin-import/.eslintrc.json

@@ -0,0 +1,10 @@
+<template>
+    <b></b>
+</template>
+
+<script>
+import B from "./b.vue"
+export default {
+    components: {B}
+}
+</script>

Diff for: tests/integrations/eslint-plugin-import/a.vue

@@ -0,0 +1,7 @@
+<template>
+    <div>Hello</div>
+</template>
+
+<script>
+export default {}
+</script>

Diff for: tests/integrations/eslint-plugin-import/b.vue

@@ -0,0 +1,15 @@
+{
+  "private": true,
+  "name": "integration-test-for-eslint-plugin-import",
+  "version": "1.0.0",
+  "description": "Integration test for eslint-plugin-import",
+  "scripts": {},
+  "keywords": [],
+  "author": "Toru Nagashima (https://github.com/mysticatea)",
+  "license": "MIT",
+  "dependencies": {
+    "eslint": "~3.19.0",
+    "eslint-plugin-import": "~2.3.0",
+    "eslint-plugin-vue": "file:../../.."
+  }
+}

Diff for: tests/integrations/eslint-plugin-import/package.json

@@ -46,6 +46,10 @@ tester.run('no-invalid-template-root', rule, {
     {
       filename: 'test.vue',
       code: '<template>\n    <!-- comment -->\n    <div v-if="foo">abc</div>\n    <div v-else-if="bar">abc</div>\n    <div v-else>abc</div>\n</template>'
+    },
+    {
+      filename: 'test.vue',
+      code: `<template>\n    <c1 v-if="1" />\n    <c2 v-else-if="1" />\n    <c3 v-else />\n</template>`
     }
   ],
   invalid: [

Diff for: tests/lib/rules/no-invalid-template-root.js

@@ -34,6 +34,10 @@ tester.run('no-invalid-v-else-if', rule, {
     {
       filename: 'test.vue',
       code: '<template><div><div v-if="foo"></div><div v-else-if="foo"></div><div v-else-if="foo"></div></div></template>'
+    },
+    {
+      filename: 'test.vue',
+      code: `<template>\n    <c1 v-if="1" />\n    <c2 v-else-if="1" />\n    <c3 v-else />\n</template>`
     }
   ],
   invalid: [

Diff for: tests/lib/rules/no-invalid-v-else-if.js

@@ -34,6 +34,10 @@ tester.run('no-invalid-v-else', rule, {
     {
       filename: 'test.vue',
       code: '<template><div><div v-if="foo"></div><div v-else-if="foo"></div><div v-else></div></div></template>'
+    },
+    {
+      filename: 'test.vue',
+      code: `<template>\n    <c1 v-if="1" />\n    <c2 v-else-if="1" />\n    <c3 v-else />\n</template>`
     }
   ],
   invalid: [