danger-wcc 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6061afcb81994d044747055b405da083c2a8f68
-  data.tar.gz: 9113729ee91c5f20f20bcbdc7dc193c8767a4118
+  metadata.gz: 5129a6e15f66a145fda1a0791144cfe4b4735150
+  data.tar.gz: 90d46909a0c85b829aaea23b543b99a61b2141f0
 SHA512:
-  metadata.gz: 1912d4617cea797c14e831c2fe0ba7669b85153944169f1345611eca4e4c4b6de6c3963f3735d6b1e1e51a76c29d2756534b59edbef3f15f0c56e2c78288ba3b
-  data.tar.gz: cabc48b95b641fdc38a403e6587788d5268a2c6325ab9542252e203c7fbb4968961e1d2bce2e3210804c5b343732b6575eee311f53194187234aeae88caaaa49
+  metadata.gz: 0a695fb8019f7d4e90dd6499ec656e579719737dbb173fc524d17bab8162d2b8438a44f6a205d38f2b10e32ff289856fc2730eec8be54a9d0aec0294fdc2cb6b
+  data.tar.gz: 9e30b7eadb23699642caf8c56345121b741e9d2d91f74d574c3c3365a1b38c9f487ba0b78a23c3d6544d50540abcafa964fc417943c6094935abb77c219d32f6

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DangerWCC
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/wcc/util/yarn_info.rb

@@ -6,9 +6,23 @@ class Danger::DangerWCC::Util
       @yarn_lock ||= File.readlines(@options[:lockfile] || 'yarn.lock')
     end
 
-    def package_json_dependencies
+    def package_json_dependencies # rubocop:disable Metrics/AbcSize
       @package_json_dependencies ||=
-        JSON.parse(File.read('package.json'))['dependencies']&.keys || []
+        begin
+          root = JSON.parse(File.read('package.json'))
+          (root['dependencies']&.keys || []).tap do |deps|
+            workspaces = root['workspaces']
+            next unless workspaces && !workspaces.empty?
+
+            # Add in deps from all workspaces
+            workspaces.each do |ws|
+              Dir.glob(File.join(ws, 'package.json')).each do |package_file|
+                d = JSON.parse(File.read(package_file))['dependencies']&.keys
+                deps.concat(d || [])
+              end
+            end
+          end
+        end
     end
 
     def package_json_changes

data/lib/wcc/yarn_deduplicate.rb

@@ -48,15 +48,14 @@ class Danger::DangerWCC < Danger::Plugin
       warning = line.content.match(DEDUPE_REGEXP)
       return unless warning
 
-      pkg, semver, wanted, got = warning.captures
+      pkg, _semver, wanted, got = warning.captures
 
       idx = yarn_info.find_index_in_lockfile(
         pkg, got
       )
       msg = <<~HEREDOC
         You have an opportunity to deduplicate "#{pkg}".
-        It wants #{semver} and could unify with #{wanted}, but instead #{got}
-        was installed alongside it.
+        It's using #{got} but could use the existing version #{wanted}.
 
         You can fix this by running :
         `npx yarn-deduplicate -s fewer --packages "#{pkg}"`

data/spec/wcc/dependencies_spec.rb

@@ -22,6 +22,7 @@ module Danger
         .and_return(load_fixture('dependencies/yarn.lock').split("\n"))
       allow(File).to receive(:read).with('package.json')
         .and_return(load_fixture('dependencies/package.json'))
+      allow(Dir).to receive(:glob).and_return([])
     end
 
     describe 'yarn dependencies' do

data/spec/wcc/yarn_deduplicate_spec.rb

@@ -40,8 +40,8 @@ module Danger
         expect(warnings[0].message)
           .to include('You have an opportunity to deduplicate "@babel/core".')
         expect(warnings[0].message)
-          .to include('It wants >=7.1.0 and could unify with 7.12.10,'\
-            ' but instead 7.4.0')
+          .to include('It\'s using 7.4.0 but could use the existing version '\
+            '7.12.10.')
         expect(warnings[0].message)
           .to include('npx yarn-deduplicate -s fewer --packages "@babel/core"')
         expect(warnings[0].file).to eq('yarn.lock')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-wcc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Watermark Dev