From 300b894d05c8c722bc71db8fe35f9cc89a417d8d Mon Sep 17 00:00:00 2001 From: Ilya Pospelov Date: Wed, 18 May 2022 09:35:11 +0300 Subject: [PATCH 1/2] add test --- .../config-cwd-case-insensitive-es6/_config.js | 11 +++++++++++ .../samples/config-cwd-case-insensitive-es6/main.js | 1 + .../config-cwd-case-insensitive-es6/rollup.config.js | 9 +++++++++ 3 files changed, 21 insertions(+) create mode 100644 test/cli/samples/config-cwd-case-insensitive-es6/_config.js create mode 100644 test/cli/samples/config-cwd-case-insensitive-es6/main.js create mode 100644 test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.js diff --git a/test/cli/samples/config-cwd-case-insensitive-es6/_config.js b/test/cli/samples/config-cwd-case-insensitive-es6/_config.js new file mode 100644 index 00000000000..8fc7b6c5aa9 --- /dev/null +++ b/test/cli/samples/config-cwd-case-insensitive-es6/_config.js @@ -0,0 +1,11 @@ +function toggleCase(s) { + return s == s.toLowerCase() ? s.toUpperCase() : s.toLowerCase(); +} + +module.exports = { + onlyWindows: true, + description: "can load ES6 config with cwd that doesn't match realpath", + command: 'rollup -c', + cwd: __dirname.replace(/^[A-Z]:\\/i, toggleCase), + execute: true +}; diff --git a/test/cli/samples/config-cwd-case-insensitive-es6/main.js b/test/cli/samples/config-cwd-case-insensitive-es6/main.js new file mode 100644 index 00000000000..df16c1b06b9 --- /dev/null +++ b/test/cli/samples/config-cwd-case-insensitive-es6/main.js @@ -0,0 +1 @@ +assert.equal( ANSWER, 42 ); diff --git a/test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.js b/test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.js new file mode 100644 index 00000000000..dee04a33fb1 --- /dev/null +++ b/test/cli/samples/config-cwd-case-insensitive-es6/rollup.config.js @@ -0,0 +1,9 @@ +import replace from '@rollup/plugin-replace'; + +export default { + input: 'main.js', + output: { + format: 'cjs' + }, + plugins: [replace({ preventAssignment: true, ANSWER: 42 })] +}; From 916df463d4917495f85a62490beda49546bc35ae Mon Sep 17 00:00:00 2001 From: Ilya Pospelov Date: Wed, 18 May 2022 10:29:20 +0300 Subject: [PATCH 2/2] fix --- cli/run/loadConfigFile.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cli/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts index 946d2d4752b..1d407162e7a 100644 --- a/cli/run/loadConfigFile.ts +++ b/cli/run/loadConfigFile.ts @@ -1,4 +1,3 @@ -import { promises as fs } from 'fs'; import { extname, isAbsolute } from 'path'; import { version } from 'process'; import { pathToFileURL } from 'url'; @@ -103,8 +102,8 @@ async function getDefaultFromTranspiledConfigFile( return loadConfigFromBundledFile(fileName, code); } -async function loadConfigFromBundledFile(fileName: string, bundledCode: string): Promise { - const resolvedFileName = await fs.realpath(fileName); +function loadConfigFromBundledFile(fileName: string, bundledCode: string): unknown { + const resolvedFileName = require.resolve(fileName); const extension = extname(resolvedFileName); const defaultLoader = require.extensions[extension]; require.extensions[extension] = (module: NodeModule, requiredFileName: string) => {