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

refactor: transform var to let/const #746

Merged
merged 2 commits into from
Dec 18, 2019
Merged

refactor: transform var to let/const #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e48ac2
refactor: transform var to let/const
erisu Dec 17, 2019
3154001
refactor: transform var to let/const manual lint fix
erisu Dec 17, 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
79 changes: 39 additions & 40 deletions bin/lib/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
under the License.
*/

var shell = require('shelljs');
var Q = require('q');
var path = require('path');
var fs = require('fs');
var xcode = require('xcode');
var xmlescape = require('xml-escape');
var ROOT = path.join(__dirname, '..', '..');
var events = require('cordova-common').events;
const shell = require('shelljs');
const Q = require('q');
const path = require('path');
const fs = require('fs');
const xcode = require('xcode');
const xmlescape = require('xml-escape');
const ROOT = path.join(__dirname, '..', '..');
const events = require('cordova-common').events;

function updateSubprojectHelp () {
console.log('Updates the subproject path of the CordovaLib entry to point to this script\'s version of Cordova.');
Expand All @@ -52,7 +52,7 @@ function copyJsAndCordovaLib (projectPath, projectName, use_shared, config) {
// like it should).
fs.symlinkSync(path.join(ROOT, 'CordovaLib'), path.join(projectPath, 'CordovaLib'));
} else {
var r = path.join(projectPath, projectName);
const r = path.join(projectPath, projectName);
shell.mkdir('-p', path.join(projectPath, 'CordovaLib', 'CordovaLib.xcodeproj'));
shell.cp('-f', path.join(r, '.gitignore'), projectPath);
shell.cp('-rf', path.join(ROOT, 'CordovaLib', 'Classes'), path.join(projectPath, 'CordovaLib'));
Expand All @@ -65,14 +65,14 @@ function copyJsAndCordovaLib (projectPath, projectName, use_shared, config) {
}

function copyScripts (projectPath, projectName) {
var srcScriptsDir = path.join(ROOT, 'bin', 'templates', 'scripts', 'cordova');
var destScriptsDir = path.join(projectPath, 'cordova');
const srcScriptsDir = path.join(ROOT, 'bin', 'templates', 'scripts', 'cordova');
const destScriptsDir = path.join(projectPath, 'cordova');

// Delete old scripts directory.
shell.rm('-rf', destScriptsDir);

// Copy in the new ones.
var binDir = path.join(ROOT, 'bin');
const binDir = path.join(ROOT, 'bin');
shell.cp('-r', srcScriptsDir, projectPath);

const nodeModulesDir = path.join(ROOT, 'node_modules');
Expand All @@ -91,14 +91,14 @@ function copyScripts (projectPath, projectName) {
// `require` path for the two libraries. if there's a better way to share
// modules across both the repo and generated projects, we should make sure
// to remove/update this.
var path_regex = /templates\/scripts\/cordova\//;
const path_regex = /templates\/scripts\/cordova\//;
shell.sed('-i', path_regex, '', path.join(destScriptsDir, 'check_reqs'));
shell.sed('-i', path_regex, '', path.join(destScriptsDir, 'apple_ios_version'));
shell.sed('-i', path_regex, '', path.join(destScriptsDir, 'apple_osx_version'));
shell.sed('-i', path_regex, '', path.join(destScriptsDir, 'apple_xcode_version'));

// CB-11792 do a token replace for __PROJECT_NAME__ in .xcconfig
var project_name_esc = projectName.replace(/&/g, '\\&');
const project_name_esc = projectName.replace(/&/g, '\\&');
shell.sed('-i', /__PROJECT_NAME__/g, project_name_esc, path.join(destScriptsDir, 'build-debug.xcconfig'));
shell.sed('-i', /__PROJECT_NAME__/g, project_name_esc, path.join(destScriptsDir, 'build-release.xcconfig'));

Expand All @@ -117,7 +117,7 @@ function copyScripts (projectPath, projectName) {
* @parm {BOOL} use_cli true if cli project
*/
function copyTemplateFiles (project_path, project_name, project_template_dir, package_name) {
var r = path.join(project_path, project_name);
const r = path.join(project_path, project_name);

shell.rm('-rf', path.join(r + '.xcodeproj'));
shell.cp('-rf', path.join(project_template_dir, '__TEMP__.xcodeproj'), project_path);
Expand Down Expand Up @@ -149,11 +149,11 @@ function copyTemplateFiles (project_path, project_name, project_template_dir, pa
*/

// https://issues.apache.org/jira/browse/CB-12402 - Encode XML characters properly
var project_name_xml_esc = xmlescape(project_name);
const project_name_xml_esc = xmlescape(project_name);
shell.sed('-i', /__PROJECT_NAME__/g, project_name_xml_esc, path.join(r + '.xcworkspace', 'contents.xcworkspacedata'));
shell.sed('-i', /__PROJECT_NAME__/g, project_name_xml_esc, path.join(r + '.xcworkspace', 'xcshareddata', 'xcschemes', project_name + '.xcscheme'));

var project_name_esc = project_name.replace(/&/g, '\\&');
const project_name_esc = project_name.replace(/&/g, '\\&');
shell.sed('-i', /__PROJECT_NAME__/g, project_name_esc, path.join(r + '.xcodeproj', 'project.pbxproj'));
shell.sed('-i', /__PROJECT_ID__/g, package_name, path.join(r + '.xcodeproj', 'project.pbxproj'));
shell.sed('-i', /__PROJECT_NAME__/g, project_name_esc, path.join(r, 'Classes', 'AppDelegate.h'));
Expand All @@ -170,7 +170,7 @@ function AbsParentPath (_path) {
}

function AbsProjectPath (relative_path) {
var absolute_path = path.resolve(relative_path);
let absolute_path = path.resolve(relative_path);
if (/.pbxproj$/.test(absolute_path)) {
absolute_path = AbsParentPath(absolute_path);
} else if (!(/.xcodeproj$/.test(absolute_path))) {
Expand Down Expand Up @@ -198,10 +198,10 @@ function relpath (_path, start) {
exports.createProject = function (project_path, package_name, project_name, opts, config) {
package_name = package_name || 'my.cordova.project';
project_name = project_name || 'CordovaExample';
var use_shared = !!opts.link;
var bin_dir = path.join(ROOT, 'bin');
var project_parent = path.dirname(project_path);
var project_template_dir = opts.customTemplate || path.join(bin_dir, 'templates', 'project');
const use_shared = !!opts.link;
const bin_dir = path.join(ROOT, 'bin');
const project_parent = path.dirname(project_path);
const project_template_dir = opts.customTemplate || path.join(bin_dir, 'templates', 'project');

// check that project path doesn't exist
if (fs.existsSync(project_path)) {
Expand Down Expand Up @@ -239,22 +239,21 @@ exports.createProject = function (project_path, package_name, project_name, opts
};

exports.updateProject = function (projectPath, opts) {
var errorString =
const errorString =
'An in-place platform update is not supported. \n' +
'The `platforms` folder is always treated as a build artifact.\n' +
'To update your platform, you have to remove, then add your ios platform again.\n' +
'Make sure you save your plugins beforehand using `cordova plugin save`, and save a copy of the platform first if you had manual changes in it.\n' +
'\tcordova plugin save\n' +
'\tcordova platform rm ios\n' +
'\tcordova platform add ios\n'
;
'\tcordova platform add ios\n';

return Q.reject(errorString);
};

function generateDoneMessage (type, link) {
var pkg = require('../../package');
var msg = 'iOS project ' + (type === 'update' ? 'updated ' : 'created ') + 'with ' + pkg.name + '@' + pkg.version;
const pkg = require('../../package');
let msg = 'iOS project ' + (type === 'update' ? 'updated ' : 'created ') + 'with ' + pkg.name + '@' + pkg.version;
if (link) {
msg += ' and has a linked CordovaLib';
}
Expand All @@ -267,9 +266,9 @@ function update_cordova_subproject (argv) {
throw new Error('Usage error for update_cordova_subproject');
}

var projectPath = AbsProjectPath(argv[0]);
var cordovaLibXcodePath;
var projectConfig;
const projectPath = AbsProjectPath(argv[0]);
let cordovaLibXcodePath;
let projectConfig;
if (argv.length < 3) {
cordovaLibXcodePath = path.join(ROOT, 'CordovaLib', 'CordovaLib.xcodeproj');
projectConfig = argv[1];
Expand All @@ -278,16 +277,16 @@ function update_cordova_subproject (argv) {
projectConfig = argv[2];
}

var parentProjectPath = AbsParentPath(projectPath);
var subprojectPath = relpath(cordovaLibXcodePath, parentProjectPath);
var REGEX = /(.+PBXFileReference.+wrapper.pb-project.+)(path = .+?;)(.*)(sourceTree.+;)(.+)/;
var newLine;
var lines = shell.grep('CordovaLib.xcodeproj', path.join(projectPath, 'project.pbxproj'));
var found = false;
const parentProjectPath = AbsParentPath(projectPath);
let subprojectPath = relpath(cordovaLibXcodePath, parentProjectPath);
const REGEX = /(.+PBXFileReference.+wrapper.pb-project.+)(path = .+?;)(.*)(sourceTree.+;)(.+)/;
let newLine;
let lines = shell.grep('CordovaLib.xcodeproj', path.join(projectPath, 'project.pbxproj'));
let found = false;

subprojectPath = subprojectPath.replace(/\\/g, '/');
lines = lines.split('\n');
for (var i = 0; i < lines.length; ++i) {
for (let i = 0; i < lines.length; ++i) {
if (lines[i].match(REGEX)) {
found = true;
newLine = lines[i].replace(/path = .+?;/, 'path = ' + subprojectPath + ';');
Expand All @@ -303,10 +302,10 @@ function update_cordova_subproject (argv) {
throw new Error('Entry not found in project file for sub-project: ' + subprojectPath);
}

var wkWebViewOnly = projectConfig.getPreference('WKWebViewOnly') === 'true';
const wkWebViewOnly = projectConfig.getPreference('WKWebViewOnly') === 'true';
if (wkWebViewOnly) {
var pbxPath = path.join(cordovaLibXcodePath, 'project.pbxproj');
var xcodeproj = xcode.project(pbxPath);
const pbxPath = path.join(cordovaLibXcodePath, 'project.pbxproj');
const xcodeproj = xcode.project(pbxPath);
xcodeproj.parseSync();
xcodeproj.updateBuildProperty('WK_WEB_VIEW_ONLY', '1');
fs.writeFileSync(pbxPath, xcodeproj.writeSync());
Expand Down
Loading