Skip to content

Commit 1f731b3

Browse files
authored
Merge branch 'main' into component-preview
2 parents 091acdb + 374e388 commit 1f731b3

File tree

5 files changed

+47
-40
lines changed

5 files changed

+47
-40
lines changed

.husky/check-versions.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
import fs from 'node:fs';
2+
import semver from 'semver';
23

34
// Read package.json
45
const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
56

67
// Extract versions
78
const devServerDependencyVersion = packageJson.dependencies['@lwc/lwc-dev-server'];
8-
const devServerTargetVersion = packageJson.apiVersionMetadata?.target?.matchingDevServerVersion;
9+
const devServerTargetVersionRange = packageJson.apiVersionMetadata?.target?.matchingDevServerVersion;
910

10-
if (!devServerDependencyVersion || !devServerTargetVersion) {
11+
if (!devServerDependencyVersion || !devServerTargetVersionRange) {
1112
console.error('Error: missing @lwc/lwc-dev-server or matchingDevServerVersion');
1213
process.exit(1); // Fail the check
1314
}
1415

1516
// Compare versions
16-
if (devServerDependencyVersion === devServerTargetVersion) {
17+
if (semver.intersects(devServerTargetVersionRange, devServerDependencyVersion)) {
1718
process.exit(0); // Pass the check
1819
} else {
1920
console.error(
20-
`Error: @lwc/lwc-dev-server versions do not match between 'dependencies' and 'apiVersionMetadata' in package.json. Expected ${devServerDependencyVersion} in apiVersionMetadata > target > matchingDevServerVersion. Got ${devServerTargetVersion} instead. When updating the @lwc/lwc-dev-server dependency, you must ensure that it is compatible with the supported API version in this branch, then update apiVersionMetadata > target > matchingDevServerVersion to match, in order to "sign off" on this dependency change.`
21+
`Error: @lwc/lwc-dev-server versions do not match between 'dependencies' and 'apiVersionMetadata' in package.json. Expected ${devServerDependencyVersion} in apiVersionMetadata > target > matchingDevServerVersion. Got ${devServerTargetVersionRange} instead. When updating the @lwc/lwc-dev-server dependency, you must ensure that it is compatible with the supported API version in this branch, then update apiVersionMetadata > target > matchingDevServerVersion to match, in order to "sign off" on this dependency change.`
2122
);
2223
process.exit(1); // Fail the check
2324
}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [4.1.7](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.6...4.1.7) (2025-07-09)
2+
3+
### Bug Fixes
4+
5+
- bump LWC to 13.0.29 @W-18283826 ([#448](https://github.com/salesforcecli/plugin-lightning-dev/issues/448)) ([e40b7fc](https://github.com/salesforcecli/plugin-lightning-dev/commit/e40b7fcdf33ecd1e6f89240eb9e44f568afba6e9))
6+
17
## [4.1.6](https://github.com/salesforcecli/plugin-lightning-dev/compare/4.1.5...4.1.6) (2025-07-08)
28

39
### Bug Fixes

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ EXAMPLES
201201
$ sf lightning dev app --target-org myOrg --device-type ios --device-id "iPhone 15 Pro Max"
202202
```
203203

204-
_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.6/src/commands/lightning/dev/app.ts)_
204+
_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.7/src/commands/lightning/dev/app.ts)_
205205

206206
## `sf lightning dev component`
207207

@@ -247,7 +247,7 @@ EXAMPLES
247247
$ sf lightning dev component --name myComponent
248248
```
249249

250-
_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.6/src/commands/lightning/dev/component.ts)_
250+
_See code: [src/commands/lightning/dev/component.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.7/src/commands/lightning/dev/component.ts)_
251251

252252
## `sf lightning dev site`
253253

@@ -302,6 +302,6 @@ EXAMPLES
302302
$ sf lightning dev site --name "Partner Central" --target-org myOrg --get-latest
303303
```
304304

305-
_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.6/src/commands/lightning/dev/site.ts)_
305+
_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/4.1.7/src/commands/lightning/dev/site.ts)_
306306

307307
<!-- commandsstop -->

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "@salesforce/plugin-lightning-dev",
33
"description": "Lightning development tools for LEX, Mobile, and Experience Sites",
4-
"version": "4.1.6",
4+
"version": "4.1.7",
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
88
"@inquirer/prompts": "^5.3.8",
99
"@inquirer/select": "^2.4.7",
10-
"@lwc/lwc-dev-server": "~13.0.27",
11-
"@lwc/sfdc-lwc-compiler": "~13.0.27",
10+
"@lwc/lwc-dev-server": "~13.0.29",
11+
"@lwc/sfdc-lwc-compiler": "~13.0.29",
1212
"@lwrjs/api": "0.18.3",
1313
"@oclif/core": "^4.4.1",
1414
"@salesforce/core": "^8.15.0",

yarn.lock

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,10 +2345,10 @@
23452345
"@lwc/style-compiler" "8.20.1"
23462346
"@lwc/template-compiler" "8.20.1"
23472347

2348-
2349-
version "13.0.27"
2350-
resolved "https://registry.yarnpkg.com/@lwc/dev-server-plugin-lex/-/dev-server-plugin-lex-13.0.27.tgz#31651e41b582ffe8683ffa634c5a5fb16b885097"
2351-
integrity sha512-3T1kj1gmBmgXKwm99TcH31D8h9Fi72mtpxhrKJdviGU1RX+zTodrQvsCYOs/wLTDRccRUcUsceewrfr8XPxXpA==
2348+
2349+
version "13.0.29"
2350+
resolved "https://registry.yarnpkg.com/@lwc/dev-server-plugin-lex/-/dev-server-plugin-lex-13.0.29.tgz#36571f676f8f1f17b7d20a9c366ca490214a176c"
2351+
integrity sha512-2zCltvNMDbcJkCN3pIwnxmWBFzotYHd70OaWoO0yYLCZSmE9nHkUA2KAFnM46oldvSCh7BfjtPw+8kS0kjPGWw==
23522352
dependencies:
23532353
magic-string "~0.30.17"
23542354

@@ -2398,33 +2398,33 @@
23982398
dependencies:
23992399
"@lwc/shared" "8.20.1"
24002400

2401-
2402-
version "13.0.27"
2403-
resolved "https://registry.yarnpkg.com/@lwc/lwc-dev-server-types/-/lwc-dev-server-types-13.0.27.tgz#43c21ac4734257a04c2791e1adb3a45f34b45647"
2404-
integrity sha512-OOS2v6YPR/C8SzKijCId7W5JQMsD2aOJqa+WpCfbJQAN7xkVKav/S11Xzj62Tla10Cw8H663mL3olBeBlROIgw==
2401+
2402+
version "13.0.29"
2403+
resolved "https://registry.yarnpkg.com/@lwc/lwc-dev-server-types/-/lwc-dev-server-types-13.0.29.tgz#24b808f13a0bd6a224db823c961dfff920e71547"
2404+
integrity sha512-CW2FJrLz3FFA3zhN3t16mIPey3CcuFxNdSrS2KNltxe93cAaNIIPYeCggtlYZjbkX6WGnhNLPcG45G70Z/u0yg==
24052405

2406-
"@lwc/lwc-dev-server@~13.0.27":
2407-
version "13.0.27"
2408-
resolved "https://registry.yarnpkg.com/@lwc/lwc-dev-server/-/lwc-dev-server-13.0.27.tgz#c9a0c9c077bcc16d98574fca84ca574547f8fc55"
2409-
integrity sha512-vEKiH/YtzitQ3CxYIS/LHaDIhEx2H+2w5qghzY2RU2SKepr2f4IHyHEkj0TXb4hZPnDX/m7vFVr2emJV0027DA==
2406+
"@lwc/lwc-dev-server@~13.0.29":
2407+
version "13.0.29"
2408+
resolved "https://registry.yarnpkg.com/@lwc/lwc-dev-server/-/lwc-dev-server-13.0.29.tgz#d1023355f8a4d108405bdff67fb926c4bd6e4a55"
2409+
integrity sha512-sS+EdcdxnSz/p0I/TjOQv+cHsubk4bdwGf4M/1D7ZHBtY2ty8WRRI9ok2FqH/FaeM04IOdS5MNdlC2PTQvJ7xA==
24102410
dependencies:
2411-
"@lwc/lwc-dev-server-types" "13.0.27"
2412-
"@lwc/sfdc-lwc-compiler" "13.0.27"
2411+
"@lwc/lwc-dev-server-types" "13.0.29"
2412+
"@lwc/sfdc-lwc-compiler" "13.0.29"
24132413
chalk "~5.4.1"
24142414
chokidar "~3.6.0"
24152415
commander "~10.0.0"
24162416
glob "^10.4.5"
24172417
ws "^8.18.2"
24182418

2419-
2420-
version "13.0.27"
2421-
resolved "https://registry.yarnpkg.com/@lwc/metadata/-/metadata-13.0.27.tgz#ebae0cd73d58dd39dce3cda33fb3208dc3886350"
2422-
integrity sha512-4uveRUfNVeHOqq6PxXLZN0oYkmpbnKIs/vWwHrof/9VKwxwnNHFrfXdhrVv7mVMTHLd6pmbSJkPu2lfmF+KQAw==
2419+
2420+
version "13.0.29"
2421+
resolved "https://registry.yarnpkg.com/@lwc/metadata/-/metadata-13.0.29.tgz#ae7862d0c332a228d2b0e4ef90afc1ff503b0071"
2422+
integrity sha512-P8gt2syBqYOjnzAPYNvKWmqYlXvbYujhShMqg6Ca0Gb7WvR8ntUCLbIFx3OaOzD1NmiZDPxJcfAeBI86j2UECg==
24232423
dependencies:
24242424
"@babel/parser" "~7.27.5"
24252425
"@babel/traverse" "~7.27.4"
24262426
"@babel/types" "~7.27.6"
2427-
"@lwc/sfdc-compiler-utils" "13.0.27"
2427+
"@lwc/sfdc-compiler-utils" "13.0.29"
24282428
postcss "~8.5.5"
24292429
postcss-selector-parser "~6.1.2"
24302430
postcss-value-parser "~4.2.0"
@@ -2446,15 +2446,15 @@
24462446
"@lwc/shared" "8.20.1"
24472447
"@rollup/pluginutils" "~5.1.4"
24482448

2449-
2450-
version "13.0.27"
2451-
resolved "https://registry.yarnpkg.com/@lwc/sfdc-compiler-utils/-/sfdc-compiler-utils-13.0.27.tgz#592080a6cb21b47149d2f7dfd18da344132c6778"
2452-
integrity sha512-7Ebdw0r1pc1t1XfCUCgP2l1T+0z/Kbrcwdn3q9z5RX20ers2kvpTGyqzzUtkrbWE+QTWByult0OFxM7KeItbAQ==
2449+
2450+
version "13.0.29"
2451+
resolved "https://registry.yarnpkg.com/@lwc/sfdc-compiler-utils/-/sfdc-compiler-utils-13.0.29.tgz#92a80e77dab3cb3057d7f56294f2c8abd998267e"
2452+
integrity sha512-hBv883zrjvYqKjq2aMWFAVvE/CO7AYLsPqUpOKm1zSwGGSxxuGz0NnvEVSzqAJdd3dHrR+GMN4RUQkPxXynOEA==
24532453

2454-
"@lwc/[email protected].27", "@lwc/sfdc-lwc-compiler@~13.0.27":
2455-
version "13.0.27"
2456-
resolved "https://registry.yarnpkg.com/@lwc/sfdc-lwc-compiler/-/sfdc-lwc-compiler-13.0.27.tgz#bfcbc7c52557ee41808359aa54392b79d212753a"
2457-
integrity sha512-UbsMqUUw9YfnZbDzf/ei1/ucNo85QJAsStRCwcmd8AlRZzWE5zLL5v1tbpFfNBplm2yOQgsczjaT2rqiYPpDhg==
2454+
"@lwc/[email protected].29", "@lwc/sfdc-lwc-compiler@~13.0.29":
2455+
version "13.0.29"
2456+
resolved "https://registry.yarnpkg.com/@lwc/sfdc-lwc-compiler/-/sfdc-lwc-compiler-13.0.29.tgz#c79ef929d0076ae02cd12c2dd39fca61d81d8419"
2457+
integrity sha512-yYBCbacsuonnR7vCh3FF/+A4Oplpc3FID6ZEdrpHj45kOgYPAeO330k3GITLJ4ar//ISMlRKDCAfe5PNHIwe2A==
24582458
dependencies:
24592459
"@babel/core" "7.27.4"
24602460
"@babel/parser" "7.27.5"
@@ -2463,11 +2463,11 @@
24632463
"@babel/traverse" "7.27.4"
24642464
"@babel/types" "7.27.6"
24652465
"@komaci/esm-generator" "256.0.1"
2466-
"@lwc/dev-server-plugin-lex" "13.0.27"
2466+
"@lwc/dev-server-plugin-lex" "13.0.29"
24672467
"@lwc/eslint-plugin-lwc" "3.0.0-beta.2"
24682468
"@lwc/eslint-plugin-lwc-platform" "6.0.0-beta.7"
2469-
"@lwc/metadata" "13.0.27"
2470-
"@lwc/sfdc-compiler-utils" "13.0.27"
2469+
"@lwc/metadata" "13.0.29"
2470+
"@lwc/sfdc-compiler-utils" "13.0.29"
24712471
"@rollup/plugin-babel" "^6.0.4"
24722472
"@rollup/plugin-replace" "^6.0.2"
24732473
"@rollup/wasm-node" "4.10.0"

0 commit comments

Comments
 (0)