forceios 11.0.1 → 12.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "forceios",
-    "version": "11.0.1",
+    "version": "12.0.0",
     "description": "Utilities for creating mobile apps based on the Salesforce Mobile SDK for iOS",
     "keywords": [ "mobilesdk", "ios", "salesforce", "mobile", "sdk" ],
     "homepage": "https://github.com/forcedotcom/SalesforceMobileSDK-iOS",

package/shared/constants.js

@@ -28,7 +28,7 @@
 var path = require('path'),
     shelljs = require('shelljs');
 
-var VERSION= '11.0.1';
+var VERSION= '12.0.0';
 
 module.exports = {
     version: VERSION,
@@ -64,13 +64,13 @@ module.exports = {
             minVersion: '12.0.0',
              pluginRepoUri: 'salesforce-mobilesdk-cordova-plugin@v' + VERSION, // GA
             platformVersion: {
-                ios: '6.3.0',
-                android: '11.0.0'
+                ios: '7.1.0',
+                android: '12.0.1'
             }
         },
-        sfdx: {
-            checkCmd: 'sfdx -v',
-            minVersion: '6.0.0'
+        sf: {
+            checkCmd: 'sf -v',
+            minVersion: '2.0.0'
         }    
     },
 
@@ -117,7 +117,7 @@ module.exports = {
             purpose: 'a hybrid mobile application',
             dir: 'hybrid',
             platforms: ['ios', 'android'],
-            toolNames: ['git', 'node', 'npm', 'cordova', 'sfdx'],
+            toolNames: ['git', 'node', 'npm', 'cordova', 'sf'],
             appTypes: ['hybrid_local', 'hybrid_remote', 'hybrid_lwc'],
             appTypesToPath: {
                 'hybrid_local': 'HybridLocalTemplate',

package/shared/createHelper.js

@@ -90,7 +90,7 @@ function createHybridApp(config) {
     // Merge files from template into it
     if (utils.dirExists(path.join(webDir, SERVER_PROJECT_DIR))) {
         config.serverDir = path.join(config.projectDir, SERVER_PROJECT_DIR)
-        utils.runProcessThrowError('sfdx force:project:create -n ' + SERVER_PROJECT_DIR, config.projectDir);
+        utils.runProcessThrowError('sf force project create -n ' + SERVER_PROJECT_DIR, config.projectDir);
 
         // Copy cordova js to static resources
         for (var platform of config.platform.split(',')) {
@@ -110,50 +110,19 @@ function createHybridApp(config) {
     utils.runProcessThrowError('cordova prepare', config.projectDir);
 
     if (config.platform.split(',').indexOf('ios') != -1) {
-	if (utils.getToolVersion('xcodebuild -version') < 14000000) {
-            // Use legacy build for xcode 13 and older
-	    useLegacyBuild(config, path.join('platforms', 'ios'));
-
-            // Removing libCordova.a from build (it causes issues e.g. CDVWKWebViewEngine won't register as plugin because it won't be recognized as a kind of CDVPlugin)
-            utils.logInfo('Updating xcode project file');
-            var xcodeProjectFile = path.join(config.projectDir,'platforms', 'ios', config.appname + '.xcodeproj', 'project.pbxproj')
-            var xcodeProjectFileContent = fs.readFileSync(xcodeProjectFile, 'utf8');
-            var newXcodeProjectFileContent = xcodeProjectFileContent.split('\n').filter(line => line.indexOf('libCordova.a in Frameworks') == -1).join('\n');
-            fs.writeFileSync(xcodeProjectFile, newXcodeProjectFileContent);
-            utils.logInfo('Updated  xcode project file');
-
-	} else {
-            // Patch podfile for xcode 14
-            fixPods(config, path.join('platforms', 'ios'));
-	}
-
+        fixPods(config, path.join('platforms', 'ios'));
+
+        // Remove libCordova.a from build 
+        utils.logInfo('Updating xcode project file');
+        var xcodeProjectFile = path.join(config.projectDir,'platforms', 'ios', config.appname + '.xcodeproj', 'project.pbxproj')
+        var xcodeProjectFileContent = fs.readFileSync(xcodeProjectFile, 'utf8');
+        var newXcodeProjectFileContent = xcodeProjectFileContent.split('\n').filter(line => line.indexOf('libCordova.a in Frameworks') == -1).join('\n');
+        fs.writeFileSync(xcodeProjectFile, newXcodeProjectFileContent);
+        utils.logInfo('Updated xcode project file');
     }
    
     // Done
     return prepareResult;
-
-}
-
-//
-// Use legacy build system in XCode
-//
-function useLegacyBuild(config, iosSubDir) {
-    var xcSettingsDir = path.join(config.projectDir, iosSubDir, config.appname + '.xcworkspace', 'xcshareddata')
-    var xcSettingsFile = path.join(xcSettingsDir, 'WorkspaceSettings.xcsettings');
-    var plistFileContent = '<?xml version="1.0" encoding="UTF-8"?>\n' +
-        '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n' +
-        '<plist version="1.0">\n' + 
-        '<dict>\n'  +
-        '<key>BuildSystemType</key>\n' + 
-        '<string>Original</string>\n' +
-        '<key>DisableBuildSystemDeprecationDiagnostic</key>\n' + 
-	    '<true/>\n' +
-        '</dict>\n' + 
-        '</plist>\n';
-    utils.logInfo('Creating WorkspaceSettings.xcsettings for project. Setting the BuildSystemType to original in ' + xcSettingsFile);
-    utils.mkDirIfNeeded(xcSettingsDir)
-    fs.writeFileSync(xcSettingsFile,plistFileContent,'utf8');
-    utils.logInfo('Created WorkspaceSettings.xcsettings for project ' + config.appname);
 }
 
 //
@@ -239,9 +208,30 @@ function printNextSteps(ide, projectPath, result) {
                         'Before you ship, make sure to plug your OAuth Client ID and Callback URI,',
                         'and OAuth Scopes into ' + bootconfigFile,
                        ]);
-
 };    
 
+//
+// Print next steps for Native Login
+// 
+function printNextStepsForNativeLogin(ide, projectPath, result) {
+    var workspacePath = path.join(projectPath, result.workspacePath);
+    var bootconfigFile =  path.join(projectPath, result.bootconfigFile);
+    var entryFile = (ide === 'XCode') ? 'SceneDelegate' : 'MainApplication';  
+
+    // Printing out next steps
+    utils.logParagraph(['Next steps' + (result.platform ? ' for ' + result.platform : '') + ':',
+                        '',
+                        'Your application project is ready in ' + projectPath + '.',
+                        'To use your new application in ' + ide + ', do the following:', 
+                        '   - open ' + workspacePath + ' in ' + ide, 
+                        '   - Update the OAuth Client ID, Callback URI, and Community URL in ' + entryFile + ' class.',
+                        '   - build and run', 
+                        'Before you ship, make sure to plug your OAuth Client ID and Callback URI,',
+                        'and OAuth Scopes into ' + bootconfigFile + ', since it is still used for',
+                        'authentication if we fallback on the webview.'
+                       ]);
+}
+
 //
 // Print next steps for server project if present
 //
@@ -254,15 +244,13 @@ function printNextStepsForServerProjectIfNeeded(projectPath) {
                             'Make sure to deploy it to your org before running your application.',
                             '',
                             'From ' + projectPath + ' do the following to setup a scratch org, push the server code:',
-                            '   - sfdx force:org:create -f server/config/project-scratch-def.json -a MyOrg',
+                            '   - sf force org create -f server/config/project-scratch-def.json -a MyOrg',
                             '   - cd server',
-                            '   - sfdx force:source:push -u MyOrg',
+                            '   - sf force source push -u MyOrg',
                             'You also need a password to login to the scratch org from the mobile app:',
-                            '   - sfdx force:user:password:generate -u MyOrg'                            
+                            '   - sf force user password generate -u MyOrg'                            
                             ]);
     }
-
-
 }
 
 //
@@ -272,7 +260,7 @@ function checkTools(toolNames) {
     try {
         utils.log("Checking tools");
         for (var toolName of toolNames) {
-            utils.checkToolVersion(SDK.tools[toolName].checkCmd, SDK.tools[toolName].minVersion, SDK.tools[toolName].maxVersion);
+            utils.checkToolVersion(SDK.tools[toolName].checkCmd, SDK.tools[toolName].minVersion, SDK.tools[toolName].maxVersion, toolName);
         }
     }
     catch (error) {
@@ -388,7 +376,12 @@ function actuallyCreateApp(forcecli, config) {
         if (!(results instanceof Array)) { results = [results] };
         for (var result of results) {
             var ide = SDK.ides[result.platform || config.platform.split(',')[0]];
-            printNextSteps(ide, config.projectPath, result);
+
+            if (config.templatepath != undefined && config.templatepath.includes('NativeLogin')) {
+                printNextStepsForNativeLogin(ide, config.projectPath, result);
+            } else {
+                printNextSteps(ide, config.projectPath, result);
+            }
         }
         printNextStepsForServerProjectIfNeeded(config.projectPath);
 

package/shared/utils.js

@@ -90,23 +90,24 @@ function getVersionNumberFromString(versionString) {
  * @param {String} cmd Command to run to get the tool version
  * @param {String} minVersionRequired Minimum version required
  * @param {String} maxVersionSupported Maximum version supported
+ * @param {String} toolName Name of tool
  *
  * @throws {Error} if tool not found or version too low
  */
-function checkToolVersion(cmd, minVersionRequired, maxVersionSupported) {
+function checkToolVersion(cmd, minVersionRequired, maxVersionSupported, toolName) {
     var toolVersionNum = getToolVersion(cmd);
     var minVersionRequiredNum = getVersionNumberFromString(minVersionRequired);
 
     if (toolVersionNum < minVersionRequiredNum) {
-        throw new Error('Installed ' + toolName + ' version (' + toolVersion + ') is less than the minimum required version ('
-                        + minVersionRequired + ').  Please update your version of ' + toolName + '.');
+        throw new Error('Installed ' + toolName + ' is less than the minimum required version ('
+                        + minVersionRequired + ').\nPlease upgrade your version of ' + toolName + '.');
     }
 
     if (maxVersionSupported) {
         var maxVersionSupportedNum = getVersionNumberFromString(maxVersionSupported);
         if (toolVersionNum > maxVersionSupportedNum) {
-            throw new Error('Installed ' + toolName + ' version (' + toolVersion + ') is more than the maximum supported version ('
-                            + maxVersionSupported + ').  Please downgrade your version of ' + toolName + '.');
+            throw new Error('Installed ' + toolName + ' is more than the maximum supported version ('
+                            + maxVersionSupported + ').\nPlease downgrade your version of ' + toolName + '.');
         }
     }
 }
@@ -122,7 +123,8 @@ function getToolVersion(cmd) {
     var toolVersion;
     try {
 	 var result = runProcessThrowError(cmd, null, true /* return output */);
-        toolVersion = result.replace(/\r?\n|\r/, '').replace(/[^0-9\.]*/, '');
+        // Remove @salesforce/cli/ from the beginning of sf cli version.
+        toolVersion = result.replace(/\r?\n|\r/, '').replace(/[^0-9\.]*/, '').replace('@salesforce/cli/', '');
     }
     catch (error) {
         throw new Error(toolName + ' is required but could not be found. Please install ' + toolName + '.');