Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DEPENDENCY] Bump js-yaml from 3.14.1 to 4.0.0 #380

Merged
merged 2 commits into from
Mar 4, 2021
+88 −12
Merged

[DEPENDENCY] Bump js-yaml from 3.14.1 to 4.0.0 #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b63f180
Bump js-yaml from 3.14.1 to 4.0.0
dependabot[bot] Feb 7, 2021
46426b4
[INTERNAL] Adopt js-yaml API usage
matz3 Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions lib/projectPreprocessor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,8 @@ class ProjectPreprocessor {
let configs;

try {
// Using loadAll with DEFAULT_SAFE_SCHEMA instead of safeLoadAll to pass "filename".
// safeLoadAll doesn't handle its parameters properly.
// See https://github.com/nodeca/js-yaml/issues/456 and https://github.com/nodeca/js-yaml/pull/381
configs = jsyaml.loadAll(configFile, undefined, {
filename: configPath,
schema: jsyaml.DEFAULT_SAFE_SCHEMA
filename: configPath
});
} catch (err) {
if (err.name === "YAMLException") {
Expand Down
2 changes: 1 addition & 1 deletion lib/translators/static.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const path = require("path");
const fs = require("graceful-fs");
const {promisify} = require("util");
const readFile = promisify(fs.readFile);
const parseYaml = require("js-yaml").safeLoad;
const parseYaml = require("js-yaml").load;

function resolveProjectPaths(project) {
project.path = path.resolve(project.path);
Expand Down
90 changes: 85 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"chalk": "^4.1.0",
"escape-string-regexp": "^4.0.0",
"graceful-fs": "^4.2.6",
"js-yaml": "^3.14.1",
"js-yaml": "^4.0.0",
"libnpmconfig": "^1.2.1",
"lockfile": "^1.0.4",
"mkdirp": "^1.0.4",
Expand Down