merge: resolve conflicts in alias types/tests; adopt robust bundle close in tests

Author: CharlieHelps

.config/tsconfig.plugin.json

@@ -1,4 +1,6 @@
 {
+  // Important: this config is symlinked into package directories as `tsconfig.json`.
+  // The `extends` path must therefore be relative to the symlink location (e.g. packages/<pkg>/).
   "extends": "../../.config/tsconfig.base.json",
   "compilerOptions": {
     "noEmit": false,

packages/alias/src/index.ts

@@ -78,7 +78,7 @@ function getEntries({ entries, customResolver }: RollupAliasOptions): readonly R
   });
 }
 
-function getHookFunction<T extends Function>(hook: T | { handler?: T }): T | null {
+function getHookFunction<T extends (...args: any[]) => any>(hook: T | { handler?: T }): T | null {
   if (typeof hook === 'function') {
     return hook;
   }
@@ -142,7 +142,7 @@ export default function alias(options: RollupAliasOptions = {}): Plugin {
 
         if (!path.isAbsolute(updatedId)) {
           this.warn(
-            `rewrote ${importee} to ${updatedId} but was not an abolute path and was not handled by other plugins. ` +
+            `rewrote ${importee} to ${updatedId} but was not an absolute path and was not handled by other plugins. ` +
               `This will lead to duplicated modules for the same path. ` +
               `To avoid duplicating modules, you should resolve to an absolute path.`
           );

packages/alias/test/alias.test.ts

@@ -489,7 +489,7 @@ describe('plugin-alias', () => {
     expect(warnList).toMatchObject([
       {
         message:
-          '[plugin alias] rewrote @/warn-importee.js to test/fixtures/folder/warn-importee.js but was not an abolute path and was not handled by other plugins. ' +
+          '[plugin alias] rewrote @/warn-importee.js to test/fixtures/folder/warn-importee.js but was not an absolute path and was not handled by other plugins. ' +
           'This will lead to duplicated modules for the same path. ' +
           'To avoid duplicating modules, you should resolve to an absolute path.',
         code: 'PLUGIN_WARNING',