Handle Rollup command line args better

Author: James Goldie

_extensions/sverto/rollup.config.js

@@ -9,64 +9,62 @@ const path = require('node:path')
 const production = !process.env.ROLLUP_WATCH;
 
 
-/* get svelte input paths (split by :) from cmd line arg */
+/* export an array of rollup configs - one for each input svelte file - using
+   additional command line args supplied from lua */
+export default cmd => {
 
-const svelteInputPaths = process.argv
-	.filter(d => d.startsWith("--svelte-in-paths="))
-	.map(d => d.replace("--svelte-in-paths=", ""))
-	.join(":")
-	.split(":")
-	.filter(d => d != "")
+	const svelteInputPaths =
+		cmd["svelte-in-paths"].split(":").filter(d => d != "")
 
-// if no svelte paths, bail out early
-if (svelteInputPaths == undefined || svelteInputPaths.length == 0) {
-	console.log("No Svelte filtes found; skipping Svelte compilation")
-	Deno.exit(0)
-}
-
-/* get quarto render dir from cmd line arg */
+	// if no svelte paths, bail out early
+	if (svelteInputPaths == undefined || svelteInputPaths.length == 0) {
+		console.log("No Svelte filtes found; skipping Svelte compilation")
+		process.exit(0)
+	}
 
-let quartoRenderPath = process.argv
-	.filter(d => d.startsWith("--quarto-out-path="))
-	.map(d => d.replace("--quarto-out-path=", ""))
+	/* get quarto render dir from cmd line arg */
+	const quartoRenderPath = cmd["quarto-out-path"]
+	if (quartoRenderPath == undefined) {
+		console.error(
+			"Error: supply a --quarto-out-path. Please report this to " +
+			"the Sverto developer.")
+		process.exit(1)
+	}
 
-if (quartoRenderPath == undefined || quartoRenderPath.length != 1) {
-	console.error("There should be 1 --quarto-out-path argument.")
-}
-quartoRenderPath = quartoRenderPath[0]
+	return svelteInputPaths.map(
 
-/* export an array of rollup configs: one for each input svelte file */
-export default svelteInputPaths.map(
+		svelteFile => ({
+			input: svelteFile,
+			output: {
+				format: "es",
+				dir: path.join(
+					quartoRenderPath,
+					path.dirname(svelteFile)),
+				sourcemap: true
+			},
+			plugins: [
+				svelte({
+					// css is added to the js bundle instead
+					emitCss: false,
+					compilerOptions: {
+						// required for ojs reactivity
+						accessors: true,
+						dev: !production,
+					}
+				}),
+				resolve({
+					browser: true,
+					dedupe: ["svelte"]
+				}),
+				commonjs(),
+				production && terser()
+			]
+		})
+	
+	)
 
-	svelteFile => ({
-		input: svelteFile,
-		output: {
-			format: "es",
-			dir: path.join(
-				quartoRenderPath,
-				path.dirname(svelteFile)),
-			sourcemap: true
-		},
-		plugins: [
-			svelte({
-				// css is added to the js bundle instead
-				emitCss: false,
-				compilerOptions: {
-					// required for ojs reactivity
-					accessors: true,
-					dev: !production,
-				}
-			}),
-			resolve({
-				browser: true,
-				dedupe: ["svelte"]
-			}),
-			commonjs(),
-			production && terser()
-		]
-	})
+}
 
-)
 
 
 

_extensions/sverto/sverto-prerender.lua

@@ -133,7 +133,6 @@ cmd =
   get_cmd_prefix() ..
   "npm run build " ..
   rollup_config .. " -- " ..
-  -- "--silent " ..
   '--quarto-out-path="' .. os.getenv("QUARTO_PROJECT_OUTPUT_DIR") .. '" ' ..
   '--svelte-in-paths="' .. svelte_path_string .. '"'
 

_extensions/sverto/sverto.lua

@@ -98,7 +98,6 @@ function inject_svelte_and_compile(m)
     else
       local svelteCommand =
         "npm run build rollup.config.js -- " ..
-        -- "--silent " ..
         '--quarto-out-path="./" ' ..
         '--svelte-in-paths="' .. sveltePaths .. '"'
       local svelteResult = os.execute(svelteCommand)