fixup! feat evanw#3666 add optional exclude option for plugin `onLoad…

…` and `onResolve` hooks
sod · Feb 24, 2024 · f168897 · f168897
1 parent 6d2d857
commit f168897
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/api/api_impl.go b/pkg/api/api_impl.go
@@ -1929,7 +1929,7 @@ func resolveKindToImportKind(kind ResolveKind) ast.ImportKind {
 
 func (impl *pluginImpl) onResolve(options OnResolveOptions, callback func(OnResolveArgs) (OnResolveResult, error)) {
 	filter, err := config.CompileFilterForPlugin(impl.plugin.Name, "OnResolve", options.Filter)
-	if filter == nil {
+	if filter == nil || err != nil  {
 		impl.log.AddError(nil, logger.Range{}, err.Error())
 		return
 	}
@@ -1985,7 +1985,7 @@ func (impl *pluginImpl) onResolve(options OnResolveOptions, callback func(OnReso
 
 func (impl *pluginImpl) onLoad(options OnLoadOptions, callback func(OnLoadArgs) (OnLoadResult, error)) {
 	filter, err := config.CompileFilterForPlugin(impl.plugin.Name, "OnLoad", options.Filter)
-	if err != nil {
+	if filter == nil || err != nil {
 		impl.log.AddError(nil, logger.Range{}, err.Error())
 		return
 	}

diff --git a/scripts/plugin-tests.js b/scripts/plugin-tests.js
@@ -2354,7 +2354,7 @@ error: Invalid path suffix "%what" returned from plugin (must start with "?" or
       ],
       onLoad: [
         { path: pathFor('a') },
-        // { path: pathFor('c') }, should have been excluded via `exclude: /_b(\.js)?$/`
+        // { path: pathFor('b') }, should have been excluded via `exclude: /_b(\.js)?$/`
         { path: pathFor('c') },
       ],
     }, null, 2)