okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed build to dist for ts output

Browse source
This commit is contained in:
Core 2022-02-04 03:59:21 +00:00
parent ae970f2c6b
commit a3a4c6dce5
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
4 changed files with 1302 additions and 1233 deletions
Download patch file Download diff file Expand all files Collapse all files

2516
cider-yarn.lock
View file

File diff suppressed because it is too large Load diff

13
package.json
View file

@ -5,7 +5,7 @@
"version": "1.1.0", "version": "1.1.0",
"description": "A new look into listening and enjoying music in style and performance.", "description": "A new look into listening and enjoying music in style and performance.",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "./build/index.js", "main": "./dist/index.js",
"author": "Cider Collective <cryptofyre@cider.sh> (https://cider.sh)", "author": "Cider Collective <cryptofyre@cider.sh> (https://cider.sh)",
"repository": "https://github.com/ciderapp/Cider.git", "repository": "https://github.com/ciderapp/Cider.git",
"bugs": { "bugs": {
@ -18,9 +18,9 @@
"watch": "tsc --watch", "watch": "tsc --watch",
"test": "yarn build && playwright test", "test": "yarn build && playwright test",
"start": "run-script-os", "start": "run-script-os",
"start:win32": "yarn build && set ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "start:win32": "yarn build && set ELECTRON_ENABLE_LOGGING=true && electron ./dist/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start:linux": "yarn build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "start:linux": "yarn build && ELECTRON_ENABLE_LOGGING=true && electron ./dist/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"start:darwin": "yarn build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "start:darwin": "yarn build && ELECTRON_ENABLE_LOGGING=true && electron ./dist/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
"pack": "electron-builder --dir", "pack": "electron-builder --dir",
"dist": "yarn build && electron-builder", "dist": "yarn build && electron-builder",
"dist:all": "yarn build && electron-builder -mwl", "dist:all": "yarn build && electron-builder -mwl",
@ -29,10 +29,11 @@
}, },
"dependencies": { "dependencies": {
"@sentry/electron": "^2.5.4", "@sentry/electron": "^2.5.4",
"@sentry/integrations": "^6.17.4",
"discord-rpc": "^4.0.1", "discord-rpc": "^4.0.1",
"ejs": "^3.1.6", "ejs": "^3.1.6",
"electron-fetch": "^1.7.4", "electron-fetch": "^1.7.4",
"electron-log": "^4.4.4", "electron-log": "^4.4.5",
"electron-notarize": "^1.1.1", "electron-notarize": "^1.1.1",
"electron-packager": "^15.4.0", "electron-packager": "^15.4.0",
"electron-store": "^8.0.1", "electron-store": "^8.0.1",
@ -118,7 +119,7 @@
], ],
"extends": null, "extends": null,
"files": [ "files": [
"./build/**/*", "./dist/**/*",
"./src/**/*", "./src/**/*",
"./resources/icons/**/*" "./resources/icons/**/*"
], ],

4
src/__tests__/base.test.ts
View file

@ -6,7 +6,7 @@ import * as fs from "fs";
test("Launch electron app", async () => { test("Launch electron app", async () => {
const paths = { const paths = {
"mainBuild": resolve(__dirname, "../../build/"), "mainBuild": resolve(__dirname, "../../dist/"),
"main": resolve(__dirname, "../main"), "main": resolve(__dirname, "../main"),
"root": resolve(__dirname, "../../"), "root": resolve(__dirname, "../../"),
"cwd": __dirname, "cwd": __dirname,
@ -17,7 +17,7 @@ test("Launch electron app", async () => {
console.log(fs.readdirSync(paths.main)) console.log(fs.readdirSync(paths.main))
const electronApp = await electron.launch({ args: ['build/index.js'], cwd: paths.root }); const electronApp = await electron.launch({ args: ['dist/index.js'], cwd: paths.root });
const appPath = await electronApp.evaluate(async ({ app }) => { const appPath = await electronApp.evaluate(async ({ app }) => {
// This runs in the main Electron process, parameter here is always // This runs in the main Electron process, parameter here is always

2
tsconfig.json
View file

@ -6,7 +6,7 @@
"noImplicitAny": true, "noImplicitAny": true,
"strict": true, "strict": true,
"sourceMap": true, "sourceMap": true,
"outDir": "./build", "outDir": "./dist",
"baseUrl": ".", "baseUrl": ".",
"paths": { "paths": {
"*": ["node_modules/*"] "*": ["node_modules/*"]