breautek commented on a change in pull request #860:
URL: https://github.com/apache/cordova-ios/pull/860#discussion_r429002345
##########
File path: bin/templates/scripts/cordova/Api.js
##########
@@ -278,10 +277,7 @@ Api.prototype.addPlugin = function (plugin,
installOptions) {
const frameworkPods = frameworkTags.filter(obj => obj.type ===
'podspec');
return this.addPodSpecs(plugin, podSpecs, frameworkPods,
installOptions);
}
- })
- // CB-11022 return non-falsy value to indicate
- // that there is no need to run prepare after
- .thenResolve(true);
Review comment:
Is it safe to remove this without adding `.then(() =>
Promise.resolve(true))` (the equivilant of `.thenResolve(true)`)?
The block above it may not return a promise, which I believe is an
implicitly returns `Promise.resolve()`, thus the consumer receives `undefined`,
a non-truthy value.
##########
File path: bin/templates/scripts/cordova/Api.js
##########
@@ -327,10 +323,7 @@ Api.prototype.removePlugin = function (plugin,
uninstallOptions) {
const frameworkPods = frameworkTags.filter(obj => obj.type ===
'podspec');
return this.removePodSpecs(plugin, podSpecs, frameworkPods,
uninstallOptions);
}
- })
- // CB-11022 return non-falsy value to indicate
- // that there is no need to run prepare after
- .thenResolve(true);
Review comment:
same concern as above
##########
File path: bin/lib/utils.js
##########
@@ -0,0 +1,65 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+*/
+
+/*
+ Provides a set of utility methods, which can also be spied on during unit
tests.
+*/
+
+// TODO: Perhaps this should live in cordova-common?
+
+const fs = require('fs-extra');
+
+/**
+ * Reads, searches, and replaces the found occurences with replacementString
and then writes the file back out.
+ * A backup is not made.
+ *
+ * @param {string} file A file path to a readable & writable file
+ * @param {RegExp} searchRegex The search regex
+ * @param {string} replacementString The string to replace the found occurences
+ * @returns {void}
+ */
+exports.replaceFileContents = function (file, searchRegex, replacementString) {
+ let contents;
+ try {
+ contents = fs.readFileSync(file).toString();
+ } catch (ex) {
+ console.log('TRYING TO READ: ', file);
Review comment:
I know I'm the one that originally wrote this, but this `console.log`
was debug code that apparently got left behind. Using the cordova log for
verbose/trace output might be better for this.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
