Skip to content

Add chromium path arguments #465

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

Merged
EzioLi01 merged 11 commits into from
Mar 11, 2024
Merged

Add chromium path arguments #465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0b9850a
Add chromium path arguments
Feb 7, 2024
bab99eb
Update simulate API
Feb 8, 2024
2f6fd14
Argument correction and exception logs
Feb 9, 2024
98dcaac
Lowercase correction
Feb 20, 2024
abd9df9
Lowercase correction 1.0
Feb 20, 2024
c401742
Fix chromium path argument validation
Feb 20, 2024
8e09323
Fix chromium path argument validation 1.0
Feb 21, 2024
ab5ec5a
Chromium target validation
Mar 1, 2024
26a7182
Fix Chromium target validation
Mar 4, 2024
25098c0
Target validation update
Mar 8, 2024
09b49af
getBrowser chromiumPath argument location change
Mar 8, 2024
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
8 changes: 5 additions & 3 deletions bin/simulate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function unknownOptHandler(optName) {
function processArgs() {
try {
var parserOptions = {
string: ['dir', 'simhostui', 'target', 'simulationpath', 'device', 'lang', 'theme', 'middleware'],
string: ['dir', 'simhostui', 'target', 'simulationpath', 'device', 'lang', 'theme', 'middleware', 'chromiumPath'],
Comment thread
EzioLi01 marked this conversation as resolved.
Outdated
boolean: ['livereload', 'forceprepare', 'corsproxy', 'generateids', 'spaurlrewrites', 'showbrowser'],
default: {
dir: null,
Expand Down Expand Up @@ -77,7 +77,8 @@ function processArgs() {
middleware: parsed.middleware,
generateids: parsed.generateids,
spaurlrewrites: parsed.spaurlrewrites,
showbrowser: parsed.showbrowser
showbrowser: parsed.showbrowser,
chromiumPath: parsed.chromiumPath
Comment thread
EzioLi01 marked this conversation as resolved.
Outdated
};
} catch (err) {
throw new Error('Error parsing arguments: ' + (err.message || err) + os.EOL + os.EOL + getUsageString());
Expand All @@ -102,7 +103,8 @@ function getUsageString() {
'[--middleware MIDDLEWARE_PATH]',
'[--generateids (GENERATEIDS)]',
'[--spaurlrewrites (SPA_URL_REWRITES)]',
'[--showbrowser (SHOWBROWSER)]'
'[--showbrowser (SHOWBROWSER)]',
'[--chromiumPath CHROMIUM_PATH]'
Comment thread
EzioLi01 marked this conversation as resolved.
Outdated
];

return message + options.join(' ') + os.EOL;
Expand Down
40 changes: 2 additions & 38 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/browsers/browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function launchBrowser(opts) {
let target = opts.target || 'default';
const url = opts.url || '';
let showBrowser = opts.showBrowser;
const chromiumPath = opts.chromiumPath;

// Handle showbrowser argument sent from cordova-tools and other unknown scenarios
// Only showbrowser = false will return method
Expand All @@ -29,7 +30,7 @@ function launchBrowser(opts) {
open(url);
return Promise.resolve();
} else {
return getBrowser(target, opts.dataDir, url).then(browser => {
return getBrowser(target, opts.dataDir, chromiumPath, url).then(browser => {
let args;

switch (process.platform) {
Expand Down Expand Up @@ -62,7 +63,7 @@ function launchBrowser(opts) {
}
}

function getBrowser(target, dataDir, url) {
function getBrowser(target, dataDir, chromiumPath, url) {
Comment thread
EzioLi01 marked this conversation as resolved.
Outdated
if (target == 'chrome') {
dataDir = dataDir || 'cordova_simulate_temp_chrome_user_data_dir';
} else if (target == 'edge') {
Expand All @@ -73,6 +74,7 @@ function getBrowser(target, dataDir, url) {
const browsers = {
win32: {
chrome: `chrome --user-data-dir=%TEMP%\\${dataDir}`,
chromium: chromiumPath || 'chromium',
Comment thread
EzioLi01 marked this conversation as resolved.
Outdated
opera: 'opera',
firefox: 'firefox',
edge: `msedge ${url} --user-data-dir=%TEMP%\\${dataDir}`
Expand Down
9 changes: 5 additions & 4 deletions src/simulate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ var Simulator = require('./server/simulator');
var BrowserHelper = require('./browsers/browser');
const log = require('./server/utils/log');

var launchBrowser = function (target, url, showBrowser) {
return BrowserHelper.launchBrowser({ target: target, url: url, showBrowser: showBrowser });
var launchBrowser = function (target, url, showBrowser, chromiumPath) {
return BrowserHelper.launchBrowser({ target: target, url: url, showBrowser: showBrowser, chromiumPath: chromiumPath });
};

var simulate = function (opts) {
Expand All @@ -17,6 +17,7 @@ var simulate = function (opts) {
var target = opts.target || 'default';
var simulator = new Simulator(opts);
var showBrowser = opts.showbrowser;
var chromiumPath = opts.chromiumPath;

if (!showBrowser) {
var noBrowserMessage = 'The argument `showbrowser` is set to false. Please load simulated application in browser manually if needed.';
Expand All @@ -25,10 +26,10 @@ var simulate = function (opts) {

return simulator.startSimulation()
.then(function () {
return launchBrowser(target, simulator.appUrl(), showBrowser);
return launchBrowser(target, simulator.appUrl(), showBrowser, chromiumPath);
})
.then(function () {
return launchBrowser(target, simulator.simHostUrl(), showBrowser);
return launchBrowser(target, simulator.simHostUrl(), showBrowser, chromiumPath);
})
.then(function () {
return simulator;
Expand Down