@elgato/cli 0.1.0-beta.2 → 0.1.0-beta.3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@elgato/cli",
-	"version": "0.1.0-beta.2",
-	"description": "The official CLI for building Node.js Stream Deck plugins.",
+	"version": "0.1.0-beta.3",
+	"description": "CLI tool for building with Stream Deck.",
 	"bin": {
 		"streamdeck": "bin/streamdeck.mjs",
 		"sd": "bin/streamdeck.mjs"

package/template/_.gitignore

@@ -1,6 +1,6 @@
 # Node.js
-node_modules
+node_modules/
 
 # Stream Deck files
-com.*.sdPlugin/bin
-com.*.sdPlugin/logs
+*.sdPlugin/bin
+*.sdPlugin/logs

package/template/rollup.config.mjs.ejs

@@ -0,0 +1,61 @@
+import commonjs from "@rollup/plugin-commonjs";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import terser from "@rollup/plugin-terser";
+import typescript from "@rollup/plugin-typescript";
+import path from "node:path";
+import url from "node:url";
+
+const isWatching = !!process.env.ROLLUP_WATCH;
+
+/**
+ * @type {import('rollup').RollupOptions}
+ */
+const config = {
+	input: "src/plugin.ts",
+	output: {
+		dir: "<%- uuid %>.sdPlugin/bin",
+		format: "cjs",
+		sourcemap: isWatching,
+		sourcemapPathTransform: (relativeSourcePath, sourcemapPath) => {
+			return url.pathToFileURL(path.resolve(path.dirname(sourcemapPath), relativeSourcePath)).href;
+		}
+	},
+	plugins: [
+		typescript({
+			sourceMap: isWatching,
+			inlineSources: isWatching,
+			mapRoot: isWatching ? "./" : undefined
+		}),
+		commonjs({
+			sourceMap: false
+		}),
+		nodeResolve({
+			browser: false,
+			exportConditions: ["node"],
+			preferBuiltins: true
+		}),
+		!isWatching &&
+			terser({
+				format: {
+					comments: false
+				}
+			})
+	]
+};
+<% if (isPreBuild) { %>
+/*
+ * This is an intermediary fix for an upstream issue that causes the build process to hang indefinitely (particularly on macOS).
+ * As part of the creation of the plugin, this temporary rollup-plugin is applied during the build step, but removed as part of
+ * the finalizing process. If you're seeing this as part of the final output, you can safely remove it.
+ * See also https://github.com/rollup/plugins/issues/983
+ */
+config.plugins.push({
+	closeBundle() {
+		process.exit(0);
+	},
+});
+/*
+ * End of fix.
+ */
+<% } %>
+export default config;

package/template/rollup.config.mjs

@@ -1,71 +0,0 @@
-import commonjs from "@rollup/plugin-commonjs";
-import nodeResolve from "@rollup/plugin-node-resolve";
-import terser from "@rollup/plugin-terser";
-import typescript from "@rollup/plugin-typescript";
-import fs from "node:fs";
-import path from "node:path";
-import url from "node:url";
-
-const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
-
-const isWatching = !!process.env.ROLLUP_WATCH;
-const tsConfig = JSON.parse(fs.readFileSync(path.resolve(__dirname, "./tsconfig.json"), "utf8"));
-
-prepareOutDir(tsConfig.compilerOptions.outDir);
-
-/**
- * @type {import('rollup').RollupOptions}
- */
-const config = {
-	input: "src/plugin.ts",
-	output: {
-		dir: tsConfig.compilerOptions.outDir,
-		format: "cjs",
-		sourcemap: isWatching,
-		sourcemapPathTransform: (relativeSourcePath, sourcemapPath) => {
-			return url.pathToFileURL(path.resolve(path.dirname(sourcemapPath), relativeSourcePath)).href;
-		}
-	},
-	plugins: [
-		typescript({
-			sourceMap: isWatching,
-			inlineSources: isWatching,
-			mapRoot: isWatching ? "./" : undefined
-		}),
-		commonjs({
-			sourceMap: false
-		}),
-		nodeResolve({
-			browser: false,
-			exportConditions: ["node"],
-			preferBuiltins: true
-		}),
-		!isWatching &&
-			terser({
-				format: {
-					comments: false
-				}
-			})
-	]
-};
-
-export default config;
-
-/**
- * Validates the output directory is situated within the current working directory; upon passing validation, the directory is cleaned before build.
- * @param {string} outDir
- */
-function prepareOutDir(outDir) {
-	if (outDir === undefined) {
-		throw new Error("outDir must be specified within the TypeScript config file.");
-	}
-
-	const relative = path.relative(__dirname, outDir);
-	if (relative && !relative.startsWith("..") && !path.isAbsolute(relative)) {
-		if (fs.existsSync(outDir)) {
-			fs.rmSync(outDir, { recursive: true });
-		}
-	} else {
-		throw new Error("outDir must be located within the current working directory. Please review the TypeScript config file.");
-	}
-}