You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by er...@apache.org on 2020/04/02 10:20:47 UTC
[cordova-serve] branch master updated: refactor: transform template
(#35)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-serve.git
The following commit(s) were added to refs/heads/master by this push:
new 8a529ca refactor: transform template (#35)
8a529ca is described below
commit 8a529cabe035de4af07b550e6c89a5b5fddaff4f
Author: エリス <er...@users.noreply.github.com>
AuthorDate: Thu Apr 2 19:20:39 2020 +0900
refactor: transform template (#35)
---
src/browser.js | 12 ++++++------
src/exec.js | 4 ++--
src/main.js | 4 ++--
src/platform.js | 4 ++--
src/server.js | 2 +-
src/util.js | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/browser.js b/src/browser.js
index 1b4faef..1c17939 100644
--- a/src/browser.js
+++ b/src/browser.js
@@ -69,7 +69,7 @@ module.exports = function (opts) {
// so we need to add a dummy empty-string window title: http://stackoverflow.com/a/154090/3191
if (target === 'edge') {
- browser += ':' + url;
+ browser += `:${url}`;
urlAdded = true;
}
@@ -104,25 +104,25 @@ module.exports = function (opts) {
function getBrowser (target, dataDir) {
dataDir = dataDir || 'temp_chrome_user_data_dir_for_cordova';
- const chromeArgs = ' --user-data-dir=/tmp/' + dataDir;
+ const chromeArgs = ` --user-data-dir=/tmp/${dataDir}`;
const browsers = {
win32: {
ie: 'iexplore',
- chrome: 'chrome --user-data-dir=%TEMP%\\' + dataDir,
+ chrome: `chrome --user-data-dir=%TEMP%\\${dataDir}`,
safari: 'safari',
opera: 'opera',
firefox: 'firefox',
edge: 'microsoft-edge'
},
darwin: {
- chrome: '"Google Chrome" --args' + chromeArgs,
+ chrome: `"Google Chrome" --args${chromeArgs}`,
safari: 'safari',
firefox: 'firefox',
opera: 'opera'
},
linux: {
- chrome: 'google-chrome' + chromeArgs,
- chromium: 'chromium-browser' + chromeArgs,
+ chrome: `google-chrome${chromeArgs}`,
+ chromium: `chromium-browser${chromeArgs}`,
firefox: 'firefox',
opera: 'opera'
}
diff --git a/src/exec.js b/src/exec.js
index a15d20c..19924e8 100644
--- a/src/exec.js
+++ b/src/exec.js
@@ -40,13 +40,13 @@ module.exports = function (cmd, opt_cwd) {
child_process.exec(cmd, opt, (err, stdout, stderr) => {
clearTimeout(timerID);
if (err) {
- reject(new Error('Error executing "' + cmd + '": ' + stderr));
+ reject(new Error(`Error executing "${cmd}": ${stderr}`));
} else {
resolve(stdout);
}
});
} catch (e) {
- console.error('error caught: ' + e);
+ console.error(`error caught: ${e}`);
reject(e);
}
});
diff --git a/src/main.js b/src/main.js
index 4d9c9ce..69d4059 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,10 +32,10 @@ function CordovaServe () {
this.app.use((req, res, next) => {
res.on('finish', function () {
const color = this.statusCode === '404' ? chalk.red : chalk.green;
- let msg = color(this.statusCode) + ' ' + this.req.originalUrl;
+ let msg = `${color(this.statusCode)} ${this.req.originalUrl}`;
const encoding = this._headers && this._headers['content-encoding'];
if (encoding) {
- msg += chalk.gray(' (' + encoding + ')');
+ msg += chalk.gray(` (${encoding})`);
}
require('./server').log(msg);
});
diff --git a/src/platform.js b/src/platform.js
index 80d7038..5bcf063 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -44,7 +44,7 @@ module.exports = function (platform, opts) {
opts.root = util.getPlatformWwwRoot(projectRoot, platform);
if (!fs.existsSync(opts.root)) {
- reject(new Error('Error: Project does not include the specified platform: ' + platform));
+ reject(new Error(`Error: Project does not include the specified platform: ${platform}`));
} else {
return resolve(that.launchServer(opts));
}
@@ -59,7 +59,7 @@ function findProjectRoot (path) {
if (!path) {
throw new Error('Current directory does not appear to be in a Cordova project.');
} else {
- throw new Error('Directory "' + path + '" does not appear to be in a Cordova project.');
+ throw new Error(`Directory "${path}" does not appear to be in a Cordova project.`);
}
}
return projectRoot;
diff --git a/src/server.js b/src/server.js
index 7bef6df..adbfe8a 100644
--- a/src/server.js
+++ b/src/server.js
@@ -66,7 +66,7 @@ module.exports = function (opts) {
const listener = server.listen(port);
listener.on('listening', () => {
that.port = port;
- const message = 'Static file server running on: ' + chalk.green('http://localhost:' + port) + ' (CTRL + C to shut down)';
+ const message = `Static file server running on: ${chalk.green(`http://localhost:${port}`)} (CTRL + C to shut down)`;
if (!opts.noServerInfo) {
log(message);
}
diff --git a/src/util.js b/src/util.js
index a4a954c..541e197 100644
--- a/src/util.js
+++ b/src/util.js
@@ -74,7 +74,7 @@ function cordovaProjectRoot (dir) {
function getPlatformWwwRoot (cordovaProjectRoot, platformName) {
const platform = platforms[platformName];
if (!platform) {
- throw new Error('Unrecognized platform: ' + platformName);
+ throw new Error(`Unrecognized platform: ${platformName}`);
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org