diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43040f9..03d74ca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/project
     docker:
-      - image: alekzonder/puppeteer # base pluginImage: node/8-slim
+      - image: circleci/node:12-browsers
     steps:
       - checkout
       - run:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68120e2..e9e48e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="5.1.7"></a>
+## [5.1.7](https://github.com/vuejs/rollup-plugin-vue/compare/v5.1.6...v5.1.7) (2020-05-11)
+
+
+### Bug Fixes
+
+* bump component-compiler to allow tree-shaking ([a85e6d9](https://github.com/vuejs/rollup-plugin-vue/commit/a85e6d9))
+* provide scopeId to template compiler when the component has scoped styles ([#337](https://github.com/vuejs/rollup-plugin-vue/issues/337)) ([1fec2c5](https://github.com/vuejs/rollup-plugin-vue/commit/1fec2c5))
+* some wording ([#339](https://github.com/vuejs/rollup-plugin-vue/issues/339)) ([6a94a53](https://github.com/vuejs/rollup-plugin-vue/commit/6a94a53))
+
+
+
 <a name="5.1.6"></a>
 ## [5.1.6](https://github.com/vuejs/rollup-plugin-vue/compare/v5.1.5...v5.1.6) (2020-01-22)
 
diff --git a/README.md b/README.md
index be2df1f..53b52cc 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ## Introduction
 
-As vue-loader is for webpack and vueify is for browserify, similarly its for rollup. As we know, webpack and browserify concat stuff and make it runnable in browser. Its difficult to share .vue components. **Now roll your [Vue](http://vuejs.org/) components.**
+As vue-loader is for webpack and vueify is for browserify, so is this for rollup. As we know, webpack and browserify concat stuff and make it runnable in the browser. It's difficult to share .vue components. **Now roll your [Vue](http://vuejs.org/) components.**
 
 With rollup you can break your application into reusable modules.
 
diff --git a/cookbook/ssr/package.json b/cookbook/ssr/package.json
index 954f7a4..edffa57 100644
--- a/cookbook/ssr/package.json
+++ b/cookbook/ssr/package.json
@@ -5,7 +5,7 @@
   },
   "main": "./dist/MyComponent.js",
   "devDependencies": {
-    "rollup": "^0.59.4",
+    "rollup": "^1.1.0",
     "rollup-plugin-vue": "link:../.."
   }
 }
diff --git a/cookbook/ssr/src/MyComponent.vue b/cookbook/ssr/src/MyComponent.vue
index 9d14df0..1e8647a 100644
--- a/cookbook/ssr/src/MyComponent.vue
+++ b/cookbook/ssr/src/MyComponent.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1>Hello {{ name }}</h1>
+  <div class="component-root-node">
+    <h1>Hello {{ name }}</h1>
+  </div>
 </template>
 
 <script>
@@ -11,6 +13,10 @@ export default {
 </script>
 
 <style scoped>
+.component-root-node {
+  background: blue;
+}
+
 h1 {
   color: red;
 }
diff --git a/docs/faqs.md b/docs/faqs.md
index be52c55..691f20d 100644
--- a/docs/faqs.md
+++ b/docs/faqs.md
@@ -12,7 +12,7 @@
 - **Error: 'default' is not exported by node_modules/vue-runtime-helpers/dist/normalize-component.js**  
   You may encounter this error when using version 4.6.2 onwards. The solution is to include `rollup-plugin-commonjs`. In your config file `rollup.config.js`, you have to import this plugin and invoke it like so:
   
-  ```
+  ``` js
   import vue from 'rollup-plugin-vue';
   import commonjs from 'rollup-plugin-commonjs';
 
diff --git a/package.json b/package.json
index 572c706..694e605 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-vue",
-  "version": "5.1.6",
+  "version": "5.1.7",
   "description": "Roll .vue files",
   "author": "Rahul Kadyan <hi@znck.me>",
   "bugs": {
@@ -45,11 +45,11 @@
     "dist/"
   ],
   "dependencies": {
-    "@vue/component-compiler": "^4.1.0",
-    "@vue/component-compiler-utils": "^3.0.0",
+    "@vue/component-compiler": "^4.2.1",
+    "@vue/component-compiler-utils": "^3.1.2",
     "debug": "^4.1.1",
     "hash-sum": "^1.0.2",
-    "magic-string": "^0.25.2",
+    "magic-string": "^0.25.7",
     "querystring": "^0.2.0",
     "rollup-pluginutils": "^2.4.1",
     "source-map": "0.7.3",
diff --git a/src/index.ts b/src/index.ts
index 0faa254..266ac66 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -22,6 +22,7 @@ import { parse, SFCDescriptor, SFCBlock } from '@vue/component-compiler-utils'
 import debug from 'debug'
 import {
   VueTemplateCompiler,
+  VueTemplateCompilerOptions,
   VueTemplateCompilerParseOptions
 } from '@vue/component-compiler-utils/dist/types'
 
@@ -159,6 +160,20 @@ export interface VuePluginOptions {
 
   beforeAssemble?(descriptor: DescriptorCompileResult): DescriptorCompileResult
 }
+
+// Official VueTemplateCompilerOptions does not expose scopeId as a part of public API
+// ScopeId is required to correctly compile Vue template with SSR optimization.
+interface TemplateOptionsRollup extends TemplateOptions {
+  compilerOptions: VueTemplateCompilerOptions & {
+    scopeId?: string
+  }
+}
+
+interface VueCompilerOptions {
+  script?: ScriptOptions | undefined;
+  style?: StyleOptions | undefined;
+  template?: TemplateOptionsRollup | undefined;
+}
 /**
  * Rollup plugin for handling .vue files.
  */
@@ -242,11 +257,25 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
     opts.template.isProduction = isProduction
   }
 
-  const compiler = createDefaultCompiler(opts)
   const descriptors = new Map<string, SFCDescriptor>()
 
   if (opts.css === false) d('Running in CSS extract mode')
 
+  const getCompiler = ({ scopeId }: { scopeId?: string}) => {
+    const options: VueCompilerOptions = { ...opts }
+
+    options.template = {
+      ...options.template!,
+      compilerOptions: {
+        ...(options.template!.compilerOptions
+          ? options.template!.compilerOptions
+          : {}),
+        scopeId: scopeId
+      }
+    }
+
+    return createDefaultCompiler(options)
+  }
   function prependStyle(
     id: string,
     lang: string,
@@ -344,6 +373,11 @@ export default function vue(opts: Partial<VuePluginOptions> = {}): Plugin {
             ? hash(path.basename(filename) + source)
             : hash(filename + source))
 
+        const hasScopedStyles = descriptor.styles.some(style => !!style.scoped)
+        const compiler = getCompiler({
+          scopeId: hasScopedStyles ? scopeId : undefined
+        })
+
         const styles = await Promise.all(
           descriptor.styles.map(async style => {
             if (style.content) {
diff --git a/yarn.lock b/yarn.lock
index 996db54..d865aba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1435,10 +1435,26 @@
     source-map "~0.6.1"
     vue-template-es2015-compiler "^1.9.0"
 
-"@vue/component-compiler@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler/-/component-compiler-4.1.0.tgz#92ccb90e425aa7e61d58bf092a5cfcdd6d0f9315"
-  integrity sha512-20S7mm7CYP94m2Morw2ftz1tqoBu1nX7KYiqo5rlgKPZ0dlY7VZX7wAL/etN3s4HD0PBeenr1pUUCBIgGSaB2g==
+"@vue/component-compiler-utils@^3.1.2":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz#8213a5ff3202f9f2137fe55370f9e8b9656081c3"
+  integrity sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==
+  dependencies:
+    consolidate "^0.15.1"
+    hash-sum "^1.0.2"
+    lru-cache "^4.1.2"
+    merge-source-map "^1.1.0"
+    postcss "^7.0.14"
+    postcss-selector-parser "^6.0.2"
+    source-map "~0.6.1"
+    vue-template-es2015-compiler "^1.9.0"
+  optionalDependencies:
+    prettier "^1.18.2"
+
+"@vue/component-compiler@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler/-/component-compiler-4.2.1.tgz#7708915f0e336726e4deea85ae7a0321c80fb680"
+  integrity sha512-HcvvAOuiwdVlPr94ocsn7AynSv6LAX9VctCgkeRzm+jy0N8GC9rEzGLCQgIRahk+IOoj9DwijGc+JC8/czvhkQ==
   dependencies:
     "@vue/component-compiler-utils" "^3.0.0"
     clean-css "^4.1.11"
@@ -1723,10 +1739,10 @@ acorn@^6.0.1, acorn@^6.0.5:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.0.5.tgz#81730c0815f3f3b34d8efa95cb7430965f4d887a"
   integrity sha512-i33Zgp3XWtmZBMNvCr4azvOFeWVw1Rk6p3hfi3LUDvIFraOMywb1kAtrbi+med14m4Xfpqm3zRZMT+c0FNE7kg==
 
-agent-base@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
-  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
   dependencies:
     es6-promisify "^5.0.0"
 
@@ -3552,6 +3568,11 @@ cssesc@^2.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
   integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
 cssnano@^3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
@@ -4092,7 +4113,12 @@ es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-promise@^4.0.3, es6-promise@^4.1.0:
+es6-promise@^4.0.3:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promise@^4.1.0:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.5.tgz#da6d0d5692efb461e082c14817fe2427d8f5d054"
   integrity sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==
@@ -5092,11 +5118,11 @@ https-browserify@^1.0.0:
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
 https-proxy-agent@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0"
-  integrity sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
+  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
   dependencies:
-    agent-base "^4.1.0"
+    agent-base "^4.3.0"
     debug "^3.1.0"
 
 iconv-lite@0.4.24, iconv-lite@^0.4.4:
@@ -6617,10 +6643,10 @@ magic-string@^0.25.1:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-magic-string@^0.25.2:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
   dependencies:
     sourcemap-codec "^1.4.4"
 
@@ -7046,9 +7072,9 @@ ms@2.0.0:
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 mz@^2.6.0:
   version "2.7.0"
@@ -8034,6 +8060,15 @@ postcss-selector-parser@^5.0.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-svgo@^2.1.1:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
@@ -8134,6 +8169,11 @@ prettier@^1.12.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
   integrity sha512-gAU9AGAPMaKb3NNSUUuhhFAS7SCO4ALTN4nRIn6PJ075Qd28Yn2Ig2ahEJWdJwJmlEBTUfC7mMUSFy8MwsOCfg==
 
+prettier@^1.18.2:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+
 pretty-bytes@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"