Merge pull request #119 from UnleashedMind/master

misc.

__tests__/lib/utils/starter-config-mapping.test.js

@@ -17,8 +17,8 @@ describe('feature-yaml-template-mapping', () => {
     test('feature-yaml-template-mapping defined', () => {
         expect(starterConfigMapping['react']).toBeDefined()
         expect(starterConfigMapping['react-native']).toBeDefined()
-        expect(starterConfigMapping['angular']).toBeDefined()
-        expect(starterConfigMapping['ionic']).toBeDefined()
-        expect(starterConfigMapping['vue']).toBeDefined()
+        // expect(starterConfigMapping['angular']).toBeDefined()
+        // expect(starterConfigMapping['ionic']).toBeDefined()
+        // expect(starterConfigMapping['vue']).toBeDefined()
     })
 })

bin/awsmobile-features

@@ -14,7 +14,6 @@
 "use strict";
 const program = require('commander')
 const inquirer = require('inquirer')
-const _ = require('lodash')
 const chalk = require('chalk')
 
 const projectInfoManager = require('../lib/project-info-manager.js')

bin/feature-command.js

@@ -15,7 +15,6 @@
 const fs = require('fs-extra')
 const program = require('commander')
 const chalk = require('chalk')
-const _ = require('lodash')
 
 const projectInfoManager = require('../lib/project-info-manager.js')
 const pathManager = require('../lib/utils/awsmobilejs-path-manager.js')
@@ -123,10 +122,10 @@ function displayGeneralHelp(){
     console.log()
     console.log('  Commands:'  )
     console.log()
-    _.keys(_commonCommands).forEach(function(command) {
+    Object.keys(_commonCommands).forEach(function(command) {
         console.log('   ' + (command + '               ').slice(0,12) + _commonCommands[command].replace('{featureName}', _featureName))
     }, this)
-    _.keys(_featureOps.featureCommands).forEach(function(command) {
+    Object.keys(_featureOps.featureCommands).forEach(function(command) {
         console.log('   ' + (command + '               ').slice(0,12) + _featureOps.featureCommands[command])
     }, this)
 }

lib/aws-operations/mobile-exportjs-file-manager.js

@@ -111,8 +111,8 @@ function updateCurrentAWSExportFiles(sourceFilePath){
     let awsExportFilePath = pathManager.getAWSExportFilePath(_projectInfo.ProjectPath) 
     if(awsExportFilePath){
         fs.copySync(sourceFilePath, awsExportFilePath)
-        console.log('awsmobile project\'s access information logged at: ' + 
-        chalk.blue(pathManager.getAWSExportFilePath_relative(_projectInfo.ProjectPath) ))    
+        console.log('awsmobile project\'s access information logged at: ')
+        console.log('    ' + chalk.blue(pathManager.getAWSExportFilePath_relative(_projectInfo.ProjectPath) ))    
     }
 }
 

lib/aws-operations/mobile-project-export-manager.js

@@ -69,8 +69,8 @@ function downloadCurrentBackendProjectSpec(downloadUrl, projectInfo, callback) {
                 if(ymlFilePath){
                     let destinationPath = pathManager.getCurrentBackendYamlFilePath(projectInfo.ProjectPath)
                     fs.copySync(ymlFilePath, destinationPath)
-                    console.log('awsmobile project\'s specifications logged at: ' + 
-                    chalk.blue(pathManager.getCurrentBackendYamlFilePath_Relative(projectInfo.ProjectPath)))
+                    console.log('awsmobile project\'s specifications logged at:')
+                    console.log('    ' + chalk.blue(pathManager.getCurrentBackendYamlFilePath_Relative(projectInfo.ProjectPath)))
                     fs.removeSync(tempExtractDirPath) 
                     fs.removeSync(tempZipFilePath)
                     if(callback){

lib/aws-operations/mobile-yaml-schema.js

@@ -12,7 +12,6 @@
 */
 "use strict";
 const jsyaml = require('js-yaml')
-const _= require('lodash')
 
 const typeProperty = 'backend-class'
 
@@ -520,7 +519,7 @@ function dressObject(obj){
 }
 
 function recursiveDressObject(obj){
-    _.keys(obj).forEach(function(key){
+    Object.keys(obj).forEach(function(key){
         let propertyType = typeof obj[key]
         if(typeof obj[key] === 'object'){
             obj[key] = recursiveDressObject(obj[key])
@@ -537,7 +536,7 @@ function trimObject(obj){
 }
 
 function recursiveTrimObject(obj){
-    _.keys(obj).forEach(function(key){
+    Object.keys(obj).forEach(function(key){
         if(typeof obj[key] === 'object'){
             obj[key] = recursiveTrimObject(obj[key])
         }

lib/awsm-base-manager.js

@@ -14,7 +14,6 @@
 const fs = require('fs-extra')
 const path = require('path')
 const moment = require('moment')
-const _ = require('lodash')
 
 const pathManager = require('./utils/awsmobilejs-path-manager.js')
 const awsmobilejsConstant = require('./utils/awsmobilejs-constant.js')

lib/backend-operations/appsync-operations/ops-appsync-create.js

@@ -17,7 +17,6 @@ const path = require('path')
 const chalk = require('chalk')
 const moment = require('moment')
 const util = require('util')
-const _ = require('lodash')
 
 const _featureName = 'appsync'
 

lib/backend-operations/backend-info-manager.js

@@ -80,8 +80,8 @@ function updateAWSExportFile(projectInfo, awsDetails, callback){
         if(srcDir && fs.existsSync(srcDir)){
             let srcDirExportFilePath = pathManager.getSrcDirExportFilePath(projectInfo)
             fs.copySync(awsExportFilePath, srcDirExportFilePath)
-            console.log('awsmobile project\'s access information copied to: ' + 
-            chalk.blue(pathManager.getSrcDirExportFilePath_relative(projectInfo)))    
+            console.log('awsmobile project\'s access information copied to: ')
+            console.log('    ' + chalk.blue(pathManager.getSrcDirExportFilePath_relative(projectInfo)))    
         }
         if(callback){
             callback()
@@ -121,8 +121,8 @@ function setBackendDetails(projectPath, backendDetails, silentFlag) {
         let jsonString = JSON.stringify(backendDetails, null, '\t')
         fs.writeFileSync(backendDetailsFilePath, jsonString, 'utf8')
         if(!silentFlag){
-            console.log('awsmobile project\'s details logged at: ' + 
-            chalk.blue(pathManager.getCurrentBackendDetailsFilePath_Relative(projectPath)))
+            console.log('awsmobile project\'s details logged at:')
+            console.log('    ' + chalk.blue(pathManager.getCurrentBackendDetailsFilePath_Relative(projectPath)))
         }
     }catch(e){
         console.log(chalk.red('failed to write backend details'))

lib/backend-operations/backend-spec-manager.js

@@ -12,7 +12,6 @@
 */
 "use strict";
 const fs = require('fs-extra')
-const _ = require('lodash')
 const chalk = require('chalk')
 const inquirer = require('inquirer')
 
@@ -70,7 +69,7 @@ function getEnabledFeaturesFromObject(backendProject){
     if(backendProject){
         result = []
         if(backendProject.features){
-            let ymlFeatures = _.keys(backendProject.features)
+            let ymlFeatures = Object.keys(backendProject.features)
             if(ymlFeatures && ymlFeatures.length > 0){
                 ymlFeatures.forEach(function(ymlFeatureName) {
                     let featureName = getFeatureName(ymlFeatureName)

lib/backend-operations/cloud-api-lambda-builder.js

@@ -16,7 +16,6 @@ const path = require('path')
 const chalk = require('chalk')
 const archiver = require('archiver')
 const moment = require('moment')
-const _ = require('lodash')
 
 const backendSpecManager = require('./backend-spec-manager.js')
 const dfops = require('../utils/directory-file-ops.js')
@@ -66,8 +65,8 @@ function validateCodebase(){
     getLambdaFunDirs()
     getExistingZipFiles()
 
-    let paths = _.keys(_cloudApiPaths)
-    let srcDirs = _.keys(_lambdaFuncSrcDirs)
+    let paths = Object.keys(_cloudApiPaths)
+    let srcDirs = Object.keys(_lambdaFuncSrcDirs)
 
     for(let i = 0; i<paths.length; i++){
         let lambdaFunc = _cloudApiPaths[paths[i]]
@@ -88,12 +87,12 @@ function getCloudApiPaths(){
     _cloudApiPaths = {}
     _lambdaFuncNames = []
     let components = _backendProject.features.cloudlogic.components
-    let apiNames = _.keys(components)
+    let apiNames = Object.keys(components)
 
     for(let i = 0; i<apiNames.length; i++){
         let api = components[apiNames[i]]
         if(api.paths){
-            let pathNames = _.keys(api.paths)
+            let pathNames = Object.keys(api.paths)
             for(let j = 0; j < pathNames.length; j++){
                 let key  = api.attributes.name + pathNames[j]
                 let lambdaFunc = api.paths[pathNames[j]]
@@ -146,7 +145,7 @@ function getExistingZipFiles(){
 function buildLambdaFunctions(callback){
     let isNewBuildExecuted = false
     let zipFileNameSuffix = '-' + moment().format(awsmobilejsConstant.DateTimeFormatStringCompact)
-    let srcFuncNames = _.keys(_lambdaFuncSrcDirs)
+    let srcFuncNames = Object.keys(_lambdaFuncSrcDirs)
     if(srcFuncNames.length > 0){
         let count = 0
         for(let i = 0; i<srcFuncNames.length; i++){
@@ -201,12 +200,12 @@ function buildLambdaFunctions(callback){
 
 function updateLambdaFuncCodeName(){
     let codeFileNameUpdated = false
-    let lambdaWithZipFiles = _.keys(_lambdaFuncZipFiles)
+    let lambdaWithZipFiles = Object.keys(_lambdaFuncZipFiles)
     for(let i = 0; i<lambdaWithZipFiles.length; i++){
         let lambdaFuncName = lambdaWithZipFiles[i]
         let zipFileName = path.basename(_lambdaFuncZipFiles[lambdaFuncName])
 
-        let apiPaths = _.keys(_cloudApiPaths)
+        let apiPaths = Object.keys(_cloudApiPaths)
         for(let i = 0; i<apiPaths.length; i++){
             let lambdaFunc = _cloudApiPaths[apiPaths[i]]
             let codeFileName = 'uploads/' + zipFileName

lib/build-backend.js

@@ -11,7 +11,6 @@
  * and limitations under the License.
 */
 "use strict";
-const _ = require('lodash')
 const chalk = require('chalk')
 const moment = require('moment')
 const fs = require('fs-extra')

lib/build-frontend.js

@@ -16,7 +16,6 @@ const fs = require('fs-extra')
 const ora = require('ora')
 const moment = require('moment')
 const chalk = require('chalk')
-const _ = require('lodash')
 
 const { spawn } = require('child_process')
 
@@ -109,8 +108,8 @@ function isNpmInstallNeeded(){
         let packageInfo = JSON.parse(fs.readFileSync(packageJsonFilePath, 'utf8'))
         if(packageInfo){
 
-            let hasDependency = (packageInfo.dependencies &&  ! _.isEmpty(packageInfo.dependencies)) ||
-                                (packageInfo.devDependencies &&  !_.isEmpty(packageInfo.devDependencies))
+            let hasDependency = (packageInfo.dependencies &&  Object.keys(packageInfo.dependencies).length>0) ||
+                                (packageInfo.devDependencies &&  Object.keys(packageInfo.devDependencies).length>0)
             if(hasDependency){
                 if(!fs.existsSync(npm_modules_DirPath)){
                     result = true

lib/project-info-manager.js

@@ -16,7 +16,6 @@ const chalk = require('chalk')
 const fs = require('fs-extra')
 const moment = require('moment')
 const util = require('util')
-const _ = require('lodash')
 
 const projectValidator = require('./project-validator.js')
 const projectConfigManager = require('./project-config-manager.js')
@@ -140,11 +139,11 @@ function trimProjectInfo(projectInfo){
 
 function updateBackendProjectDetails(projectInfo, backendProjectDetails){
     if(backendProjectDetails && backendProjectDetails.projectId && backendProjectDetails.projectId.length > 0){
-        _.keys(backendPropertyMappings).forEach(function(propertyName){
+        Object.keys(backendPropertyMappings).forEach(function(propertyName){
             projectInfo[propertyName] = backendProjectDetails[backendPropertyMappings[propertyName]]
         })
     }else{
-        _.keys(backendPropertyMappings).forEach(function(propertyName){
+        Object.keys(backendPropertyMappings).forEach(function(propertyName){
             projectInfo[propertyName] = ''
         })
     }
@@ -153,7 +152,7 @@ function updateBackendProjectDetails(projectInfo, backendProjectDetails){
 }
 
 function onClearBackend(projectInfo){
-    _.keys(backendPropertyMappings).forEach(function(propertyName){
+    Object.keys(backendPropertyMappings).forEach(function(propertyName){
         projectInfo[propertyName] = ''
     })
     setProjectInfo(projectInfo)

lib/utils/dependency-manager.js

@@ -73,8 +73,9 @@ function setupAmplifyDependency(initInfo){
                         })
             break
             case 'angular': 
-                result = yarnAddAmplify(projectPath)
-                        .then(yarnAddAmplifyAngular)
+            case 'ionic': 
+                result = npmInstallAmplify(projectPath)
+                        .then(npmInstallAmplifyAngular)
                         .then((cwd)=>{
                             return initInfo
                         })
@@ -99,6 +100,10 @@ function npmInstallAmplify(cwd){
     return spawnChildProcess(npm, ['install', 'aws-amplify'], cwd)
 }
 
+function npmInstallAmplifyAngular(cwd){
+    return spawnChildProcess(npm, ['install', 'aws-amplify-angular'], cwd)
+}
+
 function yarnAddAmplify(cwd){
     if(isYarnInstalled()){
         return spawnChildProcess(yarn, ['add', 'aws-amplify'], cwd)
@@ -123,18 +128,10 @@ function yarnAddAmplifyReactNative(cwd){
     }
 }
 
-function yarnAddAmplifyAngular(cwd){
-    if(isYarnInstalled()){
-        return spawnChildProcess(yarn, ['add', 'aws-amplify-angular'], cwd)
-    }else{
-        return spawnChildProcess(npm, ['install', 'aws-amplify-angular'], cwd)
-    }
-}
-
 function isYarnInstalled(){
     var isYarnInstalled
     try {
-        execSync('yarn -h')
+        execSync('yarn --version', {stdio: 'ignore'})
         isYarnInstalled = true
     } catch (err) {
         isYarnInstalled = false

lib/utils/git-manager.js

@@ -63,7 +63,7 @@ function getGitIgnoreAppendString(){
     'appsync-info.json' + os.EOL +
     'aws-info.json' + os.EOL +
     'project-info.json' + os.EOL +
-    'aws-exports.js' + os.EOL +
+    'aws-exports.*' + os.EOL +
     'awsmobilejs/.awsmobile/backend-build' + os.EOL +
     'awsmobilejs/\\#current-backend-info' + os.EOL +
     '~awsmobilejs-*/'

lib/utils/starter-config-mapping.js

@@ -26,7 +26,7 @@ const vueConfig = frameworkConfigMappings['vue']
 module.exports = {
     'react': reactConfig,
     'react-native': reactNativeConfig,
-    'angular': angularConfig,
-    'ionic': ionicConfig,
-    'vue': vueConfig
+    // 'angular': angularConfig,
+    // 'ionic': ionicConfig,
+    // 'vue': vueConfig
 }