Skip to content

Commit 097894e

Browse files
nolanlawsonnolanlawson
committed
Merge remote-tracking branch 'origin/master' into nolan/wired-errors
2 parents 7a82e36 + e60891b commit 097894e

File tree

39 files changed

+293
-242
lines changed

39 files changed

+293
-242
lines changed

‎.package.json.swp

16 KB
Binary file not shown.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lwc-monorepo",
3-
"version": "8.9.0",
3+
"version": "8.10.0",
44
"private": true,
55
"description": "Lightning Web Components",
66
"repository": {

‎packages/@lwc/aria-reflection/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/aria-reflection",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "ARIA element reflection polyfill for strings",
99
"keywords": [
1010
"aom",

‎packages/@lwc/babel-plugin-component/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/babel-plugin-component",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "Babel plugin to transform a LWC module",
99
"keywords": [
1010
"lwc"
@@ -45,8 +45,8 @@
4545
"@babel/helper-module-imports": "7.25.9",
4646
"@babel/traverse": "^7.25.7",
4747
"@babel/types": "^7.25.8",
48-
"@lwc/errors": "8.9.0",
49-
"@lwc/shared": "8.9.0",
48+
"@lwc/errors": "8.10.0",
49+
"@lwc/shared": "8.10.0",
5050
"line-column": "~1.0.2"
5151
},
5252
"devDependencies": {

‎packages/@lwc/compiler/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/compiler",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "LWC compiler",
99
"keywords": [
1010
"lwc"
@@ -48,11 +48,11 @@
4848
"@babel/plugin-transform-class-properties": "7.25.9",
4949
"@babel/plugin-transform-object-rest-spread": "7.25.9",
5050
"@locker/babel-plugin-transform-unforgeables": "0.22.0",
51-
"@lwc/babel-plugin-component": "8.9.0",
52-
"@lwc/errors": "8.9.0",
53-
"@lwc/shared": "8.9.0",
54-
"@lwc/ssr-compiler": "8.9.0",
55-
"@lwc/style-compiler": "8.9.0",
56-
"@lwc/template-compiler": "8.9.0"
51+
"@lwc/babel-plugin-component": "8.10.0",
52+
"@lwc/errors": "8.10.0",
53+
"@lwc/shared": "8.10.0",
54+
"@lwc/ssr-compiler": "8.10.0",
55+
"@lwc/style-compiler": "8.10.0",
56+
"@lwc/template-compiler": "8.10.0"
5757
}
5858
}

‎packages/@lwc/engine-core/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/engine-core",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "Core LWC engine APIs.",
99
"keywords": [
1010
"lwc"
@@ -42,9 +42,9 @@
4242
}
4343
},
4444
"dependencies": {
45-
"@lwc/features": "8.9.0",
46-
"@lwc/shared": "8.9.0",
47-
"@lwc/signals": "8.9.0"
45+
"@lwc/features": "8.10.0",
46+
"@lwc/shared": "8.10.0",
47+
"@lwc/signals": "8.10.0"
4848
},
4949
"devDependencies": {
5050
"observable-membrane": "2.0.0"

‎packages/@lwc/engine-dom/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/engine-dom",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "Renders LWC components in a DOM environment.",
99
"keywords": [
1010
"lwc"
@@ -42,9 +42,9 @@
4242
}
4343
},
4444
"devDependencies": {
45-
"@lwc/engine-core": "8.9.0",
46-
"@lwc/shared": "8.9.0",
47-
"@lwc/features": "8.9.0"
45+
"@lwc/engine-core": "8.10.0",
46+
"@lwc/shared": "8.10.0",
47+
"@lwc/features": "8.10.0"
4848
},
4949
"lwc": {
5050
"modules": [

‎packages/@lwc/engine-server/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/engine-server",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "Renders LWC components in a server environment.",
99
"keywords": [
1010
"lwc"
@@ -42,10 +42,10 @@
4242
}
4343
},
4444
"devDependencies": {
45-
"@lwc/engine-core": "8.9.0",
46-
"@lwc/rollup-plugin": "8.9.0",
47-
"@lwc/shared": "8.9.0",
48-
"@lwc/features": "8.9.0",
45+
"@lwc/engine-core": "8.10.0",
46+
"@lwc/rollup-plugin": "8.10.0",
47+
"@lwc/shared": "8.10.0",
48+
"@lwc/features": "8.10.0",
4949
"@rollup/plugin-virtual": "^3.0.2",
5050
"parse5": "^7.2.1"
5151
}

‎packages/@lwc/engine-server/src/__tests__/fixtures/wire/config/expected.html

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
<x-wire>
22
<template shadowrootmode="open">
33
Wire adapter value: {
4+
: ,
45
0: 0,
5-
variable: 4404,
6-
prop: not magic,
7-
array: [
8-
value
9-
],
10-
fakeMagic: [
11-
$cmpProp,
12-
$ string in arrays aren&#x27;t magic
13-
],
14-
true: true,
6+
array: [value],
7+
fakeMagic: [$cmpProp,$ string in arrays aren&#x27;t magic],
158
false: false,
16-
null: null,
179
Infinity: null,
10+
magic: 123,
1811
NaN: null,
19-
: ,
20-
magic: 123
12+
null: null,
13+
prop: not magic,
14+
true: true,
15+
undefined: undefined,
16+
variable: 4404,
17+
why: undefined,
2118
}
2219
</template>
2320
</x-wire>

‎packages/@lwc/engine-server/src/__tests__/fixtures/wire/config/modules/x/wire/adapter.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ export class adapter {
66
connect() {}
77

88
update(config) {
9-
// Quotes are encoded in the output, which is ugly
10-
this.dc(JSON.stringify(config, null, 4).replace(/"/g, ''));
9+
// JSON.stringify serializes differently for engine-server/ssr-compiler, so we do it manually
10+
const output = Object.entries(config)
11+
.sort(([a], [b]) => a.localeCompare(b))
12+
.map(([key, value]) => ` ${key}: ${JSON.stringify(value)},`)
13+
.join('\n')
14+
// Quotes are encoded as &quot; in the output, which makes it harder to read...
15+
.replace(/"/g, '');
16+
17+
this.dc(`{\n${output}\n}`);
1118
}
1219

1320
disconnect() {}

‎packages/@lwc/engine-server/src/__tests__/fixtures/wire/field/expected.html

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<x-wire>
22
<template shadowrootmode="open">
33
wired field value: {
4-
key2: [
5-
fixed,
6-
array
7-
],
8-
key1: foo
4+
key1: foo,
5+
key2: [fixed,array],
96
}
107
</template>
118
</x-wire>

‎packages/@lwc/engine-server/src/__tests__/fixtures/wire/field/modules/x/adapter/adapter.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ export default class adapter {
66
connect() {}
77

88
update(config) {
9-
// Quotes are encoded in the output, which is ugly
10-
this.dc(JSON.stringify(config, null, 4).replace(/"/g, ''));
9+
// JSON.stringify serializes differently for engine-server/ssr-compiler, so we do it manually
10+
const output = Object.entries(config)
11+
.sort(([a], [b]) => a.localeCompare(b))
12+
.map(([key, value]) => ` ${key}: ${JSON.stringify(value)},`)
13+
.join('\n')
14+
// Quotes are encoded as &quot; in the output, which makes it harder to read...
15+
.replace(/"/g, '');
16+
17+
this.dc(`{\n${output}\n}`);
1118
}
1219

1320
disconnect() {}

‎packages/@lwc/engine-server/src/__tests__/fixtures/wire/method/expected.html

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<x-wire>
22
<template shadowrootmode="open">
33
wired field value: {
4-
key2: [
5-
fixed,
6-
array
7-
],
8-
key1: foo
4+
key1: foo,
5+
key2: [fixed,array],
96
}
107
</template>
118
</x-wire>

‎packages/@lwc/engine-server/src/__tests__/fixtures/wire/method/modules/x/adapter/adapter.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ export default class adapter {
66
connect() {}
77

88
update(config) {
9-
// Quotes are encoded in the output, which is ugly
10-
this.dc(JSON.stringify(config, null, 4).replace(/"/g, ''));
9+
// JSON.stringify serializes differently for engine-server/ssr-compiler, so we do it manually
10+
const output = Object.entries(config)
11+
.sort(([a], [b]) => a.localeCompare(b))
12+
.map(([key, value]) => ` ${key}: ${JSON.stringify(value)},`)
13+
.join('\n')
14+
// Quotes are encoded as &quot; in the output, which makes it harder to read...
15+
.replace(/"/g, '');
16+
17+
this.dc(`{\n${output}\n}`);
1118
}
1219

1320
disconnect() {}

‎packages/@lwc/errors/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/errors",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "LWC Error Utilities",
99
"keywords": [
1010
"lwc"

‎packages/@lwc/features/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/features",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "LWC Features Flags",
99
"keywords": [
1010
"lwc"
@@ -42,6 +42,6 @@
4242
}
4343
},
4444
"dependencies": {
45-
"@lwc/shared": "8.9.0"
45+
"@lwc/shared": "8.10.0"
4646
}
4747
}

‎packages/@lwc/integration-karma/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@lwc/integration-karma",
33
"private": true,
4-
"version": "8.9.0",
4+
"version": "8.10.0",
55
"scripts": {
66
"start": "KARMA_MODE=watch karma start ./scripts/karma-configs/test/local.js",
77
"test": "karma start ./scripts/karma-configs/test/local.js --single-run --browsers ChromeHeadless",
@@ -17,11 +17,11 @@
1717
"karma-sauce-launcher-fix-firefox": "using a fork to work around https://github.com/karma-runner/karma-sauce-launcher/issues/275"
1818
},
1919
"devDependencies": {
20-
"@lwc/compiler": "8.9.0",
21-
"@lwc/engine-dom": "8.9.0",
22-
"@lwc/engine-server": "8.9.0",
23-
"@lwc/rollup-plugin": "8.9.0",
24-
"@lwc/synthetic-shadow": "8.9.0",
20+
"@lwc/compiler": "8.10.0",
21+
"@lwc/engine-dom": "8.10.0",
22+
"@lwc/engine-server": "8.10.0",
23+
"@lwc/rollup-plugin": "8.10.0",
24+
"@lwc/synthetic-shadow": "8.10.0",
2525
"@types/jasmine": "^5.1.4",
2626
"chokidar": "^4.0.1",
2727
"istanbul-lib-coverage": "^3.2.2",

‎packages/@lwc/integration-tests/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@lwc/integration-tests",
33
"private": true,
4-
"version": "8.9.0",
4+
"version": "8.10.0",
55
"scripts": {
66
"build": "node scripts/build.js",
77
"build:dev": "MODE=dev yarn build",
@@ -18,7 +18,7 @@
1818
"sauce:prod:ci": "MODE=prod yarn build:prod && MODE=prod ../../../scripts/ci/retry.sh wdio ./scripts/wdio.sauce.conf.js"
1919
},
2020
"devDependencies": {
21-
"@lwc/rollup-plugin": "8.9.0",
21+
"@lwc/rollup-plugin": "8.10.0",
2222
"@wdio/cli": "^9.2.14",
2323
"@wdio/local-runner": "^9.2.15",
2424
"@wdio/mocha-framework": "^9.2.8",
@@ -27,7 +27,7 @@
2727
"@wdio/static-server-service": "^9.2.2",
2828
"deepmerge": "^4.3.1",
2929
"dotenv": "^16.4.5",
30-
"lwc": "8.9.0",
30+
"lwc": "8.10.0",
3131
"minimist": "^1.2.8",
3232
"webdriverio": "^9.0.7"
3333
}

‎packages/@lwc/integration-types/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"name": "@lwc/integration-types",
33
"private": true,
4-
"version": "8.9.0",
4+
"version": "8.10.0",
55
"description": "Type validation for LWC packages",
66
"type": "module",
77
"scripts": {
88
"test": "node ./scripts/update-paths.js --check && tsc",
99
"playground": "rollup -c src/playground/rollup.config.js --watch"
1010
},
1111
"dependencies": {
12-
"@lwc/rollup-plugin": "8.9.0",
13-
"lwc": "8.9.0"
12+
"@lwc/rollup-plugin": "8.10.0",
13+
"lwc": "8.10.0"
1414
},
1515
"devDependencies": {
1616
"@rollup/plugin-replace": "^6.0.1",

‎packages/@lwc/module-resolver/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"You can safely modify dependencies, devDependencies, keywords, etc., but other props will be overwritten."
55
],
66
"name": "@lwc/module-resolver",
7-
"version": "8.9.0",
7+
"version": "8.10.0",
88
"description": "Resolves paths for LWC components",
99
"keywords": [
1010
"lwc"

‎packages/@lwc/perf-benchmarks-components/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "@lwc/perf-benchmarks-components",
3-
"version": "8.9.0",
3+
"version": "8.10.0",
44
"private": true,
55
"scripts": {
66
"build": "rm -fr dist && rollup -c ./rollup.config.mjs"
77
},
88
"devDependencies": {
9-
"@lwc/rollup-plugin": "8.9.0"
9+
"@lwc/rollup-plugin": "8.10.0"
1010
},
1111
"nx": {
1212
"targets": {

‎packages/@lwc/perf-benchmarks/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@lwc/perf-benchmarks",
3-
"version": "8.9.0",
3+
"version": "8.10.0",
44
"private": true,
55
"scripts": {
66
"build": "rm -fr dist && rollup -c ./rollup.config.mjs && node scripts/build.js && ./scripts/fix-deps.sh",
@@ -15,11 +15,11 @@
1515
"Don't forget to add these to fix-deps.sh as well."
1616
],
1717
"dependencies": {
18-
"@lwc/engine-dom": "8.9.0",
19-
"@lwc/engine-server": "8.9.0",
20-
"@lwc/perf-benchmarks-components": "8.9.0",
21-
"@lwc/ssr-runtime": "8.9.0",
22-
"@lwc/synthetic-shadow": "8.9.0"
18+
"@lwc/engine-dom": "8.10.0",
19+
"@lwc/engine-server": "8.10.0",
20+
"@lwc/perf-benchmarks-components": "8.10.0",
21+
"@lwc/ssr-runtime": "8.10.0",
22+
"@lwc/synthetic-shadow": "8.10.0"
2323
},
2424
"devDependencies": {
2525
"@best/cli": "^13.0.0",

0 commit comments

Comments
 (0)