Inline the serverless utils package

commands/doctor.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const fsp = require('fs').promises;
-const { writeText, log } = require('@serverless/utils/log');
+const { writeText, log } = require('../lib/utils/serverless-utils/log');
 const healthStatusFilename = require('../lib/utils/health-status-filename');
 
 module.exports = async () => {

commands/plugin-install.js

@@ -7,8 +7,8 @@ const path = require('path');
 const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
-const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const { log, progress, style } = require('@serverless/utils/log');
+const cloudformationSchema = require('../lib/utils/serverless-utils/cloudformation-schema');
+const { log, progress, style } = require('../lib/utils/serverless-utils/log');
 const ServerlessError = require('../lib/serverless-error');
 const yamlAstParser = require('../lib/utils/yaml-ast-parser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');

commands/plugin-uninstall.js

@@ -7,8 +7,8 @@ const path = require('path');
 const _ = require('lodash');
 const isPlainObject = require('type/plain-object/is');
 const yaml = require('js-yaml');
-const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
-const { log, progress, style } = require('@serverless/utils/log');
+const cloudformationSchema = require('../lib/utils/serverless-utils/cloudformation-schema');
+const { log, progress, style } = require('../lib/utils/serverless-utils/log');
 const yamlAstParser = require('../lib/utils/yaml-ast-parser');
 const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
 const {

lib/aws/request.js

@@ -5,7 +5,7 @@ const memoize = require('memoizee');
 const PromiseQueue = require('promise-queue');
 const sdk = require('./sdk-v2');
 const ServerlessError = require('../../lib/serverless-error');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../utils/serverless-utils/log');
 const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const https = require('https');

lib/classes/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const chalk = require('chalk');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../utils/serverless-utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const renderHelp = require('../cli/render-help');
 

lib/classes/config-schema-handler/index.js

@@ -6,7 +6,7 @@ const schema = require('../../config-schema');
 const ServerlessError = require('../../serverless-error');
 const normalizeAjvErrors = require('./normalize-ajv-errors');
 const resolveAjvValidate = require('./resolve-ajv-validate');
-const { log, style } = require('@serverless/utils/log');
+const { log, style } = require('../../utils/serverless-utils/log');
 
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
 const ERROR_PREFIX = 'Configuration error';

lib/classes/config-schema-handler/resolve-ajv-validate.js

@@ -5,7 +5,7 @@ const objectHash = require('object-hash');
 const path = require('path');
 const os = require('os');
 const standaloneCode = require('ajv/dist/standalone').default;
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../utils/serverless-utils/log');
 const fsp = require('fs').promises;
 const resolveTmpdir = require('process-utils/tmpdir');
 const safeMoveFile = require('../../utils/fs/safe-move-file');

lib/classes/plugin-manager.js

@@ -8,7 +8,7 @@ const renderCommandHelp = require('../cli/render-help/command');
 const tokenizeException = require('../utils/tokenize-exception');
 const getRequire = require('../utils/get-require');
 const importModule = require('../utils/require-with-import-fallback');
-const { log, getPluginWriters } = require('@serverless/utils/log');
+const { log, getPluginWriters } = require('../utils/serverless-utils/log');
 
 let hooksIdCounter = 0;
 let nestTracker = 0;

lib/classes/service.js

@@ -4,7 +4,7 @@ const ServerlessError = require('../serverless-error');
 const util = require('util');
 const _ = require('lodash');
 const semver = require('semver');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../utils/serverless-utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 // const currentVersion = require('../../package').version;
 // const isLocallyInstalled = require('../cli/is-locally-installed');

lib/cli/handle-error.js

@@ -2,7 +2,7 @@
 
 const isObject = require('type/object/is');
 const stripAnsi = require('strip-ansi');
-const { style, writeText, log } = require('@serverless/utils/log');
+const { style, writeText, log } = require('../utils/serverless-utils/log');
 const slsVersion = require('./../../package').version;
 const isStandaloneExecutable = require('../utils/is-standalone-executable');
 const tokenizeException = require('../utils/tokenize-exception');

lib/cli/render-help/command.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { writeText } = require('@serverless/utils/log');
+const { writeText } = require('../../utils/serverless-utils/log');
 const resolveInput = require('../resolve-input');
 const renderOptionsHelp = require('./options');
 

lib/cli/render-help/general.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('../../utils/serverless-utils/log');
 const { version } = require('../../../package');
 const globalOptions = require('../commands-schema/common-options/global');
 const resolveInput = require('../resolve-input');

lib/cli/render-help/generate-command-usage.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { style } = require('@serverless/utils/log');
+const { style } = require('../../utils/serverless-utils/log');
 
 module.exports = (commandName, commandSchema) => {
   const indentFillLength = 30;

lib/cli/render-help/options.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('../../utils/serverless-utils/log');
 
 module.exports = (commandOptions) => {
   const indentFillLength = 40;

lib/cli/render-version.js

@@ -4,7 +4,7 @@ const path = require('path');
 const { version } = require('../../package');
 const isStandaloneExecutable = require('../utils/is-standalone-executable');
 const localServerlessPath = require('./local-serverless-path');
-const { writeText } = require('@serverless/utils/log');
+const { writeText } = require('../utils/serverless-utils/log');
 
 const serverlessPath = path.resolve(__dirname, '../..');
 

lib/cli/run-compose.js

@@ -5,7 +5,7 @@ const { createRequire } = require('module');
 const path = require('path');
 const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
-const inquirer = require('@serverless/utils/inquirer');
+const inquirer = require('../utils/serverless-utils/inquirer');
 
 const relativeBinPath = '@osls/compose/bin/serverless-compose';
 

lib/cli/write-service-outputs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('../utils/serverless-utils/log');
 
 module.exports = (serviceOutputs) => {
   for (const [section, entries] of serviceOutputs) {

lib/configuration/read.js

@@ -5,7 +5,7 @@ const isPlainObject = require('type/plain-object/is');
 const path = require('path');
 const fsp = require('fs').promises;
 const yaml = require('js-yaml');
-const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const cloudformationSchema = require('../utils/serverless-utils/cloudformation-schema');
 const ServerlessError = require('../serverless-error');
 
 const readConfigurationFile = async (configurationPath) => {

lib/configuration/variables/eventually-report-resolution-errors.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../utils/serverless-utils/log');
 const ServerlessError = require('../../serverless-error');
 const resolveCliInput = require('../../cli/resolve-input');
 

lib/configuration/variables/sources/file.js

@@ -5,7 +5,7 @@ const isPlainFunction = require('type/plain-function/is');
 const path = require('path');
 const fsp = require('fs').promises;
 const yaml = require('js-yaml');
-const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const cloudformationSchema = require('../../../utils/serverless-utils/cloudformation-schema');
 const ServerlessError = require('../../../serverless-error');
 
 const readFile = async (filePath, serviceDir) => {

lib/plugins/aws/config-credentials.js

@@ -4,7 +4,7 @@ const os = require('os');
 const credentials = require('./utils/credentials');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../utils/serverless-utils/log');
 
 class AwsConfigCredentials {
   constructor(serverless, options) {

lib/plugins/aws/custom-resources/index.js

@@ -5,7 +5,7 @@ const path = require('path');
 const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../../utils/serverless-utils/log');
 const generateZip = require('./generate-zip');
 const ServerlessError = require('../../../serverless-error');
 

lib/plugins/aws/custom-resources/resources/api-gateway-cloud-watch-role/handler.js

@@ -58,10 +58,7 @@ async function create(event, context) {
         return (await iam.send(new ListAttachedRolePoliciesCommand({ RoleName: roleName })))
           .AttachedPolicies;
       } catch (error) {
-        if (
-          error.code === 'NoSuchEntity' ||
-          error.message.includes('cannot be found')
-        ) {
+        if (error.code === 'NoSuchEntity' || error.message.includes('cannot be found')) {
           // Role doesn't exist yet, create;
           await iam.send(
             new CreateRoleCommand({

lib/plugins/aws/deploy-function.js

@@ -8,7 +8,7 @@ const wait = require('timers-ext/promise/sleep');
 const validate = require('./lib/validate');
 const filesize = require('../../utils/filesize');
 const ServerlessError = require('../../serverless-error');
-const { log, style, progress } = require('@serverless/utils/log');
+const { log, style, progress } = require('../../utils/serverless-utils/log');
 
 const mainProgress = progress.get('main');
 

lib/plugins/aws/deploy-list.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { log, writeText } = require('@serverless/utils/log');
+const { log, writeText } = require('../../utils/serverless-utils/log');
 const validate = require('./lib/validate');
 const findAndGroupDeployments = require('./utils/find-and-group-deployments');
 const setBucketName = require('./lib/set-bucket-name');

lib/plugins/aws/deploy/index.js

@@ -21,7 +21,7 @@ const validateTemplate = require('./lib/validate-template');
 const updateStack = require('../lib/update-stack');
 const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
 const path = require('path');
-const { style, log, progress, writeText } = require('@serverless/utils/log');
+const { style, log, progress, writeText } = require('../../../utils/serverless-utils/log');
 const memoize = require('memoizee');
 
 const mainProgress = progress.get('main');

lib/plugins/aws/deploy/lib/check-for-changes.js

@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const normalizeFiles = require('../../lib/normalize-files');
 const ServerlessError = require('../../../../serverless-error');
-const log = require('@serverless/utils/log').log.get('check-for-changes');
+const log = require('../../../../utils/serverless-utils/log').log.get('check-for-changes');
 
 const fsp = fs.promises;
 
@@ -70,10 +70,13 @@ module.exports = {
         );
       }
     })();
-    const objects = result?.Contents?.filter(({ Key: key }) =>
-      isDeploymentDirToken(key.split('/')[3])
-    );
-    if (!objects?.length) return [];
+    const contents = result && result.Contents;
+    const objects = contents
+      ? contents.filter(({ Key: key }) => isDeploymentDirToken(key.split('/')[3]))
+      : [];
+    if (!objects.length) {
+      return [];
+    }
 
     const ordered = _.orderBy(objects, ['Key'], ['desc']);
 

lib/plugins/aws/deploy/lib/cleanup-s3-bucket.js

@@ -4,7 +4,7 @@ const _ = require('lodash');
 const findAndGroupDeployments = require('../../utils/find-and-group-deployments');
 const getS3ObjectsFromStacks = require('../../utils/get-s3-objects-from-stacks');
 const ServerlessError = require('../../../../serverless-error');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../../../utils/serverless-utils/log');
 
 module.exports = {
   async getObjectsToRemove() {

lib/plugins/aws/deploy/lib/create-stack.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const { progress, log } = require('@serverless/utils/log');
+const { progress, log } = require('../../../../utils/serverless-utils/log');
 const ServerlessError = require('../../../../serverless-error');
 const isChangeSetWithoutChanges = require('../../utils/is-change-set-without-changes');
 

lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const ServerlessError = require('../../../../serverless-error');
-const { log, progress } = require('@serverless/utils/log');
+const { log, progress } = require('../../../../utils/serverless-utils/log');
 const jsyaml = require('js-yaml');
 
 const mainProgress = progress.get('main');

lib/plugins/aws/deploy/lib/extended-validate.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const _ = require('lodash');
 const ServerlessError = require('../../../../serverless-error');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../../../utils/serverless-utils/log');
 
 module.exports = {
   async extendedValidate() {

lib/plugins/aws/deploy/lib/upload-artifacts.js

@@ -10,7 +10,7 @@ const normalizeFiles = require('../../lib/normalize-files');
 const getLambdaLayerArtifactPath = require('../../utils/get-lambda-layer-artifact-path');
 const ServerlessError = require('../../../../serverless-error');
 const setS3UploadEncryptionOptions = require('../../../../aws/set-s3-upload-encryption-options');
-const { progress, log } = require('@serverless/utils/log');
+const { progress, log } = require('../../../../utils/serverless-utils/log');
 
 const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
   Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;

lib/plugins/aws/info/display.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { isVerboseMode, style } = require('@serverless/utils/log');
+const { isVerboseMode, style } = require('../../../utils/serverless-utils/log');
 
 const filesize = require('../../../utils/filesize');
 

lib/plugins/aws/info/index.js

@@ -1,13 +1,13 @@
 'use strict';
 
-const { progress, style } = require('@serverless/utils/log');
+const { progress, style } = require('../../../utils/serverless-utils/log');
 const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
 const getStackInfo = require('./get-stack-info');
 const getResourceCount = require('./get-resource-count');
 const getApiKeyValues = require('./get-api-key-values');
 const display = require('./display');
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../../utils/serverless-utils/log');
 
 const mainProgress = progress.get('main');
 

lib/plugins/aws/invoke-local/index.js

@@ -11,7 +11,7 @@ const stdin = require('get-stdin');
 const spawnExt = require('child-process-ext/spawn');
 const { spawn } = require('child_process');
 const inspect = require('util').inspect;
-const download = require('@serverless/utils/download');
+const download = require('../../../utils/serverless-utils/download');
 const { ensureDir } = require('fs-extra');
 const cachedir = require('cachedir');
 const decompress = require('decompress');
@@ -23,7 +23,7 @@ const isStandalone = require('../../../utils/is-standalone-executable');
 const ensureArtifact = require('../../../utils/ensure-artifact');
 const resolveCfImportValue = require('../utils/resolve-cf-import-value');
 const resolveCfRefValue = require('../utils/resolve-cf-ref-value');
-const { writeText, progress, log } = require('@serverless/utils/log');
+const { writeText, progress, log } = require('../../../utils/serverless-utils/log');
 
 const cachePath = path.join(cachedir('serverless'), 'invokeLocal');
 

lib/plugins/aws/invoke.js

@@ -5,7 +5,7 @@ const validate = require('./lib/validate');
 const stdin = require('get-stdin');
 const formatLambdaLogEvent = require('./utils/format-lambda-log-event');
 const ServerlessError = require('../../serverless-error');
-const { writeText, style } = require('@serverless/utils/log');
+const { writeText, style } = require('../../utils/serverless-utils/log');
 
 class AwsInvoke {
   constructor(serverless, options) {

lib/plugins/aws/lib/check-if-ecr-repository-exists.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { log } = require('@serverless/utils/log');
+const { log } = require('../../../utils/serverless-utils/log');
 
 module.exports = {
   async checkIfEcrRepositoryExists() {

lib/plugins/aws/lib/monitor-stack.js

@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 const wait = require('timers-ext/promise/sleep');
 const ServerlessError = require('../../../serverless-error');
-const { log, style, progress } = require('@serverless/utils/log');
+const { log, style, progress } = require('../../../utils/serverless-utils/log');
 const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
 
 const mainProgress = progress.get('main');

lib/plugins/aws/lib/update-stack.js

@@ -2,7 +2,7 @@
 
 const BbPromise = require('bluebird');
 const getS3EndpointForRegion = require('../utils/get-s3-endpoint-for-region');
-const { log, progress } = require('@serverless/utils/log');
+const { log, progress } = require('../../../utils/serverless-utils/log');
 const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
 
 const NO_UPDATE_MESSAGE = 'No updates are to be performed.';

lib/plugins/aws/lib/upload-zip-file.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const fs = require('fs');
 const crypto = require('crypto');
-const log = require('@serverless/utils/log').log.get('deploy:upload');
+const log = require('../../../utils/serverless-utils/log').log.get('deploy:upload');
 const setS3UploadEncryptionOptions = require('../../../aws/set-s3-upload-encryption-options');
 
 module.exports = {