refactor: Replace _.assign and _.extend with Object.assign (#7766)

lib/classes/PluginManager.js

@@ -243,7 +243,7 @@ class PluginManager {
       }
       this.createCommandAlias(alias, key);
     });
-    return _.assign({}, details, { key, pluginName, commands });
+    return Object.assign({}, details, { key, pluginName, commands });
   }
 
   loadCommands(pluginInstance) {

lib/classes/Variables.js

@@ -146,8 +146,8 @@ class Variables {
     const provider = this.serverless.getProvider('aws');
     if (provider) {
       const requiredConfigs = [
-        _.assign({ name: 'region' }, provider.getRegionSourceValue()),
-        _.assign({ name: 'stage' }, provider.getStageSourceValue()),
+        Object.assign({ name: 'region' }, provider.getRegionSourceValue()),
+        Object.assign({ name: 'stage' }, provider.getStageSourceValue()),
         {
           name: 'profile',
           value: this.service.provider.profile,
@@ -177,7 +177,7 @@ class Variables {
       return this.disableDepedentServices(() => {
         const prepopulations = requiredConfigs.map(config =>
           this.populateValue(config.value, true) // populate
-            .then(populated => _.assign(config, { populated }))
+            .then(populated => Object.assign(config, { populated }))
         );
         return this.assignProperties(provider, prepopulations);
       });
@@ -293,7 +293,7 @@ class Variables {
     );
     return _.map(variables, variable =>
       this.populateValue(variable.value, false).then(populated =>
-        _.assign({}, variable, { populated })
+        Object.assign({}, variable, { populated })
       )
     );
   }

lib/plugins/aws/deploy/lib/createStack.js

@@ -13,7 +13,7 @@ module.exports = {
 
     // Merge additional stack tags
     if (typeof this.serverless.service.provider.stackTags === 'object') {
-      stackTags = _.extend(stackTags, this.serverless.service.provider.stackTags);
+      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
     }
 
     const params = {

lib/plugins/aws/deploy/lib/extendedValidate.js

@@ -23,7 +23,7 @@ module.exports = {
     const selfReferences = findReferences(state.service, '${self:}');
     _.forEach(selfReferences, ref => _.set(state.service, ref, this.serverless.service));
 
-    _.assign(this.serverless.service, state.service);
+    Object.assign(this.serverless.service, state.service);
 
     this.serverless.service.package.artifactDirectoryName = state.package.artifactDirectoryName;
     // only restore the default artifact path if the user is not using a custom path

lib/plugins/aws/lib/updateStack.js

@@ -19,7 +19,7 @@ module.exports = {
 
     // Merge additional stack tags
     if (typeof this.serverless.service.provider.stackTags === 'object') {
-      stackTags = _.extend(stackTags, this.serverless.service.provider.stackTags);
+      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
     }
 
     const params = {
@@ -66,7 +66,7 @@ module.exports = {
 
     // Merge additional stack tags
     if (typeof this.serverless.service.provider.stackTags === 'object') {
-      stackTags = _.extend(stackTags, this.serverless.service.provider.stackTags);
+      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
     }
 
     const params = {

lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js

@@ -17,7 +17,7 @@ module.exports = {
         };
 
         if (typeof authorizer.identityValidationExpression === 'string') {
-          _.assign(authorizerProperties, {
+          Object.assign(authorizerProperties, {
             IdentityValidationExpression: authorizer.identityValidationExpression,
           });
         }

lib/plugins/aws/package/compile/events/apiGateway/lib/method/integration.js

@@ -63,7 +63,7 @@ module.exports = {
     // * `HTTP_PROXY` for integrating with the HTTP proxy integration, or
     // * `AWS_PROXY` for integrating with the Lambda proxy integration type (the default)
     if (type === 'AWS' || type === 'AWS_PROXY') {
-      _.assign(integration, {
+      Object.assign(integration, {
         Uri: {
           'Fn::Join': [
             '',
@@ -82,12 +82,12 @@ module.exports = {
         },
       });
     } else if (type === 'HTTP' || type === 'HTTP_PROXY') {
-      _.assign(integration, {
+      Object.assign(integration, {
         Uri: http.request && http.request.uri,
         IntegrationHttpMethod: _.toUpper((http.request && http.request.method) || http.method),
       });
       if (http.connectionType) {
-        _.assign(integration, {
+        Object.assign(integration, {
           ConnectionType: http.connectionType,
           ConnectionId: http.connectionId,
         });
@@ -97,7 +97,7 @@ module.exports = {
     }
 
     if (type === 'AWS' || type === 'HTTP' || type === 'MOCK') {
-      _.assign(integration, {
+      Object.assign(integration, {
         PassthroughBehavior: http.request && http.request.passThrough,
         ContentHandling: http.request && http.request.contentHandling,
         RequestTemplates: this.getIntegrationRequestTemplates(http, type === 'AWS'),
@@ -110,7 +110,7 @@ module.exports = {
         !_.isEmpty(http.request.parameters)) ||
       http.async
     ) {
-      _.assign(integration, {
+      Object.assign(integration, {
         RequestParameters: this.getIntegrationRequestParameters(http),
       });
     }
@@ -199,15 +199,15 @@ module.exports = {
 
     // Only set defaults for AWS (lambda) integration
     if (useDefaults) {
-      _.assign(integrationRequestTemplates, {
+      Object.assign(integrationRequestTemplates, {
         'application/json': this.DEFAULT_JSON_REQUEST_TEMPLATE,
         'application/x-www-form-urlencoded': this.DEFAULT_FORM_URL_ENCODED_REQUEST_TEMPLATE,
       });
     }
 
     // set custom request templates if provided
     if (http.request && typeof http.request.template === 'object') {
-      _.assign(integrationRequestTemplates, http.request.template);
+      Object.assign(integrationRequestTemplates, http.request.template);
     }
 
     return !_.isEmpty(integrationRequestTemplates) ? integrationRequestTemplates : undefined;

lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js

@@ -549,7 +549,7 @@ module.exports = {
       }
 
       if (response.statusCodes) {
-        response.statusCodes = _.assign({}, response.statusCodes);
+        response.statusCodes = Object.assign({}, response.statusCodes);
 
         if (!_.some(response.statusCodes, code => code.pattern === '')) {
           response.statusCodes['200'] = DEFAULT_STATUS_CODES['200'];

lib/plugins/aws/package/compile/events/s3/index.js

@@ -139,7 +139,7 @@ class AwsCompileS3Events {
               };
 
               // Assign 'filter' if not empty
-              newLambdaConfiguration = _.assign(newLambdaConfiguration, filter);
+              newLambdaConfiguration = Object.assign(newLambdaConfiguration, filter);
               bucketsLambdaConfigurations[bucketName].push(newLambdaConfiguration);
             } else {
               bucketsLambdaConfigurations[bucketName] = [
@@ -151,7 +151,7 @@ class AwsCompileS3Events {
                 },
               ];
               // Assign 'filter' if not empty
-              bucketsLambdaConfigurations[bucketName][0] = _.assign(
+              bucketsLambdaConfigurations[bucketName][0] = Object.assign(
                 bucketsLambdaConfigurations[bucketName][0],
                 filter
               );

lib/plugins/aws/package/lib/generateCoreTemplate.js

@@ -8,7 +8,7 @@ const validateS3BucketName = require('../../lib/validateS3BucketName');
 
 module.exports = {
   generateCoreTemplate() {
-    _.assign(this, validateS3BucketName);
+    Object.assign(this, validateS3BucketName);
 
     this.serverless.service.provider.compiledCloudFormationTemplate = this.serverless.utils.readFileSync(
       path.join(

lib/plugins/aws/package/lib/saveServiceState.js

@@ -19,7 +19,7 @@ module.exports = {
       _.split(_.get(this.serverless.service, 'package.artifact', ''), path.sep)
     );
 
-    const strippedService = _.assign(
+    const strippedService = Object.assign(
       {},
       _.omit(this.serverless.service, ['serverless', 'package'])
     );

lib/plugins/aws/provider/awsProvider.js

@@ -322,7 +322,7 @@ class AwsProvider {
             // We do not want to trigger the retry mechanism for credential errors
             return BbPromise.reject(
               Object.assign(new this.serverless.classes.Error(errorMessage), {
-                providerError: _.assign({}, err, { retryable: false }),
+                providerError: Object.assign({}, err, { retryable: false }),
               })
             );
           }

lib/plugins/plugin/install/install.test.js

@@ -11,7 +11,6 @@ const fse = require('fs-extra');
 const PluginInstall = require('./install');
 const Serverless = require('../../../Serverless');
 const CLI = require('../../../classes/CLI');
-const _ = require('lodash');
 const userStats = require('../../../utils/userStats');
 const { expect } = require('chai');
 const { getTmpDirPath } = require('../../../../tests/utils/fs');
@@ -334,7 +333,7 @@ describe('PluginInstall', () => {
 
       return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
         expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-          _.assign({}, serverlessYml, {
+          Object.assign({}, serverlessYml, {
             plugins: ['serverless-plugin-1'],
           })
         );
@@ -354,7 +353,7 @@ describe('PluginInstall', () => {
 
       return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
         expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-          _.assign({}, serverlessYml, {
+          Object.assign({}, serverlessYml, {
             plugins: ['serverless-existing-plugin', 'serverless-plugin-1'],
           })
         );
@@ -371,7 +370,7 @@ describe('PluginInstall', () => {
       pluginInstall.options.pluginName = 'serverless-plugin-1';
       return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
         expect(serverless.utils.readFileSync(serverlessYamlFilePath, 'utf8')).to.deep.equal(
-          _.assign({}, serverlessYml, { plugins: ['serverless-plugin-1'] })
+          Object.assign({}, serverlessYml, { plugins: ['serverless-plugin-1'] })
         );
       });
     });
@@ -387,14 +386,14 @@ describe('PluginInstall', () => {
       return expect(pluginInstall.addPluginToServerlessFile())
         .to.be.fulfilled.then(() => {
           expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-            _.assign({}, serverlessJson, { plugins: ['serverless-plugin-1'] })
+            Object.assign({}, serverlessJson, { plugins: ['serverless-plugin-1'] })
           );
         })
         .then(() => {
           pluginInstall.options.pluginName = 'serverless-plugin-2';
           return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
             expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-              _.assign({}, serverlessJson, {
+              Object.assign({}, serverlessJson, {
                 plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
               })
             );
@@ -438,7 +437,7 @@ describe('PluginInstall', () => {
 
         return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
           expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-            _.assign({}, serverlessYml, {
+            Object.assign({}, serverlessYml, {
               plugins: {
                 localPath: 'test',
                 modules: [pluginInstall.options.pluginName],
@@ -463,7 +462,7 @@ describe('PluginInstall', () => {
         return expect(pluginInstall.addPluginToServerlessFile())
           .to.be.fulfilled.then(() => {
             expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-              _.assign({}, serverlessJson, {
+              Object.assign({}, serverlessJson, {
                 plugins: {
                   localPath: 'test',
                   modules: [pluginInstall.options.pluginName],
@@ -475,7 +474,7 @@ describe('PluginInstall', () => {
             pluginInstall.options.pluginName = 'serverless-plugin-2';
             return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
               expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-                _.assign({}, serverlessJson, {
+                Object.assign({}, serverlessJson, {
                   plugins: {
                     localPath: 'test',
                     modules: ['serverless-plugin-1', 'serverless-plugin-2'],

lib/utils/yamlAstParser.test.js

@@ -5,7 +5,6 @@ const chai = require('chai');
 const writeFileSync = require('./fs/writeFileSync');
 const readFileSync = require('./fs/readFileSync');
 const yamlAstParser = require('./yamlAstParser');
-const _ = require('lodash');
 const chaiAsPromised = require('chai-as-promised');
 const { getTmpDirPath } = require('../../tests/utils/fs');
 
@@ -33,7 +32,7 @@ describe('#yamlAstParser', () => {
 
     it('should add a top level object and item into the yaml file', () => {
       const yamlContent = { service: 'test-service' };
-      const expectedResult = _.assign({}, yamlContent, {
+      const expectedResult = Object.assign({}, yamlContent, {
         toplevel: ['foo'],
       });
       return addNewArrayItemAndVerifyResult(yamlContent, 'toplevel', 'foo', expectedResult);
@@ -47,7 +46,7 @@ describe('#yamlAstParser', () => {
 
     it('should add a multiple level object and item into the yaml file', () => {
       const yamlContent = { service: 'test-service' };
-      const expectedResult = _.assign({}, yamlContent, {
+      const expectedResult = Object.assign({}, yamlContent, {
         toplevel: {
           second: {
             third: ['foo'],