Merge pull request #2379 from github/charisk/move-packaging-files

Move packaging files

Author: charisk

extensions/ql-vscode/src/packaging/index.ts

@@ -0,0 +1 @@
+export * from "./packaging";

extensions/ql-vscode/src/packaging.ts …ons/ql-vscode/src/packaging/packaging.tsextensions/ql-vscode/src/packaging.ts renamed to extensions/ql-vscode/src/packaging/packaging.ts extensions/ql-vscode/src/packaging.ts renamed to extensions/ql-vscode/src/packaging/packaging.ts

@@ -1,20 +1,20 @@
-import { CodeQLCliServer } from "./cli";
+import { CodeQLCliServer } from "../cli";
 import {
   getOnDiskWorkspaceFolders,
   showAndLogExceptionWithTelemetry,
   showAndLogInformationMessage,
-} from "./helpers";
+} from "../helpers";
 import { QuickPickItem, window } from "vscode";
 import {
   ProgressCallback,
   UserCancellationException,
   withProgress,
-} from "./progress";
-import { extLogger } from "./common";
-import { asError, getErrorStack } from "./pure/helpers-pure";
-import { redactableError } from "./pure/errors";
-import { PACKS_BY_QUERY_LANGUAGE } from "./common/query-language";
-import { PackagingCommands } from "./common/commands";
+} from "../progress";
+import { extLogger } from "../common";
+import { asError, getErrorStack } from "../pure/helpers-pure";
+import { redactableError } from "../pure/errors";
+import { PACKS_BY_QUERY_LANGUAGE } from "../common/query-language";
+import { PackagingCommands } from "../common/commands";
 
 type PackagingOptions = {
   cliServer: CodeQLCliServer;

…-tests/cli-integration/packaging.test.ts …-integration/packaging/packaging.test.tsextensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts renamed to extensions/ql-vscode/test/vscode-tests/cli-integration/packaging/packaging.test.ts extensions/ql-vscode/test/vscode-tests/cli-integration/packaging.test.ts renamed to extensions/ql-vscode/test/vscode-tests/cli-integration/packaging/packaging.test.ts

@@ -1,16 +1,16 @@
 import { window } from "vscode";
 import { join } from "path";
 
-import { CodeQLCliServer } from "../../../src/cli";
-import { getErrorMessage } from "../../../src/pure/helpers-pure";
+import { CodeQLCliServer } from "../../../../src/cli";
+import { getErrorMessage } from "../../../../src/pure/helpers-pure";
 
-import * as helpers from "../../../src/helpers";
+import * as helpers from "../../../../src/helpers";
 import {
   handleDownloadPacks,
   handleInstallPackDependencies,
-} from "../../../src/packaging";
-import { mockedQuickPickItem } from "../utils/mocking.helpers";
-import { getActivatedExtension } from "../global.helper";
+} from "../../../../src/packaging";
+import { mockedQuickPickItem } from "../../utils/mocking.helpers";
+import { getActivatedExtension } from "../../global.helper";
 
 describe("Packaging commands", () => {
   let cli: CodeQLCliServer;
@@ -82,7 +82,7 @@ describe("Packaging commands", () => {
   });
 
   it("should install valid workspace pack", async () => {
-    const rootDir = join(__dirname, "./data");
+    const rootDir = join(__dirname, "../data");
     quickPickSpy.mockResolvedValue(
       mockedQuickPickItem([
         {
@@ -99,7 +99,7 @@ describe("Packaging commands", () => {
   });
 
   it("should throw an error when installing invalid workspace pack", async () => {
-    const rootDir = join(__dirname, "../data-invalid-pack");
+    const rootDir = join(__dirname, "../../data-invalid-pack");
     quickPickSpy.mockResolvedValue(
       mockedQuickPickItem([
         {