diff --git a/lerna.json b/lerna.json index 1f9238fb..1dcaa256 100644 --- a/lerna.json +++ b/lerna.json @@ -4,5 +4,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "4.8.0" + "version": "4.9.0" } diff --git a/packages/aura-language-server/package.json b/packages/aura-language-server/package.json index 5ab3bd34..3b18f34a 100644 --- a/packages/aura-language-server/package.json +++ b/packages/aura-language-server/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/aura-language-server", - "version": "4.8.0", + "version": "4.9.0", "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.8.0", + "@salesforce/lightning-lsp-common": "4.9.0", "acorn": "^6.0.0", "acorn-loose": "^6.0.0", "acorn-walk": "^6.0.0", diff --git a/packages/lightning-lsp-common/package.json b/packages/lightning-lsp-common/package.json index 8dab4825..f8ed7736 100644 --- a/packages/lightning-lsp-common/package.json +++ b/packages/lightning-lsp-common/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/lightning-lsp-common", - "version": "4.8.0", + "version": "4.9.0", "description": "Common components for lwc-language-server and aura-language-server.", "main": "lib/index.js", "typings": "lib/index.d.ts", diff --git a/packages/lightning-lsp-common/src/__tests__/context.test.ts b/packages/lightning-lsp-common/src/__tests__/context.test.ts index 001891e1..d2b82f08 100644 --- a/packages/lightning-lsp-common/src/__tests__/context.test.ts +++ b/packages/lightning-lsp-common/src/__tests__/context.test.ts @@ -199,7 +199,9 @@ it('configureSfdxProject()', async () => { // .forceignore const forceignoreContent = fs.readFileSync(forceignorePath, 'utf8'); expect(forceignoreContent).toContain('**/jsconfig.json'); + expect(forceignoreContent).toContain('**/tsconfig.json'); expect(forceignoreContent).toContain('**/.eslintrc.json'); + expect(forceignoreContent).toContain('**/*.ts'); // typings expect(join(sfdxTypingsPath, 'lds.d.ts')).toExist(); diff --git a/packages/lightning-lsp-common/src/context.ts b/packages/lightning-lsp-common/src/context.ts index fc7660f2..12f0564b 100644 --- a/packages/lightning-lsp-common/src/context.ts +++ b/packages/lightning-lsp-common/src/context.ts @@ -588,7 +588,9 @@ export class WorkspaceContext { private async updateForceIgnoreFile(ignoreFile: string): Promise { await utils.appendLineIfMissing(ignoreFile, '**/jsconfig.json'); + await utils.appendLineIfMissing(ignoreFile, '**/tsconfig.json'); await utils.appendLineIfMissing(ignoreFile, '**/.eslintrc.json'); + await utils.appendLineIfMissing(ignoreFile, '**/*.ts'); } /** diff --git a/packages/lwc-language-server/package.json b/packages/lwc-language-server/package.json index 6988b42f..cba8350f 100644 --- a/packages/lwc-language-server/package.json +++ b/packages/lwc-language-server/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/lwc-language-server", - "version": "4.8.0", + "version": "4.9.0", "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.8.0", + "@salesforce/lightning-lsp-common": "4.9.0", "@salesforce/resourceurl": "0.0.12", "@salesforce/schema": "0.0.12", "@salesforce/user": "0.0.12",