diff --git a/.circleci/config.yml b/.circleci/config.yml index a3ec7651..a8c75a6b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,12 +32,9 @@ jobs: sudo apt-get install -y wine32 - store_test_results: path: test-results - - run: - name: Building JavaScript - command: yarn build - run: name: Base Functionality Test - command: yarn playwright test + command: yarn test - run: name: Generate Builds (Linux) command: yarn dist -l -p never diff --git a/package.json b/package.json index 95651315..a021440b 100644 --- a/package.json +++ b/package.json @@ -17,16 +17,16 @@ "scripts": { "build": "tsc", "watch": "tsc --watch", + "test": "yarn build && playwright test", "start": "run-script-os", - "start:win32": "npm run 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:linux": "npm run 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": "npm run 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: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: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: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", "pack": "electron-builder --dir", - "dist": "npm run build && electron-builder", - "dist:all": "npm run build && electron-builder -mwl", - "msft": "npm run build && electron-builder -c msft-package.json", - "postinstall": "electron-builder install-app-deps", - "test": "jest" + "dist": "yarn build && electron-builder", + "dist:all": "yarn build && electron-builder -mwl", + "msft": "yarn build && electron-builder -c msft-package.json", + "postinstall": "electron-builder install-app-deps" }, "dependencies": { "@sentry/electron": "^2.5.4", @@ -53,6 +53,7 @@ "react-dom": "^17.0.2", "run-script-os": "^1.1.6", "source-map-support": "^0.5.21", + "typescript": "^4.5.5", "v8-compile-cache": "^2.3.0", "ws": "^8.4.2", "xml2js": "^0.4.23", @@ -69,8 +70,6 @@ "electron-webpack": "^2.8.2", "musickit-typescript": "^1.2.4", "playwright": "^1.18.1", - "ts-node": "^10.4.0", - "typescript": "^4.5.5", "vue-devtools": "^5.1.4", "webpack": "~5.65.0" }, diff --git a/src/__tests__/base.test.ts b/src/__tests__/base.test.ts index d5b44035..5416fe92 100644 --- a/src/__tests__/base.test.ts +++ b/src/__tests__/base.test.ts @@ -3,7 +3,7 @@ import { test, expect } from "@playwright/test"; import { join } from "path"; test("Launch electron app", async () => { - const electronApp = await electron.launch({ args: [join(__dirname, "../../")] }); + const electronApp = await electron.launch({ args: [join(__dirname, "../../build")] }); const appPath = await electronApp.evaluate(async ({ app }) => { // This runs in the main Electron process, parameter here is always @@ -37,6 +37,8 @@ test("Launch electron app", async () => { }) + console.log(windowState) + expect(windowState.isVisible).toBeTruthy(); expect(windowState.isDevToolsOpened).toBeFalsy(); expect(windowState.isCrashed).toBeFalsy(); diff --git a/yarn.lock b/yarn.lock index 3f0e1adc..495783e5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1331,22 +1331,6 @@ __metadata: languageName: node linkType: hard -"@cspotcode/source-map-consumer@npm:0.8.0": - version: 0.8.0 - resolution: "@cspotcode/source-map-consumer@npm:0.8.0" - checksum: c0c16ca3d2f58898f1bd74c4f41a189dbcc202e642e60e489cbcc2e52419c4e89bdead02c886a12fb13ea37798ede9e562b2321df997ebc210ae9bd881561b4e - languageName: node - linkType: hard - -"@cspotcode/source-map-support@npm:0.7.0": - version: 0.7.0 - resolution: "@cspotcode/source-map-support@npm:0.7.0" - dependencies: - "@cspotcode/source-map-consumer": 0.8.0 - checksum: 9faddda7757cd778b5fd6812137b2cc265810043680d6399acc20441668fafcdc874053be9dccd0d9110087287bfad27eb3bf342f72bceca9aa9059f5d0c4be8 - languageName: node - linkType: hard - "@develar/schema-utils@npm:~2.6.5": version: 2.6.5 resolution: "@develar/schema-utils@npm:2.6.5" @@ -1670,34 +1654,6 @@ __metadata: languageName: node linkType: hard -"@tsconfig/node10@npm:^1.0.7": - version: 1.0.8 - resolution: "@tsconfig/node10@npm:1.0.8" - checksum: b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a - languageName: node - linkType: hard - -"@tsconfig/node12@npm:^1.0.7": - version: 1.0.9 - resolution: "@tsconfig/node12@npm:1.0.9" - checksum: a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9 - languageName: node - linkType: hard - -"@tsconfig/node14@npm:^1.0.0": - version: 1.0.1 - resolution: "@tsconfig/node14@npm:1.0.1" - checksum: 976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be - languageName: node - linkType: hard - -"@tsconfig/node16@npm:^1.0.2": - version: 1.0.2 - resolution: "@tsconfig/node16@npm:1.0.2" - checksum: ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa - languageName: node - linkType: hard - "@types/body-parser@npm:*": version: 1.19.2 resolution: "@types/body-parser@npm:1.19.2" @@ -2275,13 +2231,6 @@ __metadata: languageName: node linkType: hard -"acorn-walk@npm:^8.1.1": - version: 8.2.0 - resolution: "acorn-walk@npm:8.2.0" - checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 - languageName: node - linkType: hard - "acorn@npm:^8.4.1": version: 8.7.0 resolution: "acorn@npm:8.7.0" @@ -2532,13 +2481,6 @@ __metadata: languageName: node linkType: hard -"arg@npm:^4.1.0": - version: 4.1.3 - resolution: "arg@npm:4.1.3" - checksum: 544af8dd3f60546d3e4aff084d451b96961d2267d668670199692f8d054f0415d86fc5497d0e641e91546f0aa920e7c29e5250e99fc89f5552a34b5d93b77f43 - languageName: node - linkType: hard - "argparse@npm:^1.0.7": version: 1.0.10 resolution: "argparse@npm:1.0.10" @@ -3379,7 +3321,6 @@ __metadata: react-dom: ^17.0.2 run-script-os: ^1.1.6 source-map-support: ^0.5.21 - ts-node: ^10.4.0 typescript: ^4.5.5 v8-compile-cache: ^2.3.0 vue-devtools: ^5.1.4 @@ -3801,13 +3742,6 @@ __metadata: languageName: node linkType: hard -"create-require@npm:^1.1.0": - version: 1.1.1 - resolution: "create-require@npm:1.1.1" - checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff - languageName: node - linkType: hard - "crocket@npm:^0.9.11": version: 0.9.11 resolution: "crocket@npm:0.9.11" @@ -4172,13 +4106,6 @@ __metadata: languageName: node linkType: hard -"diff@npm:^4.0.1": - version: 4.0.2 - resolution: "diff@npm:4.0.2" - checksum: f2c09b0ce4e6b301c221addd83bf3f454c0bc00caa3dd837cf6c127d6edf7223aa2bbe3b688feea110b7f262adbfc845b757c44c8a9f8c0c5b15d8fa9ce9d20d - languageName: node - linkType: hard - "dijkstrajs@npm:^1.0.1": version: 1.0.2 resolution: "dijkstrajs@npm:1.0.2" @@ -6828,7 +6755,7 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^27.2.5": +"jest-diff@npm:^27.2.5, jest-diff@npm:^27.4.6": version: 27.4.6 resolution: "jest-diff@npm:27.4.6" dependencies: @@ -6847,7 +6774,7 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:=27.2.5, jest-matcher-utils@npm:^27.2.5": +"jest-matcher-utils@npm:=27.2.5": version: 27.2.5 resolution: "jest-matcher-utils@npm:27.2.5" dependencies: @@ -6859,6 +6786,18 @@ __metadata: languageName: node linkType: hard +"jest-matcher-utils@npm:^27.2.5": + version: 27.4.6 + resolution: "jest-matcher-utils@npm:27.4.6" + dependencies: + chalk: ^4.0.0 + jest-diff: ^27.4.6 + jest-get-type: ^27.4.0 + pretty-format: ^27.4.6 + checksum: 445a8cc9eaa7cb08653a10cfc4f109eca76a97d1b1d3a01067bd77efa9cb3a554b74c7402a4c9d5083b21e11218e1515ef538faa47fa47c282072b4825f6b307 + languageName: node + linkType: hard + "jest-message-util@npm:^27.2.5": version: 27.4.6 resolution: "jest-message-util@npm:27.4.6" @@ -7377,13 +7316,6 @@ __metadata: languageName: node linkType: hard -"make-error@npm:^1.1.1": - version: 1.3.6 - resolution: "make-error@npm:1.3.6" - checksum: b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402 - languageName: node - linkType: hard - "make-fetch-happen@npm:^9.1.0": version: 9.1.0 resolution: "make-fetch-happen@npm:9.1.0" @@ -10582,42 +10514,6 @@ __metadata: languageName: node linkType: hard -"ts-node@npm:^10.4.0": - version: 10.4.0 - resolution: "ts-node@npm:10.4.0" - dependencies: - "@cspotcode/source-map-support": 0.7.0 - "@tsconfig/node10": ^1.0.7 - "@tsconfig/node12": ^1.0.7 - "@tsconfig/node14": ^1.0.0 - "@tsconfig/node16": ^1.0.2 - acorn: ^8.4.1 - acorn-walk: ^8.1.1 - arg: ^4.1.0 - create-require: ^1.1.0 - diff: ^4.0.1 - make-error: ^1.1.1 - yn: 3.1.1 - peerDependencies: - "@swc/core": ">=1.2.50" - "@swc/wasm": ">=1.2.50" - "@types/node": "*" - typescript: ">=2.7" - peerDependenciesMeta: - "@swc/core": - optional: true - "@swc/wasm": - optional: true - bin: - ts-node: dist/bin.js - ts-node-cwd: dist/bin-cwd.js - ts-node-script: dist/bin-script.js - ts-node-transpile-only: dist/bin-transpile.js - ts-script: dist/bin-script-deprecated.js - checksum: 3933ac0a937d33c45e04a6750fcdd3e765eb2897d1da1307cd97ac52af093bcfb632ec0453a75000a65c8b5b7bdb32b1077050a186dcc556e62657cb592e6d49 - languageName: node - linkType: hard - "tslib@npm:^1.9.3": version: 1.14.1 resolution: "tslib@npm:1.14.1" @@ -11564,13 +11460,6 @@ __metadata: languageName: node linkType: hard -"yn@npm:3.1.1": - version: 3.1.1 - resolution: "yn@npm:3.1.1" - checksum: 2c487b0e149e746ef48cda9f8bad10fc83693cd69d7f9dcd8be4214e985de33a29c9e24f3c0d6bcf2288427040a8947406ab27f7af67ee9456e6b84854f02dd6 - languageName: node - linkType: hard - "youtube-search-without-api-key@npm:^1.0.7": version: 1.0.7 resolution: "youtube-search-without-api-key@npm:1.0.7"