Merge pull request #3145 from github/dependabot/npm_and_yarn/extensions/ql-vscode/tmp-0.2.1

Bump tmp from 0.1.0 to 0.2.1 in /extensions/ql-vscode

Author: koesie10

extensions/ql-vscode/package-lock.json

@@ -1938,7 +1938,7 @@
     "source-map-support": "^0.5.21",
     "stream-json": "^1.7.3",
     "styled-components": "^6.0.2",
-    "tmp": "^0.1.0",
+    "tmp": "^0.2.1",
     "tmp-promise": "^3.0.2",
     "tree-kill": "^1.2.2",
     "unzipper": "^0.10.5",

extensions/ql-vscode/package.json

@@ -9,7 +9,9 @@ import {
 describe("isLikelyDatabaseRoot", () => {
   let dir: tmp.DirResult;
   beforeEach(() => {
-    dir = tmp.dirSync();
+    dir = tmp.dirSync({
+      unsafeCleanup: true,
+    });
   });
 
   afterEach(() => {
@@ -54,7 +56,9 @@ describe("isLikelyDatabaseRoot", () => {
 describe("isLikelyDbLanguageFolder", () => {
   let dir: tmp.DirResult;
   beforeEach(() => {
-    dir = tmp.dirSync();
+    dir = tmp.dirSync({
+      unsafeCleanup: true,
+    });
   });
 
   afterEach(() => {

extensions/ql-vscode/test/unit-tests/databases/local-databases/db-contents-heuristics.test.ts

@@ -10,7 +10,9 @@ describe("getInitialQueryContents", () => {
   let language: QueryLanguage;
 
   beforeEach(() => {
-    dir = tmp.dirSync();
+    dir = tmp.dirSync({
+      unsafeCleanup: true,
+    });
     language = QueryLanguage.Cpp;
 
     const contents = dump({

extensions/ql-vscode/test/unit-tests/local-queries/query-contents.test.ts

@@ -1,5 +1,4 @@
 import { Uri, workspace } from "vscode";
-import * as tmp from "tmp";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import { getActivatedExtension } from "../../global.helper";
 import { mkdirSync, writeFileSync } from "fs";
@@ -10,7 +9,9 @@ import {
 import { ExtensionPack } from "../../../../src/model-editor/shared/extension-pack";
 import { join } from "path";
 import { extLogger } from "../../../../src/common/logging/vscode";
-import { homedir } from "os";
+import { homedir, tmpdir } from "os";
+import { mkdir, rm } from "fs-extra";
+import { nanoid } from "nanoid";
 import { QueryLanguage } from "../../../../src/common/query-language";
 
 const dummyExtensionPackContents = `
@@ -49,21 +50,23 @@ extensions:
 
 describe("modeled-method-fs", () => {
   let tmpDir: string;
-  let tmpDirRemoveCallback: (() => void) | undefined;
+  let tmpDirRemoveCallback: (() => Promise<void>) | undefined;
   let workspacePath: string;
   let cli: CodeQLCliServer;
 
   beforeEach(async () => {
     // On windows, make sure to use a temp directory that isn't an alias and therefore won't be canonicalised by CodeQL.
+    // The tmp package doesn't support this, so we have to do it manually.
     // See https://github.com/github/vscode-codeql/pull/2605 for more context.
-    const t = tmp.dirSync({
-      dir:
-        process.platform === "win32"
-          ? join(homedir(), "AppData", "Local", "Temp")
-          : undefined,
-    });
-    tmpDir = t.name;
-    tmpDirRemoveCallback = t.removeCallback;
+    const systemTmpDir =
+      process.platform === "win32"
+        ? join(homedir(), "AppData", "Local", "Temp")
+        : tmpdir();
+    tmpDir = join(systemTmpDir, `codeql-vscode-test-${nanoid(8)}`);
+    await mkdir(tmpDir, { recursive: true });
+    tmpDirRemoveCallback = async () => {
+      await rm(tmpDir, { recursive: true });
+    };
 
     const workspaceFolder = {
       uri: Uri.file(join(tmpDir, "workspace")),
@@ -89,8 +92,8 @@ describe("modeled-method-fs", () => {
     await cli.packInstall(packUsingExtensionsPath);
   });
 
-  afterEach(() => {
-    tmpDirRemoveCallback?.();
+  afterEach(async () => {
+    await tmpDirRemoveCallback?.();
   });
 
   function writeExtensionPackFiles(

extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts

@@ -19,7 +19,9 @@ let removeStorage: tmp.DirResult["removeCallback"] | undefined;
 
 export async function beforeAllAction() {
   // Create the temp directory to be used as extension local storage.
-  const dir = tmp.dirSync();
+  const dir = tmp.dirSync({
+    unsafeCleanup: true,
+  });
   let storagePath = realpathSync(dir.name);
   if (storagePath.substring(0, 2).match(/[A-Z]:/)) {
     storagePath =

extensions/ql-vscode/test/vscode-tests/jest.activated-extension.setup.ts

@@ -83,7 +83,9 @@ describe("FilePathDiscovery", () => {
   let discovery: TestFilePathDiscovery;
 
   beforeEach(() => {
-    const t = tmp.dirSync();
+    const t = tmp.dirSync({
+      unsafeCleanup: true,
+    });
     tmpDir = normalizePath(t.name);
     tmpDirRemoveCallback = t.removeCallback;
 

extensions/ql-vscode/test/vscode-tests/minimal-workspace/common/vscode/file-path-discovery.test.ts

@@ -52,7 +52,9 @@ describe("local databases", () => {
   let extensionContextStoragePath: string;
 
   beforeEach(() => {
-    dir = tmp.dirSync();
+    dir = tmp.dirSync({
+      unsafeCleanup: true,
+    });
 
     updateSpy = jest.fn(() => Promise.resolve(undefined));
     registerSpy = jest.fn(() => Promise.resolve(undefined));

extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/local-databases.test.ts

@@ -25,7 +25,9 @@ describe("QlPackGenerator", () => {
   let dir: tmp.DirResult;
 
   beforeEach(async () => {
-    dir = tmp.dirSync();
+    dir = tmp.dirSync({
+      unsafeCleanup: true,
+    });
 
     language = "ruby";
     packFolderPath = Uri.file(

extensions/ql-vscode/test/vscode-tests/minimal-workspace/qlpack-generator.test.ts

@@ -31,7 +31,9 @@ describe("Query pack discovery", () => {
   let discovery: QueryDiscovery;
 
   beforeEach(() => {
-    const t = tmp.dirSync();
+    const t = tmp.dirSync({
+      unsafeCleanup: true,
+    });
     tmpDir = t.name;
     tmpDirRemoveCallback = t.removeCallback;