maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
Johannes Rieken 2018-08-24 14:54:50 +02:00
parent 2c43eaebec
commit 099d99b76c
5 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
extensions/typescript-language-features/extension.webpack.config.js Normal file
View file

@ -0,0 +1,23 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
//@ts-check
'use strict';
const withDefaults = require('../shared.webpack.config');
module.exports = withDefaults({
context: __dirname,
node: {
__dirname: false,
},
resolve: {
mainFields: ['module', 'main']
},
entry: {
extension: './src/extension.ts',
}
});

8
extensions/typescript-language-features/package.json
View file

@ -17,13 +17,13 @@
],
"dependencies": {
"jsonc-parser": "^2.0.1",
"semver": "4.3.6",
"semver": "5.5.1",
"vscode-extension-telemetry": "0.0.18",
"vscode-nls": "^3.2.4"
},
"devDependencies": {
"@types/node": "8.0.33",
"@types/semver": "5.4.0",
"@types/semver": "^5.5.0",
"vscode": "^1.1.10"
},
"scripts": {
@ -71,7 +71,9 @@
"default": false,
"description": "%typescript.disableAutomaticTypeAcquisition%",
"scope": "window",
"tags": ["usesOnlineServices"]
"tags": [
"usesOnlineServices"
]
},
"typescript.npm": {
"type": [

15
extensions/typescript-language-features/src/utils/telemetry.ts
View file

@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as path from 'path';
import * as vscode from 'vscode';
import VsCodeTelemetryReporter from 'vscode-extension-telemetry';
import { memoize } from './memoize';
@ -59,15 +59,14 @@ export default class TelemetryReporter {
@memoize
private get packageInfo(): IPackageInfo | null {
const packagePath = path.join(__dirname, '..', '..', 'package.json');
const extensionPackage = require(packagePath);
if (extensionPackage) {
const { packageJSON } = vscode.extensions.getExtension('vscode.typescript-language-features')!;
if (packageJSON) {
return {
name: extensionPackage.name,
version: extensionPackage.version,
aiKey: extensionPackage.aiKey
name: packageJSON.name,
version: packageJSON.version,
aiKey: packageJSON.aiKey
};
}
return null;
}
}
}

6
extensions/typescript-language-features/src/utils/versionProvider.ts
View file

@ -140,9 +140,9 @@ export class TypeScriptVersionProvider {
public get bundledVersion(): TypeScriptVersion {
try {
const bundledVersion = new TypeScriptVersion(
path.dirname(require.resolve('typescript/lib/tsserver.js')),
'');
const { extensionPath } = vscode.extensions.getExtension('vscode.typescript-language-features')!;
const typescriptPath = path.join(extensionPath, '../node_modules/typescript/lib');
const bundledVersion = new TypeScriptVersion(typescriptPath, '');
if (bundledVersion.isValid) {
return bundledVersion;
}

12
extensions/typescript-language-features/yarn.lock
View file

@ -6,9 +6,9 @@
version "8.0.33"
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
"@types/semver@5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.4.0.tgz#f3658535af7f1f502acd6da7daf405ffeb1f7ee4"
"@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
ajv@^5.1.0:
version "5.5.2"
@ -1274,9 +1274,9 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
semver@4.3.6:
version "4.3.6"
resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
semver@5.5.1:
version "5.5.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
semver@^5.3.0, semver@^5.4.1:
version "5.5.0"