Merge branch 'main' into madhur/tree-shaking

Author: madhur310

.eslintrc.json

@@ -50,6 +50,7 @@
     "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/no-unused-vars": "error",
     "func-style": ["error", "expression"],
+    "arrow-body-style": ["error", "as-needed"],
     "import/no-extraneous-dependencies": "error"
   }
 }

.gitignore

@@ -22,4 +22,5 @@ npm-debug.log
 
 # Ignore artifacts
 *.tgz
-.npmrcpackage-lock.json
+.npmrc
+package-lock.json

lerna.json

@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.12.8"
+  "version": "4.12.11"
 }

package.json

@@ -66,6 +66,12 @@
   "lint-staged": {
     "./{src,test}/**/*.{ts,js}": [
       "eslint -c .eslintrc.json --fix"
+    ],
+    "packages/*/src/**/*.{ts,js}": [
+      "eslint -c .eslintrc.json --fix"
+    ],
+    "packages/*/test/**/*.{ts,js}": [
+      "eslint -c .eslintrc.json --fix"
     ]
   },
   "private": true,

packages/aura-language-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/aura-language-server",
-  "version": "4.12.8",
+  "version": "4.12.11",
   "description": "Language server for Aura components.",
   "main": "lib/index.js",
   "module": "lib/index.js",
@@ -66,7 +66,7 @@
     "package": "yarn pack"
   },
   "dependencies": {
-    "@salesforce/lightning-lsp-common": "4.12.8",
+    "@salesforce/lightning-lsp-common": "4.12.11",
     "acorn-loose": "^6.0.0",
     "acorn-walk": "^6.0.0",
     "line-column": "^1.0.2",

packages/aura-language-server/src/__tests__/aura-utils.test.ts

@@ -2,27 +2,23 @@ import { TextDocument, Position } from 'vscode-languageserver';
 import { getAuraBindingValue, parse } from '../aura-utils';
 
 describe('getAuraBindingValue', () => {
-    function createDocument(content: string): TextDocument {
-        return TextDocument.create('file:///test.cmp', 'html', 0, content);
-    }
+    const createDocument = (content: string): TextDocument => TextDocument.create('file:///test.cmp', 'html', 0, content);
 
-    function createPosition(line: number, character: number): Position {
-        return Position.create(line, character);
-    }
+    const createPosition = (line: number, character: number): Position => Position.create(line, character);
 
-    function getBindingValue(content: string, line: number, character: number): string | null {
+    const getBindingValue = (content: string, line: number, character: number): string | null => {
         const document = createDocument(content);
         const htmlDocument = parse(content);
         const position = createPosition(line, character);
         console.log('position', position);
         return getAuraBindingValue(document, position, htmlDocument);
-    }
+    };
 
     // simple function to find the cursor position in a string, helpful for readability
-    function findCursorPosition(content: string): number {
+    const findCursorPosition = (content: string): number => {
         const cursorPosition = content.indexOf('|');
         return cursorPosition;
-    }
+    };
 
     describe('basic functionality', () => {
         it('should extract property from v binding in attribute', () => {

packages/aura-language-server/src/__tests__/package-dependencies.test.ts

@@ -9,13 +9,13 @@ import glob from 'glob';
 
 const checkedPackagePatterns: RegExp[] = [/^@salesforce/i, /^@lwc/i];
 
-function readJsonFile(jsonFilePath: string): any {
+const readJsonFile = (jsonFilePath: string): any => {
     try {
         return JSON.parse(fs.readFileSync(jsonFilePath, 'utf8'));
     } catch (e) {
         throw new Error(`Error reading json file from ${jsonFilePath}: ${e}`);
     }
-}
+};
 
 const packageJsonPath = path.join(__dirname, '..', '..', 'package.json');
 const packageJson = readJsonFile(packageJsonPath);