Merge branch 'main' into cristi/dependabot

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.12.0"
+  "version": "4.12.1"
 }

packages/aura-language-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/aura-language-server",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "Language server for Aura components.",
   "main": "lib/aura-indexer/indexer.js",
   "typings": "lib/shared.d.ts",
@@ -27,7 +27,7 @@
     "package": "yarn pack"
   },
   "dependencies": {
-    "@salesforce/lightning-lsp-common": "4.12.0",
+    "@salesforce/lightning-lsp-common": "4.12.1",
     "acorn": "^6.0.0",
     "acorn-loose": "^6.0.0",
     "acorn-walk": "^6.0.0",

packages/lightning-lsp-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/lightning-lsp-common",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "Common components for lwc-language-server and aura-language-server.",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

packages/lightning-lsp-common/src/__tests__/context.test.ts

@@ -183,7 +183,7 @@ it('configureSfdxProject()', async () => {
     expect(jsconfigForceApp.compilerOptions.experimentalDecorators).toBe(true);
     expect(jsconfigForceApp.include[0]).toBe('**/*');
     expect(jsconfigForceApp.include[1]).toBe('../../../../.sfdx/typings/lwc/**/*.d.ts');
-    expect(jsconfigForceApp.compilerOptions.baseUrl).toBeUndefined(); // baseUrl/paths set when indexing
+    expect(jsconfigForceApp.compilerOptions.baseUrl).toBeDefined(); // baseUrl/paths set when indexing
     expect(jsconfigForceApp.typeAcquisition).toEqual({ include: ['jest'] });
     // verify updated jsconfig.json
     const jsconfigUtilsContent = fs.readFileSync(jsconfigPathUtils, 'utf8');

packages/lightning-lsp-common/src/resources/sfdx/jsconfig-sfdx.json

@@ -1,19 +1,20 @@
 {
     "compilerOptions": {
-        "experimentalDecorators": true
+        "experimentalDecorators": true,
+        "baseUrl": ".",
+        "paths": {
+            "c/*": [
+                "*"
+            ]
+        }
     },
     "include": [
         "**/*",
         "${project_root}/.sfdx/typings/lwc/**/*.d.ts"
     ],
-    "paths": {
-        "c/*": [
-            "*"
-        ]
-    },
     "typeAcquisition": {
         "include": [
             "jest"
         ]
     }
-}
+}

packages/lwc-language-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/lwc-language-server",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "Language server for Lightning Web Components.",
   "main": "lib/indexer.js",
   "license": "BSD-3-Clause",
@@ -34,7 +34,7 @@
     "@lwc/template-compiler": "2.50.0",
     "@salesforce/apex": "0.0.12",
     "@salesforce/label": "0.0.12",
-    "@salesforce/lightning-lsp-common": "4.12.0",
+    "@salesforce/lightning-lsp-common": "4.12.1",
     "@salesforce/resourceurl": "0.0.12",
     "@salesforce/schema": "0.0.12",
     "@salesforce/user": "0.0.12",