Skip to content

Commit 57e5f1f

Browse files
committed
Merge branch 'master' into wjh/wtr-party
2 parents 00e7e0f + 6ce708a commit 57e5f1f

File tree

63 files changed

+942
-958
lines changed

Some content is hidden

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

63 files changed

+942
-958
lines changed

.git2gus/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"productTag": "a1aB0000000g309IAA",
3-
"defaultBuild": "256",
3+
"defaultBuild": "258",
44
"hideWorkItemUrl": true
55
}

.github/dependabot.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,15 @@ updates:
4949
patterns:
5050
- 'webdriverio'
5151
- '@wdio/*'
52-
update-types:
53-
- 'major'
54-
- 'minor'
55-
- 'patch'
5652
vitest:
5753
patterns:
5854
- 'vitest'
5955
- '@vitest/*'
60-
update-types:
61-
- 'major'
62-
- 'minor'
63-
- 'patch'
6456
# Non-major version bumps hopefully shouldn't break anything,
6557
# so let's group them together into a single PR!
6658
theoretically-non-breaking:
6759
update-types:
6860
- 'minor'
6961
- 'patch'
62+
exclude-patterns:
63+
- '@wdio/*'

.github/workflows/unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- name: Check package.json integrity
5252
run: node ./scripts/tasks/check-and-rewrite-package-json.js --test
5353
- name: Check licenses are up to date
54-
run: node ./scripts/tasks/generate-license-files.js --test
54+
run: node ./scripts/tasks/generate-license-files.mjs --test
5555
- name: Verify @lwc/shared is tree-shakable
5656
run: node ./scripts/tasks/verify-treeshakable.mjs ./packages/@lwc/shared/dist/index.js
5757
- name: Verify that dependencies are declared

.husky/pre-push

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set -e
22
node ./scripts/tasks/check-and-rewrite-package-json.js --test
3-
node ./scripts/tasks/generate-license-files.js --test
3+
node ./scripts/tasks/generate-license-files.mjs --test
44
node ./scripts/tasks/verify-treeshakable.mjs ./packages/@lwc/shared/dist/index.js
55
node ./scripts/tasks/check-imports-are-declared-dependencies.js

.nucleus.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ branches:
3232
pull-request:
3333
<<: *branch-definition
3434
merge-method: force-push # release branch should always be in sync with master branch (linear history)
35-
winter25:
35+
# Only active branches need to be included in this config
36+
winter26:
3637
pull-request:
3738
<<: *branch-definition
3839
spring25:

ARCHITECTURE.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ At a high level, the `@lwc/compiler` calls into three other packages to process
3131

3232
```mermaid
3333
graph TD
34-
compiler[@lwc/compiler];
35-
templatecompiler[@lwc/template-compiler];
36-
babelplugincomponent[@lwc/babel-plugin-component];
37-
stylecompiler[@lwc/style-compiler];
34+
compiler["@lwc/compiler"];
35+
templatecompiler["@lwc/template-compiler"];
36+
babelplugincomponent["@lwc/babel-plugin-component"];
37+
stylecompiler["@lwc/style-compiler"];
3838
compiler-->|HTML|templatecompiler;
3939
compiler-->|CSS|stylecompiler;
4040
compiler-->|JS|babelplugincomponent;
@@ -52,11 +52,11 @@ We can complicate the diagram a bit more by including `@lwc/rollup-plugin`[^roll
5252

5353
```mermaid
5454
graph TD
55-
rollupplugin[@lwc/rollup-plugin];
56-
compiler[@lwc/compiler];
57-
templatecompiler[@lwc/template-compiler];
58-
babelplugincomponent[@lwc/babel-plugin-component];
59-
stylecompiler[@lwc/style-compiler];
55+
rollupplugin["@lwc/rollup-plugin"];
56+
compiler["@lwc/compiler"];
57+
templatecompiler["@lwc/template-compiler"];
58+
babelplugincomponent["@lwc/babel-plugin-component"];
59+
stylecompiler["@lwc/style-compiler"];
6060
rollupplugin-->compiler;
6161
compiler-->|HTML|templatecompiler;
6262
compiler-->|CSS|stylecompiler;
@@ -67,12 +67,12 @@ This also gets more complex once we include the SSR compiler:
6767

6868
```mermaid
6969
graph TD
70-
rollupplugin[@lwc/rollup-plugin];
71-
compiler[@lwc/compiler];
72-
templatecompiler[@lwc/template-compiler];
73-
babelplugincomponent[@lwc/babel-plugin-component];
74-
stylecompiler[@lwc/style-compiler];
75-
ssrcompiler[@lwc/ssr-compiler];
70+
rollupplugin["@lwc/rollup-plugin"];
71+
compiler["@lwc/compiler"];
72+
templatecompiler["@lwc/template-compiler"];
73+
babelplugincomponent["@lwc/babel-plugin-component"];
74+
stylecompiler["@lwc/style-compiler"];
75+
ssrcompiler["@lwc/ssr-compiler"];
7676
rollupplugin-->compiler;
7777
compiler-->|HTML|templatecompiler;
7878
compiler-->|CSS|stylecompiler;
@@ -90,9 +90,9 @@ At runtime, the core logic of the client-side LWC engine is in `@lwc/engine-core
9090

9191
```mermaid
9292
graph TD
93-
enginedom[@lwc/engine-dom];
94-
enginecore[@lwc/engine-core];
95-
engineserver[@lwc/engine-server];
93+
enginedom["@lwc/engine-dom"];
94+
enginecore["@lwc/engine-core"];
95+
engineserver["@lwc/engine-server"];
9696
enginedom-->enginecore;
9797
engineserver-->enginecore;
9898
```

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lwc-monorepo",
3-
"version": "8.20.1",
3+
"version": "8.21.1",
44
"private": true,
55
"description": "Lightning Web Components",
66
"repository": {
@@ -34,30 +34,30 @@
3434
"test:types": "nx test @lwc/integration-types",
3535
"release:version": "./scripts/release/version.sh",
3636
"release:publish": "./scripts/release/publish.sh",
37-
"release:publish:canary": "nx release publish --registry https://registry.npmjs.org"
37+
"release:publish:canary": "nx release publish --registry https://registry.npmjs.org --tag canary"
3838
},
3939
"devDependencies": {
4040
"@commitlint/cli": "^19.8.1",
41-
"@eslint/js": "9.31.0",
41+
"@eslint/js": "9.33.0",
4242
"@lwc/eslint-plugin-lwc-internal": "link:./scripts/eslint-plugin",
4343
"@lwc/test-utils-lwc-internals": "link:./scripts/test-utils",
44-
"@nx/js": "21.2.3",
44+
"@nx/js": "21.3.11",
4545
"@rollup/plugin-commonjs": "^28.0.6",
4646
"@rollup/plugin-inject": "^5.0.5",
4747
"@rollup/plugin-node-resolve": "^16.0.1",
4848
"@rollup/plugin-replace": "^6.0.2",
4949
"@rollup/plugin-typescript": "^12.1.4",
5050
"@swc-node/register": "~1.10.10",
51-
"@swc/core": "~1.12.14",
51+
"@swc/core": "~1.13.3",
5252
"@swc/helpers": "~0.5.17",
5353
"@types/babel__core": "^7.20.5",
54-
"@types/node": "^22.14.1",
54+
"@types/node": "^22.17.1",
5555
"@vitest/coverage-v8": "^3.2.4",
5656
"@vitest/eslint-plugin": "^1.3.4",
5757
"@vitest/ui": "^3.2.4",
5858
"bytes": "^3.1.2",
5959
"es-module-lexer": "^1.7.0",
60-
"eslint": "9.31.0",
60+
"eslint": "9.33.0",
6161
"eslint-config-flat-gitignore": "^2.1.0",
6262
"eslint-plugin-header": "^3.1.1",
6363
"eslint-plugin-import": "^2.32.0",
@@ -66,22 +66,22 @@
6666
"husky": "^9.1.7",
6767
"isbinaryfile": "^5.0.4",
6868
"jsdom": "^26.1.0",
69-
"lint-staged": "^15.5.1",
69+
"lint-staged": "^16.1.5",
7070
"magic-string": "^0.30.17",
71-
"nx": "21.2.3",
71+
"nx": "21.3.11",
7272
"prettier": "^3.6.2",
73-
"rollup": "^4.45.0",
73+
"rollup": "^4.46.2",
7474
"terser": "^5.43.1",
7575
"tslib": "^2.8.1",
7676
"typescript": "5.8.2",
77-
"typescript-eslint": "8.36.0",
77+
"typescript-eslint": "8.39.0",
7878
"vitest": "^3.2.4"
7979
},
8080
"lint-staged": {
8181
"*.{js,mjs,ts,only,skip}": "eslint --cache",
8282
"*.{css,js,json,md,mjs,ts,yaml,yml}": "prettier --check",
8383
"{packages/**/package.json,scripts/tasks/check-and-rewrite-package-json.js}": "node ./scripts/tasks/check-and-rewrite-package-json.js --test",
84-
"{LICENSE-CORE.md,**/LICENSE.md,yarn.lock,scripts/tasks/generate-license-files.js,scripts/shared/bundled-dependencies.js}": "node ./scripts/tasks/generate-license-files.js --test"
84+
"{LICENSE-CORE.md,**/LICENSE.md,yarn.lock,scripts/tasks/generate-license-files.mjs,scripts/shared/bundled-dependencies.js}": "node ./scripts/tasks/generate-license-files.mjs --test"
8585
},
8686
"workspaces": [
8787
"packages/@lwc/*",

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.20.1",
7+
"version": "8.21.1",
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.20.1",
7+
"version": "8.21.1",
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.27.1",
50-
"@lwc/errors": "8.20.1",
51-
"@lwc/shared": "8.20.1",
50+
"@lwc/errors": "8.21.1",
51+
"@lwc/shared": "8.21.1",
5252
"line-column": "~1.0.2"
5353
},
5454
"devDependencies": {

packages/@lwc/compiler/package.json

Lines changed: 7 additions & 7 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/compiler",
7-
"version": "8.20.1",
7+
"version": "8.21.1",
88
"description": "LWC compiler",
99
"keywords": [
1010
"lwc"
@@ -52,11 +52,11 @@
5252
"@babel/plugin-transform-class-properties": "7.27.1",
5353
"@babel/plugin-transform-object-rest-spread": "7.28.0",
5454
"@locker/babel-plugin-transform-unforgeables": "0.22.0",
55-
"@lwc/babel-plugin-component": "8.20.1",
56-
"@lwc/errors": "8.20.1",
57-
"@lwc/shared": "8.20.1",
58-
"@lwc/ssr-compiler": "8.20.1",
59-
"@lwc/style-compiler": "8.20.1",
60-
"@lwc/template-compiler": "8.20.1"
55+
"@lwc/babel-plugin-component": "8.21.1",
56+
"@lwc/errors": "8.21.1",
57+
"@lwc/shared": "8.21.1",
58+
"@lwc/ssr-compiler": "8.21.1",
59+
"@lwc/style-compiler": "8.21.1",
60+
"@lwc/template-compiler": "8.21.1"
6161
}
6262
}

0 commit comments

Comments
 (0)