fixed some examples stuff

This commit is contained in:
Tobias Koppers 2013-02-13 11:51:08 +01:00
parent 4d1ca1993d
commit 90f8a42ab3
9 changed files with 38 additions and 12 deletions

View File

@ -2,4 +2,4 @@ module.exports =
cool: "stuff"
answer: 42
external: require "./cup2.coffee"
again: require "./cup2.coffee"
again: require "./cup2"

View File

@ -1 +1 @@
console.log(require("./cup1.coffee"));
console.log(require("./cup1"));

View File

@ -0,0 +1,10 @@
module.exports = {
module: {
loaders: [
{ test: /\.coffee$/, loader: "coffee" }
]
},
resolve: {
extensions: ["", ".web.coffee", ".web.js", ".coffee", ".js"]
}
}

View File

@ -6,4 +6,4 @@ console.dir(require("./loader!./file"));
// use buildin json loader
console.dir(require("./test.json")); // default by extension
console.dir(require("json!./test.json")); // manual
console.dir(require("!json!./test.json")); // manual

View File

@ -0,0 +1,7 @@
module.exports = {
module: {
loaders: [
{ test: /\.json$/, loader: "json" }
]
}
}

View File

@ -11,7 +11,7 @@
{{js/output.js}}
```
# js/1.output.js
# js/1.output.js and js/my own chunk.js
``` javascript
{{js/1.output.js}}

View File

@ -0,0 +1,5 @@
module.exports = {
output: {
namedChunkFilename: "[name].js"
}
}

View File

@ -473,10 +473,10 @@ Compilation.prototype.createChunkAssets = function createChunkAssets() {
source = this.chunkTemplate.render(chunk, this.moduleTemplate, this.dependencyTemplates);
this.assets[file = chunkFilename.replace(REGEXP_HASH, hash).replace(REGEXP_ID, chunk.id)] = source;
chunk.files.push(file);
}
if(namedChunkFilename && chunk.name) {
this.assets[file = namedChunkFilename.replace(REGEXP_HASH, hash).replace(REGEXP_ID, chunk.id).replace(REGEXP_NAME, chunk.name || "")] = source;
chunk.files.push(file);
if(namedChunkFilename && chunk.name) {
this.assets[file = namedChunkFilename.replace(REGEXP_HASH, hash).replace(REGEXP_ID, chunk.id).replace(REGEXP_NAME, chunk.name || "")] = source;
chunk.files.push(file);
}
}
}
};

View File

@ -76,18 +76,22 @@ ContextModule.prototype.build = function(options, compilation, resolver, fs, cal
ContextModule.prototype.source = function(dependencyTemplates, outputOptions, requestShortener) {
var map = {};
this.dependencies.forEach(function(dep) {
this.dependencies.slice().sort(function(a,b) {
if(a.userRequest == b.userRequest) return 0;
return a.userRequest < b.userRequest ? -1 : 1;
}).forEach(function(dep) {
if(dep.module)
map[dep.userRequest] = dep.module.id
});
var str = [
"var map = ", JSON.stringify(map, null, "\t"), ";\n",
"module.exports = function webpackContext(req) {\n",
"\treturn require(map[req] || (function() { throw new Error(\"Cannot find module \" + req + \".\") }()));\n",
"function webpackContext(req) {\n",
"\treturn require(map[req] || (function() { throw new Error(\"Cannot find module '\" + req + \"'.\") }()));\n",
"};\n",
"module.exports.keys = function webpackContextKeys() {\n",
"webpackContext.keys = function webpackContextKeys() {\n",
"\treturn Object.keys(map);\n",
"};\n",
"module.exports = webpackContext;\n",
];
return new RawSource(str.join(""));
};