diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36cefbede..6e71f929f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,7 +84,9 @@ jobs: cp "$file" "release/equicordDesktop${filename^}" done + find release -size 0 -delete rm release/package.json + rm release/*.map - name: Upload Equicord if: github.repository == 'Equicord/Equicord' diff --git a/scripts/build/build.mts b/scripts/build/build.mts index f5e7696ca..cc74f0e7f 100644 --- a/scripts/build/build.mts +++ b/scripts/build/build.mts @@ -23,7 +23,7 @@ import { existsSync, readdirSync } from "fs"; import { readdir, rm, writeFile } from "fs/promises"; import { join } from "path"; -import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "@scripts/build/common.mts"; +import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, exists, globPlugins, IS_DEV, IS_REPORTER, IS_STANDALONE, IS_UPDATER_DISABLED, resolvePluginName, VERSION, watch } from "./common.mjs"; const defines = { IS_STANDALONE: String(IS_STANDALONE), diff --git a/scripts/build/buildWeb.mts b/scripts/build/buildWeb.mts index 67832d95b..3cc42ab2a 100644 --- a/scripts/build/buildWeb.mts +++ b/scripts/build/buildWeb.mts @@ -23,7 +23,7 @@ import { appendFile, mkdir, readdir, readFile, rm, writeFile } from "fs/promises import { join } from "path"; import Zip from "zip-local"; -import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mts"; +import { addBuild, BUILD_TIMESTAMP, buildOrWatchAll, commonOpts, globPlugins, IS_DEV, IS_REPORTER, VERSION } from "./common.mjs"; /** * @type {esbuild.BuildOptions} diff --git a/scripts/build/common.mts b/scripts/build/common.mts index d1aa61aab..c2321fcfd 100644 --- a/scripts/build/common.mts +++ b/scripts/build/common.mts @@ -27,7 +27,7 @@ import { minify as minifyHtml } from "html-minifier-terser"; import { join, relative } from "path"; import { promisify } from "util"; -import { getPluginTarget } from "../utils.mts"; +import { getPluginTarget } from "../utils.mjs"; const PackageJSON: typeof import("../../package.json") = JSON.parse(readFileSync("package.json", "utf-8")); diff --git a/tsconfig.json b/tsconfig.json index d8d61f4c0..73310004d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,12 +20,6 @@ "jsx": "preserve", "baseUrl": "./src/", "paths": { - "@scripts/*": [ - "../scripts/*" - ], - "@scripts/build/*": [ - "../scripts/build/*" - ], "@main/*": [ "./main/*" ],