diff --git a/.changeset/silent-boats-speak.md b/.changeset/silent-boats-speak.md new file mode 100644 index 0000000..db5946e --- /dev/null +++ b/.changeset/silent-boats-speak.md @@ -0,0 +1,5 @@ +--- +'@emigrate/plugin-tools': minor +--- + +Include "@emigrate/" in the plugin prefix list, i.e. when searching for the plugin "blaha" it will look for the packages "blaha", "@emigrate/blaha", "@emigrate/plugin-blaha" and "emigrate-plugin-blaha" and use the first of them that exists diff --git a/packages/plugin-tools/src/index.ts b/packages/plugin-tools/src/index.ts index 9cfb4da..91d30f2 100644 --- a/packages/plugin-tools/src/index.ts +++ b/packages/plugin-tools/src/index.ts @@ -43,6 +43,9 @@ export const isEmigrateReporter = (plugin: any): plugin is EmigrateReporter => { 'onCollectedMigrations', 'onLockedMigrations', 'onNewMigration', + 'onMigrationRemoveStart', + 'onMigrationRemoveSuccess', + 'onMigrationRemoveError', 'onMigrationStart', 'onMigrationSuccess', 'onMigrationError', @@ -139,18 +142,22 @@ const getOrLoad = async (potentials: Array>, check: ( }; const getImportFromEsm = async () => { - let importFromEsm = await import('import-from-esm'); + const importFromEsm = await import('import-from-esm'); // Because of "allowSyntheticDefaultImports" we need to do this ugly hack if ((importFromEsm as any).default) { - importFromEsm = (importFromEsm as any).default as unknown as typeof importFromEsm; + return (importFromEsm as any).default as unknown as typeof importFromEsm; } return importFromEsm; }; export const loadStorage = async (name: string): Promise => { - return load(name, ['@emigrate/storage-', 'emigrate-storage-', '@emigrate/plugin-storage-'], isEmigrateStorage); + return load( + name, + ['@emigrate/', '@emigrate/storage-', 'emigrate-storage-', '@emigrate/plugin-storage-'], + isEmigrateStorage, + ); }; export const loadReporter = async (name: string): Promise => { @@ -161,9 +168,13 @@ export const loadPlugin = async ( type: T, plugin: string, ): Promise | undefined> => { - return load(plugin, ['@emigrate/plugin-', 'emigrate-plugin-'], (value: unknown): value is PluginFromType => { - return isPluginOfType(type, value); - }); + return load( + plugin, + ['@emigrate/', '@emigrate/plugin-', 'emigrate-plugin-'], + (value: unknown): value is PluginFromType => { + return isPluginOfType(type, value); + }, + ); }; const load = async (