From 36654654b936db358141449fb7c4683851ed914a Mon Sep 17 00:00:00 2001
From: Jesper van den Ende <jespertheend@gmail.com>
Date: Fri, 7 Jun 2024 22:05:56 +0200
Subject: [PATCH] Use rollup browser build as dependency

---
 scripts/dev.js                                | 49 +++++++------------
 .../src/tasks/workers/bundleScripts/bundle.js |  6 +--
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/scripts/dev.js b/scripts/dev.js
index f5a2e3c5..823b483a 100755
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@ -104,38 +104,27 @@ export async function dev({
 	}
 
 	if (needsDependencies || needsDevDependencies) {
-		const { dev } = await import("https://deno.land/x/dev@v0.2.0/mod.js");
+		const { downloadNpmPackage, esmify, addTsNocheck } = await import("https://deno.land/x/dev@v0.4.0/mod.js");
 
-		await dev({
-			actions: [
-				// required for during development, can be skipped with ci
-				{
-					type: "downloadNpmPackage",
-					package: "typescript@5.4.5",
-					ignore: !needsDevDependencies,
-				},
+		if (needsDevDependencies) {
+			await downloadNpmPackage({
+				package: "typescript@5.4.5",
+			});
+		}
 
-				// studio dependencies
-				{
-					type: "downloadNpmPackage",
-					package: "rollup@4.18.0",
-				},
-				{
-					type: "downloadNpmPackage",
-					package: "rollup-plugin-resolve-url-objects@0.0.4",
-					downloadDependencies: true,
-				},
-				{
-					type: "esmify",
-					entryPointPath: "npm_packages/rollup/4.18.0/dist/rollup.browser.js",
-					outputPath: "studio/deps/rollup.browser.js",
-				},
-				{
-					type: "esmify",
-					entryPointPath: "npm_packages/rollup-plugin-resolve-url-objects/0.0.4/main.js",
-					outputPath: "studio/deps/rollup-plugin-resolve-url-objects.js",
-				},
-			],
+		await downloadNpmPackage({
+			package: "@rollup/browser@4.18.0",
+		});
+		await addTsNocheck({
+			path: "npm_packages/@rollup/browser/4.18.0"
+		})
+		await downloadNpmPackage({
+			package: "rollup-plugin-resolve-url-objects@0.0.4",
+			downloadDependencies: true,
+		});
+		await esmify({
+			entryPointPath: "npm_packages/rollup-plugin-resolve-url-objects/0.0.4/main.js",
+			outFile: "studio/deps/rollup-plugin-resolve-url-objects.js",
 		});
 	}
 
diff --git a/studio/src/tasks/workers/bundleScripts/bundle.js b/studio/src/tasks/workers/bundleScripts/bundle.js
index f4d72c77..16bee6d6 100644
--- a/studio/src/tasks/workers/bundleScripts/bundle.js
+++ b/studio/src/tasks/workers/bundleScripts/bundle.js
@@ -1,8 +1,8 @@
-import transpiledRollup from "../../../../deps/rollup.browser.js";
+import { rollup as rollupWithoutTypes } from "../../../../../npm_packages/@rollup/browser/4.18.0/dist/es/rollup.browser.js";
 import { resolvePlugin } from "./resolvePlugin.js";
 import resolveUrlObjects from "../../../../deps/rollup-plugin-resolve-url-objects.js";
 
-const rollup = /** @type {import("$rollup")} */ (transpiledRollup);
+const rollup = /** @type {import("$rollup").rollup} */ (rollupWithoutTypes);
 
 /**
  * @typedef BundleOptions
@@ -31,7 +31,7 @@ export async function bundle({ inputPaths, outputPath, readScriptCallbackId, ser
 		return result;
 	};
 
-	const bundle = await rollup.rollup({
+	const bundle = await rollup({
 		input: inputPaths,
 		plugins: [
 			resolvePlugin({