Compare commits
2 Commits
master
...
feature/no
| Author | SHA1 | Date |
|---|---|---|
Jan Nicklas
|
2ea554518a | |
|
Jan Nicklas
|
0474662b01 |
|
|
@ -44,22 +44,13 @@
|
||||||
/* 0 */
|
/* 0 */
|
||||||
/***/ function(module, exports, __webpack_require__) {
|
/***/ function(module, exports, __webpack_require__) {
|
||||||
|
|
||||||
eval("__webpack_require__(1);\n\nvar universal = __webpack_require__(5);\nvar h1 = document.createElement('h1');\nh1.innerHTML = universal();\n\ndocument.body.appendChild(h1);\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./example.js\n// module id = 0\n// module chunks = 0\n//# sourceURL=webpack:///./example.js?");
|
eval("__webpack_require__(!(function webpackMissingModule() { var e = new Error(\"Cannot find module \\\"./main.css\\\"\"); e.code = 'MODULE_NOT_FOUND'; throw e; }()));\n\nvar universal = __webpack_require__(1);\nvar h1 = document.createElement('h1');\nh1.innerHTML = universal();\n\ndocument.body.appendChild(h1);\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./example.js\n// module id = 0\n// module chunks = 0\n//# sourceURL=webpack:///./example.js?");
|
||||||
|
|
||||||
/***/ },
|
/***/ },
|
||||||
/* 1 */
|
/* 1 */
|
||||||
/***/ function(module, exports) {
|
/***/ function(module, exports) {
|
||||||
|
|
||||||
eval("// removed by extract-text-webpack-plugin\n\n//////////////////\n// WEBPACK FOOTER\n// ./main.css\n// module id = 1\n// module chunks = 0\n//# sourceURL=webpack:///./main.css?");
|
eval("// This file is used for frontend and backend\n'use strict';\n\n// If compiled by the html-webpack-plugin\n// HTML_WEBPACK_PLUGIN is set to true:\nvar backend = typeof HTML_WEBPACK_PLUGIN !== 'undefined';\n\nmodule.exports = function () {\n return 'Hello World from ' + (backend ? 'backend' : 'frontend');\n};\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./universial.js\n// module id = 1\n// module chunks = 0\n//# sourceURL=webpack:///./universial.js?");
|
||||||
|
|
||||||
/***/ },
|
|
||||||
/* 2 */,
|
|
||||||
/* 3 */,
|
|
||||||
/* 4 */,
|
|
||||||
/* 5 */
|
|
||||||
/***/ function(module, exports) {
|
|
||||||
|
|
||||||
eval("// This file is used for frontend and backend\n'use strict';\n\n// If compiled by the html-webpack-plugin\n// HTML_WEBPACK_PLUGIN is set to true:\nvar backend = typeof HTML_WEBPACK_PLUGIN !== 'undefined';\n\nmodule.exports = function () {\n return 'Hello World from ' + (backend ? 'backend' : 'frontend');\n};\n\n\n//////////////////\n// WEBPACK FOOTER\n// ./universial.js\n// module id = 5\n// module chunks = 0\n//# sourceURL=webpack:///./universial.js?");
|
|
||||||
|
|
||||||
/***/ }
|
/***/ }
|
||||||
/******/ ]);
|
/******/ ]);
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
<html><head><title>Webpack App</title><link href="styles.css" rel="stylesheet"></head><body>Hello World from backend - <h2>Partial</h2>
|
<html><head><title>/index.js: Webpack App</title></head><body>Hello World from backend - <h2>Partial</h2>
|
||||||
<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
|
<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
body {
|
|
||||||
background: snow;
|
|
||||||
}
|
|
||||||
|
|
@ -45,6 +45,15 @@
|
||||||
/******/ });
|
/******/ });
|
||||||
/******/ };
|
/******/ };
|
||||||
|
|
||||||
|
/******/ // getDefaultExport function for compatibility with non-harmony modules
|
||||||
|
/******/ __webpack_require__.n = function(module) {
|
||||||
|
/******/ var getter = module && module.__esModule ?
|
||||||
|
/******/ function getDefault() { return module['default']; } :
|
||||||
|
/******/ function getModuleExports() { return module; };
|
||||||
|
/******/ __webpack_require__.d(getter, 'a', getter);
|
||||||
|
/******/ return getter;
|
||||||
|
/******/ };
|
||||||
|
|
||||||
/******/ // Object.prototype.hasOwnProperty.call
|
/******/ // Object.prototype.hasOwnProperty.call
|
||||||
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
|
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
<html><head><title>Webpack App</title><link href="styles.css" rel="stylesheet"></head><body>Hello World from backend - <h2>Partial</h2>
|
<html><head><title>template.js: Webpack App</title><link href="styles.css" rel="stylesheet"></head><body>Hello World from backend - <h2>Partial</h2>
|
||||||
<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
|
<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script></body></html>
|
||||||
|
|
@ -5,8 +5,9 @@ var universal = require('./universial.js');
|
||||||
// Export a function / promise / or a string:
|
// Export a function / promise / or a string:
|
||||||
// This function has to return a string or promised string:
|
// This function has to return a string or promised string:
|
||||||
module.exports = function (templateParams) {
|
module.exports = function (templateParams) {
|
||||||
|
var filename = __filename;
|
||||||
var html = '<html><head>' +
|
var html = '<html><head>' +
|
||||||
'<title>' + templateParams.htmlWebpackPlugin.options.title + '</title>' +
|
'<title>' + filename + ': ' + templateParams.htmlWebpackPlugin.options.title + '</title>' +
|
||||||
'</head><body>' + universal() + ' - ' + partial + '</body></html>';
|
'</head><body>' + universal() + ' - ' + partial + '</body></html>';
|
||||||
|
|
||||||
return html;
|
return html;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ module.exports = {
|
||||||
},
|
},
|
||||||
module: {
|
module: {
|
||||||
loaders: [
|
loaders: [
|
||||||
{ test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader') },
|
{ test: /\.css$/, loader: ExtractTextPlugin.extract({loader: 'css-loader'}) },
|
||||||
{ test: /\.png$/, loader: 'file-loader' },
|
{ test: /\.png$/, loader: 'file-loader' },
|
||||||
{ test: /\.html$/, loader: 'html-loader' }
|
{ test: /\.html$/, loader: 'html-loader' }
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
<head><link href="styles.css" rel="stylesheet"></head>Hello World from backend2016-10-29T07:02:05.646Z<h2>Partial</h2>
|
<head><link href="styles.css" rel="stylesheet"></head>Hello World from backend2016-10-29T07:11:51.268Z<h2>Partial</h2>
|
||||||
<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script>
|
<img src="0714810ae3fb211173e2964249507195.png"><script type="text/javascript" src="bundle.js"></script>
|
||||||
2
index.js
2
index.js
|
|
@ -593,7 +593,7 @@ HtmlWebpackPlugin.prototype.createHtmlTag = function (tagDefinition) {
|
||||||
HtmlWebpackPlugin.prototype.getFullTemplatePath = function (template, context) {
|
HtmlWebpackPlugin.prototype.getFullTemplatePath = function (template, context) {
|
||||||
// If the template doesn't use a loader use the lodash template loader
|
// If the template doesn't use a loader use the lodash template loader
|
||||||
if (template.indexOf('!') === -1) {
|
if (template.indexOf('!') === -1) {
|
||||||
template = require.resolve('./lib/loader.js') + '!' + path.resolve(context, template);
|
template = 'html-webpack-plugin/lib/loader.js!' + path.resolve(context, template);
|
||||||
}
|
}
|
||||||
// Resolve template path
|
// Resolve template path
|
||||||
return template.replace(
|
return template.replace(
|
||||||
|
|
|
||||||
|
|
@ -53,30 +53,21 @@ module.exports.compileTemplate = function compileTemplate (template, context, ou
|
||||||
new LoaderTargetPlugin('node')
|
new LoaderTargetPlugin('node')
|
||||||
);
|
);
|
||||||
|
|
||||||
// Fix for "Uncaught TypeError: __webpack_require__(...) is not a function"
|
initializeChildCompilerCache(childCompiler);
|
||||||
// Hot module replacement requires that every child compiler has its own
|
|
||||||
// cache. @see https://github.com/ampedandwired/html-webpack-plugin/pull/179
|
// Allow full access to __filename and __dirname for the template compilation
|
||||||
childCompiler.plugin('compilation', function (compilation) {
|
childCompilerNodeSettings({
|
||||||
if (compilation.cache) {
|
__filename: true,
|
||||||
if (!compilation.cache[compilerName]) {
|
__dirname: true
|
||||||
compilation.cache[compilerName] = {};
|
|
||||||
}
|
|
||||||
compilation.cache = compilation.cache[compilerName];
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Compile and return a promise
|
// Compile and return a promise
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise(function (resolve, reject) {
|
||||||
childCompiler.runAsChild(function (err, entries, childCompilation) {
|
childCompiler.runAsChild(function onCompilationComplete(err, entries, childCompilation) {
|
||||||
// Resolve / reject the promise
|
err = normalizeCompilationErrors(err, childCompilation);
|
||||||
if (childCompilation && childCompilation.errors && childCompilation.errors.length) {
|
if (err)
|
||||||
var errorDetails = childCompilation.errors.map(function (error) {
|
return reject(err);
|
||||||
return error.message + (error.error ? ':\n' + error.error : '');
|
}
|
||||||
}).join('\n');
|
|
||||||
reject(new Error('Child compilation failed:\n' + errorDetails));
|
|
||||||
} else if (err) {
|
|
||||||
reject(err);
|
|
||||||
} else {
|
|
||||||
// Replace [hash] placeholders in filename
|
// Replace [hash] placeholders in filename
|
||||||
var outputName = compilation.mainTemplate.applyPluginsWaterfall('asset-path', outputOptions.filename, {
|
var outputName = compilation.mainTemplate.applyPluginsWaterfall('asset-path', outputOptions.filename, {
|
||||||
hash: childCompilation.hash,
|
hash: childCompilation.hash,
|
||||||
|
|
@ -97,7 +88,6 @@ module.exports.compileTemplate = function compileTemplate (template, context, ou
|
||||||
// Compiled code
|
// Compiled code
|
||||||
content: childCompilation.assets[outputName].source()
|
content: childCompilation.assets[outputName].source()
|
||||||
});
|
});
|
||||||
}
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
@ -110,3 +100,47 @@ function getCompilerName (context, filename) {
|
||||||
var relativePath = path.relative(context, absolutePath);
|
var relativePath = path.relative(context, absolutePath);
|
||||||
return 'html-webpack-plugin for "' + (absolutePath.length < relativePath.length ? absolutePath : relativePath) + '"';
|
return 'html-webpack-plugin for "' + (absolutePath.length < relativePath.length ? absolutePath : relativePath) + '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fix for "Uncaught TypeError: __webpack_require__(...) is not a function"
|
||||||
|
* Hot module replacement requires that every child compiler has its own
|
||||||
|
* @see https://github.com/ampedandwired/html-webpack-plugin/pull/179
|
||||||
|
*/
|
||||||
|
function initializeChildCompilerCache(childCompiler) {
|
||||||
|
childCompiler.plugin('compilation', function (compilation) {
|
||||||
|
if (compilation.cache) {
|
||||||
|
if (!compilation.cache[compilerName]) {
|
||||||
|
compilation.cache[compilerName] = {};
|
||||||
|
}
|
||||||
|
compilation.cache = compilation.cache[compilerName];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure the parser
|
||||||
|
* This is a workaround as NodeStuffPlugin can't be use in a child compiler
|
||||||
|
* @see https://github.com/webpack/webpack/issues/2978
|
||||||
|
*/
|
||||||
|
function setupChildCompilerNodeStuff(childCompiler, nodeStuffPluginOptions) {
|
||||||
|
childCompiler.plugin('normal-module-factory', function (normalModuleFactory) {
|
||||||
|
normalModuleFactory.plugin('parser-options', function (parserOptions) {
|
||||||
|
parserOptions.node = _.merge(parserOptions.node || {}, nodeStuffPluginOptions);
|
||||||
|
return parserOptions;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns all compilation errors in one error
|
||||||
|
*/
|
||||||
|
function normalizeCompilationErrors(compilationErrorObject, compilation) {
|
||||||
|
// Gather internal errors
|
||||||
|
if (childCompilation && childCompilation.errors && childCompilation.errors.length) {
|
||||||
|
var errorDetails = childCompilation.errors.map(function (error) {
|
||||||
|
return error.message + (error.error ? ':\n' + error.error : '');
|
||||||
|
}).join('\n');
|
||||||
|
return new Error(errorDetails);
|
||||||
|
}
|
||||||
|
return compilationErrorObject;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
// This file is only be used for internal webpack html plugin unit testing.
|
||||||
|
// To simulates that the html-webpack-plugin is installed in the node_modules directory.
|
||||||
|
module.exports = require('../../');
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
// This file is only be used for internal webpack html plugin unit testing.
|
||||||
|
// To simulates that the html-webpack-plugin is installed in the node_modules directory.
|
||||||
|
module.exports = require('../../../lib/loader.js');
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
module.exports = function (templateParams) {
|
module.exports = function (templateParams) {
|
||||||
return 'templateParams.compilation exists: ' + !!templateParams.compilation;
|
return {
|
||||||
|
compilation: typeof templateParams.compilation,
|
||||||
|
dirname: __dirname,
|
||||||
|
filename: __filename
|
||||||
|
};
|
||||||
};
|
};
|
||||||
Loading…
Reference in New Issue