Add dependents for plugins back into dynamic resolving

Author: Inrixia

build/index.ts

@@ -23,7 +23,8 @@ const externals = ["@luna/*", "oby", "react", "react-dom/client", "react/jsx-run
 export const pluginBuildOptions = async (pluginPath: string, opts?: BuildOptions) => {
 	const pluginPackage = await readFile(path.join(pluginPath, "package.json"), "utf8").then(JSON.parse);
 	// Sanitize pluginPackage.name, remove @, replace / with .
-	const safeName = pluginPackage.name.replace(/@/g, "").replace(/\//g, ".");
+	const pkgName = pluginPackage.name;
+	const safeName = pkgName.replace(/@/g, "").replace(/\//g, ".");
 	return <BuildOptions>{
 		...defaultBuildOptions,
 		write: false,
@@ -36,7 +37,15 @@ export const pluginBuildOptions = async (pluginPath: string, opts?: BuildOptions
 		external: [...(opts?.external ?? []), ...externals],
 		plugins: [
 			...(opts?.plugins ?? []),
-			dynamicExternalsPlugin("luna?.core?.modules"),
+			dynamicExternalsPlugin(
+				(module: string) => `
+				const imp = luna?.core?.modules?.["${module}"];
+				if (imp === undefined) throw new Error("Cannot find module ${module} in luna.core.modules");
+				// Icky but it works
+				luna.core.LunaPlugin.plugins["${module}"]?.dependents.add(luna.core.LunaPlugin.plugins["${pkgName}"]);
+				module.exports = imp;
+			`,
+			),
 			fileUrlPlugin,
 			lunaNativePlugin,
 			writeBundlePlugin(path.join(pluginPath, "package.json")),

build/plugins/dynamicExternals.ts

@@ -1,6 +1,6 @@
 import type { Plugin } from "esbuild";
 
-export const dynamicExternalsPlugin = (globalStore: string): Plugin => ({
+export const dynamicExternalsPlugin = (resolveModuleContents: (module: string) => string): Plugin => ({
 	name: "dynamicExternals",
 	setup(build) {
 		const externalsRegex = build.initialOptions.external
@@ -12,11 +12,7 @@ export const dynamicExternalsPlugin = (globalStore: string): Plugin => ({
 			namespace: "dynamicExternals",
 		}));
 		build.onLoad({ filter: /.*/, namespace: "dynamicExternals" }, (args) => ({
-			contents: `
-				const imp = ${globalStore}?.["${args.path}"];
-				if (imp === undefined) throw new Error("Cannot find module '${args.path}' in ${globalStore}'");
-				module.exports = imp;
-			`,
+			contents: resolveModuleContents(args.path),
 		}));
 	},
 });

render/src/LunaPlugin.ts

@@ -354,8 +354,6 @@ export class LunaPlugin {
 			this.exports = await import(blobURL);
 			if (this.exports === undefined) return this.trace.err.throw(`Failed to load. Module exports undefined!`);
 
-			// todo RETURN LunaPlugin.plugins[name]?.dependents.add(this);
-
 			// Ensure loadError is cleared
 			this.loadError._ = undefined;