Merge branch 'main' into nrkruk/pocSiteApi

Author: nrkruk

.github/CI_README.md

@@ -0,0 +1,26 @@
+# CI Info
+
+[Github Workflows Readme](https://github.com/salesforcecli/github-workflows)
+
+## Releasing a new version
+
+[Release Workflow](https://github.com/salesforcecli/plugin-lightning-dev/actions/workflows/create-github-release.yml)
+
+## Node Version Configuration
+
+This repository provides flexibility to manage Node.js versions in CI workflows using repository variables.
+These variables can be configured at the repository level via the [Actions settings page](https://github.com/salesforcecli/plugin-lightning-dev/settings/variables/actions).
+These can also be supplied as arguments to individual workflows directly.
+
+### `UT_DISABLE_NODE_CURRENT`
+
+- Disables the latest Node.js version in GitHub Actions workflows.
+
+### `UT_DISABLE_NODE_PREVIOUS`
+
+- Disables the previous Node.js version in GitHub Actions workflows.
+
+### `NODE_VERSION_OVERRIDE`
+
+- Overrides the full set of Node.js versions used for testing and publishing.
+- **Default:** `'lts/*'` and `'lts/-1'`.

.github/workflows/onRelease.yml

@@ -49,6 +49,5 @@ jobs:
       sign: true
       tag: ${{ needs.getDistTag.outputs.tag || (needs.getMajorVersion.outputs.major == '1') && 'latest' || 'next' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}
-      nodeVersion: 20.18.0
 
     secrets: inherit

.github/workflows/test.yml

@@ -26,4 +26,3 @@ jobs:
       fail-fast: false
     with:
       os: ${{ matrix.os }}
-      nodeVersion: 20.18.0

CHANGELOG.md

@@ -1,3 +1,39 @@
+## [2.6.2](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.6.1...2.6.2) (2024-12-06)
+
+### Bug Fixes
+
+- **deps:** bump the npm_and_yarn group with 2 updates ([#284](https://github.com/salesforcecli/plugin-lightning-dev/issues/284)) ([c05b45d](https://github.com/salesforcecli/plugin-lightning-dev/commit/c05b45d43fde49bff671a99d6e8c9afccc8ee8c8))
+
+## [2.6.1](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.6.0...2.6.1) (2024-12-06)
+
+### Bug Fixes
+
+- rename CI readme ([f6d0c2c](https://github.com/salesforcecli/plugin-lightning-dev/commit/f6d0c2ca09b02ad7d82b1c2a919fdb617c76b085))
+
+# [2.6.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.5.0...2.6.0) (2024-12-06)
+
+### Features
+
+- support node 22+ ([#282](https://github.com/salesforcecli/plugin-lightning-dev/issues/282)) ([ea9b60f](https://github.com/salesforcecli/plugin-lightning-dev/commit/ea9b60f145de5874f53db5cdf78c8c9566dcfeac))
+
+# [2.5.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.4.0...2.5.0) (2024-11-25)
+
+### Features
+
+- update lwc dependencies to match 254/patch code line @W-17311538 ([#271](https://github.com/salesforcecli/plugin-lightning-dev/issues/271)) ([89c40b3](https://github.com/salesforcecli/plugin-lightning-dev/commit/89c40b37720014fc591af53c6df9cffc21c58eba))
+
+# [2.4.0](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.3.2...2.4.0) (2024-11-25)
+
+### Features
+
+- add open_browser env var for testing ([#269](https://github.com/salesforcecli/plugin-lightning-dev/issues/269)) ([d4d3778](https://github.com/salesforcecli/plugin-lightning-dev/commit/d4d37782b779867c85d4e8f388a93d5af670da9c))
+
+## [2.3.2](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.3.1...2.3.2) (2024-11-22)
+
+### Bug Fixes
+
+- download site bundle correctly if site name has special chars ([#262](https://github.com/salesforcecli/plugin-lightning-dev/issues/262)) ([fd52cec](https://github.com/salesforcecli/plugin-lightning-dev/commit/fd52cecb73535cd5fdd303bdd4f82321d3848c40))
+
 ## [2.3.1](https://github.com/salesforcecli/plugin-lightning-dev/compare/2.3.0...2.3.1) (2024-11-21)
 
 ### Bug Fixes

CODEOWNERS

@@ -1,4 +1,4 @@
 # Comment line immediately above ownership line is reserved for related other information. Please be careful while editing.
 
 #GUSINFO: Web Application Runtime, Lightning Web Runtime (Container)
-* @salesforcecli/lwr
+* @salesforcecli/lwr @salesforcecli/lex @salesforcecli/mobile-platform-experience

README.md

@@ -200,7 +200,7 @@ EXAMPLES
     $ sf lightning dev app --target-org myOrg --device-type ios --device-id "iPhone 15 Pro Max"
 ```
 
-_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.3.2-alpha.0/src/commands/lightning/dev/app.ts)_
+_See code: [src/commands/lightning/dev/app.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.6.2/src/commands/lightning/dev/app.ts)_
 
 ## `sf lightning dev site`
 
@@ -244,6 +244,6 @@ EXAMPLES
     $ sf lightning dev site --name "Partner Central" --target-org myOrg
 ```
 
-_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.3.2-alpha.0/src/commands/lightning/dev/site.ts)_
+_See code: [src/commands/lightning/dev/site.ts](https://github.com/salesforcecli/plugin-lightning-dev/blob/2.6.2/src/commands/lightning/dev/site.ts)_
 
 <!-- commandsstop -->

package.json

@@ -1,24 +1,23 @@
 {
   "name": "@salesforce/plugin-lightning-dev",
   "description": "Lightning development tools for LEX, Mobile, and Experience Sites",
-  "version": "2.3.2-alpha.0",
+  "version": "2.6.2",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@inquirer/prompts": "^5.3.8",
     "@inquirer/select": "^2.4.7",
-    "@lwc/lwc-dev-server": "^10.7.4",
-    "@lwc/sfdc-lwc-compiler": "^10.7.4",
-    "@lwrjs/api": "0.15.0-alpha.44",
+    "@lwc/lwc-dev-server": "^11.1.0",
+    "@lwc/sfdc-lwc-compiler": "^11.1.0",
+    "@lwrjs/api": "0.15.6",
     "@oclif/core": "^4.0.30",
     "@salesforce/core": "^8.6.2",
     "@salesforce/kit": "^3.1.6",
     "@salesforce/lwc-dev-mobile-core": "4.0.0-alpha.9",
     "@salesforce/sf-plugins-core": "^11.2.4",
     "axios": "^1.7.7",
     "glob": "^10.4.5",
-    "lwc": "^8.2.0",
-    "lwr": "0.15.0-alpha.44",
+    "lwc": "^8.10.1",
     "node-fetch": "^3.3.2"
   },
   "devDependencies": {
@@ -27,14 +26,14 @@
     "@salesforce/dev-scripts": "^10.2.10",
     "@salesforce/plugin-command-reference": "^3.1.34",
     "@types/node-fetch": "^2.6.11",
-    "eslint-plugin-sf-plugin": "^1.20.1",
+    "eslint-plugin-sf-plugin": "^1.20.13",
     "esmock": "^2.6.7",
     "oclif": "^4.15.28",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
   "engines": {
-    "node": ">=18.0.0 <23"
+    "node": ">=18.0.0"
   },
   "files": [
     "/lib",
@@ -220,7 +219,7 @@
     "comment": "Refer to ApiVersionMetadata in orgUtils.ts for details",
     "target": {
       "versionNumber": "63.0",
-      "matchingDevServerVersion": "^10.7.4"
+      "matchingDevServerVersion": "^11.1.0"
     },
     "versionToTagMappings": [
       {

src/commands/lightning/dev/site.ts

@@ -83,7 +83,7 @@ export default class LightningDevSite extends SfCommand<void> {
       const startupParams: LocalDevOptions = {
         sfCLI: true,
         authToken,
-        open: true,
+        open: process.env.OPEN_BROWSER === 'false' ? false : true,
         port,
         logLevel: 'error',
         mode: 'dev',

src/shared/experience/expSite.ts

@@ -37,6 +37,8 @@ export class ExperienceSite {
     this.org = org;
     this.siteDisplayName = siteName.trim();
     this.siteName = this.siteDisplayName.replace(' ', '_');
+    // Replace any special characters in site name with underscore
+    this.siteName = this.siteName.replace(/[^a-zA-Z0-9]/g, '_');
   }
 
   /**

test/spec/expSite.test.ts

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { expect } from 'chai';
+import { Connection, Org } from '@salesforce/core';
+import sinon from 'sinon';
+import { ExperienceSite } from '../../src/shared/experience/expSite.js';
+
+describe('getRemoteMetadata', () => {
+  it('should return remote metadata when it exists', async () => {
+    const org = new Org();
+    const siteName = 'site@with#special-chars';
+    const experienceSite = new ExperienceSite(org, siteName);
+
+    // Create a mock Connection instance using sinon
+    const mockConnection = sinon.createStubInstance(Connection);
+
+    // Configure the mock to return the desired result when calling query
+    mockConnection.query.resolves({
+      done: true,
+      totalSize: 1,
+      records: [
+        {
+          Name: 'MRT_experience_00DSG00000ECBfZ_0DMSG000001CfA6_site_with_special_chars_10-30_12-47',
+          LastModifiedDate: '2024-11-12',
+        },
+      ],
+    });
+
+    // Replace the original connection with the mocked connection
+    org.getConnection = () => mockConnection;
+
+    const remoteMetadata = await experienceSite.getRemoteMetadata();
+
+    // Check if the called query matches the expected pattern
+    const calledQuery = mockConnection.query.args[0][0];
+    const expectedPattern =
+      /SELECT Name, LastModifiedDate FROM StaticResource WHERE Name LIKE 'MRT_experience_%_site_with_special_chars/;
+    expect(calledQuery).to.match(expectedPattern);
+
+    expect(remoteMetadata).to.deep.equal({
+      bundleName: 'MRT_experience_00DSG00000ECBfZ_0DMSG000001CfA6_site_with_special_chars_10-30_12-47',
+      bundleLastModified: '2024-11-12',
+    });
+  });
+});