refactor: Use @serverless/utils for cloudformationSchema (#8705)

serverless · Jan 6, 2021 · 2efc357 · 2efc357
1 parent 4460383
commit 2efc357
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 76 deletions.
diff --git a/lib/plugins/aws/lib/cloudformationSchema.js b/lib/plugins/aws/lib/cloudformationSchema.js
diff --git a/lib/utils/fs/parse.js b/lib/utils/fs/parse.js
@@ -3,7 +3,7 @@
 const jc = require('json-cycle');
 const yaml = require('js-yaml');
 const _ = require('lodash');
-const cloudFormationSchema = require('../../plugins/aws/lib/cloudformationSchema');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 
 const loadYaml = (contents, options) => {
   let data;
@@ -26,7 +26,7 @@ function parse(filePath, contents) {
     };
     let result = loadYaml(contents.toString(), options);
     if (result.error && result.error.name === 'YAMLException') {
-      _.merge(options, { schema: cloudFormationSchema.schema });
+      _.merge(options, { schema: cloudformationSchema });
       result = loadYaml(contents.toString(), options);
     }
     if (result.error) {

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@serverless/cli": "^1.5.2",
     "@serverless/components": "^3.4.3",
     "@serverless/enterprise-plugin": "^4.4.0",
-    "@serverless/utils": "^2.1.0",
+    "@serverless/utils": "^2.2.0",
     "ajv": "^7.0.3",
     "ajv-keywords": "^4.0.0",
     "archiver": "^5.1.0",

diff --git a/test/unit/lib/plugins/aws/lib/cloudformationSchema.test.js b/test/unit/lib/plugins/aws/lib/cloudformationSchema.test.js