Skip to content

Commit 16d0237

Browse files
committed
Merge branch 'master' of https://github.com/salesforce/lwc into ssr-validate-api-decorator
2 parents 650562a + bb51f84 commit 16d0237

File tree

112 files changed

+3659
-2825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+3659
-2825
lines changed

.github/workflows/unit.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ jobs:
6666
run: yarn test:types
6767
- name: Run unit tests
6868
run: yarn test:ci
69-
# TODO [#4815]: enable all SSR v2 tests
70-
- name: Run experimental SSR fixture tests
71-
run: TEST_SSR_COMPILER=1 yarn test packages/@lwc/ssr-compiler/src/__tests__/fixtures.spec.ts
7269
- name: Upload unit test coverage report
7370
uses: actions/upload-artifact@v4
7471
with:

eslint.config.mjs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,7 @@ export default tseslint.config(
4848
},
4949

5050
parserOptions: {
51-
projectService: {
52-
allowDefaultProject: [
53-
// I'm not sure why these files aren't picked up... :\
54-
'packages/@lwc/module-resolver/scripts/test/matchers/to-throw-error-with-code.ts',
55-
'packages/@lwc/module-resolver/scripts/test/matchers/to-throw-error-with-type.ts',
56-
'packages/@lwc/module-resolver/scripts/test/setup-test.ts',
57-
],
58-
},
51+
projectService: {},
5952
},
6053
},
6154

package.json

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lwc-monorepo",
3-
"version": "8.12.4",
3+
"version": "8.12.6",
44
"private": true,
55
"description": "Lightning Web Components",
66
"repository": {
@@ -24,6 +24,7 @@
2424
"test:ci": "vitest run --workspace vitest.workspace.mjs --coverage",
2525
"test:karma": "nx test @lwc/integration-karma",
2626
"test:karma:start": "nx start @lwc/integration-karma",
27+
"test:hydration:start": "nx hydration:start @lwc/integration-karma",
2728
"test:integration": "nx sauce @lwc/integration-tests",
2829
"test:performance": "nx test @lwc/perf-benchmarks",
2930
"test:performance:best": "nx test:best @lwc/perf-benchmarks",
@@ -34,44 +35,44 @@
3435
},
3536
"devDependencies": {
3637
"@commitlint/cli": "^19.6.1",
37-
"@eslint/js": "9.17.0",
38+
"@eslint/js": "9.19.0",
3839
"@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
3940
"@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
40-
"@nx/js": "20.3.0",
41+
"@nx/js": "20.3.3",
4142
"@rollup/plugin-commonjs": "^28.0.2",
4243
"@rollup/plugin-inject": "^5.0.5",
4344
"@rollup/plugin-node-resolve": "^16.0.0",
4445
"@rollup/plugin-replace": "^6.0.2",
4546
"@rollup/plugin-typescript": "^12.1.2",
4647
"@swc-node/register": "~1.10.9",
47-
"@swc/core": "~1.10.4",
48+
"@swc/core": "~1.10.11",
4849
"@swc/helpers": "~0.5.15",
4950
"@types/babel__core": "^7.20.5",
50-
"@types/node": "^22.10.5",
51-
"@vitest/coverage-v8": "^2.1.8",
52-
"@vitest/eslint-plugin": "^1.1.24",
53-
"@vitest/ui": "^2.1.8",
51+
"@types/node": "^22.10.10",
52+
"@vitest/coverage-v8": "^3.0.4",
53+
"@vitest/eslint-plugin": "^1.1.25",
54+
"@vitest/ui": "^3.0.4",
5455
"bytes": "^3.1.2",
5556
"es-module-lexer": "^1.6.0",
56-
"eslint": "9.17.0",
57-
"eslint-config-flat-gitignore": "^0.3.0",
57+
"eslint": "9.19.0",
58+
"eslint-config-flat-gitignore": "^1.0.0",
5859
"eslint-plugin-header": "^3.1.1",
5960
"eslint-plugin-import": "^2.31.0",
60-
"glob": "^11.0.0",
61+
"glob": "^11.0.1",
6162
"globals": "^15.14.0",
6263
"husky": "^9.1.7",
6364
"isbinaryfile": "^5.0.4",
64-
"jsdom": "^25.0.1",
65-
"lint-staged": "^15.3.0",
65+
"jsdom": "^26.0.0",
66+
"lint-staged": "^15.4.3",
6667
"magic-string": "^0.30.17",
67-
"nx": "20.3.0",
68+
"nx": "20.3.3",
6869
"prettier": "^3.4.2",
69-
"rollup": "^4.30.0",
70+
"rollup": "^4.32.0",
7071
"terser": "^5.37.0",
7172
"tslib": "^2.8.1",
72-
"typescript": "5.4.5",
73-
"typescript-eslint": "8.19.0",
74-
"vitest": "^2.1.8"
73+
"typescript": "5.7.3",
74+
"typescript-eslint": "8.21.0",
75+
"vitest": "^3.0.4"
7576
},
7677
"lint-staged": {
7778
"*.{js,mjs,ts}": "eslint --cache",

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

Lines changed: 1 addition & 1 deletion
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.12.4",
7+
"version": "8.12.6",
88
"description": "ARIA element reflection polyfill for strings",
99
"keywords": [
1010
"aom",

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

Lines changed: 3 additions & 3 deletions
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.12.4",
7+
"version": "8.12.6",
88
"description": "Babel plugin to transform a LWC module",
99
"keywords": [
1010
"lwc"
@@ -47,8 +47,8 @@
4747
},
4848
"dependencies": {
4949
"@babel/helper-module-imports": "7.25.9",
50-
"@lwc/errors": "8.12.4",
51-
"@lwc/shared": "8.12.4",
50+
"@lwc/errors": "8.12.6",
51+
"@lwc/shared": "8.12.6",
5252
"line-column": "~1.0.2"
5353
},
5454
"devDependencies": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import { wire, LightningElement } from "lwc";
2+
export default class Test extends LightningElement {
3+
@wire(function adapter() {}, {}) wiredProp;
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"message": "LWC1097: @wire expects a function identifier as first parameter.",
3+
"loc": {
4+
"line": 3,
5+
"column": 8,
6+
"start": 107,
7+
"length": 21
8+
},
9+
"filename": "test.js"
10+
}

packages/@lwc/babel-plugin-component/src/__tests__/fixtures/wire-decorator/decorator-expects-a-function-identifier-as-first-parameter/expected.js

Whitespace-only changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { wire, LightningElement } from "lwc";
2+
import Foo from "foo";
3+
export default class Test extends LightningElement {
4+
@wire(Foo['Bar'], {}) wiredProp;
5+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"message": "LWC1131: @wire identifier cannot contain computed properties",
3+
"loc": {
4+
"line": 4,
5+
"column": 8,
6+
"start": 130,
7+
"length": 10
8+
},
9+
"filename": "test.js"
10+
}

0 commit comments

Comments
 (0)