@kirill.konshin/electron-builder 0.0.2 → 0.0.3

package/dist/builder.js

@@ -1,129 +1,94 @@
-const {
-  GITHUB_REF_TYPE,
-  GITHUB_REF_NAME,
-  GITHUB_RUN_ID,
-  GITHUB_REF,
-  AWS_URL,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  GH_TOKEN,
-  CSC_IDENTITY_AUTO_DISCOVERY
-} = process.env;
-const isGithubTag = GITHUB_REF_TYPE === "tag";
-const isGithubMaster = GITHUB_REF_TYPE === "branch" && GITHUB_REF_NAME === "master";
-const isDevPublish = AWS_URL?.includes(":9000");
-const isNoAutoDiscovery = CSC_IDENTITY_AUTO_DISCOVERY === "false";
-const isSkipPublish = !isDevPublish && !isGithubMaster && !isGithubTag;
-const channel = isGithubTag ? "latest" : GITHUB_REF_NAME;
+//#region src/builder.ts
+var { GITHUB_REF_TYPE, GITHUB_REF_NAME, GITHUB_RUN_ID, GITHUB_REF, AWS_URL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, GH_TOKEN, CSC_IDENTITY_AUTO_DISCOVERY } = process.env;
+var isGithubTag = GITHUB_REF_TYPE === "tag";
+var isGithubMaster = GITHUB_REF_TYPE === "branch" && GITHUB_REF_NAME === "master";
+var isDevPublish = AWS_URL?.includes(":9000");
+var isNoAutoDiscovery = CSC_IDENTITY_AUTO_DISCOVERY === "false";
+var isSkipPublish = !isDevPublish && !isGithubMaster && !isGithubTag;
+var channel = isGithubTag ? "latest" : GITHUB_REF_NAME;
 function getVersion() {
-  if (isGithubMaster) {
-    return `0.0.${GITHUB_RUN_ID}`;
-  }
-  if (isGithubTag) {
-    return GITHUB_REF.split("/").pop();
-  }
-  return `0.0.${Date.now()}`;
+	if (isGithubMaster) return `0.0.${GITHUB_RUN_ID}`;
+	if (isGithubTag) return GITHUB_REF.split("/").pop();
+	return `0.0.${Date.now()}`;
 }
 function getTarget() {
-  const arch = ["arm64", isNoAutoDiscovery ? "" : "x64"].filter(Boolean);
-  const target = [
-    {
-      target: "dmg",
-      arch
-    },
-    {
-      target: "zip",
-      arch
-    }
-  ];
-  if (isNoAutoDiscovery) {
-    console.log("Skipping signing...");
-    delete process.env.CSC_LINK;
-    return [target[0]];
-  }
-  return target;
+	const arch = ["arm64", isNoAutoDiscovery ? "" : "x64"].filter(Boolean);
+	const target = [{
+		target: "dmg",
+		arch
+	}, {
+		target: "zip",
+		arch
+	}];
+	if (isNoAutoDiscovery) {
+		console.log("Skipping signing...");
+		delete process.env.CSC_LINK;
+		return [target[0]];
+	}
+	return target;
 }
 function builerConfig(options) {
-  if (options.s3 && (!AWS_URL || !AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) {
-    throw new Error("Missing AWS configuration");
-  }
-  if (options.githubReleases && !GH_TOKEN) {
-    throw new Error("Missing AWS configuration");
-  }
-  const config = {
-    files: [
-      "**/*",
-      "!electron-builder.js",
-      "!electron-builder.yml",
-      "!package.json",
-      "assets",
-      ...options.config.files
-    ],
-    directories: {
-      buildResources: "assets"
-    },
-    mac: {
-      category: options.config.mac?.category ?? "public.app-category.utils",
-      target: getTarget()
-    },
-    //TODO Windows target
-    dmg: {
-      contents: [
-        {
-          x: 130,
-          y: 130
-        },
-        {
-          x: 370,
-          y: 130,
-          type: "link",
-          path: "/Applications"
-        }
-      ]
-    },
-    publish: [
-      options.s3 && {
-        provider: "s3",
-        endpoint: AWS_URL,
-        channel,
-        ...options.s3
-        // bucket
-      },
-      options.githubReleases && GH_TOKEN && (isGithubTag || isGithubMaster) && {
-        provider: "github",
-        private: true,
-        token: GH_TOKEN,
-        releaseType: isGithubTag ? "release" : "draft",
-        channel,
-        ...options.githubReleases
-        // repo, owner
-      }
-    ].filter(Boolean),
-    extraMetadata: {
-      version: getVersion()
-    }
-  };
-  if (isSkipPublish) {
-    delete config.publish;
-    delete config.extraMetadata;
-  }
-  console.log("Electron Builder context", {
-    isDevPublish,
-    isGithubMaster,
-    isGithubTag,
-    isSkipPublish,
-    isNoAutoDiscovery,
-    channel,
-    GITHUB_RUN_ID,
-    GITHUB_REF_TYPE,
-    GITHUB_REF_NAME,
-    CSC_IDENTITY_AUTO_DISCOVERY,
-    AWS_URL
-  });
-  console.log("Electron Builder configuration", JSON.stringify(config, null, 2));
-  return config;
+	if (options.s3 && (!AWS_URL || !AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) throw new Error("Missing AWS configuration");
+	if (options.githubReleases && !GH_TOKEN) throw new Error("Missing AWS configuration");
+	const config = {
+		files: [
+			"**/*",
+			"!electron-builder.js",
+			"!electron-builder.yml",
+			"!package.json",
+			"assets",
+			...options.config.files
+		],
+		directories: { buildResources: "assets" },
+		mac: {
+			category: options.config.mac?.category ?? "public.app-category.utils",
+			target: getTarget()
+		},
+		dmg: { contents: [{
+			x: 130,
+			y: 130
+		}, {
+			x: 370,
+			y: 130,
+			type: "link",
+			path: "/Applications"
+		}] },
+		publish: [options.s3 && {
+			provider: "s3",
+			endpoint: AWS_URL,
+			channel,
+			...options.s3
+		}, options.githubReleases && GH_TOKEN && (isGithubTag || isGithubMaster) && {
+			provider: "github",
+			private: true,
+			token: GH_TOKEN,
+			releaseType: isGithubTag ? "release" : "draft",
+			channel,
+			...options.githubReleases
+		}].filter(Boolean),
+		extraMetadata: { version: getVersion() }
+	};
+	if (isSkipPublish) {
+		delete config.publish;
+		delete config.extraMetadata;
+	}
+	console.log("Electron Builder context", {
+		isDevPublish,
+		isGithubMaster,
+		isGithubTag,
+		isSkipPublish,
+		isNoAutoDiscovery,
+		channel,
+		GITHUB_RUN_ID,
+		GITHUB_REF_TYPE,
+		GITHUB_REF_NAME,
+		CSC_IDENTITY_AUTO_DISCOVERY,
+		AWS_URL
+	});
+	console.log("Electron Builder configuration", JSON.stringify(config, null, 2));
+	return config;
 }
-export {
-  builerConfig
-};
-//# sourceMappingURL=builder.js.map
+//#endregion
+export { builerConfig };
+
+//# sourceMappingURL=builder.js.map

package/dist/builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder.js","sources":["../src/builder.ts"],"sourcesContent":["import type { Configuration, MacConfiguration } from 'electron-builder';\nimport type { GithubOptions, S3Options } from 'builder-util-runtime';\n\nconst {\n    GITHUB_REF_TYPE,\n    GITHUB_REF_NAME,\n    GITHUB_RUN_ID,\n    GITHUB_REF,\n    AWS_URL,\n    AWS_ACCESS_KEY_ID,\n    AWS_SECRET_ACCESS_KEY,\n    GH_TOKEN,\n    CSC_IDENTITY_AUTO_DISCOVERY,\n} = process.env;\n\nconst isGithubTag = GITHUB_REF_TYPE === 'tag';\nconst isGithubMaster = GITHUB_REF_TYPE === 'branch' && GITHUB_REF_NAME === 'master';\nconst isDevPublish = AWS_URL?.includes(':9000');\nconst isNoAutoDiscovery = CSC_IDENTITY_AUTO_DISCOVERY === 'false';\nconst isSkipPublish = !isDevPublish && !isGithubMaster && !isGithubTag;\n\n//FIXME Refine logic, tags should be versions, not channels, use branches? See how Changesets does it\nconst channel = isGithubTag ? 'latest' : GITHUB_REF_NAME; // https://www.electron.build/tutorials/release-using-channels.html\n\nfunction getVersion() {\n    if (isGithubMaster) {\n        return `0.0.${GITHUB_RUN_ID}`; //TODO Figure out last normal in master and bump it\n    }\n    if (isGithubTag) {\n        return GITHUB_REF!.split('/').pop();\n    }\n    return `0.0.${Date.now()}`; //TODO Read from package.json?\n}\n\nfunction getTarget() {\n    const arch = ['arm64', isNoAutoDiscovery ? '' : 'x64'].filter(Boolean) as any;\n\n    const target: MacConfiguration['target'] = [\n        {\n            target: 'dmg',\n            arch,\n        },\n        {\n            target: 'zip',\n            arch,\n        },\n    ];\n\n    // Leave only DMG if no signing\n    if (isNoAutoDiscovery) {\n        console.log('Skipping signing...');\n        delete process.env.CSC_LINK;\n        return [target[0]]; // only keep DMG\n    }\n\n    return target;\n}\n\nexport function builerConfig(options: {\n    config: Configuration;\n    s3?: Pick<S3Options, 'bucket'> & Partial<S3Options>; //TODO Omit?\n    githubReleases: Pick<GithubOptions, 'owner' | 'repo'> & Partial<GithubOptions>;\n}): Configuration {\n    if (options.s3 && (!AWS_URL || !AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) {\n        throw new Error('Missing AWS configuration');\n    }\n\n    if (options.githubReleases && !GH_TOKEN) {\n        throw new Error('Missing AWS configuration');\n    }\n\n    const config: Configuration = {\n        files: [\n            '**/*',\n            '!electron-builder.js',\n            '!electron-builder.yml',\n            '!package.json',\n            'assets',\n            ...(options.config.files as never),\n        ],\n        directories: {\n            buildResources: 'assets',\n        },\n        mac: {\n            category: options.config.mac?.category ?? 'public.app-category.utils',\n            target: getTarget(),\n        },\n        //TODO Windows target\n        dmg: {\n            contents: [\n                {\n                    x: 130,\n                    y: 130,\n                },\n                {\n                    x: 370,\n                    y: 130,\n                    type: 'link',\n                    path: '/Applications',\n                },\n            ],\n        },\n        publish: [\n            options.s3 &&\n                ({\n                    provider: 's3',\n                    endpoint: AWS_URL,\n                    channel,\n                    ...options.s3, // bucket\n                } as S3Options),\n            options.githubReleases &&\n                GH_TOKEN &&\n                (isGithubTag || isGithubMaster) &&\n                ({\n                    provider: 'github',\n                    private: true,\n                    token: GH_TOKEN,\n                    releaseType: isGithubTag ? 'release' : 'draft',\n                    channel,\n                    ...options.githubReleases, // repo, owner\n                } as GithubOptions),\n        ].filter(Boolean) as never,\n        extraMetadata: {\n            version: getVersion(),\n        },\n    };\n\n    if (isSkipPublish) {\n        delete config.publish;\n        delete (config as never as any).extraMetadata;\n    }\n\n    console.log('Electron Builder context', {\n        isDevPublish,\n        isGithubMaster,\n        isGithubTag,\n        isSkipPublish,\n        isNoAutoDiscovery,\n        channel,\n        GITHUB_RUN_ID: GITHUB_RUN_ID,\n        GITHUB_REF_TYPE: GITHUB_REF_TYPE,\n        GITHUB_REF_NAME: GITHUB_REF_NAME,\n        CSC_IDENTITY_AUTO_DISCOVERY: CSC_IDENTITY_AUTO_DISCOVERY,\n        AWS_URL: AWS_URL,\n    });\n\n    console.log('Electron Builder configuration', JSON.stringify(config, null, 2));\n\n    return config;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","names":[],"sources":["../src/builder.ts"],"sourcesContent":["import type { Configuration, MacConfiguration } from 'electron-builder';\nimport type { GithubOptions, S3Options } from 'builder-util-runtime';\n\nconst {\n    GITHUB_REF_TYPE,\n    GITHUB_REF_NAME,\n    GITHUB_RUN_ID,\n    GITHUB_REF,\n    AWS_URL,\n    AWS_ACCESS_KEY_ID,\n    AWS_SECRET_ACCESS_KEY,\n    GH_TOKEN,\n    CSC_IDENTITY_AUTO_DISCOVERY,\n} = process.env;\n\nconst isGithubTag = GITHUB_REF_TYPE === 'tag';\nconst isGithubMaster = GITHUB_REF_TYPE === 'branch' && GITHUB_REF_NAME === 'master';\nconst isDevPublish = AWS_URL?.includes(':9000');\nconst isNoAutoDiscovery = CSC_IDENTITY_AUTO_DISCOVERY === 'false';\nconst isSkipPublish = !isDevPublish && !isGithubMaster && !isGithubTag;\n\n//FIXME Refine logic, tags should be versions, not channels, use branches? See how Changesets does it\nconst channel = isGithubTag ? 'latest' : GITHUB_REF_NAME; // https://www.electron.build/tutorials/release-using-channels.html\n\nfunction getVersion() {\n    if (isGithubMaster) {\n        return `0.0.${GITHUB_RUN_ID}`; //TODO Figure out last normal in master and bump it\n    }\n    if (isGithubTag) {\n        return GITHUB_REF!.split('/').pop();\n    }\n    return `0.0.${Date.now()}`; //TODO Read from package.json?\n}\n\nfunction getTarget() {\n    const arch = ['arm64', isNoAutoDiscovery ? '' : 'x64'].filter(Boolean) as any;\n\n    const target: MacConfiguration['target'] = [\n        {\n            target: 'dmg',\n            arch,\n        },\n        {\n            target: 'zip',\n            arch,\n        },\n    ];\n\n    // Leave only DMG if no signing\n    if (isNoAutoDiscovery) {\n        console.log('Skipping signing...');\n        delete process.env.CSC_LINK;\n        return [target[0]]; // only keep DMG\n    }\n\n    return target;\n}\n\nexport function builerConfig(options: {\n    config: Configuration;\n    s3?: Pick<S3Options, 'bucket'> & Partial<S3Options>; //TODO Omit?\n    githubReleases: Pick<GithubOptions, 'owner' | 'repo'> & Partial<GithubOptions>;\n}): Configuration {\n    if (options.s3 && (!AWS_URL || !AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) {\n        throw new Error('Missing AWS configuration');\n    }\n\n    if (options.githubReleases && !GH_TOKEN) {\n        throw new Error('Missing AWS configuration');\n    }\n\n    const config: Configuration = {\n        files: [\n            '**/*',\n            '!electron-builder.js',\n            '!electron-builder.yml',\n            '!package.json',\n            'assets',\n            ...(options.config.files as never),\n        ],\n        directories: {\n            buildResources: 'assets',\n        },\n        mac: {\n            category: options.config.mac?.category ?? 'public.app-category.utils',\n            target: getTarget(),\n        },\n        //TODO Windows target\n        dmg: {\n            contents: [\n                {\n                    x: 130,\n                    y: 130,\n                },\n                {\n                    x: 370,\n                    y: 130,\n                    type: 'link',\n                    path: '/Applications',\n                },\n            ],\n        },\n        publish: [\n            options.s3 &&\n                ({\n                    provider: 's3',\n                    endpoint: AWS_URL,\n                    channel,\n                    ...options.s3, // bucket\n                } as S3Options),\n            options.githubReleases &&\n                GH_TOKEN &&\n                (isGithubTag || isGithubMaster) &&\n                ({\n                    provider: 'github',\n                    private: true,\n                    token: GH_TOKEN,\n                    releaseType: isGithubTag ? 'release' : 'draft',\n                    channel,\n                    ...options.githubReleases, // repo, owner\n                } as GithubOptions),\n        ].filter(Boolean) as never,\n        extraMetadata: {\n            version: getVersion(),\n        },\n    };\n\n    if (isSkipPublish) {\n        delete config.publish;\n        delete (config as never as any).extraMetadata;\n    }\n\n    console.log('Electron Builder context', {\n        isDevPublish,\n        isGithubMaster,\n        isGithubTag,\n        isSkipPublish,\n        isNoAutoDiscovery,\n        channel,\n        GITHUB_RUN_ID: GITHUB_RUN_ID,\n        GITHUB_REF_TYPE: GITHUB_REF_TYPE,\n        GITHUB_REF_NAME: GITHUB_REF_NAME,\n        CSC_IDENTITY_AUTO_DISCOVERY: CSC_IDENTITY_AUTO_DISCOVERY,\n        AWS_URL: AWS_URL,\n    });\n\n    console.log('Electron Builder configuration', JSON.stringify(config, null, 2));\n\n    return config;\n}\n"],"mappings":";AAGA,IAAM,EACF,iBACA,iBACA,eACA,YACA,SACA,mBACA,uBACA,UACA,gCACA,QAAQ;AAEZ,IAAM,cAAc,oBAAoB;AACxC,IAAM,iBAAiB,oBAAoB,YAAY,oBAAoB;AAC3E,IAAM,eAAe,SAAS,SAAS,OAAO;AAC9C,IAAM,oBAAoB,gCAAgC;AAC1D,IAAM,gBAAgB,CAAC,gBAAgB,CAAC,kBAAkB,CAAC;AAG3D,IAAM,UAAU,cAAc,WAAW;AAEzC,SAAS,aAAa;CAClB,IAAI,gBACA,OAAO,OAAO;CAElB,IAAI,aACA,OAAO,WAAY,MAAM,GAAG,CAAC,CAAC,IAAI;CAEtC,OAAO,OAAO,KAAK,IAAI;AAC3B;AAEA,SAAS,YAAY;CACjB,MAAM,OAAO,CAAC,SAAS,oBAAoB,KAAK,KAAK,CAAC,CAAC,OAAO,OAAO;CAErE,MAAM,SAAqC,CACvC;EACI,QAAQ;EACR;CACJ,GACA;EACI,QAAQ;EACR;CACJ,CACJ;CAGA,IAAI,mBAAmB;EACnB,QAAQ,IAAI,qBAAqB;EACjC,OAAO,QAAQ,IAAI;EACnB,OAAO,CAAC,OAAO,EAAE;CACrB;CAEA,OAAO;AACX;AAEA,SAAgB,aAAa,SAIX;CACd,IAAI,QAAQ,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,wBAClD,MAAM,IAAI,MAAM,2BAA2B;CAG/C,IAAI,QAAQ,kBAAkB,CAAC,UAC3B,MAAM,IAAI,MAAM,2BAA2B;CAG/C,MAAM,SAAwB;EAC1B,OAAO;GACH;GACA;GACA;GACA;GACA;GACA,GAAI,QAAQ,OAAO;EACvB;EACA,aAAa,EACT,gBAAgB,SACpB;EACA,KAAK;GACD,UAAU,QAAQ,OAAO,KAAK,YAAY;GAC1C,QAAQ,UAAU;EACtB;EAEA,KAAK,EACD,UAAU,CACN;GACI,GAAG;GACH,GAAG;EACP,GACA;GACI,GAAG;GACH,GAAG;GACH,MAAM;GACN,MAAM;EACV,CACJ,EACJ;EACA,SAAS,CACL,QAAQ,MACH;GACG,UAAU;GACV,UAAU;GACV;GACA,GAAG,QAAQ;EACf,GACJ,QAAQ,kBACJ,aACC,eAAe,mBACf;GACG,UAAU;GACV,SAAS;GACT,OAAO;GACP,aAAa,cAAc,YAAY;GACvC;GACA,GAAG,QAAQ;EACf,CACR,CAAC,CAAC,OAAO,OAAO;EAChB,eAAe,EACX,SAAS,WAAW,EACxB;CACJ;CAEA,IAAI,eAAe;EACf,OAAO,OAAO;EACd,OAAQ,OAAwB;CACpC;CAEA,QAAQ,IAAI,4BAA4B;EACpC;EACA;EACA;EACA;EACA;EACA;EACe;EACE;EACA;EACY;EACpB;CACb,CAAC;CAED,QAAQ,IAAI,kCAAkC,KAAK,UAAU,QAAQ,MAAM,CAAC,CAAC;CAE7E,OAAO;AACX"}

package/dist/images.js

@@ -1,25 +1,18 @@
 import psd from "psd";
 import sharp from "sharp";
 import path from "node:path";
-async function generateImages({
-  iconPsdPath,
-  dmgBackgroundPsdPath,
-  electronAssetsPath,
-  webPublicPath
-}) {
-  const iconPsd = await psd.open(iconPsdPath);
-  await iconPsd.image.saveAsPng(path.join(electronAssetsPath, "icon.png"));
-  const bgPsd = await psd.open(dmgBackgroundPsdPath);
-  await bgPsd.image.saveAsPng(path.join(electronAssetsPath, "background@2x.png"));
-  const iconPng = sharp(path.join(electronAssetsPath, "icon.png"));
-  const bgPng = sharp(path.join(electronAssetsPath, "background@2x.png"));
-  await bgPng.resize(500).toFile(path.join(electronAssetsPath, "background.png"));
-  await iconPng.toFile(path.join(electronAssetsPath, "splash.webp"));
-  await iconPng.toFile(path.join(electronAssetsPath, "icon.icns"));
-  await iconPng.toFile(path.join(webPublicPath, "icon.png"));
-  await iconPng.resize(32).toFile(path.join(webPublicPath, "favicon.ico"));
+//#region src/images.ts
+async function generateImages({ iconPsdPath, dmgBackgroundPsdPath, electronAssetsPath, webPublicPath }) {
+	await (await psd.open(iconPsdPath)).image.saveAsPng(path.join(electronAssetsPath, "icon.png"));
+	await (await psd.open(dmgBackgroundPsdPath)).image.saveAsPng(path.join(electronAssetsPath, "background@2x.png"));
+	const iconPng = sharp(path.join(electronAssetsPath, "icon.png"));
+	await sharp(path.join(electronAssetsPath, "background@2x.png")).resize(500).toFile(path.join(electronAssetsPath, "background.png"));
+	await iconPng.toFile(path.join(electronAssetsPath, "splash.webp"));
+	await iconPng.toFile(path.join(electronAssetsPath, "icon.icns"));
+	await iconPng.toFile(path.join(webPublicPath, "icon.png"));
+	await iconPng.resize(32).toFile(path.join(webPublicPath, "favicon.ico"));
 }
-export {
-  generateImages
-};
-//# sourceMappingURL=images.js.map
+//#endregion
+export { generateImages };
+
+//# sourceMappingURL=images.js.map

package/dist/images.js.map

@@ -1 +1 @@
-{"version":3,"file":"images.js","sources":["../src/images.ts"],"sourcesContent":["import psd from 'psd';\nimport sharp from 'sharp';\nimport path from 'node:path';\n\nexport async function generateImages({\n    iconPsdPath,\n    dmgBackgroundPsdPath,\n    electronAssetsPath,\n    webPublicPath,\n}: {\n    iconPsdPath: string;\n    dmgBackgroundPsdPath: string;\n    electronAssetsPath: string;\n    webPublicPath: string;\n}): Promise<void> {\n    const iconPsd = await psd.open(iconPsdPath);\n    await iconPsd.image!.saveAsPng(path.join(electronAssetsPath, 'icon.png'));\n\n    const bgPsd = await psd.open(dmgBackgroundPsdPath);\n    await bgPsd.image!.saveAsPng(path.join(electronAssetsPath, 'background@2x.png'));\n\n    const iconPng = sharp(path.join(electronAssetsPath, 'icon.png'));\n    const bgPng = sharp(path.join(electronAssetsPath, 'background@2x.png'));\n\n    await bgPng.resize(500).toFile(path.join(electronAssetsPath, 'background.png'));\n\n    await iconPng.toFile(path.join(electronAssetsPath, 'splash.webp'));\n    await iconPng.toFile(path.join(electronAssetsPath, 'icon.icns'));\n\n    //TODO Crop without icon BG\n    await iconPng.toFile(path.join(webPublicPath, 'icon.png'));\n    await iconPng.resize(32).toFile(path.join(webPublicPath, 'favicon.ico'));\n}\n"],"names":[],"mappings":";;;AAIA,eAAsB,eAAe;AAAA,EACjC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACJ,GAKkB;AACd,QAAM,UAAU,MAAM,IAAI,KAAK,WAAW;AAC1C,QAAM,QAAQ,MAAO,UAAU,KAAK,KAAK,oBAAoB,UAAU,CAAC;AAExE,QAAM,QAAQ,MAAM,IAAI,KAAK,oBAAoB;AACjD,QAAM,MAAM,MAAO,UAAU,KAAK,KAAK,oBAAoB,mBAAmB,CAAC;AAE/E,QAAM,UAAU,MAAM,KAAK,KAAK,oBAAoB,UAAU,CAAC;AAC/D,QAAM,QAAQ,MAAM,KAAK,KAAK,oBAAoB,mBAAmB,CAAC;AAEtE,QAAM,MAAM,OAAO,GAAG,EAAE,OAAO,KAAK,KAAK,oBAAoB,gBAAgB,CAAC;AAE9E,QAAM,QAAQ,OAAO,KAAK,KAAK,oBAAoB,aAAa,CAAC;AACjE,QAAM,QAAQ,OAAO,KAAK,KAAK,oBAAoB,WAAW,CAAC;AAG/D,QAAM,QAAQ,OAAO,KAAK,KAAK,eAAe,UAAU,CAAC;AACzD,QAAM,QAAQ,OAAO,EAAE,EAAE,OAAO,KAAK,KAAK,eAAe,aAAa,CAAC;AAC3E;"}
+{"version":3,"file":"images.js","names":[],"sources":["../src/images.ts"],"sourcesContent":["import psd from 'psd';\nimport sharp from 'sharp';\nimport path from 'node:path';\n\nexport async function generateImages({\n    iconPsdPath,\n    dmgBackgroundPsdPath,\n    electronAssetsPath,\n    webPublicPath,\n}: {\n    iconPsdPath: string;\n    dmgBackgroundPsdPath: string;\n    electronAssetsPath: string;\n    webPublicPath: string;\n}): Promise<void> {\n    const iconPsd = await psd.open(iconPsdPath);\n    await iconPsd.image!.saveAsPng(path.join(electronAssetsPath, 'icon.png'));\n\n    const bgPsd = await psd.open(dmgBackgroundPsdPath);\n    await bgPsd.image!.saveAsPng(path.join(electronAssetsPath, 'background@2x.png'));\n\n    const iconPng = sharp(path.join(electronAssetsPath, 'icon.png'));\n    const bgPng = sharp(path.join(electronAssetsPath, 'background@2x.png'));\n\n    await bgPng.resize(500).toFile(path.join(electronAssetsPath, 'background.png'));\n\n    await iconPng.toFile(path.join(electronAssetsPath, 'splash.webp'));\n    await iconPng.toFile(path.join(electronAssetsPath, 'icon.icns'));\n\n    //TODO Crop without icon BG\n    await iconPng.toFile(path.join(webPublicPath, 'icon.png'));\n    await iconPng.resize(32).toFile(path.join(webPublicPath, 'favicon.ico'));\n}\n"],"mappings":";;;;AAIA,eAAsB,eAAe,EACjC,aACA,sBACA,oBACA,iBAMc;CAEd,OAAM,MADgB,IAAI,KAAK,WAAW,EAAA,CAC5B,MAAO,UAAU,KAAK,KAAK,oBAAoB,UAAU,CAAC;CAGxE,OAAM,MADc,IAAI,KAAK,oBAAoB,EAAA,CACrC,MAAO,UAAU,KAAK,KAAK,oBAAoB,mBAAmB,CAAC;CAE/E,MAAM,UAAU,MAAM,KAAK,KAAK,oBAAoB,UAAU,CAAC;CAG/D,MAFc,MAAM,KAAK,KAAK,oBAAoB,mBAAmB,CAE/D,CAAA,CAAM,OAAO,GAAG,CAAC,CAAC,OAAO,KAAK,KAAK,oBAAoB,gBAAgB,CAAC;CAE9E,MAAM,QAAQ,OAAO,KAAK,KAAK,oBAAoB,aAAa,CAAC;CACjE,MAAM,QAAQ,OAAO,KAAK,KAAK,oBAAoB,WAAW,CAAC;CAG/D,MAAM,QAAQ,OAAO,KAAK,KAAK,eAAe,UAAU,CAAC;CACzD,MAAM,QAAQ,OAAO,EAAE,CAAC,CAAC,OAAO,KAAK,KAAK,eAAe,aAAa,CAAC;AAC3E"}

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './builder';
-export * from './images';
+export * from './builder.js';
+export * from './images.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,7 +1,3 @@
 import { builerConfig } from "./builder.js";
 import { generateImages } from "./images.js";
-export {
-  builerConfig,
-  generateImages
-};
-//# sourceMappingURL=index.js.map
+export { builerConfig, generateImages };

package/package.json

@@ -1,18 +1,16 @@
 {
   "name": "@kirill.konshin/electron-builder",
   "description": "Utilities",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "scripts": {
     "----- BUILD -----": "",
     "clean": "rm -rf dist .tscache tsconfig.tsbuildinfo",
     "build": "vite build",
-    "build:index": "ctix build",
-    "build:check-types": "attw --pack .",
     "start": "yarn build --watch",
     "wait": "wait-on ./dist/index.js",
     "----- TEST -----": "",
-    "test:disabled": "vitest run --coverage",
+    "test": "vitest run --coverage",
     "test:watch": "vitest watch --coverage",
     "----- STORYBOOK -----": "",
     "storybook:start": "storybook dev -p 6006",
@@ -24,10 +22,12 @@
   },
   "devDependencies": {
     "@kirill.konshin/utils-private": "*",
+    "builder-util-runtime": "^9.3.1",
     "electron": "^37.2.5",
     "electron-builder": "^26.0.12"
   },
   "peerDependencies": {
+    "builder-util-runtime": "^9",
     "electron": "^37",
     "electron-builder": "^26"
   },
@@ -48,11 +48,27 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "peerDependenciesMeta": {
+    "builder-util-runtime": {
+      "optional": true
+    },
     "electron": {
       "optional": true
     },
     "electron-builder": {
       "optional": true
     }
-  }
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/kirill-konshin/utils.git",
+    "directory": "packages/electron-builder"
+  },
+  "nx": {
+    "tags": [
+      "platform:electron"
+    ]
+  },
+  "files": [
+    "dist"
+  ]
 }

package/.ctirc

@@ -1,20 +0,0 @@
-{
-  "options": [
-    {
-      "mode": "create",
-      "project": "tsconfig.json",
-      "include": "src/**/*.{ts,tsx}",
-      "exclude": [
-        "**/*.stories.*",
-        "**/*.test.*",
-        "**/*.fixture.*"
-      ],
-      "startFrom": "src",
-      "backup": false,
-      "overwrite": true,
-      "generationStyle": "default-alias-named-star",
-      "output": "src",
-      "verbose": true
-    }
-  ]
-}

package/.turbo/turbo-build.log

@@ -1,21 +0,0 @@
-vite v7.0.6 building SSR bundle for production...
-- ctix 'create' mode start, ...
-✔ /home/runner/work/utils/utils/packages/electron-builder/tsconfig.json loading complete!
-✔ analysis export statements completed!
-- build "index.ts" file start
-- output file exists check, ...
-
-
-✔ ctix 'create' mode complete!
-transforming...
-✓ 3 modules transformed.
-rendering chunks...
-
-[vite:dts] Start generate declaration files...
-dist/index.js    0.17 kB │ map: 0.09 kB
-dist/images.js   1.02 kB │ map: 1.94 kB
-dist/builder.js  3.03 kB │ map: 6.73 kB
-[vite:dts] Declaration files built in 1463ms.
-
-✓ built in 4.62s
-Updated package.json with exports

package/CHANGELOG.md

@@ -1,7 +0,0 @@
-# @kirill.konshin/electron-builder
-
-## 0.0.2
-
-### Patch Changes
-
-- 63fdba8: Divided core to browser/node/worker-specific packages, CTIX upgrade, etc.

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;"}

package/src/builder.ts

@@ -1,150 +0,0 @@
-import type { Configuration, MacConfiguration } from 'electron-builder';
-import type { GithubOptions, S3Options } from 'builder-util-runtime';
-
-const {
-    GITHUB_REF_TYPE,
-    GITHUB_REF_NAME,
-    GITHUB_RUN_ID,
-    GITHUB_REF,
-    AWS_URL,
-    AWS_ACCESS_KEY_ID,
-    AWS_SECRET_ACCESS_KEY,
-    GH_TOKEN,
-    CSC_IDENTITY_AUTO_DISCOVERY,
-} = process.env;
-
-const isGithubTag = GITHUB_REF_TYPE === 'tag';
-const isGithubMaster = GITHUB_REF_TYPE === 'branch' && GITHUB_REF_NAME === 'master';
-const isDevPublish = AWS_URL?.includes(':9000');
-const isNoAutoDiscovery = CSC_IDENTITY_AUTO_DISCOVERY === 'false';
-const isSkipPublish = !isDevPublish && !isGithubMaster && !isGithubTag;
-
-//FIXME Refine logic, tags should be versions, not channels, use branches? See how Changesets does it
-const channel = isGithubTag ? 'latest' : GITHUB_REF_NAME; // https://www.electron.build/tutorials/release-using-channels.html
-
-function getVersion() {
-    if (isGithubMaster) {
-        return `0.0.${GITHUB_RUN_ID}`; //TODO Figure out last normal in master and bump it
-    }
-    if (isGithubTag) {
-        return GITHUB_REF!.split('/').pop();
-    }
-    return `0.0.${Date.now()}`; //TODO Read from package.json?
-}
-
-function getTarget() {
-    const arch = ['arm64', isNoAutoDiscovery ? '' : 'x64'].filter(Boolean) as any;
-
-    const target: MacConfiguration['target'] = [
-        {
-            target: 'dmg',
-            arch,
-        },
-        {
-            target: 'zip',
-            arch,
-        },
-    ];
-
-    // Leave only DMG if no signing
-    if (isNoAutoDiscovery) {
-        console.log('Skipping signing...');
-        delete process.env.CSC_LINK;
-        return [target[0]]; // only keep DMG
-    }
-
-    return target;
-}
-
-export function builerConfig(options: {
-    config: Configuration;
-    s3?: Pick<S3Options, 'bucket'> & Partial<S3Options>; //TODO Omit?
-    githubReleases: Pick<GithubOptions, 'owner' | 'repo'> & Partial<GithubOptions>;
-}): Configuration {
-    if (options.s3 && (!AWS_URL || !AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY)) {
-        throw new Error('Missing AWS configuration');
-    }
-
-    if (options.githubReleases && !GH_TOKEN) {
-        throw new Error('Missing AWS configuration');
-    }
-
-    const config: Configuration = {
-        files: [
-            '**/*',
-            '!electron-builder.js',
-            '!electron-builder.yml',
-            '!package.json',
-            'assets',
-            ...(options.config.files as never),
-        ],
-        directories: {
-            buildResources: 'assets',
-        },
-        mac: {
-            category: options.config.mac?.category ?? 'public.app-category.utils',
-            target: getTarget(),
-        },
-        //TODO Windows target
-        dmg: {
-            contents: [
-                {
-                    x: 130,
-                    y: 130,
-                },
-                {
-                    x: 370,
-                    y: 130,
-                    type: 'link',
-                    path: '/Applications',
-                },
-            ],
-        },
-        publish: [
-            options.s3 &&
-                ({
-                    provider: 's3',
-                    endpoint: AWS_URL,
-                    channel,
-                    ...options.s3, // bucket
-                } as S3Options),
-            options.githubReleases &&
-                GH_TOKEN &&
-                (isGithubTag || isGithubMaster) &&
-                ({
-                    provider: 'github',
-                    private: true,
-                    token: GH_TOKEN,
-                    releaseType: isGithubTag ? 'release' : 'draft',
-                    channel,
-                    ...options.githubReleases, // repo, owner
-                } as GithubOptions),
-        ].filter(Boolean) as never,
-        extraMetadata: {
-            version: getVersion(),
-        },
-    };
-
-    if (isSkipPublish) {
-        delete config.publish;
-        delete (config as never as any).extraMetadata;
-    }
-
-    console.log('Electron Builder context', {
-        isDevPublish,
-        isGithubMaster,
-        isGithubTag,
-        isSkipPublish,
-        isNoAutoDiscovery,
-        channel,
-        GITHUB_RUN_ID: GITHUB_RUN_ID,
-        GITHUB_REF_TYPE: GITHUB_REF_TYPE,
-        GITHUB_REF_NAME: GITHUB_REF_NAME,
-        CSC_IDENTITY_AUTO_DISCOVERY: CSC_IDENTITY_AUTO_DISCOVERY,
-        AWS_URL: AWS_URL,
-    });
-
-    console.log('Electron Builder configuration', JSON.stringify(config, null, 2));
-
-    return config;
-}

package/src/images.ts

@@ -1,33 +0,0 @@
-import psd from 'psd';
-import sharp from 'sharp';
-import path from 'node:path';
-
-export async function generateImages({
-    iconPsdPath,
-    dmgBackgroundPsdPath,
-    electronAssetsPath,
-    webPublicPath,
-}: {
-    iconPsdPath: string;
-    dmgBackgroundPsdPath: string;
-    electronAssetsPath: string;
-    webPublicPath: string;
-}): Promise<void> {
-    const iconPsd = await psd.open(iconPsdPath);
-    await iconPsd.image!.saveAsPng(path.join(electronAssetsPath, 'icon.png'));
-
-    const bgPsd = await psd.open(dmgBackgroundPsdPath);
-    await bgPsd.image!.saveAsPng(path.join(electronAssetsPath, 'background@2x.png'));
-
-    const iconPng = sharp(path.join(electronAssetsPath, 'icon.png'));
-    const bgPng = sharp(path.join(electronAssetsPath, 'background@2x.png'));
-
-    await bgPng.resize(500).toFile(path.join(electronAssetsPath, 'background.png'));
-
-    await iconPng.toFile(path.join(electronAssetsPath, 'splash.webp'));
-    await iconPng.toFile(path.join(electronAssetsPath, 'icon.icns'));
-
-    //TODO Crop without icon BG
-    await iconPng.toFile(path.join(webPublicPath, 'icon.png'));
-    await iconPng.resize(32).toFile(path.join(webPublicPath, 'favicon.ico'));
-}

package/src/index.ts

@@ -1,2 +0,0 @@
-export * from './builder';
-export * from './images';

package/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../utils-private/tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "declarationDir": "dist"
-  },
-  "include": ["src"],
-  "exclude": []
-}

package/turbo.json

@@ -1,10 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "extends": ["//"],
-  "tasks": {
-    "build": {
-      "dependsOn": ["^build"],
-      "outputs": ["src/**/*/index.ts", "package.json", "dist/**/*"]
-    }
-  }
-}

package/vite.config.ts

@@ -1,2 +0,0 @@
-import config from '../utils-private/vite.config';
-export default config;