From 3799913eac18a558a29c2faf68dc4bbf359a19eb Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Mon, 16 Apr 2018 15:09:23 +0800 Subject: [PATCH 1/2] fix(buble-loader): always transpile lib directory --- lib/webpack/createBaseConfig.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js index 0d6a95419b..dbfc32f9ee 100644 --- a/lib/webpack/createBaseConfig.js +++ b/lib/webpack/createBaseConfig.js @@ -68,10 +68,18 @@ module.exports = function createBaseConfig ({ }) if (!siteConfig.evergreen) { + const libDir = path.join(__dirname, '..') config.module .rule('js') .test(/\.js$/) - .exclude.add(/node_modules/).end() + .exclude.add(filepath => { + // Always transpile lib directory + if (filepath.startsWith(libDir)) { + return false + } + // Don't transpiled node_modules + return /node_modules/.test(filepath) + }).end() .use('buble-loader') .loader('buble-loader') .options({ From 8fd693659f0bb69b5812216890da9b065b3d74df Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Mon, 16 Apr 2018 15:17:11 +0800 Subject: [PATCH 2/2] typo --- lib/webpack/createBaseConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/webpack/createBaseConfig.js b/lib/webpack/createBaseConfig.js index dbfc32f9ee..9a88196b2f 100644 --- a/lib/webpack/createBaseConfig.js +++ b/lib/webpack/createBaseConfig.js @@ -77,7 +77,7 @@ module.exports = function createBaseConfig ({ if (filepath.startsWith(libDir)) { return false } - // Don't transpiled node_modules + // Don't transpile node_modules return /node_modules/.test(filepath) }).end() .use('buble-loader')