fix bug with deps, handle adding babel-core dep

hzoo · hzoo · commit 7c34cdf318ec · 2018-02-16T18:02:20.000-05:00
diff --git a/src/__snapshots__/packageData.test.js.snap b/src/__snapshots__/packageData.test.js.snap
@@ -1,5 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`@babel/core peerDep 1`] = `
+Object {
+  "devDependencies": Object {
+    "@babel/core": "7.0.0-beta.39",
+    "@babel/plugin-proposal-object-rest-spread": "7.0.0-beta.39",
+    "@babel/preset-env": "7.0.0-beta.39",
+    "babel-loader": "v8.0.0-beta.0",
+  },
+  "name": "add-@babel/core-peerDep",
+}
+`;
+
 exports[`packages 1`] = `
 Object {
   "@babel/cli": "7.0.0-beta.39",
diff --git a/src/fixtures-babel-core.json b/src/fixtures-babel-core.json
@@ -0,0 +1,8 @@
+{
+  "name": "add-@babel/core-peerDep",
+  "devDependencies": {
+    "babel-loader": "^7.1.1",
+    "babel-plugin-transform-object-rest-spread": "^6.20.2",
+    "babel-preset-es2015": "^6.18.0"
+  }
+}
diff --git a/src/index.js b/src/index.js
@@ -27,7 +27,7 @@ function updatePackageJSON(pkg) {
     ));
   }
 
-  if (pkg.devDependencies) {
+  if (pkg.dependencies) {
     pkg.dependencies = sortKeys(upgradeDeps(
       pkg.dependencies,
       getLatestVersion()
diff --git a/src/packageData.test.js b/src/packageData.test.js
@@ -2,6 +2,7 @@ const { updatePackageJSON } = require('./');
 const upgradeDeps = require('./upgradeDeps');
 const depsFixture = require('./fixtures-deps');
 const scriptsFixture = require('./fixtures-script');
+const babelCoreFixture = require('./fixtures-babel-core');
 
 test('packages', () => {
   expect(upgradeDeps(depsFixture, "7.0.0-beta.39")).toMatchSnapshot();
@@ -10,3 +11,7 @@ test('packages', () => {
 test('scripts', () => {
   expect(updatePackageJSON(scriptsFixture)).toMatchSnapshot();
 })
+
+test('@babel/core peerDep', () => {
+  expect(updatePackageJSON(babelCoreFixture)).toMatchSnapshot();
+})
diff --git a/src/upgradeDeps.js b/src/upgradeDeps.js
@@ -30,5 +30,16 @@ module.exports = function upgradeDeps(dependencies, version) {
       dependencies[pkg] = otherPackages[pkg];
     }
   }
+
+  // one-off on checking for `@babel/core` dep
+  const deps = Object.keys(dependencies);
+  if (deps.some(a => {
+    return a.includes('@babel/plugin') || a.includes('@babel/preset');
+  })) {
+    if (!deps.includes('@babel/core')) {
+      dependencies['@babel/core'] = version;
+    }
+  }
+
   return dependencies;
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function updatePackageJSON(pkg) {`
`27`	`27`	`));`
`28`	`28`	`}`
`29`	`29`
`30`		`- if (pkg.devDependencies) {`
	`30`	`+ if (pkg.dependencies) {`
`31`	`31`	`pkg.dependencies = sortKeys(upgradeDeps(`
`32`	`32`	`pkg.dependencies,`
`33`	`33`	`getLatestVersion()`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,16 @@ module.exports = function upgradeDeps(dependencies, version) {`
`30`	`30`	`dependencies[pkg] = otherPackages[pkg];`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+`
	`34`	+ // one-off on checking for `@babel/core` dep
	`35`	`+ const deps = Object.keys(dependencies);`
	`36`	`+ if (deps.some(a => {`
	`37`	`+ return a.includes('@babel/plugin') \|\| a.includes('@babel/preset');`
	`38`	`+ })) {`
	`39`	`+ if (!deps.includes('@babel/core')) {`
	`40`	`+ dependencies['@babel/core'] = version;`
	`41`	`+ }`
	`42`	`+ }`
	`43`	`+`
`33`	`44`	`return dependencies;`
`34`	`45`	`}`