Merge branch 'feature/v1'

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 All notable changes to the "VSIX Viewer" extension will be documented in this file.
 
-## [0.0.1]
+## [#{Release.ReleaseName}#]
 
-- Initial release
+- Initial release
+- Minor changes to telemetry

README.md

@@ -1,6 +1,7 @@
 # VSIX Viewer
 
-A simple extension to view files within a VSIX files inside Visual Studio Code. 
+A simple viewer for VSIX files, which lets you see the contents of VSIX files within Visual Studio Code. 
+
 
 ![viewer](marketplace/demo.gif)
 
@@ -23,4 +24,8 @@ See Change Log [here](CHANGELOG.md)
 
 ## Issues
 
-If you find any bug or have any suggestion/feature request, please submit the issues to the GitHub repo.
+If you find any bug or have any suggestion/feature request, please submit the issues to the GitHub repo.
+
+## Credits
+
+Some icons comes from the brilliant [vscode-icons](https://github.com/robertohuertasm/vscode-icons) extension for Visual Studio Code.

package.json

@@ -25,7 +25,8 @@
 	"keywords": [
 		"vsix",
 		"viewer",
-		"explorer"
+		"explorer",
+		"extension"
 	],
 	"license": "MIT",
 	"activationEvents": [
@@ -93,6 +94,7 @@
 		"mocha": "^6.1.4",
 		"ts-loader": "~6.2.0",
 		"tslint": "^5.20.0",
+		"tslint-webpack-plugin": "~2.1.0",
 		"typescript": "^3.6.3",
 		"vsce": "~1.68.0",
 		"webpack": "~4.41.2",

src/extension.ts

@@ -1,7 +1,7 @@
-import * as vscode from 'vscode';
-import { VsixOutlineProvider } from './vsixOutlineProvider';
+import * as vscode from "vscode";
+import { VsixOutlineProvider } from "./vsixOutlineProvider";
 import Util from "./util";
-import TelemetryClient from './telemetryClient';
+import TelemetryClient from "./telemetryClient";
 
 export function activate(context: vscode.ExtensionContext) {
 

src/telemetryClient.ts

@@ -47,7 +47,6 @@ export default class TelemetryClient {
             }
             if (this._enabled && this._reporter) {
                 let properties: { [key: string]: string } = {};
-                properties["os"] = process.env.os || "??";
                 error.stack = this.anonymizePaths(error.stack);
                 this._reporter.sendTelemetryException(error, properties);
                 this._lastStackTrackTrace = error.stack;
@@ -64,7 +63,6 @@ export default class TelemetryClient {
 
     dispose() {
         let properties: { [key: string]: string } = {};
-        properties["os"] = process.env.os || "??";
         properties["totalExtensionActiveTime"] = ((Date.now() - startTime) / 1000).toString();
         TelemetryClient.instance.sendEvent("extensionEnded", properties);
 

webpack.config.js

@@ -3,28 +3,34 @@
 'use strict';
 
 const path = require('path');
+const TSLintPlugin = require('tslint-webpack-plugin');
 
 /**@type {import('webpack').Configuration}*/
 const config = {
-  target: 'node', // vscode extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
+  target: 'node',
 
-  entry: './src/extension.ts', // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+  entry: './src/extension.ts',
   output: {
-    // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
     path: path.resolve(__dirname, 'dist'),
     filename: 'extension.js',
     libraryTarget: 'commonjs2',
     devtoolModuleFilenameTemplate: '../[resource-path]'
   },
   devtool: 'source-map',
   externals: {
-    vscode: 'commonjs vscode', // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/
+    vscode: 'commonjs vscode',
     'applicationinsights-native-metrics': 'applicationinsights-native-metrics'
   },
   resolve: {
-    // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader
     extensions: ['.ts', '.js']
   },
+  plugins: [
+    new TSLintPlugin({
+      files: ['./src/**/*.ts'],
+      config: './tslint.json',
+      waitForLinting: true
+    })
+  ],
   module: {
     rules: [
       {