Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(client/electron): environment.json path, jsign path #1955

Merged
merged 5 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions client/electron/start.action.mjs
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this under client and not src/electron?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Must have happened when I was switching branches - will revert

Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright 2022 The Outline Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

import url from 'url';
import electron from 'electron';

import {runAction} from '../../../src/build/run_action.mjs';
import {getBuildParameters} from '../../build/get_build_parameters.mjs';
import {getRootDir} from '../../client/src/build/get_root_dir.mjs';
import {spawnStream} from '../../client/src/build/spawn_stream.mjs';

/**
* @description Builds and starts the electron application.
*
* @param {string[]} parameters
*/
export async function main(...parameters) {
const {platform, buildMode} = getBuildParameters(parameters);

await runAction('www/build', platform, `--buildMode=${buildMode}`);
await runAction('electron/build_main', ...parameters);
await runAction('electron/build', platform, `--buildMode=${buildMode}`);

process.env.OUTLINE_DEBUG = buildMode === 'debug';

await spawnStream(electron, getRootDir());
}

if (import.meta.url === url.pathToFileURL(process.argv[1]).href) {
await main(...process.argv.slice(2));
}
4 changes: 3 additions & 1 deletion client/src/www/build.action.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ export async function main(...parameters) {
}
}

await fs.mkdir(path.resolve(getRootDir(), 'client', 'www'), {recursive: true});

await fs.writeFile(
path.resolve(getRootDir(), 'www', 'environment.json'),
path.resolve(getRootDir(), 'client', 'www', 'environment.json'),
JSON.stringify({
SENTRY_DSN: sentryDsn,
APP_VERSION: versionName,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {dirname, resolve} from 'path';
import {fileURLToPath, pathToFileURL} from 'url';
import {format} from 'util';

import {jsign} from '../../../../third_party/jsign/index.mjs';
import {jsign} from '../../../third_party/jsign/index.mjs';

/**
* Get the parent folder path of this script.
Expand Down
Loading