Merge pull request #198 from traed/master

Add option to ignore warnings

Author: Rich-Harris

index.js

@@ -1,10 +1,10 @@
 const path = require('path');
+const fs = require('fs');
 const relative = require('require-relative');
 const { createFilter } = require('@rollup/pluginutils');
 const { compile, preprocess } = require('svelte/compiler');
 
 const PREFIX = '[rollup-plugin-svelte]';
-const pkg_export_errors = new Set();
 
 const plugin_options = new Set([
 	'emitCss',
@@ -15,6 +15,54 @@ const plugin_options = new Set([
 	'preprocess'
 ]);
 
+const parse_pkg = function(dir) {
+	const pkg_file = path.join(dir, 'package.json');
+
+	try {
+		return JSON.parse(fs.readFileSync(pkg_file, 'utf-8'));
+	} catch (e) {
+		return false;
+	}
+}
+
+const get_dir = (file, importer) => relative.resolve(file, path.dirname(importer));
+
+const find_pkg = function(name, importer) {
+	let dir, pkg;
+
+	try {
+		const file = `${name}/package.json`;
+		const resolved = get_dir(file, importer);
+		dir = path.dirname(resolved);
+		pkg = require(resolved);
+	} catch (err) {
+		if (err.code === 'MODULE_NOT_FOUND') return {pkg: null, dir};
+		if (err.code === 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
+			dir = path.dirname(get_dir(file, importer));
+			
+			while (dir) {
+				pkg = parse_pkg(dir);
+
+				if (pkg && pkg.name === name) {
+					return {pkg, dir};
+				}
+
+				const parent = path.dirname(dir);
+				if (parent === dir) {
+					break;
+				}
+				dir = parent;
+			}
+
+			return {pkg: null, dir};
+		}
+
+		throw err;
+	}
+
+	return {pkg, dir};
+}
+
 /**
  * @param [options] {Partial<import('.').Options>}
  * @returns {import('rollup').Plugin}
@@ -55,27 +103,15 @@ module.exports = function (options = {}) {
 			// if this is a bare import, see if there's a valid pkg.svelte
 			const parts = importee.split('/');
 
-			let dir, pkg, name = parts.shift();
+			let name = parts.shift();
 			if (name && name[0] === '@') {
 				name += `/${parts.shift()}`;
 			}
 
-			try {
-				const file = `${name}/package.json`;
-				const resolved = relative.resolve(file, path.dirname(importer));
-				dir = path.dirname(resolved);
-				pkg = require(resolved);
-			} catch (err) {
-				if (err.code === 'MODULE_NOT_FOUND') return null;
-				if (err.code === 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
-					pkg_export_errors.add(name);
-					return null;
-				}
-				throw err;
-			}
+			const {pkg, dir} = find_pkg(name, importer);
 
 			// use pkg.svelte
-			if (parts.length === 0 && pkg.svelte) {
+			if (parts.length === 0 && pkg && pkg.svelte) {
 				return path.resolve(dir, pkg.svelte);
 			}
 		},
@@ -129,16 +165,6 @@ module.exports = function (options = {}) {
 			}
 
 			return compiled.js;
-		},
-
-		/**
-		 * All resolutions done; display warnings wrt `package.json` access.
-		 */
-		generateBundle() {
-			if (pkg_export_errors.size > 0) {
-				console.warn(`\n${PREFIX} The following packages did not export their \`package.json\` file so we could not check the "svelte" field. If you had difficulties importing svelte components from a package, then please contact the author and ask them to export the package.json file.\n`);
-				console.warn(Array.from(pkg_export_errors, s => `- ${s}`).join('\n') + '\n');
-			}
 		}
 	};
 };