github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix extension reloading for local bundle extensions (#18287)

Browse Source 
Fixes #17694
This commit is contained in:
Nicola Krumschmidt
2023-04-21 20:23:53 +02:00
committed by GitHub
parent 7382530696
commit b69f380275
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/extensions.ts
View File

@@ -294,8 +294,10 @@ class ExtensionManager {
private initializeWatcher(): void {
logger.info('Watching extensions for changes...');
const localExtensionPaths = NESTED_EXTENSION_TYPES.flatMap((type) => {
const typeDir = path.posix.join(pathToRelativeUrl(env['EXTENSIONS_PATH']), pluralize(type));
const extensionDirUrl = pathToRelativeUrl(env['EXTENSIONS_PATH']);
const localExtensionUrls = NESTED_EXTENSION_TYPES.flatMap((type) => {
const typeDir = path.posix.join(extensionDirUrl, pluralize(type));
const fileExts = ['js', 'mjs', 'cjs'];
if (isIn(type, HYBRID_EXTENSION_TYPES)) {
@@ -308,9 +310,12 @@ class ExtensionManager {
}
});
this.watcher = chokidar.watch([path.resolve('package.json'), ...localExtensionPaths], {
ignoreInitial: true,
});
this.watcher = chokidar.watch(
[path.resolve('package.json'), path.posix.join(extensionDirUrl, '*', 'package.json'), ...localExtensionUrls],
{
ignoreInitial: true,
}
);
this.watcher
.on('add', () => this.reload())
@@ -330,7 +335,7 @@ class ExtensionManager {
if (this.watcher) {
const toPackageExtensionPaths = (extensions: Extension[]) =>
extensions
.filter((extension) => !extension.local)
.filter((extension) => !extension.local || extension.type === 'bundle')
.flatMap((extension) =>
isTypeIn(extension, HYBRID_EXTENSION_TYPES) || extension.type === 'bundle'
? [