From ef39e958db39b367875af871a7014b4d284f5554 Mon Sep 17 00:00:00 2001
From: Mariusz Nowak <medyk@medikoo.com>
Date: Wed, 23 Sep 2020 15:06:28 +0200
Subject: [PATCH] refactor: Upgrade "@serverless/utils" to v2

Drop "@serverless/inquirer" dependency
---
 lib/plugins/interactiveCli/index.js                  | 2 +-
 lib/plugins/interactiveCli/initializeService.js      | 2 +-
 lib/plugins/interactiveCli/initializeService.test.js | 2 +-
 lib/plugins/interactiveCli/setupAws.js               | 2 +-
 lib/plugins/interactiveCli/setupAws.test.js          | 4 ++--
 lib/plugins/interactiveCli/tabCompletion.js          | 2 +-
 lib/plugins/interactiveCli/tabCompletion.test.js     | 2 +-
 lib/plugins/interactiveCli/utils.js                  | 2 +-
 package.json                                         | 3 +--
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/plugins/interactiveCli/index.js b/lib/plugins/interactiveCli/index.js
index e7457b9e0c1..d0aabbb7a9b 100644
--- a/lib/plugins/interactiveCli/index.js
+++ b/lib/plugins/interactiveCli/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 const initializeService = require('./initializeService');
 const setupAws = require('./setupAws');
 const tabCompletion = require('./tabCompletion');
diff --git a/lib/plugins/interactiveCli/initializeService.js b/lib/plugins/interactiveCli/initializeService.js
index 91060472d37..3128cf88312 100644
--- a/lib/plugins/interactiveCli/initializeService.js
+++ b/lib/plugins/interactiveCli/initializeService.js
@@ -2,7 +2,7 @@
 
 const { join } = require('path');
 const chalk = require('chalk');
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 const createFromTemplate = require('../../utils/createFromTemplate');
 const {
   getConfigFilePath,
diff --git a/lib/plugins/interactiveCli/initializeService.test.js b/lib/plugins/interactiveCli/initializeService.test.js
index c836bb9227e..b1c3e1f6bd1 100644
--- a/lib/plugins/interactiveCli/initializeService.test.js
+++ b/lib/plugins/interactiveCli/initializeService.test.js
@@ -5,7 +5,7 @@ const { expect } = require('chai');
 const sinon = require('sinon');
 const { remove: rmDir, lstat } = require('fs-extra');
 const runServerless = require('../../../test/utils/run-serverless');
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 
 const fixturesPath = join(__dirname, 'test/fixtures');
diff --git a/lib/plugins/interactiveCli/setupAws.js b/lib/plugins/interactiveCli/setupAws.js
index 382fbfa775c..84022777af9 100644
--- a/lib/plugins/interactiveCli/setupAws.js
+++ b/lib/plugins/interactiveCli/setupAws.js
@@ -2,7 +2,7 @@
 
 const BbPromise = require('bluebird');
 const chalk = require('chalk');
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 const awsCredentials = require('../aws/utils/credentials');
 const { confirm } = require('./utils');
 const openBrowser = require('../../utils/openBrowser');
diff --git a/lib/plugins/interactiveCli/setupAws.test.js b/lib/plugins/interactiveCli/setupAws.test.js
index c7f1da94239..197dc32549e 100644
--- a/lib/plugins/interactiveCli/setupAws.test.js
+++ b/lib/plugins/interactiveCli/setupAws.test.js
@@ -7,7 +7,7 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const { remove: rmDir, lstat, outputFile: writeFile } = require('fs-extra');
 const { resolveFileProfiles } = require('../aws/utils/credentials');
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
 const runServerless = require('../../../test/utils/run-serverless');
 
@@ -25,7 +25,7 @@ const modulesCacheStub = {
       openBrowserUrls.push(url);
     }),
   // Ensure to rely on same inquirer module that we mock in tests
-  [require.resolve('@serverless/inquirer')]: inquirer,
+  [require.resolve('@serverless/utils/inquirer')]: inquirer,
 };
 
 describe('interactiveCli: setupAws', () => {
diff --git a/lib/plugins/interactiveCli/tabCompletion.js b/lib/plugins/interactiveCli/tabCompletion.js
index 0530f0a76e0..71520dc21d1 100644
--- a/lib/plugins/interactiveCli/tabCompletion.js
+++ b/lib/plugins/interactiveCli/tabCompletion.js
@@ -12,7 +12,7 @@ const muteConsoleLog = require('../../utils/log/muteConsoleLog');
 const isTabTabCompletionSupported = require('../../utils/tabCompletion/isSupported');
 const tabtabOptions = require('../../utils/tabCompletion/tabtabOptions');
 const promptDisabledConfigPropertyName = require('../../utils/tabCompletion/promptDisabledConfigPropertyName');
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 const { confirm } = require('./utils');
 
 BbPromise.promisifyAll(fs);
diff --git a/lib/plugins/interactiveCli/tabCompletion.test.js b/lib/plugins/interactiveCli/tabCompletion.test.js
index 34883a8eab1..413f821da9a 100644
--- a/lib/plugins/interactiveCli/tabCompletion.test.js
+++ b/lib/plugins/interactiveCli/tabCompletion.test.js
@@ -12,7 +12,7 @@ const BbPromise = require('bluebird');
 const configUtils = require('@serverless/utils/config');
 const promptDisabledConfigPropertyName = require('../../utils/tabCompletion/promptDisabledConfigPropertyName');
 const isTabCompletionSupported = require('../../utils/tabCompletion/isSupported');
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 
 const lifecycleHookNamesBlacklist = [
   'before:interactiveCli:setupAws',
diff --git a/lib/plugins/interactiveCli/utils.js b/lib/plugins/interactiveCli/utils.js
index aa45b2c81de..0c48679d8ab 100644
--- a/lib/plugins/interactiveCli/utils.js
+++ b/lib/plugins/interactiveCli/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const inquirer = require('@serverless/inquirer');
+const inquirer = require('@serverless/utils/inquirer');
 
 module.exports = {
   confirm: (message, options = {}) => {
diff --git a/package.json b/package.json
index 7c21bcc975d..7641772ae55 100644
--- a/package.json
+++ b/package.json
@@ -25,8 +25,7 @@
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.1.3",
     "@serverless/enterprise-plugin": "^4.0.4",
-    "@serverless/inquirer": "^1.1.2",
-    "@serverless/utils": "^1.2.0",
+    "@serverless/utils": "^2.0.0",
     "ajv": "^6.12.5",
     "ajv-keywords": "^3.5.2",
     "archiver": "^5.0.2",