chore: merge dev

Author: Guillaume Chau

README.md

@@ -24,4 +24,4 @@ Please see [contributing guide](https://github.com/vuejs/vue-cli/blob/dev/.githu
 
 ## License
 
-MIT
+[MIT](https://github.com/vuejs/vue-cli/blob/dev/LICENSE)

packages/@vue/babel-preset-app/package.json

@@ -21,11 +21,11 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/packages/@vue/babel-preset-app#readme",
   "dependencies": {
-    "@babel/plugin-syntax-jsx": "7.0.0-beta.46",
-    "@babel/plugin-transform-runtime": "7.0.0-beta.46",
-    "@babel/preset-env": "7.0.0-beta.46",
-    "@babel/preset-stage-2": "7.0.0-beta.46",
-    "@babel/runtime": "7.0.0-beta.46",
+    "@babel/plugin-syntax-jsx": "7.0.0-beta.47",
+    "@babel/plugin-transform-runtime": "7.0.0-beta.47",
+    "@babel/preset-env": "7.0.0-beta.47",
+    "@babel/preset-stage-2": "7.0.0-beta.47",
+    "@babel/runtime": "7.0.0-beta.47",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-plugin-dynamic-import-node": "^1.2.0",
     "babel-plugin-transform-vue-jsx": "^4.0.1"

packages/@vue/cli-plugin-babel/README.md

@@ -29,8 +29,7 @@ module.exports = {
 ## Installing in an Already Created Project
 
 ``` sh
-npm install -D @vue/cli-plugin-babel
-vue invoke babel
+vue add @vue/babel
 ```
 
 ## Injected webpack-chain Rules

packages/@vue/cli-plugin-babel/__tests__/transpileDependencies.spec.js

@@ -0,0 +1,67 @@
+jest.setTimeout(30000)
+
+const { defaultPreset } = require('@vue/cli/lib/options')
+const create = require('@vue/cli-test-utils/createTestProject')
+
+let project
+
+beforeAll(async () => {
+  project = await create('babel-transpile-deps', defaultPreset)
+
+  await project.write(
+    'node_modules/external-dep/package.json',
+    `{ "name": "external-dep", "version": "1.0.0", "main": "index.js" }`
+  )
+
+  await project.write(
+    'node_modules/external-dep/index.js',
+    `const test = () => "__TEST__";\nexport default test`
+  )
+
+  let $packageJson = await project.read('package.json')
+
+  $packageJson = JSON.parse($packageJson)
+  $packageJson.dependencies['external-dep'] = '1.0.0'
+  $packageJson = JSON.stringify($packageJson)
+
+  await project.write(
+    'package.json',
+    $packageJson
+  )
+
+  let $mainjs = await project.read('src/main.js')
+
+  $mainjs = `import test from 'external-dep'\n${$mainjs}\nconsole.log(test())`
+
+  await project.write(
+    'src/main.js',
+    $mainjs
+  )
+})
+
+test('dep from node_modules should not been transpiled', async () => {
+  const { stdout } = await project.run('vue-cli-service build')
+
+  let $vendorjs = stdout.match(/(js\/vendors~app\.[^.]+\.js)/)[1]
+
+  $vendorjs = `dist/${$vendorjs}`
+  $vendorjs = await project.read($vendorjs)
+
+  expect($vendorjs).toMatch('() => "__TEST__"')
+})
+
+test('dep from node_modules should been transpiled', async () => {
+  await project.write(
+    'vue.config.js',
+    `module.exports = { transpileDependencies: ['external-dep'] }`
+  )
+
+  const { stdout } = await project.run('vue-cli-service build')
+
+  let $vendorjs = stdout.match(/(js\/vendors~app\.[^.]+\.js)/)[1]
+
+  $vendorjs = `dist/${$vendorjs}`
+  $vendorjs = await project.read($vendorjs)
+
+  expect($vendorjs).toMatch('return "__TEST__"')
+})

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

@@ -1,8 +1,3 @@
-// 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

packages/@vue/cli-plugin-babel/package.json

@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-cli/packages/@vue/cli-plugin-babel#readme",
   "dependencies": {
-    "@babel/core": "7.0.0-beta.46",
+    "@babel/core": "7.0.0-beta.47",
     "@vue/babel-preset-app": "^3.0.0-beta.10",
     "babel-loader": "^8.0.0-0"
   },