Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/resources/overlay/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@
<script src="https://www.youtube.com/iframe_api"></script>

<% for(let jsDep of dependencies.js) { %>
<script src="<%-jsDep%>"></script>
<% if (jsDep.module) { %>
<script type="module" src="<%-jsDep.url%>"></script>
<% } else { %>
<script src="<%-jsDep.url%>"></script>
<% } %>
<% } %>

<script>
Expand Down
14 changes: 12 additions & 2 deletions src/server/http-server-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,20 @@ class HttpServerManager extends EventEmitter {
const combinedJsDeps = [...new Set([
...effectDefs
.filter(ed => ed.dependencies?.js?.length)
.map(ed => ed.dependencies.js),
.map(ed => ed.dependencies.js.map((jsDep) => {
if (typeof jsDep === "string") {
return { module: false, url: jsDep };
}
return jsDep;
})),
...widgetExtensions
.filter(we => we.dependencies?.js?.length)
.map(we => we.dependencies.js)
.map(we => we.dependencies.js.map((jsDep) => {
if (typeof jsDep === "string") {
return { module: false, url: jsDep };
}
return jsDep;
}))
].flat())];

const combinedGlobalStyles = [
Expand Down
2 changes: 1 addition & 1 deletion src/types/effects.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export type OverlayExtension<OverlayData = unknown> = {
dependencies?: {
globalStyles?: string;
css?: string[];
js?: string[];
js?: Array<string | { module: boolean, url: string }>;
};
event: {
name: string;
Expand Down
2 changes: 1 addition & 1 deletion src/types/overlay-widgets.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export type OverlayWidgetType<
overlayExtension: {
dependencies?: {
css?: string[];
js?: string[];
js?: Array<string | { module: boolean, url: string }>;
globalStyles?: string;
};

Expand Down