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

Jump to bottom

chore(deps): bump js-yaml from 3.14.1 to 4.1.0 #5093

Merged
merged 5 commits into from
Jan 24, 2024
Merged

chore(deps): bump js-yaml from 3.14.1 to 4.1.0 #5093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e05ca1
chore(deps): bump js-yaml from 3.14.1 to 4.1.0
dependabot[bot] Jan 15, 2024
ef59025
Bump js-yaml from 3.x to 4.x
romainseb Jan 24, 2024
3dea0e4
Merge ef59025a7a5db8dc3f63cead89237913d04e0f0e into 8bc031ff270d762f2…
dependabot[bot] Jan 24, 2024
7af4353
chore: yarn-deduplicate
github-actions[bot] Jan 24, 2024
a791706
Merge branch 'master' into dependabot/npm_and_yarn/js-yaml-4.1.0
romainseb Jan 24, 2024
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
5 changes: 5 additions & 0 deletions .changeset/five-dots-matter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@talend/scripts-config-cdn': minor
---

deps: bump js-yaml from 3.x to 4.x
5 changes: 3 additions & 2 deletions tools/scripts-config-cdn/cdn.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const umds = require('./umds.json');
const { download } = require('./utils');

const CDN_URL = 'https://statics-dev.cloud.talend.com';
let schema = yaml.DEFAULT_SCHEMA.extend(require('js-yaml-js-types').all);

function getModuleName(nameandversion, isPnpm = false) {
if (isPnpm) {
Expand Down Expand Up @@ -151,7 +152,7 @@ function getModulesFromLockFile(dir) {
try {
yarnv1 = lockfile.parse(fs.readFileSync(lockPath, 'utf-8'));
} catch (e) {
yarnv3 = yaml.load(fs.readFileSync(lockPath, 'utf-8'));
yarnv3 = yaml.load(fs.readFileSync(lockPath, 'utf-8'), { schema });
// eslint-disable-next-line no-underscore-dangle
delete yarnv3.__metadata;
}
Expand All @@ -166,7 +167,7 @@ function getModulesFromLockFile(dir) {
})
.map(addLocal);
} else if (fs.existsSync(lockTypeMap.pnpm.path)) {
const json = yaml.load(fs.readFileSync(lockTypeMap.pnpm.path, 'utf-8'));
const json = yaml.load(fs.readFileSync(lockTypeMap.pnpm.path, 'utf-8'), { schema });
infos = Object.keys(json.packages)
.map(moduleAndversion => {
if (moduleAndversion.startsWith('file:')) {
Expand Down
3 changes: 2 additions & 1 deletion tools/scripts-config-cdn/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"@talend/dynamic-cdn-webpack-plugin": "^13.1.0",
"@talend/module-to-cdn": "^9.10.0",
"@yarnpkg/lockfile": "^1.1.0",
"js-yaml": "^3.14.1",
"js-yaml": "^4.1.0",
"js-yaml-js-types": "^1.0.1",
"read-pkg-up": "^7.0.1"
},
"devDependencies": {
Expand Down
9 changes: 8 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12294,7 +12294,14 @@ js-levenshtein@^1.1.6:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==

[email protected], js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.1, js-yaml@^3.6.1:
js-yaml-js-types@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/js-yaml-js-types/-/js-yaml-js-types-1.0.1.tgz#fa57135b99d67b3612718426af2d9b314e5c6808"
integrity sha512-5tpfyORs8OQ43alNERbWfYRCtWgykvzYgY46fUhrQi2+kS7N0NuuFYLZ/IrfmVm5muLTndeMublgraXiFRjEPw==
dependencies:
esprima "^4.0.1"

[email protected], js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.6.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
Expand Down
Loading