mirror of https://github.com/webpack/webpack.git
				
				
				
			Merge remote-tracking branch 'upstream/master' into custom-json-parser
This commit is contained in:
		
						commit
						61a08df893
					
				
							
								
								
									
										12
									
								
								yarn.lock
								
								
								
								
							
							
						
						
									
										12
									
								
								yarn.lock
								
								
								
								
							|  | @ -3806,9 +3806,9 @@ lines-and-columns@^1.1.6: | ||||||
|   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= |   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= | ||||||
| 
 | 
 | ||||||
| lint-staged@^9.2.1: | lint-staged@^9.2.1: | ||||||
|   version "9.4.3" |   version "9.5.0" | ||||||
|   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.4.3.tgz#f55ad5f94f6e105294bfd6499b23142961f7b982" |   resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-9.5.0.tgz#290ec605252af646d9b74d73a0fa118362b05a33" | ||||||
|   integrity sha512-PejnI+rwOAmKAIO+5UuAZU9gxdej/ovSEOAY34yMfC3OS4Ac82vCBPzAWLReR9zCPOMqeVwQRaZ3bUBpAsaL2Q== |   integrity sha512-nawMob9cb/G1J98nb8v3VC/E8rcX1rryUYXVZ69aT9kde6YWX+uvNOEHY5yf2gcWcTJGiD0kqXmCnS3oD75GIA== | ||||||
|   dependencies: |   dependencies: | ||||||
|     chalk "^2.4.2" |     chalk "^2.4.2" | ||||||
|     commander "^2.20.0" |     commander "^2.20.0" | ||||||
|  | @ -5536,9 +5536,9 @@ schema-utils@^1.0.0: | ||||||
|     ajv-keywords "^3.1.0" |     ajv-keywords "^3.1.0" | ||||||
| 
 | 
 | ||||||
| schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.5.0: | schema-utils@^2.0.0, schema-utils@^2.0.1, schema-utils@^2.5.0: | ||||||
|   version "2.5.0" |   version "2.6.1" | ||||||
|   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" |   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" | ||||||
|   integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== |   integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== | ||||||
|   dependencies: |   dependencies: | ||||||
|     ajv "^6.10.2" |     ajv "^6.10.2" | ||||||
|     ajv-keywords "^3.4.1" |     ajv-keywords "^3.4.1" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue