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.

Sign up for GitHub

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

Jump to bottom

feat: Adds binaryArgs to pass additional flags to Firefox binary #1563

Merged
merged 10 commits into from
Mar 29, 2019
Merged

feat: Adds binaryArgs to pass additional flags to Firefox binary #1563

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
420b395
feat: adds binaryArgs
denar90 Mar 15, 2019
f6cd95f
feat: binaryArgs tests and cli
denar90 Mar 19, 2019
7a8d346
refactor: ignoredParams logging for firefox-android
denar90 Mar 21, 2019
0076326
fix: typo in test suite
denar90 Mar 21, 2019
baa8cab
fix: binary-args description
denar90 Mar 25, 2019
14af123
refactor: Rename binaryArgs to args
denar90 Mar 28, 2019
117553b
refactor: Improve spelling for warning message
denar90 Mar 28, 2019
28cb262
refactor: Append binaryArgs instead of prepend
denar90 Mar 28, 2019
41a85b1
Revert "refactor: Rename binaryArgs to args"
denar90 Mar 28, 2019
22753b7
refactor: use args naming for passing additional browser binary options
denar90 Mar 29, 2019
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# OSX
.DS_Store
.idea
Copy link
Member

Choose a reason for hiding this comment

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

This change seems unrelated.


# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
Expand Down
3 changes: 3 additions & 0 deletions src/cmd/run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export type CmdRunParams = {|
sourceDir: string,
startUrl?: Array<string>,
target?: Array<string>,
binaryArgs?: Array<string>,

// Android CLI options.
adbBin?: string,
Expand Down Expand Up @@ -77,6 +78,7 @@ export default async function run(
adbPort,
adbDevice,
firefoxApk,
binaryArgs,
}: CmdRunParams,
{
buildExtension = defaultBuildExtension,
Expand Down Expand Up @@ -107,6 +109,7 @@ export default async function run(
extensions: [{sourceDir, manifestData}],
keepProfileChanges,
startUrl,
binaryArgs,
desktopNotifications,
};

Expand Down
1 change: 1 addition & 0 deletions src/extension-runners/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export type ExtensionRunnerParams = {|
profilePath?: string,
keepProfileChanges: boolean,
startUrl: ?string | ?Array<string>,
binaryArgs?: Array<string>,

// Common injected dependencies.
desktopNotifications: typeof defaultDesktopNotifications,
Expand Down
3 changes: 1 addition & 2 deletions src/extension-runners/firefox-desktop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,9 @@ export class FirefoxDesktopExtensionRunner {
startUrl,
firefoxApp,
firefoxClient,
binaryArgs = [],
} = this.params;

const binaryArgs = [];
Copy link
Member

Choose a reason for hiding this comment

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

In this version of the PR the arguments are still prepended instead of appended. Restore the binaryArgs variable and use binaryArgs.push(...args); before passing it to firefoxApp.run.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, looks like I misunderstood you. Does it look fine now - 28cb262?


if (browserConsole) {
binaryArgs.push('-jsconsole');
Copy link
Member

Choose a reason for hiding this comment

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

uhm... I'm thinking that it may be better to append the additional arguments that the user may be passing to a web-ext run command (instead of prepending them before the ones added internally by web-ext itself).

@Rob--W what do you think about it?

Copy link
Member

Choose a reason for hiding this comment

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

Appending rather than prepending sounds good to me.

}
Expand Down