refactor: Upgrade "@serverless/utils" to v2

Drop "@serverless/inquirer" dependency
serverless · Sep 23, 2020 · ef39e95 · ef39e95
1 parent b867df1
commit ef39e95
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",