Skip to content
This repository has been archived by the owner on Aug 1, 2022. It is now read-only.

Commit

Permalink
fix(build): fix bundling of electron main files
Browse files Browse the repository at this point in the history
We fix the bundling of the electron main process file and it to the
tests.

Signed-off-by: Thomas Scholtes <thomas@monadic.xyz>
  • Loading branch information
Thomas Scholtes committed Mar 23, 2021
1 parent e2c2488 commit f316539
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .buildkite/run.sh
Expand Up @@ -55,6 +55,9 @@ echo "--- Run proxy tests"
timeout 6m cargo test --all --all-features --all-targets -- -Z unstable-options --report-time
)

echo "--- Bundle electron main files"
time yarn run rollup -c rollup.electron.js

echo "--- Starting proxy daemon and runing app tests"
time ELECTRON_ENABLE_LOGGING=1 yarn test

Expand Down
2 changes: 1 addition & 1 deletion rollup.electron.js
Expand Up @@ -3,7 +3,7 @@ import externals from "rollup-plugin-node-externals";
import typescript from "@rollup/plugin-typescript";

export default {
input: "native/main.ts",
input: "native/index.ts",
output: {
sourcemap: true,
file: "native/bundle.js",
Expand Down
4 changes: 2 additions & 2 deletions tsconfig.json
@@ -1,7 +1,7 @@
{
"extends": "@tsconfig/svelte/tsconfig.json",
"include": ["ui/**/*", "native/**/*.ts", "scripts/**/*.ts"],
"exclude": ["native/main.comp.js", "node_modules/*", "public/*"],
"include": ["ui/**/*", "native/**/*", "scripts/**/*.ts"],
"exclude": ["native/bundle.js", "node_modules/*", "public/*"],
"compilerOptions": {
/* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
"target": "ES2018",
Expand Down

0 comments on commit f316539

Please sign in to comment.