From 6348e1cb323bb3d57492cc72c964717c2e3699b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Tue, 1 Nov 2022 22:00:33 +0100 Subject: [PATCH] Pass external dependencies from Babel to Webpack (#971) --- src/cache.js | 20 ++++++++++++-------- src/index.js | 3 ++- src/transform.js | 12 ++++++++++-- test/loader.test.js | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 11 deletions(-) diff --git a/src/cache.js b/src/cache.js index 384fecf0..dd26c5ec 100644 --- a/src/cache.js +++ b/src/cache.js @@ -119,15 +119,19 @@ const handleCache = async function (directory, params) { // return it to the user asap and write it in cache const result = await transform(source, options); - try { - await write(file, cacheCompression, result); - } catch (err) { - if (fallback) { - // Fallback to tmpdir if node_modules folder not writable - return handleCache(os.tmpdir(), params); + // Do not cache if there are external dependencies, + // since they might change and we cannot control it. + if (!result.externalDependencies.length) { + try { + await write(file, cacheCompression, result); + } catch (err) { + if (fallback) { + // Fallback to tmpdir if node_modules folder not writable + return handleCache(os.tmpdir(), params); + } + + throw err; } - - throw err; } return result; diff --git a/src/index.js b/src/index.js index 070c5c84..5ba55e3e 100644 --- a/src/index.js +++ b/src/index.js @@ -210,8 +210,9 @@ async function loader(source, inputSourceMap, overrides) { }); } - const { code, map, metadata } = result; + const { code, map, metadata, externalDependencies } = result; + externalDependencies?.forEach(dep => this.addDependency(dep)); metadataSubscribers.forEach(subscriber => { subscribe(subscriber, metadata, this); }); diff --git a/src/transform.js b/src/transform.js index 8905eb9f..bc0c88d0 100644 --- a/src/transform.js +++ b/src/transform.js @@ -19,13 +19,21 @@ module.exports = async function (source, options) { // https://github.com/babel/babel/blob/main/packages/babel-core/src/transformation/index.js // For discussion on this topic see here: // https://github.com/babel/babel-loader/pull/629 - const { ast, code, map, metadata, sourceType } = result; + const { ast, code, map, metadata, sourceType, externalDependencies } = result; if (map && (!map.sourcesContent || !map.sourcesContent.length)) { map.sourcesContent = [source]; } - return { ast, code, map, metadata, sourceType }; + return { + ast, + code, + map, + metadata, + sourceType, + // Convert it from a Set to an Array to make it JSON-serializable. + externalDependencies: Array.from(externalDependencies || []), + }; }; module.exports.version = babel.version; diff --git a/test/loader.test.js b/test/loader.test.js index 01b18d63..a60af502 100644 --- a/test/loader.test.js +++ b/test/loader.test.js @@ -184,3 +184,38 @@ test.cb("should load ESM config files", t => { t.end(); }); }); + +test.cb("should track external dependencies", t => { + const dep = path.join(__dirname, "fixtures/metadata.js"); + const config = Object.assign({}, globalConfig, { + entry: path.join(__dirname, "fixtures/constant.js"), + output: { + path: t.context.directory, + }, + module: { + rules: [ + { + test: /\.js$/, + loader: babelLoader, + options: { + babelrc: false, + configFile: false, + plugins: [ + api => { + api.cache.never(); + api.addExternalDependency(dep); + return { visitor: {} }; + }, + ], + }, + }, + ], + }, + }); + + webpack(config, (err, stats) => { + t.true(stats.compilation.fileDependencies.has(dep)); + t.deepEqual(stats.compilation.warnings, []); + t.end(); + }); +});