fix: fix peer dependencies for ts-jest & babel-jest

haoqunjiang · haoqunjiang · commit 5d1da587be36 · 2019-04-30T20:22:14.000+08:00
diff --git a/package.json b/package.json
@@ -45,7 +45,6 @@
   "devDependencies": {
     "@vuepress/plugin-pwa": "^1.0.0-alpha.47",
     "@vuepress/theme-vue": "1.0.0-alpha.44",
-    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "debug": "^4.1.0",
     "eslint": "^5.16.0",
@@ -74,7 +73,6 @@
     "yorkie": "^2.0.0"
   },
   "resolutions": {
-    "babel-core": "7.0.0-bridge.0",
     "puppeteer": "1.11.0",
     "vue": "^2.6.10",
     "vue-template-compiler": "^2.6.10",
diff --git a/packages/@vue/cli-plugin-unit-jest/__tests__/jestGenerator.spec.js b/packages/@vue/cli-plugin-unit-jest/__tests__/jestGenerator.spec.js
@@ -25,8 +25,7 @@ test('base', async () => {
 
   // should inject babel-jest
   expect(pkg.devDependencies).toHaveProperty('babel-jest')
-  // babel-core 6 -> 7 shim
-  expect(pkg.devDependencies).toHaveProperty('babel-core')
+  expect(pkg.devDependencies).toHaveProperty('@babel/core')
   // eslint
   expect(files['tests/unit/.eslintrc.js']).toMatch('jest: true')
 
diff --git a/packages/@vue/cli-plugin-unit-jest/generator/index.js b/packages/@vue/cli-plugin-unit-jest/generator/index.js
@@ -54,18 +54,17 @@ module.exports = (api, _, __, invoking) => {
     if (api.hasPlugin('babel')) {
       api.extendPackage({
         devDependencies: {
-          'babel-jest': '^23.6.0',
-          // this is for now necessary to force babel-jest and vue-jest to use babel 7
-          'babel-core': '7.0.0-bridge.0'
+          'babel-jest': '^24.7.1',
+          '@babel/core': '^7.4.4'
         }
       })
     } else {
-      // Jest's shipped babel-jest still uses babel 6,
-      // so we cannot use extendPackage which renders babel.config.js.
+      // ts-jest still does not support babel.config.js
+      // https://github.com/kulshekhar/ts-jest/issues/933
       api.render(files => {
         files['.babelrc'] = JSON.stringify(
           {
-            plugins: ['transform-es2015-modules-commonjs']
+            plugins: ['@babel/plugin-transform-modules-commonjs']
           },
           null,
           2
@@ -106,6 +105,7 @@ const applyTS = (module.exports.applyTS = (api, invoking) => {
       },
       devDependencies: {
         // this is for now necessary to force ts-jest and vue-jest to use babel 7
+        '@babel/core': '^7.4.4',
         'babel-core': '7.0.0-bridge.0'
       }
     })
diff --git a/packages/@vue/cli-plugin-unit-jest/package.json b/packages/@vue/cli-plugin-unit-jest/package.json
@@ -23,9 +23,10 @@
     "access": "public"
   },
   "dependencies": {
+    "@babel/plugin-transform-modules-commonjs": "^7.4.4",
     "@vue/cli-shared-utils": "^3.6.0",
+    "babel-core": "7.0.0-bridge.0",
     "babel-jest": "^24.7.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "jest": "^24.7.1",
     "jest-serializer-vue": "^2.0.2",
     "jest-transform-stub": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
@@ -3507,7 +3507,7 @@ babel-plugin-syntax-object-rest-spread@^6.8.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
   integrity sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=
 
-babel-plugin-transform-es2015-modules-commonjs@^6.26.0, babel-plugin-transform-es2015-modules-commonjs@^6.26.2:
+babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
   version "6.26.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
   integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
