@@ -42,11 +42,10 @@ function getSvelteDependencies(
4242 . map ( ( dep ) => resolveDependencyData ( dep , localRequire ) )
4343 . filter ( Boolean ) as DependencyData [ ] ;
4444 for ( const { pkg, dir } of resolvedDeps ) {
45- const type = getSvelteDependencyType ( pkg ) ;
46- if ( ! type ) continue ;
47- result . push ( { name : pkg . name , type, pkg, dir, path } ) ;
45+ if ( ! isSvelteLib ( pkg ) ) continue ;
46+ result . push ( { name : pkg . name , pkg, dir, path } ) ;
4847 // continue crawling for component libraries so we can optimize them, js libraries are fine
49- if ( type === 'component-library' && pkg . dependencies ) {
48+ if ( pkg . dependencies ) {
5049 let dependencyNames = Object . keys ( pkg . dependencies ) ;
5150 const circular = dependencyNames . filter ( ( name ) => path . includes ( name ) ) ;
5251 if ( circular . length > 0 ) {
@@ -107,22 +106,8 @@ function parsePkg(dir: string, silent = false): Pkg | void {
107106 }
108107}
109108
110- function getSvelteDependencyType ( pkg : Pkg ) : SvelteDependencyType | undefined {
111- if ( isSvelteComponentLib ( pkg ) ) {
112- return 'component-library' ;
113- } else if ( isSvelteLib ( pkg ) ) {
114- return 'js-library' ;
115- } else {
116- return undefined ;
117- }
118- }
119-
120- function isSvelteComponentLib ( pkg : Pkg ) {
121- return ! ! pkg . svelte ;
122- }
123-
124109function isSvelteLib ( pkg : Pkg ) {
125- return ! ! pkg . dependencies ?. svelte || ! ! pkg . peerDependencies ?. svelte ;
110+ return ! ! pkg . svelte || ! ! pkg . dependencies ?. svelte || ! ! pkg . peerDependencies ?. svelte ;
126111}
127112
128113const COMMON_DEPENDENCIES_WITHOUT_SVELTE_FIELD = [
@@ -217,16 +202,11 @@ interface DependencyData {
217202
218203export interface SvelteDependency {
219204 name : string ;
220- type : SvelteDependencyType ;
221205 dir : string ;
222206 pkg : Pkg ;
223207 path : string [ ] ;
224208}
225209
226- // component-library => exports svelte components
227- // js-library => only uses svelte api, no components
228- export type SvelteDependencyType = 'component-library' | 'js-library' ;
229-
230210export interface Pkg {
231211 name : string ;
232212 svelte ?: string ;
0 commit comments