Fix relative paths in source now that extension is bundled

Since bundling produces a single (bundled) file at `out/main.js` all the
relative paths that expected `out/src/...` needed to drop one set of
`../` to be correct. We cannot emit the bundled extension to
`out/src/main.js` because, as mentioned previously, we still must
transpile everything for the unit tests, so `out/src/` is already full.

Author: andyleejordan

src/features/Examples.ts

@@ -9,7 +9,7 @@ export class ExamplesFeature implements vscode.Disposable {
     private examplesPath: string;
 
     constructor() {
-        this.examplesPath = path.resolve(__dirname, "../../../examples");
+        this.examplesPath = path.resolve(__dirname, "../../examples");
         this.command = vscode.commands.registerCommand("PowerShell.OpenExamplesFolder", () => {
             vscode.commands.executeCommand(
                 "vscode.openFolder",

src/features/PesterTests.ts

@@ -18,7 +18,7 @@ export class PesterTestsFeature implements vscode.Disposable {
     private invokePesterStubScriptPath: string;
 
     constructor(private sessionManager: SessionManager) {
-        this.invokePesterStubScriptPath = path.resolve(__dirname, "../../../modules/PowerShellEditorServices/InvokePesterStub.ps1");
+        this.invokePesterStubScriptPath = path.resolve(__dirname, "../../modules/PowerShellEditorServices/InvokePesterStub.ps1");
 
         // File context-menu command - Run Pester Tests
         this.command = vscode.commands.registerCommand(

src/logging.ts

@@ -40,7 +40,7 @@ export class Logger implements ILogger {
     constructor() {
         this.logChannel = vscode.window.createOutputChannel("PowerShell Extension Logs");
 
-        this.logBasePath = path.resolve(__dirname, "../../logs");
+        this.logBasePath = path.resolve(__dirname, "../logs");
         utils.ensurePathExists(this.logBasePath);
 
         this.commands = [

src/main.ts

@@ -36,7 +36,7 @@ import { LanguageClientConsumer } from "./languageClientConsumer";
 
 // The most reliable way to get the name and version of the current extension.
 // tslint:disable-next-line: no-var-requires
-const PackageJSON: any = require("../../package.json");
+const PackageJSON: any = require("../package.json");
 
 // the application insights key (also known as instrumentation key) used for telemetry.
 const AI_KEY: string = "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217";
@@ -197,7 +197,7 @@ function checkForUpdatedVersion(context: vscode.ExtensionContext, version: strin
                 if (choice === showReleaseNotes) {
                     vscode.commands.executeCommand(
                         "markdown.showPreview",
-                        vscode.Uri.file(path.resolve(__dirname, "../../CHANGELOG.md")));
+                        vscode.Uri.file(path.resolve(__dirname, "../CHANGELOG.md")));
                 }
             });
     }

src/settings.ts

@@ -157,7 +157,7 @@ export function load(): ISettings {
 
     const defaultDeveloperSettings: IDeveloperSettings = {
         featureFlags: [],
-        bundledModulesPath: "../../../PowerShellEditorServices/module",
+        bundledModulesPath: "../../PowerShellEditorServices/module",
         editorServicesLogLevel: "Normal",
         editorServicesWaitForDebugger: false,
         waitForSessionFileTimeoutSeconds: 240,
@@ -234,7 +234,7 @@ export function load(): ISettings {
         promptToUpdatePackageManagement:
             configuration.get<boolean>("promptToUpdatePackageManagement", true),
         bundledModulesPath:
-            "../../modules",
+            "../modules",
         useX86Host:
             configuration.get<boolean>("useX86Host", false),
         enableProfileLoading:

test/features/CustomViews.test.ts

@@ -70,15 +70,15 @@ hello
                     content: "console.log('asdf');",
                 },
                 {
-                    fileName: "../testCustomViews.js",
+                    fileName: "../../testCustomViews.js",
                     content: "console.log('asdf');",
                 },
             ],
             cssFiles: [],
             expectedHtmlString: `<html><head></head><body>
 hello
 <script src="${convertToVSCodeResourceScheme(path.join(__dirname, "testCustomViews.js"))}"></script>
-<script src="${convertToVSCodeResourceScheme(path.join(__dirname, "../testCustomViews.js"))}"></script>
+<script src="${convertToVSCodeResourceScheme(path.join(__dirname, "../../testCustomViews.js"))}"></script>
 </body></html>`,
         },