diff --git a/package-lock.json b/package-lock.json index f3d95051e..480a058fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "commander": "^11.0.0", "compare-versions": "^6.1.0", "fs-extra": "^11.1.0", - "glob": "^8.1.0", + "glob": "^10.3.4", "got": "^13.0.0", "hpagent": "^1.2.0", "js-yaml": "^4.1.0", @@ -34,7 +34,6 @@ }, "devDependencies": { "@types/fs-extra": "^11.0.1", - "@types/glob": "^8.1.0", "@types/js-yaml": "^4.0.5", "@types/mocha": "^10.0.1", "@types/node": "^18.17.15", @@ -66,7 +65,6 @@ }, "node_modules/@isaacs/cliui": { "version": "8.0.2", - "dev": true, "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -82,7 +80,6 @@ }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { "version": "6.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -93,7 +90,6 @@ }, "node_modules/@isaacs/cliui/node_modules/ansi-styles": { "version": "6.2.1", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -104,12 +100,10 @@ }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", - "dev": true, "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", - "dev": true, "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", @@ -125,7 +119,6 @@ }, "node_modules/@isaacs/cliui/node_modules/strip-ansi": { "version": "7.1.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -139,7 +132,6 @@ }, "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { "version": "8.1.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", @@ -155,7 +147,6 @@ }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", - "dev": true, "license": "MIT", "optional": true, "engines": { @@ -196,15 +187,6 @@ "@types/node": "*" } }, - "node_modules/@types/glob": { - "version": "8.1.0", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimatch": "^5.1.2", - "@types/node": "*" - } - }, "node_modules/@types/http-cache-semantics": { "version": "4.0.1", "license": "MIT" @@ -222,11 +204,6 @@ "@types/node": "*" } }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "dev": true, - "license": "MIT" - }, "node_modules/@types/mocha": { "version": "10.0.1", "dev": true, @@ -417,7 +394,6 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -425,7 +401,6 @@ }, "node_modules/ansi-styles": { "version": "4.3.0", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -804,7 +779,6 @@ }, "node_modules/color-convert": { "version": "2.0.1", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -815,7 +789,6 @@ }, "node_modules/color-name": { "version": "1.1.4", - "dev": true, "license": "MIT" }, "node_modules/commander": { @@ -1015,12 +988,10 @@ }, "node_modules/eastasianwidth": { "version": "0.2.0", - "dev": true, "license": "MIT" }, "node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, "license": "MIT" }, "node_modules/end-of-stream": { @@ -1131,7 +1102,6 @@ }, "node_modules/foreground-child": { "version": "3.1.1", - "dev": true, "license": "ISC", "dependencies": { "cross-spawn": "^7.0.0", @@ -1146,7 +1116,6 @@ }, "node_modules/foreground-child/node_modules/signal-exit": { "version": "4.0.2", - "dev": true, "license": "ISC", "engines": { "node": ">=14" @@ -1293,17 +1262,20 @@ "optional": true }, "node_modules/glob": { - "version": "8.1.0", + "version": "10.3.4", "license": "ISC", "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "foreground-child": "^3.1.0", + "jackspeak": "^2.0.3", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/cjs/src/bin.js" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -1513,7 +1485,6 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -1604,7 +1575,6 @@ }, "node_modules/jackspeak": { "version": "2.2.1", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -1812,13 +1782,16 @@ } }, "node_modules/minimatch": { - "version": "5.1.6", + "version": "9.0.3", "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { @@ -1830,7 +1803,6 @@ }, "node_modules/minipass": { "version": "6.0.2", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -2154,12 +2126,11 @@ } }, "node_modules/path-scurry": { - "version": "1.9.2", - "dev": true, + "version": "1.10.1", "license": "BlueOak-1.0.0", "dependencies": { - "lru-cache": "^9.1.1", - "minipass": "^5.0.0 || ^6.0.2" + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -2169,8 +2140,7 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.1.2", - "dev": true, + "version": "10.0.1", "license": "ISC", "engines": { "node": "14 || >=16.14" @@ -2407,41 +2377,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "10.2.6", - "dev": true, - "license": "ISC", - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", - "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" - }, - "bin": { - "glob": "dist/cjs/src/bin.js" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "9.0.1", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/safe-buffer": { "version": "5.1.2", "license": "MIT" @@ -2583,7 +2518,6 @@ }, "node_modules/string-width": { "version": "4.2.3", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -2597,7 +2531,6 @@ "node_modules/string-width-cjs": { "name": "string-width", "version": "4.2.3", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -2610,7 +2543,6 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -2622,7 +2554,6 @@ "node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -2924,7 +2855,6 @@ "node_modules/wrap-ansi-cjs": { "name": "wrap-ansi", "version": "7.0.0", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", diff --git a/package.json b/package.json index 9a179a078..6559e9d01 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "homepage": "https://github.com/redhat-developer/vscode-extension-tester#readme", "devDependencies": { "@types/fs-extra": "^11.0.1", - "@types/glob": "^8.1.0", "@types/js-yaml": "^4.0.5", "@types/mocha": "^10.0.1", "@types/node": "^18.17.15", @@ -59,7 +58,7 @@ "commander": "^11.0.0", "compare-versions": "^6.1.0", "fs-extra": "^11.1.0", - "glob": "^8.1.0", + "glob": "^10.3.4", "got": "^13.0.0", "hpagent": "^1.2.0", "js-yaml": "^4.1.0", diff --git a/test/test-project/src/test/xsideBar/scmView-test.ts b/test/test-project/src/test/xsideBar/scmView-test.ts index b0ec9ae78..c06e789c7 100644 --- a/test/test-project/src/test/xsideBar/scmView-test.ts +++ b/test/test-project/src/test/xsideBar/scmView-test.ts @@ -6,7 +6,7 @@ import * as fs from 'fs-extra'; (VSBrowser.instance.version >= '1.38.0' ? describe : describe.skip)('SCM View', () => { let view: ScmView; - before(async function context() { + before(async function () { this.timeout(15000); fs.writeFileSync(path.resolve('.', 'testfile'), 'content'); await VSBrowser.instance.openResources(path.resolve('..', '..')); diff --git a/test/test-project/src/test/xsideBar/sideBarView-test.ts b/test/test-project/src/test/xsideBar/sideBarView-test.ts index 2d00cc663..e4f17fa2c 100644 --- a/test/test-project/src/test/xsideBar/sideBarView-test.ts +++ b/test/test-project/src/test/xsideBar/sideBarView-test.ts @@ -56,12 +56,6 @@ describe('SideBarView', () => { content = view.getContent(); }); - after(async function() { - this.timeout(15000); - await new Workbench().executeCommand('close test folder'); - await new Promise((res) => { setTimeout(res, 3000); }); - }); - it('getSections works', async () => { const sections = await content.getSections(); expect(sections).not.empty;