From a34837d642800144d7200e81a4330a492e0d1067 Mon Sep 17 00:00:00 2001 From: Mattias Ekstrand Date: Thu, 13 Jan 2022 14:27:26 +0100 Subject: [PATCH 1/4] fix(babel): consider path delimeter on windows (#1089) --- packages/babel/src/preflightCheck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel/src/preflightCheck.js b/packages/babel/src/preflightCheck.js index ce0660941..2c9fd7dc0 100644 --- a/packages/babel/src/preflightCheck.js +++ b/packages/babel/src/preflightCheck.js @@ -34,7 +34,7 @@ function helpersTestTransform() { const mismatchError = (actual, expected, filename) => `You have declared using "${expected}" babelHelpers, but transforming ${filename} resulted in "${actual}". Please check your configuration.`; -const inheritsHelperRe = /\/helpers\/(esm\/)?inherits/; +const inheritsHelperRe = /[\\\/]+helpers[\\\/]+(esm[\\\/]+)?inherits/; export default async function preflightCheck(ctx, babelHelpers, transformOptions) { const finalOptions = addBabelPlugin(transformOptions, helpersTestTransform); From 46267060ca28232e1bd4b22f6e1936ba047a8412 Mon Sep 17 00:00:00 2001 From: Mattias Ekstrand Date: Fri, 14 Jan 2022 09:48:32 +0100 Subject: [PATCH 2/4] Fixed lint issues --- packages/babel/src/preflightCheck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel/src/preflightCheck.js b/packages/babel/src/preflightCheck.js index 2c9fd7dc0..49dc67c39 100644 --- a/packages/babel/src/preflightCheck.js +++ b/packages/babel/src/preflightCheck.js @@ -34,7 +34,7 @@ function helpersTestTransform() { const mismatchError = (actual, expected, filename) => `You have declared using "${expected}" babelHelpers, but transforming ${filename} resulted in "${actual}". Please check your configuration.`; -const inheritsHelperRe = /[\\\/]+helpers[\\\/]+(esm[\\\/]+)?inherits/; +const inheritsHelperRe = /[\\/]+helpers[\\/]+(esm[\\/]+)?inherits/; export default async function preflightCheck(ctx, babelHelpers, transformOptions) { const finalOptions = addBabelPlugin(transformOptions, helpersTestTransform); From a5f0758b57f8010ef7ba9720b4dc5760a7e155c5 Mon Sep 17 00:00:00 2001 From: Mattias Ekstrand Date: Thu, 20 Jan 2022 15:45:05 +0100 Subject: [PATCH 3/4] Added reference to issue in babel --- packages/babel/src/preflightCheck.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/babel/src/preflightCheck.js b/packages/babel/src/preflightCheck.js index 49dc67c39..80b66eaf9 100644 --- a/packages/babel/src/preflightCheck.js +++ b/packages/babel/src/preflightCheck.js @@ -34,6 +34,7 @@ function helpersTestTransform() { const mismatchError = (actual, expected, filename) => `You have declared using "${expected}" babelHelpers, but transforming ${filename} resulted in "${actual}". Please check your configuration.`; +// Revert to /\/helpers\/(esm\/)?inherits/ once https://github.com/babel/babel/issues/14185 is fixed const inheritsHelperRe = /[\\/]+helpers[\\/]+(esm[\\/]+)?inherits/; export default async function preflightCheck(ctx, babelHelpers, transformOptions) { From 4431cafa6040ff182500c391f7dde5b1ffad6a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= Date: Tue, 22 Feb 2022 11:00:25 +0100 Subject: [PATCH 4/4] chore: update comment linking to the resolved Babel issue --- packages/babel/src/preflightCheck.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/babel/src/preflightCheck.js b/packages/babel/src/preflightCheck.js index 80b66eaf9..be0a20a02 100644 --- a/packages/babel/src/preflightCheck.js +++ b/packages/babel/src/preflightCheck.js @@ -34,7 +34,7 @@ function helpersTestTransform() { const mismatchError = (actual, expected, filename) => `You have declared using "${expected}" babelHelpers, but transforming ${filename} resulted in "${actual}". Please check your configuration.`; -// Revert to /\/helpers\/(esm\/)?inherits/ once https://github.com/babel/babel/issues/14185 is fixed +// Revert to /\/helpers\/(esm\/)?inherits/ when Babel 8 gets released, this was fixed in https://github.com/babel/babel/issues/14185 const inheritsHelperRe = /[\\/]+helpers[\\/]+(esm[\\/]+)?inherits/; export default async function preflightCheck(ctx, babelHelpers, transformOptions) {