rollup 3.0.0-3 → 3.0.0-6

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-2
-	Sat, 30 Jul 2022 12:51:34 GMT - commit 41906cedefbc03640d6e8ca23ce6975f3bb5c6a1
+	Rollup.js v3.0.0-5
+	Tue, 06 Sep 2022 05:29:28 GMT - commit 1d085668121abe6be83c28c212a02c181c16d2b8
 
 	https://github.com/rollup/rollup
 
@@ -9,11 +9,10 @@
 */
 'use strict';
 
-const require$$0 = require('path');
-const url = require('url');
-const require$$0$1 = require('fs');
-const require$$2 = require('util');
-const process$1 = require('process');
+const node_fs = require('node:fs');
+const node_path = require('node:path');
+const process$1 = require('node:process');
+const node_url = require('node:url');
 const tty = require('tty');
 const rollup = require('./rollup.js');
 const mergeOptions = require('./mergeOptions.js');
@@ -173,122 +172,6 @@ function handleError(err, recover = false) {
         process$1.exit(1);
 }
 
-var getPackageType$2 = {exports: {}};
-
-const path$2 = require$$0;
-
-function isNodeModules$2(directory) {
-	let basename = path$2.basename(directory);
-	/* istanbul ignore next: platform specific branch */
-	if (path$2.sep === '\\') {
-		basename = basename.toLowerCase();
-	}
-
-	return basename === 'node_modules';
-}
-
-var isNodeModules_1 = isNodeModules$2;
-
-var cache = new Map();
-
-const path$1 = require$$0;
-const {promisify} = require$$2;
-const readFile = promisify(require$$0$1.readFile);
-
-const isNodeModules$1 = isNodeModules_1;
-const resultsCache$1 = cache;
-
-const promiseCache = new Map();
-
-async function getDirectoryTypeActual$1(directory) {
-	if (isNodeModules$1(directory)) {
-		return 'commonjs';
-	}
-
-	try {
-		return JSON.parse(await readFile(path$1.resolve(directory, 'package.json'))).type || 'commonjs';
-	} catch (_) {
-	}
-
-	const parent = path$1.dirname(directory);
-	if (parent === directory) {
-		return 'commonjs';
-	}
-
-	return getDirectoryType$1(parent);
-}
-
-async function getDirectoryType$1(directory) {
-	if (resultsCache$1.has(directory)) {
-		return resultsCache$1.get(directory);
-	}
-
-	if (promiseCache.has(directory)) {
-		return promiseCache.get(directory);
-	}
-
-	const promise = getDirectoryTypeActual$1(directory);
-	promiseCache.set(directory, promise);
-	const result = await promise;
-	resultsCache$1.set(directory, result);
-	promiseCache.delete(directory);
-
-	return result;
-}
-
-function getPackageType$1(filename) {
-	return getDirectoryType$1(path$1.resolve(path$1.dirname(filename)));
-}
-
-var async = getPackageType$1;
-
-const path = require$$0;
-const {readFileSync} = require$$0$1;
-
-const isNodeModules = isNodeModules_1;
-const resultsCache = cache;
-
-function getDirectoryTypeActual(directory) {
-	if (isNodeModules(directory)) {
-		return 'commonjs';
-	}
-
-	try {
-		return JSON.parse(readFileSync(path.resolve(directory, 'package.json'))).type || 'commonjs';
-	} catch (_) {
-	}
-
-	const parent = path.dirname(directory);
-	if (parent === directory) {
-		return 'commonjs';
-	}
-
-	return getDirectoryType(parent);
-}
-
-function getDirectoryType(directory) {
-	if (resultsCache.has(directory)) {
-		return resultsCache.get(directory);
-	}
-
-	const result = getDirectoryTypeActual(directory);
-	resultsCache.set(directory, result);
-
-	return result;
-}
-
-function getPackageTypeSync$1(filename) {
-	return getDirectoryType(path.resolve(path.dirname(filename)));
-}
-
-var sync = getPackageTypeSync$1;
-
-const getPackageType = async;
-const getPackageTypeSync = sync;
-
-getPackageType$2.exports = filename => getPackageType(filename);
-getPackageType$2.exports.sync = getPackageTypeSync;
-
 function batchWarnings() {
     let count = 0;
     const deferredWarnings = new Map();
@@ -621,11 +504,11 @@ async function loadAndRegisterPlugin(inputOptions, pluginText) {
         if (!plugin) {
             try {
                 if (pluginText[0] == '.')
-                    pluginText = require$$0.resolve(pluginText);
+                    pluginText = node_path.resolve(pluginText);
                 // Windows absolute paths must be specified as file:// protocol URL
                 // Note that we do not have coverage for Windows-only code paths
                 else if (pluginText.match(/^[A-Za-z]:\\/)) {
-                    pluginText = url.pathToFileURL(require$$0.resolve(pluginText)).href;
+                    pluginText = node_url.pathToFileURL(node_path.resolve(pluginText)).href;
                 }
                 plugin = await requireOrImport(pluginText);
             }
@@ -664,7 +547,7 @@ async function requireOrImport(pluginPath) {
 }
 
 async function loadConfigFile(fileName, commandOptions = {}) {
-    const configs = await loadConfigsFromFile(fileName, commandOptions);
+    const configs = await getConfigList(getDefaultFromCjs(await getConfigFileExport(fileName, commandOptions)), commandOptions);
     const warnings = batchWarnings();
     try {
         const normalizedConfigs = [];
@@ -680,77 +563,91 @@ async function loadConfigFile(fileName, commandOptions = {}) {
         throw err;
     }
 }
-async function loadConfigsFromFile(fileName, commandOptions) {
-    const extension = require$$0.extname(fileName);
-    const configFileExport = commandOptions.configPlugin ||
-        // We always transpile the .js non-module case because many legacy code bases rely on this
-        (extension === '.js' && getPackageType$2.exports.sync(fileName) !== 'module')
-        ? await getDefaultFromTranspiledConfigFile(fileName, commandOptions)
-        : getDefaultFromCjs((await import(url.pathToFileURL(fileName).href)).default);
-    return getConfigList(configFileExport, commandOptions);
+async function getConfigFileExport(fileName, commandOptions) {
+    if (commandOptions.configPlugin || commandOptions.bundleConfigAsCjs) {
+        try {
+            return await loadTranspiledConfigFile(fileName, commandOptions);
+        }
+        catch (err) {
+            if (err.message.includes('not defined in ES module scope')) {
+                return rollup.error(rollup.errCannotBundleConfigAsEsm(err));
+            }
+            throw err;
+        }
+    }
+    let cannotLoadEsm = false;
+    const handleWarning = (warning) => {
+        if (warning.message.includes('To load an ES module')) {
+            cannotLoadEsm = true;
+        }
+    };
+    process$1.on('warning', handleWarning);
+    try {
+        const fileUrl = node_url.pathToFileURL(fileName);
+        if (process$1.env.ROLLUP_WATCH) {
+            // We are adding the current date to allow reloads in watch mode
+            fileUrl.search = `?${Date.now()}`;
+        }
+        return (await import(fileUrl.href)).default;
+    }
+    catch (err) {
+        if (cannotLoadEsm) {
+            return rollup.error(rollup.errCannotLoadConfigAsCjs(err));
+        }
+        if (err.message.includes('not defined in ES module scope')) {
+            return rollup.error(rollup.errCannotLoadConfigAsEsm(err));
+        }
+        throw err;
+    }
+    finally {
+        process$1.off('warning', handleWarning);
+    }
 }
 function getDefaultFromCjs(namespace) {
-    return namespace.__esModule ? namespace.default : namespace;
+    return namespace.default || namespace;
 }
-async function getDefaultFromTranspiledConfigFile(fileName, commandOptions) {
+async function loadTranspiledConfigFile(fileName, { bundleConfigAsCjs, configPlugin, silent }) {
     const warnings = batchWarnings();
     const inputOptions = {
-        external: (id) => (id[0] !== '.' && !require$$0.isAbsolute(id)) || id.slice(-5, id.length) === '.json',
+        external: (id) => (id[0] !== '.' && !node_path.isAbsolute(id)) || id.slice(-5, id.length) === '.json',
         input: fileName,
         onwarn: warnings.add,
         plugins: [],
         treeshake: false
     };
-    await addPluginsFromCommandOption(commandOptions.configPlugin, inputOptions);
+    await addPluginsFromCommandOption(configPlugin, inputOptions);
     const bundle = await rollup.rollup(inputOptions);
-    if (!commandOptions.silent && warnings.count > 0) {
+    if (!silent && warnings.count > 0) {
         stderr(bold(`loaded ${rollup.relativeId(fileName)} with warnings`));
         warnings.flush();
     }
     const { output: [{ code }] } = await bundle.generate({
         exports: 'named',
-        format: 'cjs',
+        format: bundleConfigAsCjs ? 'cjs' : 'es',
         plugins: [
             {
                 name: 'transpile-import-meta',
                 resolveImportMeta(property, { moduleId }) {
                     if (property === 'url') {
-                        return `'${url.pathToFileURL(moduleId).href}'`;
+                        return `'${node_url.pathToFileURL(moduleId).href}'`;
                     }
                     if (property == null) {
-                        return `{url:'${url.pathToFileURL(moduleId).href}'}`;
+                        return `{url:'${node_url.pathToFileURL(moduleId).href}'}`;
                     }
                 }
             }
         ]
     });
-    return loadConfigFromBundledFile(fileName, code);
+    return loadConfigFromWrittenFile(node_path.join(node_path.dirname(fileName), `rollup.config-${Date.now()}.${bundleConfigAsCjs ? 'cjs' : 'mjs'}`), code);
 }
-function loadConfigFromBundledFile(fileName, bundledCode) {
-    const resolvedFileName = require.resolve(fileName);
-    const extension = require$$0.extname(resolvedFileName);
-    const defaultLoader = require.extensions[extension];
-    require.extensions[extension] = (module, requiredFileName) => {
-        if (requiredFileName === resolvedFileName) {
-            module._compile(bundledCode, requiredFileName);
-        }
-        else {
-            if (defaultLoader) {
-                defaultLoader(module, requiredFileName);
-            }
-        }
-    };
-    delete require.cache[resolvedFileName];
+async function loadConfigFromWrittenFile(bundledFileName, bundledCode) {
+    await node_fs.promises.writeFile(bundledFileName, bundledCode);
     try {
-        const config = getDefaultFromCjs(require(fileName));
-        require.extensions[extension] = defaultLoader;
-        return config;
+        return (await import(node_url.pathToFileURL(bundledFileName).href)).default;
     }
-    catch (err) {
-        if (err.code === 'ERR_REQUIRE_ESM') {
-            return rollup.error(rollup.errTranspiledEsmConfig(fileName));
-        }
-        throw err;
+    finally {
+        // Not awaiting here saves some ms while potentially hiding a non-critical error
+        node_fs.promises.unlink(bundledFileName);
     }
 }
 async function getConfigList(configFileExport, commandOptions) {

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.0.0-2
-	Sat, 30 Jul 2022 12:51:34 GMT - commit 41906cedefbc03640d6e8ca23ce6975f3bb5c6a1
+	Rollup.js v3.0.0-5
+	Tue, 06 Sep 2022 05:29:28 GMT - commit 1d085668121abe6be83c28c212a02c181c16d2b8
 
 	https://github.com/rollup/rollup
 
@@ -37,7 +37,7 @@ function mergeOptions(config, rawCommandOptions = { external: [], globals: undef
     if (outputOptionsArray.length === 0)
         outputOptionsArray.push({});
     const outputOptions = outputOptionsArray.map(singleOutputOptions => mergeOutputOptions(singleOutputOptions, command, warn));
-    rollup.warnUnknownOptions(command, Object.keys(inputOptions).concat(Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'), Object.keys(commandAliases), 'config', 'environment', 'plugin', 'silent', 'failAfterWarnings', 'stdin', 'waitForBundleInput', 'configPlugin'), 'CLI flags', warn, /^_$|output$|config/);
+    rollup.warnUnknownOptions(command, Object.keys(inputOptions).concat(Object.keys(outputOptions[0]).filter(option => option !== 'sourcemapPathTransform'), Object.keys(commandAliases), 'bundleConfigAsCjs', 'config', 'environment', 'plugin', 'silent', 'failAfterWarnings', 'stdin', 'waitForBundleInput', 'configPlugin'), 'CLI flags', warn, /^_$|output$|config/);
     inputOptions.output = outputOptions;
     return inputOptions;
 }