Updates unit test configs

Author: eamodio

.vscode-test.mjs

@@ -2,11 +2,12 @@ import { defineConfig } from '@vscode/test-cli';
 
 export default defineConfig([
 	{
+		label: 'UnitTests',
+		files: 'out/tests/**/*.test.js',
+		version: 'insiders',
 		mocha: {
 			ui: 'bdd',
 			timeout: 20000,
 		},
-		label: 'unitTests',
-		files: 'out/**/*.test.js',
 	},
 ]);

.vscodeignore

@@ -16,7 +16,6 @@ patches/**
 resources/**
 scripts/**
 src/**
-test/**
 tests/**
 **/*.map
 **/*.pdn

eslint.config.mjs

@@ -15,7 +15,7 @@ export default ts.config(
 	litConfigs['flat/recommended'],
 	wcConfigs['flat/recommended'],
 	{
-		ignores: ['*', '*/', '!src/', '!tests/', 'src/@types/', 'src/test/**/*'],
+		ignores: ['*', '*/', '!src/', '!tests/', 'src/@types/'],
 	},
 	{
 		linterOptions: {
@@ -324,7 +324,7 @@ export default ts.config(
 	{
 		name: 'extension:node',
 		files: ['src/**/*'],
-		ignores: ['**/webview/**/*', 'src/test/**/*', 'src/webviews/apps/**/*', 'src/env/browser/**/*'],
+		ignores: ['src/**/webview/**/*', 'src/webviews/apps/**/*', 'src/env/browser/**/*'],
 		languageOptions: {
 			globals: { ...globals.node },
 			parser: ts.parser,
@@ -361,7 +361,7 @@ export default ts.config(
 	{
 		name: 'extension:browser',
 		files: ['src/**/*'],
-		ignores: ['**/webview/**/*', 'src/test/**/*', 'src/webviews/apps/**/*', 'src/env/node/**/*'],
+		ignores: ['src/**/webview/**/*', 'src/webviews/apps/**/*', 'src/env/node/**/*'],
 		languageOptions: {
 			globals: { ...globals.worker },
 			parser: ts.parser,
@@ -517,7 +517,7 @@ export default ts.config(
 	},
 	{
 		name: 'tests:unit',
-		files: ['**/__tests__/**', 'src/test/suite/**'],
+		files: ['src/**/__tests__/**/*'],
 		rules: {
 			'no-restricted-imports': 'off',
 			'@typescript-eslint/no-restricted-imports': 'off',

package.json

@@ -20153,7 +20153,7 @@
 		"build:extension:browser": "webpack --mode development --config-name extension:webworker",
 		"build:webviews": "webpack --mode development --config-name webviews",
 		"build:icons": "pnpm run icons:svgo && pnpm fantasticon && pnpm run icons:apply && pnpm run icons:export",
-		"build:tests": "node ./scripts/esbuild.tests.mjs --mode development",
+		"build:tests": "node ./scripts/esbuild.tests.mjs",
 		"// Extracts the contributions from package.json into contributions.json": "//",
 		"extract:contributions": "node --experimental-strip-types ./scripts/generateContributions.mts --extract",
 		"// Generates contributions in contributions.json into package.json": "//",

scripts/esbuild.tests.mjs

@@ -10,35 +10,28 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.join(path.dirname(__filename), '..');
 
 const args = process.argv.slice(2);
-
-let index = args.indexOf('--mode');
-const mode = (index >= 0 ? args[index + 1] : undefined) || 'none';
-
 const watch = args.includes('--watch');
 
 /**
  * @param { 'node' | 'webworker' } target
- * @param { 'production' | 'development' | 'none' } mode
  */
-async function buildTests(target, mode) {
+async function buildTests(target) {
 	/** @type BuildOptions | WatchOptions */
 	const config = {
 		bundle: true,
-		entryPoints: ['src/test/suite/index.ts', 'src/**/*.test.ts'],
+		entryPoints: ['src/**/__tests__/**/*.test.ts'],
 		entryNames: '[name]',
-		drop: ['debugger'],
 		external: ['vscode'],
 		format: 'cjs',
 		logLevel: 'info',
 		mainFields: target === 'webworker' ? ['browser', 'module', 'main'] : ['module', 'main'],
 		metafile: false,
-		minify: mode === 'production',
+		minify: false,
 		outdir: target === 'webworker' ? 'out/tests/browser' : 'out/tests',
 		platform: target === 'webworker' ? 'browser' : target,
 		plugins: [nodeExternalsPlugin()],
-		sourcemap: mode !== 'production',
+		sourcemap: true,
 		target: ['es2023', 'chrome124', 'node20.14.0'],
-		treeShaking: true,
 		tsconfig: target === 'webworker' ? 'tsconfig.test.browser.json' : 'tsconfig.test.json',
 	};
 
@@ -66,7 +59,7 @@ async function buildTests(target, mode) {
 }
 
 try {
-	await Promise.allSettled([buildTests('node', mode)]);
+	await Promise.allSettled([buildTests('node')]);
 } catch (ex) {
 	console.error(ex);
 	process.exit(1);

src/test/suite/extension.test.ts.bak

@@ -24,5 +24,5 @@
 		"../../system/**/*.ts",
 		"../../**/webview/**/*"
 	],
-	"exclude": ["**/-webview/**/*"]
+	"exclude": ["src/**/__tests__/**/*", "src/**/-webview/**/*"]
 }

src/test/suite/index.ts

@@ -8,7 +8,7 @@
 		"isolatedModules": true,
 		"lib": ["es2023"],
 		"module": "esnext",
-		"moduleResolution": "Bundler",
+		"moduleResolution": "bundler",
 		"noFallthroughCasesInSwitch": true,
 		"noImplicitOverride": true,
 		"noImplicitReturns": true,

src/webviews/apps/tsconfig.json

@@ -9,5 +9,5 @@
 		"tsBuildInfoFile": "tsconfig.browser.tsbuildinfo"
 	},
 	"include": ["src/**/*"],
-	"exclude": ["**/webview/**/*", "src/test/**/*", "src/webviews/apps/**/*", "src/env/node/**/*"]
+	"exclude": ["src/**/__tests__/**/*", "src/**/webview/**/*", "src/webviews/apps/**/*", "src/env/node/**/*"]
 }

tsconfig.base.json

@@ -1,4 +1,7 @@
 {
+	"compilerOptions": {
+		"composite": true
+	},
 	"files": [],
 	"references": [
 		{ "path": "./tsconfig.node.json" },

tsconfig.browser.json

@@ -7,5 +7,5 @@
 		"tsBuildInfoFile": "tsconfig.node.tsbuildinfo"
 	},
 	"include": ["src/**/*"],
-	"exclude": ["**/webview/**/*", "src/test/**/*", "src/webviews/apps/**/*", "src/env/browser/**/*"]
+	"exclude": ["src/**/__tests__/**/*", "src/**/webview/**/*", "src/webviews/apps/**/*", "src/env/browser/**/*"]
 }

tsconfig.json

@@ -8,5 +8,5 @@
 		}
 	},
 	"include": ["src/**/*"],
-	"exclude": ["node_modules", "**/webview/**/*", "src/webviews/apps/**/*", "src/env/browser/**/*"]
+	"exclude": ["src/**/webview/**/*", "src/webviews/apps/**/*", "src/env/browser/**/*"]
 }