Skip to content

Commit 8f603e5

Browse files
committed
update examples
1 parent 42b8d48 commit 8f603e5

16 files changed

Lines changed: 330 additions & 56 deletions

File tree

examples/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ example demonstrating Code Splitting through the builder loader
3636

3737
example demonstrating merging of chucks with named chucks
3838

39+
## mixed
40+
41+
example demonstrating mixing CommonJs and AMD
42+
3943
# Requests
4044

4145
If you think a example is missing, please report it as issue. :)

examples/code-splitted-require.context/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ getTemplate("b", function(b) {
8282

8383
/*** (webpack)\buildin\__webpack_console.js ***/
8484

85-
var console = (function() { return this["console"] || this["window"].console || {} }());
85+
var console = (function() { return this["console"] || (this["window"] && this["window"].console) || {} }());
8686
module.exports = console;
8787
for(var name in {log:1, info:1, error:1, warn:1, dir:1, trace:1, assert:1})
8888
if(!console[name])
@@ -156,22 +156,22 @@ module.exports = function() {
156156
## Uncompressed
157157

158158
```
159-
Hash: 31dccb161bdcaed364272c7c6eb214ca
160-
Compile Time: 42ms
159+
Hash: c7f8c66d7e427c2d4fbe8d43782f1861
160+
Compile Time: 41ms
161161
Chunks: 2
162162
Modules: 6
163163
Modules including duplicates: 6
164164
Modules per chunk: 3
165165
Modules first chunk: 2
166-
output.js: 2880 characters
166+
output.js: 2900 characters
167167
1.output.js: 1088 characters
168168
169169
<id> <size> <filename>
170170
<reason> from <filename>
171171
output.js
172172
0 268 .\example.js
173173
main
174-
1 496 (webpack)\buildin\__webpack_console.js
174+
1 516 (webpack)\buildin\__webpack_console.js
175175
require (2x) from .\example.js
176176
1.output.js
177177
2 289 [context] (webpack)\examples\require.context\templates
@@ -187,22 +187,22 @@ output.js
187187
## Minimized (uglify-js, no zip)
188188

189189
```
190-
Hash: 92b150628c926c6aa61c9f5e72006164
191-
Compile Time: 119ms
190+
Hash: 580941dfbda8e981342d71fa2fbeae40
191+
Compile Time: 112ms
192192
Chunks: 2
193193
Modules: 6
194194
Modules including duplicates: 6
195195
Modules per chunk: 3
196196
Modules first chunk: 2
197-
output.js: 1119 characters
197+
output.js: 1132 characters
198198
1.output.js: 473 characters
199199
200200
<id> <size> <filename>
201201
<reason> from <filename>
202202
output.js
203203
0 157 .\example.js
204204
main
205-
1 389 (webpack)\buildin\__webpack_console.js
205+
1 402 (webpack)\buildin\__webpack_console.js
206206
require (2x) from .\example.js
207207
1.output.js
208208
2 228 [context] (webpack)\examples\require.context\templates

examples/code-splitting-bundle-loader/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ require(/* bundle!./file.js */2)(function(fileJsExports) {
7373

7474
/*** (webpack)\buildin\__webpack_console.js ***/
7575

76-
var console = (function() { return this["console"] || this["window"].console || {} }());
76+
var console = (function() { return this["console"] || (this["window"] && this["window"].console) || {} }());
7777
module.exports = console;
7878
for(var name in {log:1, info:1, error:1, warn:1, dir:1, trace:1, assert:1})
7979
if(!console[name])
@@ -135,22 +135,22 @@ module.exports = "It works";
135135
## Uncompressed
136136

137137
```
138-
Hash: 78ea2d6893a1c0365c7a34aae7bb3833
139-
Compile Time: 53ms
138+
Hash: 44dfbfa6a5cc501f02898703b4ef5937
139+
Compile Time: 51ms
140140
Chunks: 2
141141
Modules: 4
142142
Modules including duplicates: 4
143143
Modules per chunk: 2
144144
Modules first chunk: 3
145-
output.js: 3145 characters
145+
output.js: 3165 characters
146146
1.output.js: 156 characters
147147
148148
<id> <size> <filename>
149149
<reason> from <filename>
150150
output.js
151151
0 91 .\example.js
152152
main
153-
1 496 (webpack)\buildin\__webpack_console.js
153+
1 516 (webpack)\buildin\__webpack_console.js
154154
require (1x) from .\example.js
155155
2 324 (webpack)\~\bundle-loader!.\file.js
156156
require (1x) from .\example.js
@@ -162,22 +162,22 @@ output.js
162162
## Minimized (uglify-js, no zip)
163163

164164
```
165-
Hash: 26154bdd756af9972717cd33f9781f20
166-
Compile Time: 125ms
165+
Hash: 962468b3e6fafd1d80a8a957de5ea778
166+
Compile Time: 121ms
167167
Chunks: 2
168168
Modules: 4
169169
Modules including duplicates: 4
170170
Modules per chunk: 2
171171
Modules first chunk: 3
172-
output.js: 1188 characters
172+
output.js: 1201 characters
173173
1.output.js: 57 characters
174174
175175
<id> <size> <filename>
176176
<reason> from <filename>
177177
output.js
178178
0 39 .\example.js
179179
main
180-
1 389 (webpack)\buildin\__webpack_console.js
180+
1 402 (webpack)\buildin\__webpack_console.js
181181
require (1x) from .\example.js
182182
2 164 (webpack)\~\bundle-loader!.\file.js
183183
require (1x) from .\example.js

examples/code-splitting/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ output.js
150150

151151
```
152152
Hash: acb96ffb60e2a4a3abff7ff64fc7b104
153-
Compile Time: 105ms
153+
Compile Time: 104ms
154154
Chunks: 2
155155
Modules: 5
156156
Modules including duplicates: 5

examples/coffee-script/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module.exports = 42
4545
/******/ require.cache = installedModules;
4646
/******/ return require(0);
4747
/******/})
48-
/******/({
48+
/******/({c:"",
4949
/******/0: function(module, exports, require) {
5050

5151
/*** .\example.js ***/
@@ -60,7 +60,7 @@ console.log(require(/* ./cup1.coffee */3));
6060

6161
/*** (webpack)\buildin\__webpack_console.js ***/
6262

63-
var console = (function() { return this["console"] || this["window"].console || {} }());
63+
var console = (function() { return this["console"] || (this["window"] && this["window"].console) || {} }());
6464
module.exports = console;
6565
for(var name in {log:1, info:1, error:1, warn:1, dir:1, trace:1, assert:1})
6666
if(!console[name])
@@ -121,21 +121,21 @@ console.timeEnd = function() {
121121
## Uncompressed
122122

123123
```
124-
Hash: 6f847f3ae460f720cea4227c0a6befb2
125-
Compile Time: 139ms
124+
Hash: 58628a1bc3fecc68f3d9e0c6ea7a4080
125+
Compile Time: 136ms
126126
Chunks: 1
127127
Modules: 4
128128
Modules including duplicates: 4
129129
Modules per chunk: 4
130130
Modules first chunk: 4
131-
output.js: 2277 characters
131+
output.js: 2302 characters
132132
133133
<id> <size> <filename>
134134
<reason> from <filename>
135135
output.js
136136
0 43 .\example.js
137137
main
138-
1 496 (webpack)\buildin\__webpack_console.js
138+
1 516 (webpack)\buildin\__webpack_console.js
139139
require (1x) from .\example.js
140140
require (1x) from .\cup2.coffee
141141
2 92 (webpack)\~\coffee-loader!.\cup2.coffee
@@ -147,21 +147,21 @@ output.js
147147
## Minimized (uglify-js, no zip)
148148

149149
```
150-
Hash: 59325c1d71d5ede2a056831707e21289
151-
Compile Time: 206ms
150+
Hash: fd07f35e1c2b5ad11e9ae1ca31d78676
151+
Compile Time: 208ms
152152
Chunks: 1
153153
Modules: 4
154154
Modules including duplicates: 4
155155
Modules per chunk: 4
156156
Modules first chunk: 4
157-
output.js: 846 characters
157+
output.js: 864 characters
158158
159159
<id> <size> <filename>
160160
<reason> from <filename>
161161
output.js
162162
0 23 .\example.js
163163
main
164-
1 389 (webpack)\buildin\__webpack_console.js
164+
1 402 (webpack)\buildin\__webpack_console.js
165165
require (1x) from .\example.js
166166
require (1x) from .\cup2.coffee
167167
2 76 (webpack)\~\coffee-loader!.\cup2.coffee

examples/commonjs/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ exports.add = function() {
5050
/******/ require.cache = installedModules;
5151
/******/ return require(0);
5252
/******/})
53-
/******/({
53+
/******/({c:"",
5454
/******/0: function(module, exports, require) {
5555

5656
/*** .\example.js ***/
@@ -95,13 +95,13 @@ exports.add = function() {
9595

9696
```
9797
Hash: 9326ee6a998b5e42fd07a7a2f390ce57
98-
Compile Time: 24ms
98+
Compile Time: 25ms
9999
Chunks: 1
100100
Modules: 3
101101
Modules including duplicates: 3
102102
Modules per chunk: 3
103103
Modules first chunk: 3
104-
output.js: 1345 characters
104+
output.js: 1350 characters
105105
106106
<id> <size> <filename>
107107
<reason> from <filename>
@@ -118,13 +118,13 @@ output.js
118118

119119
```
120120
Hash: 4131f4717fa510f9f9929b1b6a050226
121-
Compile Time: 74ms
121+
Compile Time: 73ms
122122
Chunks: 1
123123
Modules: 3
124124
Modules including duplicates: 3
125125
Modules per chunk: 3
126126
Modules first chunk: 3
127-
output.js: 478 characters
127+
output.js: 483 characters
128128
129129
<id> <size> <filename>
130130
<reason> from <filename>

examples/loader/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = function(content) {
5656
/******/ require.cache = installedModules;
5757
/******/ return require(0);
5858
/******/})
59-
/******/({
59+
/******/({c:"",
6060
/******/0: function(module, exports, require) {
6161

6262
/*** .\example.js ***/
@@ -79,7 +79,7 @@ console.dir(require(/* json!./test.json */2)); // manual
7979

8080
/*** (webpack)\buildin\__webpack_console.js ***/
8181

82-
var console = (function() { return this["console"] || this["window"].console || {} }());
82+
var console = (function() { return this["console"] || (this["window"] && this["window"].console) || {} }());
8383
module.exports = console;
8484
for(var name in {log:1, info:1, error:1, warn:1, dir:1, trace:1, assert:1})
8585
if(!console[name])
@@ -151,21 +151,21 @@ Prints in node.js (`node example.js`) and in browser:
151151
## Uncompressed
152152

153153
```
154-
Hash: 88a3c642e57308e55abb0438c64498e1
155-
Compile Time: 69ms
154+
Hash: 32d984116944fa5f4cb96f98c59402f4
155+
Compile Time: 66ms
156156
Chunks: 1
157157
Modules: 6
158158
Modules including duplicates: 6
159159
Modules per chunk: 6
160160
Modules first chunk: 6
161-
output.js: 2585 characters
161+
output.js: 2610 characters
162162
163163
<id> <size> <filename>
164164
<reason> from <filename>
165165
output.js
166166
0 333 .\example.js
167167
main
168-
1 496 (webpack)\buildin\__webpack_console.js
168+
1 516 (webpack)\buildin\__webpack_console.js
169169
require (3x) from .\example.js
170170
2 36 (webpack)\~\json-loader!.\test.json
171171
require (1x) from .\example.js

0 commit comments

Comments
 (0)