chore: merge dev

Author: Guillaume Chau

docs/css.md

@@ -13,15 +13,23 @@ Vue CLI uses PostCSS internally, and enables [autoprefixer](https://github.com/p
 
 You can [use CSS Modules in `*.vue` files](https://vue-loader.vuejs.org/en/features/css-modules.html) out of the box with `<style module>`.
 
-If you wish to import style files as CSS Modules in JavaScript, you can import a file with a `?module` resourceQuery:
+To import CSS or other pre-processor files as CSS Modules in JavaScript, the filename should end with `.module.(css|less|sass|scss|styl)`:
+
+``` js
+import styles from './foo.module.css'
+// works for all supported pre-processors as well
+import sassStyles from './foo.module.scss'
+```
+
+Alternatively, you can import a file explicitly with a `?module` resourceQuery so that you can drop the `.module` in the filename:
 
 ``` js
 import styles from './foo.css?module'
 // works for all supported pre-processors as well
 import sassStyles from './foo.scss?module'
 ```
 
-If you wish to customize the CSS modules class name output you can set the `css.localIdentName` option in `vue.config.js`.
+If you wish to customize the generated CSS modules class names, you can do so via the `css.localIdentName` option in `vue.config.js`.
 
 ### Pre-Processors
 
@@ -57,3 +65,5 @@ module.exports = {
   }
 }
 ```
+
+This is preferred over manually tapping into specific loaders, because these options will be shared across all rules that are related to it.

package.json

@@ -51,11 +51,15 @@
     "jest": "^22.1.4",
     "lerna": "^2.8.0",
     "lint-staged": "^6.0.1",
-    "memfs": "^2.6.0",
+    "memfs": "^2.8.0",
     "puppeteer": "^1.0.0",
     "request": "^2.83.0",
     "request-promise-native": "^1.0.5",
     "rimraf": "^2.6.2",
     "yorkie": "^1.0.2"
+  },
+  "resolutions": {
+    "fs-monkey": "0.3.1",
+    "babel-core": "7.0.0-bridge.0"
   }
 }

packages/@vue/cli-plugin-babel/index.js

@@ -1,3 +1,8 @@
+// hack babel's codegen to fix source map.
+// this is a temporary patch before the actual change is released.
+// TODO remove after upgrading Babel to 7.0.0-beta.47
+require('./patchBabel')
+
 module.exports = (api, {
   parallel,
   transpileDependencies