3201dc333d 
								
							 
						 
						
							
							
								
								Merge branch 'webpack-1'  
							
							... 
							
							
							
							Conflicts:
	lib/NormalModuleFactory.js
	package.json 
							
						 
						
							2015-11-13 21:58:38 +01:00  
				
					
						
							
							
								 
						
							
								6b60662068 
								
							 
						 
						
							
							
								
								performance improvement  
							
							
							
						 
						
							2015-11-13 21:55:41 +01:00  
				
					
						
							
							
								 
						
							
								4985cb2844 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	lib/dependencies/ContextDependency.js 
							
						 
						
							2015-10-18 10:55:23 +02:00  
				
					
						
							
							
								 
						
							
								5acfacfdd6 
								
							 
						 
						
							
							
								
								replaced Class with constructor  
							
							
							
						 
						
							2015-10-18 10:53:38 +02:00  
				
					
						
							
							
								 
						
							
								7cbd78c1da 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	.travis.yml
	bin/config-optimist.js
	test/statsCases/define-plugin/expected.txt 
							
						 
						
							2015-09-19 20:11:48 +02:00  
				
					
						
							
							
								 
						
							
								8ff6cb5fed 
								
							 
						 
						
							
							
								
								Report constructor correctly when inheriting from Tapable  
							
							
							
						 
						
							2015-08-18 12:35:57 +01:00  
				
					
						
							
							
								 
						
							
								5bbfbae551 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	package.json
	test/statsCases/chunks/expected.txt 
							
						 
						
							2015-07-25 13:49:14 +02:00  
				
					
						
							
							
								 
						
							
								ea7fd67ec1 
								
							 
						 
						
							
							
								
								fixed   #1239  
							
							
							
						 
						
							2015-07-22 22:34:25 +02:00  
				
					
						
							
							
								 
						
							
								431a4c791c 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	hot/dev-server.js
	hot/only-dev-server.js
	hot/poll.js
	hot/signal.js
	lib/ChunkTemplate.js
	lib/HotModuleReplacement.runtime.js
	lib/HotModuleReplacementPlugin.js
	lib/JsonpMainTemplatePlugin.js
	lib/MainTemplate.js
	lib/NormalModule.js
	lib/Parser.js
	lib/RecordIdsPlugin.js
	lib/WebpackOptionsApply.js
	lib/dependencies/RequireEnsureDependency.js
	lib/node/OldNodeWatchFileSystem.js
	lib/optimize/OccurrenceOrderPlugin.js
	package.json 
							
						 
						
							2015-07-17 09:30:37 +02:00  
				
					
						
							
							
								 
						
							
								f7d799adb4 
								
							 
						 
						
							
							
								
								rebeautify without spacing after keyword  
							
							
							
						 
						
							2015-07-16 00:19:23 +02:00  
				
					
						
							
							
								 
						
							
								0a340f2b1a 
								
							 
						 
						
							
							
								
								feat(app): Beautify all lib files  
							
							
							
						 
						
							2015-07-13 01:20:09 +03:00  
				
					
						
							
							
								 
						
							
								5594eab317 
								
							 
						 
						
							
							
								
								feat(app): Improve eslint and jsbeautify  
							
							
							
						 
						
							2015-07-08 15:16:50 +03:00  
				
					
						
							
							
								 
						
							
								8cfeb51c30 
								
							 
						 
						
							
							
								
								refactoring and bug fixes  
							
							
							
						 
						
							2015-07-07 00:11:13 +02:00  
				
					
						
							
							
								 
						
							
								cf30eeeb0f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	lib/ChunkTemplate.js
	lib/Compilation.js
	lib/HotModuleReplacement.runtime.js
	test/TestCases.test.js
	test/statsCases/chunks/expected.txt
	test/statsCases/simple-more-info/expected.txt
	test/statsCases/simple/expected.txt 
							
						 
						
							2015-07-01 00:44:17 +02:00  
				
					
						
							
							
								 
						
							
								a04ffb9283 
								
							 
						 
						
							
							
								
								added (experimental) NamedModulesPlugin  
							
							
							
						 
						
							2015-06-27 22:47:51 +02:00  
				
					
						
							
							
								 
						
							
								02522f11c3 
								
							 
						 
						
							
							
								
								throw an error when trying to use [chunkhash]  
							
							... 
							
							
							
							... when it's not allowed.
I. e. with HMR enabled [chunkhash] for the entry chunk
is not allowed. Now it throws an error.
Also fixes a bug where [chunkhash] doesn't have to correct
length. fixes  #1192  
							
						 
						
							2015-06-27 11:34:17 +02:00  
				
					
						
							
							
								 
						
							
								4e041dfd52 
								
							 
						 
						
							
							
								
								fixed [chunkhash] and [name] issue  
							
							... 
							
							
							
							fixed  #1181 
fixed  #1018  
						
							2015-06-24 23:17:12 +02:00  
				
					
						
							
							
								 
						
							
								41f56a523a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							
							
						 
						
							2015-06-13 17:47:50 +02:00  
				
					
						
							
							
								 
						
							
								e20c485928 
								
							 
						 
						
							
							
								
								reset module index and index2 when loading from cache  
							
							... 
							
							
							
							consistent entry order 
							
						 
						
							2015-06-13 17:44:52 +02:00  
				
					
						
							
							
								 
						
							
								2245c4acca 
								
							 
						 
						
							
							
								
								Promise based chunk loading API  
							
							... 
							
							
							
							don't flag entry module with `0` id anymore
use extra argument in chunk instead
this allows to require entry points 
							
						 
						
							2015-06-13 11:45:28 +02:00  
				
					
						
							
							
								 
						
							
								66df34688e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	bin/convert-argv.js
	lib/webpack.js 
							
						 
						
							2015-06-07 22:24:03 +02:00  
				
					
						
							
							
								 
						
							
								08d9d87f9a 
								
							 
						 
						
							
							
								
								Fix typos  
							
							
							
						 
						
							2015-05-26 19:59:02 -07:00  
				
					
						
							
							
								 
						
							
								ddf6066128 
								
							 
						 
						
							
							
								
								fixed index for entry points  
							
							
							
						 
						
							2015-05-25 20:46:23 +02:00  
				
					
						
							
							
								 
						
							
								c92491ff30 
								
							 
						 
						
							
							
								
								better default for chunkFilename and tests  
							
							
							
						 
						
							2015-05-16 16:10:25 +02:00  
				
					
						
							
							
								 
						
							
								599c39dbc0 
								
							 
						 
						
							
							
								
								better defaults for filename and chunkFilename  
							
							
							
						 
						
							2015-05-16 14:52:23 +02:00  
				
					
						
							
							
								 
						
							
								ff7848369a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	bin/webpack.js
	package.json 
							
						 
						
							2015-05-10 20:41:04 +02:00  
				
					
						
							
							
								 
						
							
								8a6ac101ea 
								
							 
						 
						
							
							
								
								generate two indices, which representent global order  
							
							... 
							
							
							
							and use the first for sorting modules by default 
							
						 
						
							2015-05-10 18:43:47 +02:00  
				
					
						
							
							
								 
						
							
								f4b9d5f57a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	lib/Compilation.js
	lib/Compiler.js
	lib/DefinePlugin.js
	lib/HotModuleReplacementPlugin.js
	lib/Parser.js
	lib/node/NodeSourcePlugin.js
	lib/node/OldNodeWatchFileSystem.js
	package.json 
							
						 
						
							2015-04-27 20:22:13 +02:00  
				
					
						
							
							
								 
						
							
								cebd3b9722 
								
							 
						 
						
							
							
								
								added linting  
							
							
							
						 
						
							2015-04-23 23:55:50 +02:00  
				
					
						
							
							
								 
						
							
								9c26ffe6a8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	lib/Stats.js 
							
						 
						
							2015-04-20 21:08:42 +02:00  
				
					
						
							
							
								 
						
							
								3419ddcb29 
								
							 
						 
						
							
							
								
								use dedupe plugin later in compilation  
							
							... 
							
							
							
							fixed  webpack/style-loader#54  
						
							2015-04-20 19:39:02 +02:00  
				
					
						
							
							
								 
						
							
								ed75627f06 
								
							 
						 
						
							
							
								
								Merge branch 'master' into webpack-2  
							
							... 
							
							
							
							Conflicts:
	bin/convert-argv.js
	package.json 
							
						 
						
							2015-04-14 20:09:29 +02:00  
				
					
						
							
							
								 
						
							
								0431b74149 
								
							 
						 
						
							
							
								
								added cheap-source-map and lineToLine option  
							
							
							
						 
						
							2015-04-05 01:52:30 +02:00  
				
					
						
							
							
								 
						
							
								c4db71c9d6 
								
							 
						 
						
							
							
								
								added some async steps to prevent stack overflows  
							
							
							
						 
						
							2015-04-03 23:39:58 +02:00  
				
					
						
							
							
								 
						
							
								8fef0c79f3 
								
							 
						 
						
							
							
								
								cache sources  
							
							
							
						 
						
							2015-04-03 19:47:53 +02:00  
				
					
						
							
							
								 
						
							
								ab149eb4d4 
								
							 
						 
						
							
							
								
								Merge branch 'hot-multi-pass' of  https://github.com/webpack/webpack.git  into webpack-2  
							
							... 
							
							
							
							Conflicts:
	lib/Compilation.js 
							
						 
						
							2015-03-05 22:30:24 +01:00  
				
					
						
							
							
								 
						
							
								a4a72607f0 
								
							 
						 
						
							
							
								
								throw Error when multiple chunks emit to the same filename  
							
							
							
						 
						
							2015-03-05 22:02:01 +01:00  
				
					
						
							
							
								 
						
							
								63eff24427 
								
							 
						 
						
							
							
								
								removed namedChunkFilename  
							
							
							
						 
						
							2015-03-05 22:01:36 +01:00  
				
					
						
							
							
								 
						
							
								13b60359f4 
								
							 
						 
						
							
							
								
								DedupePlugin correctly inserts deduplication code  
							
							... 
							
							
							
							fixed  #770  
						
							2015-02-09 08:43:46 +01:00  
				
					
						
							
							
								 
						
							
								769d40eec5 
								
							 
						 
						
							
							
								
								profile earlier and from cache  
							
							
							
						 
						
							2015-02-04 23:22:32 +01:00  
				
					
						
							
							
								 
						
							
								e9acc3907e 
								
							 
						 
						
							
							
								
								remove issuer for entry and prefetch  
							
							
							
						 
						
							2015-02-04 23:22:31 +01:00  
				
					
						
							
							
								 
						
							
								725371e271 
								
							 
						 
						
							
							
								
								separate module assets from chunk assets  
							
							
							
						 
						
							2015-01-31 16:19:36 +01:00  
				
					
						
							
							
								 
						
							
								fb49376f6d 
								
							 
						 
						
							
							
								
								Added multi pass hot mode  #669  
							
							
							
						 
						
							2015-01-30 00:46:52 +01:00  
				
					
						
							
							
								 
						
							
								adfcfce15f 
								
							 
						 
						
							
							
								
								watching of missing files,  fixed   #668  
							
							... 
							
							
							
							store missing files from errors for missingDependencies
make the new watching plugins default
added OldWatchingPlugin 
							
						 
						
							2015-01-17 21:55:44 +01:00  
				
					
						
							
							
								 
						
							
								de1ea9d15e 
								
							 
						 
						
							
							
								
								allow multiple chunks for a dependency block  #640  
							
							
							
						 
						
							2015-01-01 21:58:27 +01:00  
				
					
						
							
							
								 
						
							
								738c1d3e68 
								
							 
						 
						
							
							
								
								support library with CommonsChunkPlugin  
							
							... 
							
							
							
							fixes  #622  
						
							2014-12-22 16:10:23 +01:00  
				
					
						
							
							
								 
						
							
								1c9fd48839 
								
							 
						 
						
							
							
								
								reorganized function  
							
							
							
						 
						
							2014-11-02 12:17:05 +01:00  
				
					
						
							
							
								 
						
							
								8131061c8e 
								
							 
						 
						
							
							
								
								added weak dependencies, require.resolveWeak  
							
							... 
							
							
							
							#526  
						
							2014-10-13 16:10:19 +02:00  
				
					
						
							
							
								 
						
							
								f371945a29 
								
							 
						 
						
							
							
								
								Add TemplatedPathPlugin  
							
							
							
						 
						
							2014-09-11 15:31:08 +02:00  
				
					
						
							
							
								 
						
							
								9a8cae6d43 
								
							 
						 
						
							
							
								
								added `NoErrorsPlugin`, which doesn't emit on error  
							
							... 
							
							
							
							fixes webpack/webpack-dev-server#42
fixes  #449  
							
						 
						
							2014-09-03 14:16:17 +02:00