Merge branch 'master' into remove-lodash-typeof-checks

Author: ricardo-devis-agullo

src/cli/domain/registry.ts

@@ -123,7 +123,7 @@ export default function registry(opts: RegistryOptions = {}): RegistryCli {
       callback: Callback<unknown, string>
     ) {
       if (!!options.username && !!options.password) {
-        requestsHeaders = _.extend(requestsHeaders, {
+        requestsHeaders = Object.assign(requestsHeaders, {
           Authorization:
             'Basic ' +
             new Buffer(options.username + ':' + options.password).toString(

src/cli/facade/publish.ts

@@ -111,7 +111,7 @@ const publish =
             logger.warn(strings.messages.cli.REGISTRY_CREDENTIALS_REQUIRED);
 
             return getCredentials((_err, credentials) => {
-              putComponentToRegistry(_.extend(options, credentials), cb);
+              putComponentToRegistry(Object.assign(options, credentials), cb);
             });
           } else if ((err as any).code === 'cli_version_not_valid') {
             const upgradeCommand = strings.commands.cli.UPGRADE(

src/registry/domain/repository.ts

@@ -182,7 +182,7 @@ export default function repository(conf: Config): Repository {
                 null as any
               );
             }
-            callback(null, _.extend(component, { allVersions }));
+            callback(null, Object.assign(component, { allVersions }));
           }
         );
       });
@@ -360,7 +360,7 @@ export default function repository(conf: Config): Repository {
       }
 
       const validationResult = validator.validatePackageJson(
-        _.extend(pkgDetails, {
+        Object.assign(pkgDetails, {
           componentName,
           customValidator: conf.publishValidation
         })

src/registry/routes/components.ts

@@ -72,7 +72,7 @@ export default function components(
             headers: req.headers,
             ip: req.ip,
             omitHref: !!req.body.omitHref,
-            parameters: _.extend({}, req.body.parameters, component.parameters),
+            parameters: { ...req.body.parameters, ...component.parameters },
             version: component.version
           },
           result => callback(null, result)

src/registry/routes/helpers/get-component.ts

@@ -317,7 +317,7 @@ export default function getComponent(conf: Config, repository: Repository) {
             callback({
               status: 200,
               headers: responseHeaders,
-              response: _.extend(response, {
+              response: Object.assign(response, {
                 data: data,
                 template: {
                   src: repository.getStaticFilePath(
@@ -363,7 +363,7 @@ export default function getComponent(conf: Config, repository: Repository) {
                   callback({
                     status: 200,
                     headers: responseHeaders,
-                    response: _.extend(response, { html })
+                    response: Object.assign(response, { html })
                   });
                 }
               );

test/acceptance/registry.js

@@ -4,7 +4,6 @@ const expect = require('chai').expect;
 const emptyResponseHandler = require('oc-empty-response-handler');
 const path = require('path');
 const request = require('minimal-request');
-const _ = require('lodash');
 
 describe('registry', () => {
   let registry;
@@ -111,9 +110,10 @@ describe('registry', () => {
       before(done => {
         registry.close();
         initializeRegistry(
-          _.extend(getDefaultTestConfiguration(), {
+          {
+            ...getDefaultTestConfiguration(),
             customHeadersToSkipOnWeakVersion: ['Cache-Control']
-          }),
+          },
           done
         );
       });
@@ -273,9 +273,10 @@ describe('registry', () => {
       before(done => {
         registry.close();
         initializeRegistry(
-          _.extend(getDefaultTestConfiguration(), {
+          {
+            ...getDefaultTestConfiguration(),
             customHeadersToSkipOnWeakVersion: ['Cache-Control']
-          }),
+          },
           done
         );
       });

test/integration/targz.js

@@ -4,7 +4,6 @@ const expect = require('chai').expect;
 const fs = require('fs-extra');
 const path = require('path');
 const targz = require('targz');
-const _ = require('lodash');
 
 describe('The targz dependency', () => {
   describe('when compressing a folder with targz', () => {
@@ -21,9 +20,7 @@ describe('The targz dependency', () => {
           dest: file,
           tar: {
             map: function (fileName) {
-              return _.extend(fileName, {
-                name: 'hello-world/' + fileName.name
-              });
+              return { ...fileName, name: 'hello-world/' + fileName.name };
             }
           }
         },

test/unit/cli-domain-get-mocked-plugins.js

@@ -18,16 +18,14 @@ describe('cli : domain : get-mocked-plugins', () => {
   let getMockedPlugins;
 
   const initialise = function (fs, pathJoinStub) {
-    fsMock = _.extend(
-      {
-        existsSync: sinon.stub().returns(true),
-        readFileSync: sinon.stub().returns('file content'),
-        readJsonSync: sinon.stub().returns({ content: true }),
-        realpathSync: sinon.stub().returns('/root/'),
-        writeFile: sinon.stub().yields(null, 'ok')
-      },
-      fs || {}
-    );
+    fsMock = {
+      existsSync: sinon.stub().returns(true),
+      readFileSync: sinon.stub().returns('file content'),
+      readJsonSync: sinon.stub().returns({ content: true }),
+      realpathSync: sinon.stub().returns('/root/'),
+      writeFile: sinon.stub().yields(null, 'ok'),
+      ...fs
+    };
 
     const fakePathFunc = function () {
       return _.toArray(arguments)

test/unit/registry-domain-repository.js

@@ -5,7 +5,6 @@ const fs = require('fs-extra');
 const injectr = require('injectr');
 const path = require('path');
 const sinon = require('sinon');
-const _ = require('lodash');
 
 describe('registry : domain : repository', () => {
   let response;
@@ -150,7 +149,7 @@ describe('registry : domain : repository', () => {
 
       describe('when the templates specificed on the configuaration are core-templates', () => {
         it('should only return uniques templates', () => {
-          const conf = _.extend(cdnConfiguration, {
+          const conf = Object.assign(cdnConfiguration, {
             templates: [require('oc-template-jade')]
           });
           const repository = Repository(conf);
@@ -161,7 +160,7 @@ describe('registry : domain : repository', () => {
       describe('when templates specificed on the configuaration are not installed', () => {
         it('should throw an error', () => {
           try {
-            const conf = _.extend(cdnConfiguration, {
+            const conf = Object.assign(cdnConfiguration, {
               templates: [require('oc-template-react')]
             });
             Repository(conf);
@@ -360,7 +359,7 @@ describe('registry : domain : repository', () => {
             s3Mock.putDir = sinon.stub();
             s3Mock.putDir.yields(null, 'done');
             repository.publishComponent(
-              _.extend(pkg, {
+              Object.assign(pkg, {
                 outputFolder: '/path/to/component',
                 componentName: 'hello-world'
               }),