fix(cp-frontend): update webpack patch

This commit is contained in:
Sérgio Ramos 2017-08-28 20:04:55 +01:00
parent 1eac90c79a
commit 75ec47b234
3 changed files with 884 additions and 246 deletions

View File

@ -74,7 +74,7 @@
"lodash.isstring": "^4.0.1", "lodash.isstring": "^4.0.1",
"lodash.uniq": "^4.5.0", "lodash.uniq": "^4.5.0",
"lodash.uniqby": "^4.7.0", "lodash.uniqby": "^4.7.0",
"prettier": "1.5.3", "prettier": "1.6.0",
"quality-docs": "^3.3.0", "quality-docs": "^3.3.0",
"read-pkg": "^2.0.0", "read-pkg": "^2.0.0",
"redrun": "^5.9.15", "redrun": "^5.9.15",

View File

@ -55,27 +55,29 @@ module.exports = config => {
} }
if (Array.isArray(loader.oneOf)) { if (Array.isArray(loader.oneOf)) {
return Object.assign(loader, { return loaders.concat([
oneOf: loader.oneOf.map(loader => { Object.assign(loader, {
if (!isString(loader.loader)) { oneOf: loader.oneOf.map(loader => {
if (!isString(loader.loader)) {
return loader;
}
if (loader.loader.match(/babel-loader/)) {
return BabelLoader(loader);
}
if (loader.loader.match(/file-loader/)) {
return FileLoader(loader);
}
return loader; return loader;
} })
if (loader.loader.match(/babel-loader/)) {
return BabelLoader(loader);
}
if (loader.loader.match(/file-loader/)) {
return FileLoader(loader);
}
return loader;
}) })
}); ]);
} }
if (!isString(loader.loader)) { if (!isString(loader.loader)) {
return loader; return loaders.concat([loader]);
} }
if (loader.loader.match(/babel-loader/)) { if (loader.loader.match(/babel-loader/)) {

1094
yarn.lock

File diff suppressed because it is too large Load Diff