From 7c696ff40057c548f5e0630780dde85a2ae9ed43 Mon Sep 17 00:00:00 2001
From: Jeff Berry <jeff.berry@sdvi.com>
Date: Thu, 15 Mar 2018 18:11:08 -0700
Subject: [PATCH 1/3] Update PostCSS to ^6.0.*

---
 package.json        | 182 +++++++++++++++----------------
 src/style/css.js    |   6 +-
 src/vueTransform.js |   8 +-
 yarn.lock           | 253 ++++++++++++++++++++++++--------------------
 4 files changed, 242 insertions(+), 207 deletions(-)

diff --git a/package.json b/package.json
index f4c03fc..f3a119c 100644
--- a/package.json
+++ b/package.json
@@ -1,93 +1,93 @@
 {
-  "name": "rollup-plugin-vue",
-  "version": "3.0.0",
-  "description": "Roll .vue files",
-  "main": "dist/rollup-plugin-vue.common.js",
-  "module": "dist/rollup-plugin-vue.js",
-  "scripts": {
-    "test": "npm run lint && npm run build && npm run unit",
-    "build": "node config/build.js",
-    "dev": "npm run unit -- -w",
-    "unit": "cross-env NODE_ENV=production mocha test/test.js --slow=5000 --timeout=10000",
-    "lint": "eslint src/**",
-    "lint:fix": "eslint --fix src/**",
-    "coveralls": "cross-env NODE_ENV=production istanbul cover --default-excludes -x 'dist/**' -x 'config/**' ./node_modules/mocha/bin/_mocha --report lcovonly  --  --slow=5000 --timeout=10000 test/test.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
-    "prepare": "npm run build",
-    "docs": "php -S localhost:8080 -t .github/sereno/public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/znck/rollup-plugin-vue.git"
-  },
-  "keywords": [
-    "rollup-plugin",
-    "vue"
-  ],
-  "files": [
-    "dist/",
-    "src/"
-  ],
-  "author": "Rahul Kadyan <hi@znck.me>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/znck/rollup-plugin-vue/issues"
-  },
-  "homepage": "https://github.com/znck/rollup-plugin-vue#readme",
-  "dependencies": {
-    "babel-runtime": "^6.22.0",
-    "camelcase": "^4.0.0",
-    "de-indent": "^1.0.2",
-    "debug": "^3.1.0",
-    "hash-sum": "^1.0.2",
-    "html-minifier": "^3.2.3",
-    "magic-string": "^0.22.4",
-    "merge-options": "^1.0.0",
-    "parse5": "^3.0.3",
-    "postcss": "^5.2.11",
-    "postcss-load-config": "^1.2.0",
-    "postcss-modules": "^0.6.4",
-    "postcss-selector-parser": "^2.2.3",
-    "posthtml": "^0.10.1",
-    "posthtml-attrs-parser": "^0.1.1",
-    "rollup-pluginutils": "^2.0.1",
-    "typescript": "^2.4.1",
-    "vue-template-es2015-compiler": "^1.6.0",
-    "vue-template-validator": "^1.1.5"
-  },
-  "devDependencies": {
-    "autoprefixer": "^7.1.2",
-    "babel-eslint": "^7.1.1",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-stage-2": "^6.22.0",
-    "clean-css": "^3.4.24",
-    "coveralls": "^2.11.15",
-    "cross-env": "^5.1.3",
-    "eslint": "^3.14.0",
-    "eslint-config-standard": "^6.2.1",
-    "eslint-plugin-html": "^1.7.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^2.0.1",
-    "istanbul": "^0.4.5",
-    "mocha": "^4.0.1",
-    "rollup": "^0.52.0",
-    "rollup-plugin-babel": "^2.7.1",
-    "rollup-plugin-buble": "^0.18.0",
-    "rollup-plugin-css-only": "^0.2.0",
-    "rollup-plugin-replace": "^2.0.0",
-    "uglify-js": "^2.7.5",
-    "vue-template-compiler": "^2.5.9"
-  },
-  "optionalDependencies": {
-    "coffee-script": "^1.12.4",
-    "coffeescript-compiler": "^0.1.1",
-    "less": "^2.7.2",
-    "node-sass": "^4.5.0",
-    "pug": "^2.0.0-beta11",
-    "stylus": "^0.54.5"
-  },
-  "peerDependencies": {
-    "vue": "*",
-    "vue-template-compiler": "*"
-  }
+    "name": "rollup-plugin-vue",
+    "version": "3.0.0",
+    "description": "Roll .vue files",
+    "main": "dist/rollup-plugin-vue.common.js",
+    "module": "dist/rollup-plugin-vue.js",
+    "scripts": {
+        "test": "npm run lint && npm run build && npm run unit",
+        "build": "node config/build.js",
+        "dev": "npm run unit -- -w",
+        "unit": "cross-env NODE_ENV=production mocha test/test.js --slow=5000 --timeout=10000",
+        "lint": "eslint src/**",
+        "lint:fix": "eslint --fix src/**",
+        "coveralls": "cross-env NODE_ENV=production istanbul cover --default-excludes -x 'dist/**' -x 'config/**' ./node_modules/mocha/bin/_mocha --report lcovonly  --  --slow=5000 --timeout=10000 test/test.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+        "prepare": "npm run build",
+        "docs": "php -S localhost:8080 -t .github/sereno/public"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/znck/rollup-plugin-vue.git"
+    },
+    "keywords": [
+        "rollup-plugin",
+        "vue"
+    ],
+    "files": [
+        "dist/",
+        "src/"
+    ],
+    "author": "Rahul Kadyan <hi@znck.me>",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/znck/rollup-plugin-vue/issues"
+    },
+    "homepage": "https://github.com/znck/rollup-plugin-vue#readme",
+    "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "camelcase": "^4.0.0",
+        "de-indent": "^1.0.2",
+        "debug": "^3.1.0",
+        "hash-sum": "^1.0.2",
+        "html-minifier": "^3.2.3",
+        "magic-string": "^0.22.4",
+        "merge-options": "^1.0.0",
+        "parse5": "^3.0.3",
+        "postcss": "^6.0.19",
+        "postcss-load-config": "^1.2.0",
+        "postcss-modules": "^1.1.0",
+        "postcss-selector-parser": "^3.1.1",
+        "posthtml": "^0.10.1",
+        "posthtml-attrs-parser": "^0.1.1",
+        "rollup-pluginutils": "^2.0.1",
+        "typescript": "^2.4.1",
+        "vue-template-es2015-compiler": "^1.6.0",
+        "vue-template-validator": "^1.1.5"
+    },
+    "devDependencies": {
+        "autoprefixer": "^7.1.2",
+        "babel-eslint": "^7.1.1",
+        "babel-plugin-transform-runtime": "^6.22.0",
+        "babel-preset-es2015": "^6.22.0",
+        "babel-preset-stage-2": "^6.22.0",
+        "clean-css": "^3.4.24",
+        "coveralls": "^2.11.15",
+        "cross-env": "^5.1.3",
+        "eslint": "^3.14.0",
+        "eslint-config-standard": "^6.2.1",
+        "eslint-plugin-html": "^1.7.0",
+        "eslint-plugin-promise": "^3.4.0",
+        "eslint-plugin-standard": "^2.0.1",
+        "istanbul": "^0.4.5",
+        "mocha": "^4.0.1",
+        "rollup": "^0.52.0",
+        "rollup-plugin-babel": "^2.7.1",
+        "rollup-plugin-buble": "^0.18.0",
+        "rollup-plugin-css-only": "^0.2.0",
+        "rollup-plugin-replace": "^2.0.0",
+        "uglify-js": "^2.7.5",
+        "vue-template-compiler": "^2.5.9"
+    },
+    "optionalDependencies": {
+        "coffee-script": "^1.12.4",
+        "coffeescript-compiler": "^0.1.1",
+        "less": "^2.7.2",
+        "node-sass": "^4.5.0",
+        "pug": "^2.0.1",
+        "stylus": "^0.54.5"
+    },
+    "peerDependencies": {
+        "vue": "*",
+        "vue-template-compiler": "*"
+    }
 }
diff --git a/src/style/css.js b/src/style/css.js
index 1dc9f84..2ab0910 100644
--- a/src/style/css.js
+++ b/src/style/css.js
@@ -63,7 +63,9 @@ const addScopeID = postcss.plugin('add-scope-id', ({ scopeID }) => {
 
     return root => {
         root.walkRules(rule => {
-            rule.selector = selectorTransformer.process(rule.selector).result
+            selectorTransformer.processSync(rule, {
+                updateSelector: true
+            })
         })
     }
 })
@@ -100,7 +102,7 @@ export default async function (promise, options) {
     const hasModule = style.module === true
     const hasScope = style.scoped === true
     const postcssConfig = await postcssLoadConfig(options.postcss)
-    const plugins = postcssConfig.plugins || []
+    const plugins = [...postcssConfig.plugins] || []
     let processPromise = Promise.resolve()
 
     if (hasScope) {
diff --git a/src/vueTransform.js b/src/vueTransform.js
index b0ef5b7..074cac1 100644
--- a/src/vueTransform.js
+++ b/src/vueTransform.js
@@ -149,7 +149,7 @@ async function processStyle (styles, id, content, options) {
 
         const map = (new MagicString(code)).generateMap({ hires: true })
 
-        const output = {
+        let output = {
             id,
             code: code,
             map: map,
@@ -158,7 +158,11 @@ async function processStyle (styles, id, content, options) {
             scoped: 'scoped' in style.attrs
         }
 
-        outputs.push(options.autoStyles || output.scoped || output.module ? await compile(output, options) : output)
+        if (options.autoStyles || output.scoped || output.module) {
+            output = await compile(output, options)
+        }
+
+        outputs.push(output)
     }
 
     return outputs
diff --git a/yarn.lock b/yarn.lock
index 73eda75..1a32ce0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -81,6 +81,12 @@ ansi-styles@^3.1.0:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
 aproba@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.0.4.tgz#2713680775e7614c8ba186c065d4e2e52d1072c0"
@@ -895,6 +901,14 @@ chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 
+chalk@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 character-parser@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-2.2.0.tgz#c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"
@@ -1077,24 +1091,24 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-css-modules-loader-core@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.0.1.tgz#94e3eec9bc8174df0f974641f3e0d0550497f694"
+css-modules-loader-core@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16"
   dependencies:
-    icss-replace-symbols "1.0.2"
-    postcss "5.1.2"
-    postcss-modules-extract-imports "1.0.0"
-    postcss-modules-local-by-default "1.1.1"
-    postcss-modules-scope "1.0.2"
-    postcss-modules-values "1.2.2"
+    icss-replace-symbols "1.1.0"
+    postcss "6.0.1"
+    postcss-modules-extract-imports "1.1.0"
+    postcss-modules-local-by-default "1.2.0"
+    postcss-modules-scope "1.1.0"
+    postcss-modules-values "1.3.0"
 
 css-parse@1.7.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
 
-css-selector-tokenizer@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -1215,6 +1229,12 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+dot-prop@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  dependencies:
+    is-obj "^1.0.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -1513,10 +1533,6 @@ flat-cache@^1.2.1:
     graceful-fs "^4.1.2"
     write "^0.2.1"
 
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-
 for-in@^0.1.5:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
@@ -1726,6 +1742,10 @@ has-flag@^2.0.0:
   version "2.0.0"
   resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
 
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -1794,9 +1814,9 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-icss-replace-symbols@1.0.2, icss-replace-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
 
 ignore@^3.2.0:
   version "3.2.2"
@@ -1954,6 +1974,10 @@ is-number@^2.0.2, is-number@^2.1.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -2055,10 +2079,6 @@ jodid25519@^1.0.0:
   dependencies:
     jsbn "~0.1.0"
 
-js-base64@^2.1.9:
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
-
 js-stringify@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/js-stringify/-/js-stringify-1.0.2.tgz#1736fddfd9724f28a3682adc6230ae7e4e9679db"
@@ -2599,7 +2619,7 @@ pluralize@^1.2.1:
 
 postcss-load-config@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
@@ -2620,47 +2640,47 @@ postcss-load-plugins@^2.3.0:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
-postcss-modules-extract-imports@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.0.tgz#5b07f368e350cda6fd5c8844b79123a7bd3e37be"
+postcss-modules-extract-imports@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb"
   dependencies:
-    postcss "^5.0.4"
+    postcss "^6.0.1"
 
-postcss-modules-local-by-default@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
+postcss-modules-local-by-default@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
   dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
 
-postcss-modules-scope@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
+postcss-modules-scope@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
   dependencies:
-    css-selector-tokenizer "^0.6.0"
-    postcss "^5.0.4"
+    css-selector-tokenizer "^0.7.0"
+    postcss "^6.0.1"
 
-postcss-modules-values@1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
+postcss-modules-values@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
   dependencies:
-    icss-replace-symbols "^1.0.2"
-    postcss "^5.0.14"
+    icss-replace-symbols "^1.1.0"
+    postcss "^6.0.1"
 
-postcss-modules@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-0.6.4.tgz#77a58bb77ba1b4392b270c0b59852fd75e89a8b4"
+postcss-modules@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-1.1.0.tgz#c9f94f76ff6addf7c35b842e69ed442118156bb0"
   dependencies:
-    css-modules-loader-core "^1.0.1"
+    css-modules-loader-core "^1.1.0"
     generic-names "^1.0.2"
-    postcss "^5.2.8"
+    postcss "^6.0.1"
     string-hash "^1.1.1"
 
-postcss-selector-parser@^2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+postcss-selector-parser@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
   dependencies:
-    flatten "^1.0.2"
+    dot-prop "^4.1.1"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
@@ -2668,23 +2688,22 @@ postcss-value-parser@^3.2.3:
   version "3.3.0"
   resolved "http://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
 
-postcss@5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.1.2.tgz#bd84886a66bcad489afaf7c673eed5ef639551e2"
-  dependencies:
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.1.2"
-
-postcss@^5.0.14, postcss@^5.0.4, postcss@^5.2.11, postcss@^5.2.8:
-  version "5.2.12"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.12.tgz#6a2b15e35dd65634441bb0961fa796904c7890e0"
+postcss@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
   dependencies:
     chalk "^1.1.3"
-    js-base64 "^2.1.9"
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
+postcss@^6.0.1, postcss@^6.0.19:
+  version "6.0.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
+  dependencies:
+    chalk "^2.3.1"
+    source-map "^0.6.1"
+    supports-color "^5.2.0"
+
 postcss@^6.0.6:
   version "6.0.9"
   resolved "http://registry.npm.taobao.org/postcss/download/postcss-6.0.9.tgz#54819766784a51c65b1ec4d54c2f93765438c35a"
@@ -2752,24 +2771,24 @@ pseudomap@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
-pug-attrs@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.2.tgz#8be2b2225568ffa75d1b866982bff9f4111affcb"
+pug-attrs@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pug-attrs/-/pug-attrs-2.0.3.tgz#a3095f970e64151f7bdad957eef55fb5d7905d15"
   dependencies:
     constantinople "^3.0.1"
     js-stringify "^1.0.1"
-    pug-runtime "^2.0.3"
+    pug-runtime "^2.0.4"
 
-pug-code-gen@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-1.1.1.tgz#1cf72744ef2a039eae6a3340caaa1105871258e8"
+pug-code-gen@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pug-code-gen/-/pug-code-gen-2.0.1.tgz#0951ec83225d74d8cfc476a7f99a259b5f7d050c"
   dependencies:
     constantinople "^3.0.1"
     doctypes "^1.1.0"
     js-stringify "^1.0.1"
-    pug-attrs "^2.0.2"
+    pug-attrs "^2.0.3"
     pug-error "^1.3.2"
-    pug-runtime "^2.0.3"
+    pug-runtime "^2.0.4"
     void-elements "^2.0.1"
     with "^5.0.0"
 
@@ -2777,73 +2796,73 @@ pug-error@^1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/pug-error/-/pug-error-1.3.2.tgz#53ae7d9d29bb03cf564493a026109f54c47f5f26"
 
-pug-filters@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-2.1.1.tgz#10ab2b6d7e5aeec99cad28a1e4c8085f823fc754"
+pug-filters@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/pug-filters/-/pug-filters-3.0.1.tgz#163ef73bfbb1f1544d032b2b40f45130eb52dccb"
   dependencies:
     clean-css "^3.3.0"
     constantinople "^3.0.1"
     jstransformer "1.0.0"
     pug-error "^1.3.2"
-    pug-walk "^1.1.1"
+    pug-walk "^1.1.7"
     resolve "^1.1.6"
     uglify-js "^2.6.1"
 
-pug-lexer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-3.0.0.tgz#173b00a082e5684a60eb0deb5aae4e514a172e26"
+pug-lexer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pug-lexer/-/pug-lexer-4.0.0.tgz#210c18457ef2e1760242740c5e647bd794cec278"
   dependencies:
     character-parser "^2.1.1"
     is-expression "^3.0.0"
     pug-error "^1.3.2"
 
-pug-linker@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-2.0.2.tgz#1deca67d741fab46b028c1366f178fbaee620233"
+pug-linker@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/pug-linker/-/pug-linker-3.0.5.tgz#9e9a7ae4005682d027deeb96b000f88eeb83a02f"
   dependencies:
     pug-error "^1.3.2"
-    pug-walk "^1.1.1"
+    pug-walk "^1.1.7"
 
-pug-load@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.5.tgz#eaaf46ccace8aff7461e0fad1e2b67305514f2c6"
+pug-load@^2.0.11:
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/pug-load/-/pug-load-2.0.11.tgz#e648e57ed113fe2c1f45d57858ea2bad6bc01527"
   dependencies:
     object-assign "^4.1.0"
-    pug-walk "^1.1.1"
+    pug-walk "^1.1.7"
 
-pug-parser@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-2.0.2.tgz#53a680cfd05039dcb0c27d029094bc4a792689b0"
+pug-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pug-parser/-/pug-parser-5.0.0.tgz#e394ad9b3fca93123940aff885c06e44ab7e68e4"
   dependencies:
     pug-error "^1.3.2"
     token-stream "0.0.1"
 
-pug-runtime@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.3.tgz#98162607b0fce9e254d427f33987a5aee7168bda"
+pug-runtime@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pug-runtime/-/pug-runtime-2.0.4.tgz#e178e1bda68ab2e8c0acfc9bced2c54fd88ceb58"
 
-pug-strip-comments@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz#d313afa01bcc374980e1399e23ebf2eb9bdc8513"
+pug-strip-comments@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pug-strip-comments/-/pug-strip-comments-1.0.3.tgz#f1559592206edc6f85310dacf4afb48a025af59f"
   dependencies:
     pug-error "^1.3.2"
 
-pug-walk@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.1.tgz#b9976240d213692e6993fbc13ae1205c54052efe"
+pug-walk@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/pug-walk/-/pug-walk-1.1.7.tgz#c00d5c5128bac5806bec15d2b7e7cdabe42531f3"
 
-pug@^2.0.0-beta11:
-  version "2.0.0-beta11"
-  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.0-beta11.tgz#15abe6af5004c7e2cf4613e4b27465c9546b5f01"
+pug@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pug/-/pug-2.0.1.tgz#27c151612b53d729abe8e8285aac6bc89345b5d0"
   dependencies:
-    pug-code-gen "^1.1.1"
-    pug-filters "^2.1.1"
-    pug-lexer "^3.0.0"
-    pug-linker "^2.0.2"
-    pug-load "^2.0.5"
-    pug-parser "^2.0.2"
-    pug-runtime "^2.0.3"
-    pug-strip-comments "^1.0.2"
+    pug-code-gen "^2.0.1"
+    pug-filters "^3.0.1"
+    pug-lexer "^4.0.0"
+    pug-linker "^3.0.5"
+    pug-load "^2.0.11"
+    pug-parser "^5.0.0"
+    pug-runtime "^2.0.4"
+    pug-strip-comments "^1.0.3"
 
 punycode@^1.4.1:
   version "1.4.1"
@@ -3182,6 +3201,10 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, sourc
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
 source-map@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"
@@ -3305,7 +3328,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -3317,6 +3340,12 @@ supports-color@^4.0.0, supports-color@^4.2.1:
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.2.0, supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  dependencies:
+    has-flag "^3.0.0"
+
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"

From b3f0d7c99ea0fbfaadb89237970e361ef6ae723b Mon Sep 17 00:00:00 2001
From: Jeff Berry <jeff.berry@sdvi.com>
Date: Thu, 15 Mar 2018 18:36:04 -0700
Subject: [PATCH 2/3] De-indent package.json

---
 package.json | 177 +++++++++++++++++++++++++--------------------------
 1 file changed, 86 insertions(+), 91 deletions(-)

diff --git a/package.json b/package.json
index f3a119c..06f4dcb 100644
--- a/package.json
+++ b/package.json
@@ -1,93 +1,88 @@
 {
-    "name": "rollup-plugin-vue",
-    "version": "3.0.0",
-    "description": "Roll .vue files",
-    "main": "dist/rollup-plugin-vue.common.js",
-    "module": "dist/rollup-plugin-vue.js",
-    "scripts": {
-        "test": "npm run lint && npm run build && npm run unit",
-        "build": "node config/build.js",
-        "dev": "npm run unit -- -w",
-        "unit": "cross-env NODE_ENV=production mocha test/test.js --slow=5000 --timeout=10000",
-        "lint": "eslint src/**",
-        "lint:fix": "eslint --fix src/**",
-        "coveralls": "cross-env NODE_ENV=production istanbul cover --default-excludes -x 'dist/**' -x 'config/**' ./node_modules/mocha/bin/_mocha --report lcovonly  --  --slow=5000 --timeout=10000 test/test.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
-        "prepare": "npm run build",
-        "docs": "php -S localhost:8080 -t .github/sereno/public"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/znck/rollup-plugin-vue.git"
-    },
-    "keywords": [
-        "rollup-plugin",
-        "vue"
-    ],
-    "files": [
-        "dist/",
-        "src/"
-    ],
-    "author": "Rahul Kadyan <hi@znck.me>",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/znck/rollup-plugin-vue/issues"
-    },
-    "homepage": "https://github.com/znck/rollup-plugin-vue#readme",
-    "dependencies": {
-        "babel-runtime": "^6.22.0",
-        "camelcase": "^4.0.0",
-        "de-indent": "^1.0.2",
-        "debug": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "html-minifier": "^3.2.3",
-        "magic-string": "^0.22.4",
-        "merge-options": "^1.0.0",
-        "parse5": "^3.0.3",
-        "postcss": "^6.0.19",
-        "postcss-load-config": "^1.2.0",
-        "postcss-modules": "^1.1.0",
-        "postcss-selector-parser": "^3.1.1",
-        "posthtml": "^0.10.1",
-        "posthtml-attrs-parser": "^0.1.1",
-        "rollup-pluginutils": "^2.0.1",
-        "typescript": "^2.4.1",
-        "vue-template-es2015-compiler": "^1.6.0",
-        "vue-template-validator": "^1.1.5"
-    },
-    "devDependencies": {
-        "autoprefixer": "^7.1.2",
-        "babel-eslint": "^7.1.1",
-        "babel-plugin-transform-runtime": "^6.22.0",
-        "babel-preset-es2015": "^6.22.0",
-        "babel-preset-stage-2": "^6.22.0",
-        "clean-css": "^3.4.24",
-        "coveralls": "^2.11.15",
-        "cross-env": "^5.1.3",
-        "eslint": "^3.14.0",
-        "eslint-config-standard": "^6.2.1",
-        "eslint-plugin-html": "^1.7.0",
-        "eslint-plugin-promise": "^3.4.0",
-        "eslint-plugin-standard": "^2.0.1",
-        "istanbul": "^0.4.5",
-        "mocha": "^4.0.1",
-        "rollup": "^0.52.0",
-        "rollup-plugin-babel": "^2.7.1",
-        "rollup-plugin-buble": "^0.18.0",
-        "rollup-plugin-css-only": "^0.2.0",
-        "rollup-plugin-replace": "^2.0.0",
-        "uglify-js": "^2.7.5",
-        "vue-template-compiler": "^2.5.9"
-    },
-    "optionalDependencies": {
-        "coffee-script": "^1.12.4",
-        "coffeescript-compiler": "^0.1.1",
-        "less": "^2.7.2",
-        "node-sass": "^4.5.0",
-        "pug": "^2.0.1",
-        "stylus": "^0.54.5"
-    },
-    "peerDependencies": {
-        "vue": "*",
-        "vue-template-compiler": "*"
-    }
+  "name": "rollup-plugin-vue",
+  "version": "3.0.0",
+  "description": "Roll .vue files",
+  "main": "dist/rollup-plugin-vue.common.js",
+  "module": "dist/rollup-plugin-vue.js",
+  "scripts": {
+    "test": "npm run lint && npm run build && npm run unit",
+    "build": "node config/build.js",
+    "dev": "npm run unit -- -w",
+    "unit": "cross-env NODE_ENV=production mocha test/test.js --slow=5000 --timeout=10000",
+    "lint": "eslint src/**",
+    "lint:fix": "eslint --fix src/**",
+    "coveralls":
+      "cross-env NODE_ENV=production istanbul cover --default-excludes -x 'dist/**' -x 'config/**' ./node_modules/mocha/bin/_mocha --report lcovonly  --  --slow=5000 --timeout=10000 test/test.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+    "prepare": "npm run build",
+    "docs": "php -S localhost:8080 -t .github/sereno/public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/znck/rollup-plugin-vue.git"
+  },
+  "keywords": ["rollup-plugin", "vue"],
+  "files": ["dist/", "src/"],
+  "author": "Rahul Kadyan <hi@znck.me>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/znck/rollup-plugin-vue/issues"
+  },
+  "homepage": "https://github.com/znck/rollup-plugin-vue#readme",
+  "dependencies": {
+    "babel-runtime": "^6.22.0",
+    "camelcase": "^4.0.0",
+    "de-indent": "^1.0.2",
+    "debug": "^3.1.0",
+    "hash-sum": "^1.0.2",
+    "html-minifier": "^3.2.3",
+    "magic-string": "^0.22.4",
+    "merge-options": "^1.0.0",
+    "parse5": "^3.0.3",
+    "postcss": "^6.0.19",
+    "postcss-load-config": "^1.2.0",
+    "postcss-modules": "^1.1.0",
+    "postcss-selector-parser": "^3.1.1",
+    "posthtml": "^0.10.1",
+    "posthtml-attrs-parser": "^0.1.1",
+    "rollup-pluginutils": "^2.0.1",
+    "typescript": "^2.4.1",
+    "vue-template-es2015-compiler": "^1.6.0",
+    "vue-template-validator": "^1.1.5"
+  },
+  "devDependencies": {
+    "autoprefixer": "^7.1.2",
+    "babel-eslint": "^7.1.1",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-preset-es2015": "^6.22.0",
+    "babel-preset-stage-2": "^6.22.0",
+    "clean-css": "^3.4.24",
+    "coveralls": "^2.11.15",
+    "cross-env": "^5.1.3",
+    "eslint": "^3.14.0",
+    "eslint-config-standard": "^6.2.1",
+    "eslint-plugin-html": "^1.7.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^2.0.1",
+    "istanbul": "^0.4.5",
+    "mocha": "^4.0.1",
+    "rollup": "^0.52.0",
+    "rollup-plugin-babel": "^2.7.1",
+    "rollup-plugin-buble": "^0.18.0",
+    "rollup-plugin-css-only": "^0.2.0",
+    "rollup-plugin-replace": "^2.0.0",
+    "uglify-js": "^2.7.5",
+    "vue-template-compiler": "^2.5.9"
+  },
+  "optionalDependencies": {
+    "coffee-script": "^1.12.4",
+    "coffeescript-compiler": "^0.1.1",
+    "less": "^2.7.2",
+    "node-sass": "^4.5.0",
+    "pug": "^2.0.1",
+    "stylus": "^0.54.5"
+  },
+  "peerDependencies": {
+    "vue": "*",
+    "vue-template-compiler": "*"
+  }
 }

From b7162efec20777f279f4a027e28344382079d264 Mon Sep 17 00:00:00 2001
From: Jeff Berry <jeff.berry@sdvi.com>
Date: Thu, 15 Mar 2018 18:37:54 -0700
Subject: [PATCH 3/3] Undo package.json formatting

---
 package.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 06f4dcb..197d005 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,7 @@
     "unit": "cross-env NODE_ENV=production mocha test/test.js --slow=5000 --timeout=10000",
     "lint": "eslint src/**",
     "lint:fix": "eslint --fix src/**",
-    "coveralls":
-      "cross-env NODE_ENV=production istanbul cover --default-excludes -x 'dist/**' -x 'config/**' ./node_modules/mocha/bin/_mocha --report lcovonly  --  --slow=5000 --timeout=10000 test/test.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+    "coveralls": "cross-env NODE_ENV=production istanbul cover --default-excludes -x 'dist/**' -x 'config/**' ./node_modules/mocha/bin/_mocha --report lcovonly  --  --slow=5000 --timeout=10000 test/test.js && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
     "prepare": "npm run build",
     "docs": "php -S localhost:8080 -t .github/sereno/public"
   },
@@ -20,8 +19,14 @@
     "type": "git",
     "url": "git+https://github.com/znck/rollup-plugin-vue.git"
   },
-  "keywords": ["rollup-plugin", "vue"],
-  "files": ["dist/", "src/"],
+  "keywords": [
+    "rollup-plugin",
+    "vue"
+  ],
+  "files": [
+    "dist/",
+    "src/"
+  ],
   "author": "Rahul Kadyan <hi@znck.me>",
   "license": "MIT",
   "bugs": {