@sveltejs/vite-plugin-svelte 1.0.0-next.34 → 1.0.0-next.35

package/src/index.ts

@@ -27,7 +27,7 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 	}
 	validateInlineOptions(inlineOptions);
 	const cache = new VitePluginSvelteCache();
-	const pkg_export_errors = new Set();
+	const pkg_resolve_errors = new Set();
 	// updated in configResolved hook
 	let requestParser: IdParser;
 	let options: ResolvedOptions;
@@ -137,21 +137,13 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 			}
 
 			try {
-				const resolved = resolveViaPackageJsonSvelte(importee, importer);
+				const resolved = resolveViaPackageJsonSvelte(importee, importer, cache);
 				if (resolved) {
 					log.debug(`resolveId resolved ${resolved} via package.json svelte field of ${importee}`);
 					return resolved;
 				}
 			} catch (err) {
-				switch (err.code) {
-					case 'ERR_PACKAGE_PATH_NOT_EXPORTED':
-						pkg_export_errors.add(importee);
-						return null;
-					case 'MODULE_NOT_FOUND':
-						return null;
-					default:
-						throw err;
-				}
+				pkg_resolve_errors.add(importee);
 			}
 		},
 
@@ -206,10 +198,11 @@ export function svelte(inlineOptions?: Partial<Options>): Plugin {
 		 */
 		// TODO generateBundle isn't called by vite, is buildEnd enough or should it be logged once per violation in resolve
 		buildEnd() {
-			if (pkg_export_errors.size > 0) {
+			if (pkg_resolve_errors.size > 0) {
 				log.warn(
-					`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.`,
-					Array.from(pkg_export_errors, (s) => `- ${s}`).join('\n')
+					`vite-plugin-svelte was unable to find package.json of the following packages and wasn't able to resolve via their "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.
+					${Array.from(pkg_resolve_errors, (s) => `- ${s}`).join('\n')}`.replace(/\t/g, '')
 				);
 			}
 		}

package/src/utils/dependencies.ts

@@ -66,7 +66,10 @@ function getSvelteDependencies(
 	return result;
 }
 
-function resolveDependencyData(dep: string, localRequire: NodeRequire): DependencyData | void {
+export function resolveDependencyData(
+	dep: string,
+	localRequire: NodeRequire
+): DependencyData | void {
 	try {
 		const pkgJson = `${dep}/package.json`;
 		const pkg = localRequire(pkgJson);
@@ -166,7 +169,7 @@ const COMMON_PREFIXES_WITHOUT_SVELTE_FIELD = [
  * @param dependency {string}
  * @returns {boolean} true if it is a dependency without a svelte field
  */
-function is_common_without_svelte_field(dependency: string): boolean {
+export function is_common_without_svelte_field(dependency: string): boolean {
 	return (
 		COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD.includes(dependency) ||
 		COMMON_PREFIXES_WITHOUT_SVELTE_FIELD.some(

package/src/utils/resolve.ts

@@ -1,14 +1,29 @@
 import path from 'path';
-import fs from 'fs';
-// @ts-ignore
-import relative from 'require-relative';
+import { createRequire } from 'module';
+import { is_common_without_svelte_field, resolveDependencyData } from './dependencies';
+import { VitePluginSvelteCache } from './vite-plugin-svelte-cache';
 
-export function resolveViaPackageJsonSvelte(importee: string, importer?: string): string | void {
-	if (importer && isBareImport(importee)) {
-		const importeePkgFile = relative.resolve(`${importee}/package.json`, path.dirname(importer));
-		const importeePkg = JSON.parse(fs.readFileSync(importeePkgFile, { encoding: 'utf-8' }));
-		if (importeePkg.svelte) {
-			return path.resolve(path.dirname(importeePkgFile), importeePkg.svelte);
+export function resolveViaPackageJsonSvelte(
+	importee: string,
+	importer: string | undefined,
+	cache: VitePluginSvelteCache
+): string | void {
+	if (importer && isBareImport(importee) && !is_common_without_svelte_field(importee)) {
+		const cached = cache.getResolvedSvelteField(importee, importer);
+		if (cached) {
+			return cached;
+		}
+		const localRequire = createRequire(importer);
+		const pkgData = resolveDependencyData(importee, localRequire);
+		if (pkgData) {
+			const { pkg, dir } = pkgData;
+			if (pkg.svelte) {
+				const result = path.resolve(dir, pkg.svelte);
+				cache.setResolvedSvelteField(importee, importer, result);
+				return result;
+			}
+		} else {
+			throw new Error(`failed to resolve package.json of ${importee} imported by ${importer}`);
 		}
 	}
 }

package/src/utils/vite-plugin-svelte-cache.ts

@@ -6,6 +6,7 @@ export class VitePluginSvelteCache {
 	private _js = new Map<string, Code>();
 	private _dependencies = new Map<string, string[]>();
 	private _dependants = new Map<string, Set<string>>();
+	private _resolvedSvelteFields = new Map<string, string>();
 
 	public update(compileData: CompileData) {
 		this.updateCSS(compileData);
@@ -80,4 +81,23 @@ export class VitePluginSvelteCache {
 		const dependants = this._dependants.get(path);
 		return dependants ? [...dependants] : [];
 	}
+
+	public getResolvedSvelteField(name: string, importer?: string): string | void {
+		return this._resolvedSvelteFields.get(this._getResolvedSvelteFieldKey(name, importer));
+	}
+
+	public setResolvedSvelteField(
+		importee: string,
+		importer: string | undefined = undefined,
+		resolvedSvelte: string
+	) {
+		this._resolvedSvelteFields.set(
+			this._getResolvedSvelteFieldKey(importee, importer),
+			resolvedSvelte
+		);
+	}
+
+	private _getResolvedSvelteFieldKey(importee: string, importer?: string): string {
+		return importer ? `${importer} > ${importee}` : importee;
+	}
 }