Skip to content

Commit 1628170

Browse files
mrstorkmrstork
authored
fix: replace js-yaml with yaml package (#6469)
* fix: replace js-yaml with yaml package * test: update build snapshots * fix: replace yaml library in manifest parsing * chore: fix import path
1 parent fd0335a commit 1628170

File tree

24 files changed

+95
-96
lines changed

24 files changed

+95
-96
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/build/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
"hot-shots": "10.2.1",
9090
"indent-string": "^5.0.0",
9191
"is-plain-obj": "^4.0.0",
92-
"js-yaml": "^4.0.0",
9392
"keep-func-props": "^6.0.0",
9493
"locate-path": "^7.0.0",
9594
"log-process-errors": "^11.0.0",
@@ -103,9 +102,9 @@
103102
"p-locate": "^6.0.0",
104103
"p-map": "^7.0.0",
105104
"p-reduce": "^3.0.0",
105+
"package-directory": "^8.0.0",
106106
"path-exists": "^5.0.0",
107107
"path-type": "^6.0.0",
108-
"package-directory": "^8.0.0",
109108
"pretty-ms": "^9.0.0",
110109
"ps-list": "^8.0.0",
111110
"read-package-up": "^11.0.0",
@@ -121,6 +120,7 @@
121120
"ts-node": "^10.9.1",
122121
"typescript": "^5.0.0",
123122
"uuid": "^11.0.0",
123+
"yaml": "^2.8.0",
124124
"yargs": "^17.6.0"
125125
},
126126
"devDependencies": {

‎packages/build/src/log/serialize.js‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎packages/build/src/log/serialize.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { stringify } from 'yaml'
2+
3+
export const serializeObject = function (object: object): string {
4+
return stringify(object, { sortMapEntries: true }).trimEnd()
5+
}
6+
7+
export const serializeArray = function (array: string[]) {
8+
return array.map(addDash).join('\n')
9+
}
10+
11+
const addDash = function (string: string) {
12+
return ` - ${string}`
13+
}

‎packages/build/src/plugins/manifest/load.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { promises as fs } from 'fs'
22

3-
import { load as loadYaml, JSON_SCHEMA } from 'js-yaml'
3+
import { parse } from 'yaml'
44

55
import { addErrorInfo } from '../../error/info.js'
66

@@ -10,7 +10,7 @@ import { validateManifest } from './validate.js'
1010
export const loadManifest = async function ({ manifestPath, packageName, pluginPackageJson, loadedFrom, origin }) {
1111
try {
1212
const rawManifest = await loadRawManifest(manifestPath)
13-
const manifest = await parseManifest(rawManifest)
13+
const manifest = parseManifest(rawManifest)
1414
validateManifest(manifest, rawManifest)
1515
return manifest
1616
} catch (error) {
@@ -32,9 +32,9 @@ const loadRawManifest = async function (manifestPath) {
3232
}
3333
}
3434

35-
const parseManifest = async function (rawManifest) {
35+
const parseManifest = function (rawManifest) {
3636
try {
37-
return await loadYaml(rawManifest, { schema: JSON_SCHEMA, json: true })
37+
return parse(rawManifest, { logLevel: 'error' })
3838
} catch (error) {
3939
throw new Error(`Could not parse plugin's "manifest.yml"\n${error.message}`)
4040
}

‎packages/build/tests/core/snapshots/tests.js.md‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Generated by [AVA](https://avajs.dev).
295295
repositoryRoot: packages/build/tests/core/fixtures/empty␊
296296
testOpts:␊
297297
pluginsListUrl: test␊
298-
silentLingeringProcesses: 'true'␊
298+
silentLingeringProcesses: "true"␊
299299
␊
300300
> Current directory␊
301301
packages/build/tests/core/fixtures/empty␊
@@ -393,7 +393,7 @@ Generated by [AVA](https://avajs.dev).
393393
repositoryRoot: packages/build/tests/core/fixtures/cached_config␊
394394
testOpts:␊
395395
pluginsListUrl: test␊
396-
silentLingeringProcesses: 'true'␊
396+
silentLingeringProcesses: "true"␊
397397
␊
398398
> Current directory␊
399399
packages/build/tests/core/fixtures/cached_config␊
@@ -444,7 +444,7 @@ Generated by [AVA](https://avajs.dev).
444444
repositoryRoot: packages/build/tests/core/fixtures/cached_config␊
445445
testOpts:␊
446446
pluginsListUrl: test␊
447-
silentLingeringProcesses: 'true'␊
447+
silentLingeringProcesses: "true"␊
448448
␊
449449
> Current directory␊
450450
packages/build/tests/core/fixtures/cached_config␊
@@ -1005,7 +1005,7 @@ Generated by [AVA](https://avajs.dev).
10051005
repositoryRoot: packages/build/tests/core/fixtures/single␊
10061006
testOpts:␊
10071007
pluginsListUrl: test␊
1008-
silentLingeringProcesses: 'true'␊
1008+
silentLingeringProcesses: "true"␊
10091009
␊
10101010
> Current directory␊
10111011
packages/build/tests/core/fixtures/single␊
@@ -1355,7 +1355,7 @@ Generated by [AVA](https://avajs.dev).
13551355
repositoryRoot: packages/build/tests/core/fixtures/empty␊
13561356
testOpts:␊
13571357
pluginsListUrl: test␊
1358-
silentLingeringProcesses: 'true'␊
1358+
silentLingeringProcesses: "true"␊
13591359
␊
13601360
> Current directory␊
13611361
packages/build/tests/core/fixtures/empty␊
@@ -1738,11 +1738,11 @@ Generated by [AVA](https://avajs.dev).
17381738
publish: packages/build/tests/core/fixtures/functions_config_1␊
17391739
publishOrigin: default␊
17401740
functions:␊
1741-
'*':␊
1741+
"*":␊
17421742
external_node_modules:␊
1743-
- '@netlify/imaginary-module-one'␊
1744-
- '@netlify/imaginary-module-two'␊
1745-
- '@netlify/imaginary-module-three'␊
1743+
- "@netlify/imaginary-module-one"␊
1744+
- "@netlify/imaginary-module-two"␊
1745+
- "@netlify/imaginary-module-three"␊
17461746
included_files:␊
17471747
- directory-1␊
17481748
- directory-2/file-1␊
@@ -1799,20 +1799,20 @@ Generated by [AVA](https://avajs.dev).
17991799
publish: packages/build/tests/core/fixtures/functions_config_2␊
18001800
publishOrigin: default␊
18011801
functions:␊
1802-
'*':␊
1802+
"*":␊
18031803
ignored_node_modules:␊
1804-
- '@netlify/imaginary-module-one'␊
1804+
- "@netlify/imaginary-module-one"␊
18051805
included_files:␊
18061806
- directory-1␊
18071807
node_bundler: esbuild␊
18081808
function_*:␊
18091809
external_node_modules:␊
1810-
- '@netlify/imaginary-module-three'␊
1810+
- "@netlify/imaginary-module-three"␊
18111811
included_files:␊
18121812
- directory-3/**/*.jpg␊
18131813
function_one:␊
18141814
external_node_modules:␊
1815-
- '@netlify/imaginary-module-two'␊
1815+
- "@netlify/imaginary-module-two"␊
18161816
included_files:␊
18171817
- directory-2/file-1␊
18181818
functionsDirectory: packages/build/tests/core/fixtures/functions_config_2/functions␊
@@ -1865,17 +1865,17 @@ Generated by [AVA](https://avajs.dev).
18651865
publish: packages/build/tests/core/fixtures/functions_config_3␊
18661866
publishOrigin: default␊
18671867
functions:␊
1868-
'*':␊
1868+
"*":␊
18691869
external_node_modules:␊
1870-
- '@netlify/imaginary-module-one'␊
1870+
- "@netlify/imaginary-module-one"␊
18711871
included_files:␊
18721872
- directory-1␊
18731873
node_bundler: esbuild␊
18741874
function_one:␊
18751875
external_node_modules:␊
1876-
- '@netlify/imaginary-module-two'␊
1876+
- "@netlify/imaginary-module-two"␊
18771877
included_files:␊
1878-
- '!directory-1/file-1'␊
1878+
- "!directory-1/file-1"␊
18791879
functionsDirectory: packages/build/tests/core/fixtures/functions_config_3/functions␊
18801880
␊
18811881
> Context␊
@@ -1904,17 +1904,17 @@ Generated by [AVA](https://avajs.dev).
19041904
publish: packages/build/tests/core/fixtures/functions_config_3␊
19051905
publishOrigin: default␊
19061906
functions:␊
1907-
'*':␊
1907+
"*":␊
19081908
external_node_modules:␊
1909-
- '@netlify/imaginary-module-one'␊
1909+
- "@netlify/imaginary-module-one"␊
19101910
included_files:␊
19111911
- directory-1␊
19121912
node_bundler: esbuild␊
19131913
function_one:␊
19141914
external_node_modules:␊
1915-
- '@netlify/imaginary-module-two'␊
1915+
- "@netlify/imaginary-module-two"␊
19161916
included_files:␊
1917-
- '!directory-1/file-1'␊
1917+
- "!directory-1/file-1"␊
19181918
functionsDirectory: packages/build/tests/core/fixtures/functions_config_3/functions`
19191919

19201920
## Shows notice about bundling errors and warnings coming from esbuild
@@ -1946,7 +1946,7 @@ Generated by [AVA](https://avajs.dev).
19461946
publish: packages/build/tests/core/fixtures/esbuild_errors_1␊
19471947
publishOrigin: default␊
19481948
functions:␊
1949-
'*':␊
1949+
"*":␊
19501950
node_bundler: esbuild␊
19511951
functionsDirectory: packages/build/tests/core/fixtures/esbuild_errors_1/functions␊
19521952
␊
@@ -2004,7 +2004,7 @@ Generated by [AVA](https://avajs.dev).
20042004
publish: packages/build/tests/core/fixtures/esbuild_errors_2␊
20052005
publishOrigin: default␊
20062006
functions:␊
2007-
'*':␊
2007+
"*":␊
20082008
node_bundler: esbuild␊
20092009
functionsDirectory: packages/build/tests/core/fixtures/esbuild_errors_2/functions␊
20102010
␊

‎packages/build/tests/core/snapshots/tests.js.snap‎

-1 Bytes
Binary file not shown.

‎packages/build/tests/edge_functions/snapshots/tests.js.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ Generated by [AVA](https://avajs.dev).
582582
publish: packages/build/tests/edge_functions/fixtures/functions_user␊
583583
publishOrigin: default␊
584584
functions:␊
585-
'*':␊
585+
"*":␊
586586
deno_import_map: packages/build/tests/edge_functions/fixtures/functions_user/netlify/edge-functions/import-map.json␊
587587
␊
588588
> Context␊

‎packages/build/tests/edge_functions/snapshots/tests.js.snap‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)