Merge remote-tracking branch 'origin/master' into pr/rkrasiuk/67

This commit is contained in:
Alexandru Dima 2019-12-18 10:53:08 +01:00
commit 06d7cfe314
No known key found for this signature in database
GPG key ID: 6E58D7B045760DA0

View file

@ -117,7 +117,7 @@ function createLoaderRules(languages, features, workers, outputPath, publicPath)
} }
return { return {
getWorkerUrl: function (moduleId, label) { getWorkerUrl: function (moduleId, label) {
var pathPrefix = (typeof window.__webpack_public_path__ === 'string' ? window.__webpack_public_path__ : ${JSON.stringify(publicPath)}); var pathPrefix = (typeof __webpack_public_path__ === 'string' ? __webpack_public_path__ : ${JSON.stringify(publicPath)});
return (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label]; return (pathPrefix ? stripTrailingSlash(pathPrefix) + '/' : '') + paths[label];
} }
}; };