feat: compile test

zjffun · zjffun · commit 1ca06584f8be · 2025-01-25T22:50:20.000+08:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,6 +24,7 @@ jobs:
           yarn run compile-web
       - name: Test
         run: |
+          yarn run compile-tests
           xvfb-run -a yarn run test
           xvfb-run -a yarn run test-web
       - name: Publish
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 test.temp
 .DS_Store
 
-/out
+out
 out-view
 dist
 node_modules
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,17 +1,16 @@
-packages
+.vscode
+out/
+src/
+tsconfig.json
+webpack.config.js
+esbuild.js
 yarn.lock
-
-.vscode/**
 .vscode-test/**
-out/test/**
 views/**
 test.temp/**
-
-src/**
 .gitignore
 .yarnrc
 vsc-extension-quickstart.md
-**/tsconfig.json
 **/.eslintrc.json
 **/*.map
 **/*.ts
diff --git a/esbuild-test.js b/esbuild-test.js
diff --git a/esbuild.js b/esbuild.js
@@ -12,7 +12,7 @@ async function main() {
     sourcemap: !production,
     sourcesContent: false,
     platform: "node",
-    outfile: "out/extension.js",
+    outfile: "dist/extension.js",
     external: ["vscode", "jsonc-parser"],
     logLevel: "silent",
     plugins: [
diff --git a/package.json b/package.json
@@ -37,7 +37,8 @@
     "editor-view:watch": "webpack --config ./views/code-snippets-editor/webpack.config.js --watch",
     "eslint-fix": "eslint --fix .",
     "prettier-fix": "prettier --write .",
-    "test": "node esbuild-test.js && node ./test/runTest.js",
+    "compile-tests": "tsc -p . --outDir out",
+    "test": "node ./out/test/runTest.js",
     "test-web": "node ./test/runTestWeb.js",
     "watch": "concurrently \"yarn run editor-view:watch\" \"node esbuild.js --watch\"",
     "watch-web": "webpack --watch",
diff --git a/src/test/runTest.ts b/src/test/runTest.ts
@@ -1,18 +1,16 @@
-const path = require("path");
-const { runTests } = require("@vscode/test-electron");
+import * as path from "path";
+
+import { runTests } from "@vscode/test-electron";
 
 async function main() {
   try {
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`
-    const extensionDevelopmentPath = path.resolve(__dirname, "../");
+    const extensionDevelopmentPath = path.resolve(__dirname, "../../");
 
     // The path to test runner
     // Passed to --extensionTestsPath
-    const extensionTestsPath = path.resolve(
-      __dirname,
-      "../out/test/suite/index",
-    );
+    const extensionTestsPath = path.resolve(__dirname, "./suite/index");
 
     // Download VS Code, unzip it and run the integration test
     await runTests({
diff --git a/src/test/runTestWeb.ts b/src/test/runTestWeb.ts
@@ -1,17 +1,17 @@
-const path = require("path");
-const { runTests } = require("@vscode/test-web");
+import * as path from "path";
+import { runTests } from "@vscode/test-web";
 
 async function main() {
   try {
     // The folder containing the Extension Manifest package.json
     // Passed to `--extensionDevelopmentPath`
-    const extensionDevelopmentPath = path.resolve(__dirname, "../");
+    const extensionDevelopmentPath = path.resolve(__dirname, "../../");
 
     // The path to test runner
     // Passed to --extensionTestsPath
     const extensionTestsPath = path.resolve(
       __dirname,
-      "../dist/web/test/suite/index",
+      "../../dist/web/test/suite/index",
     );
 
     // Download VS Code, unzip it and run the integration test
diff --git a/src/test/suite/index.ts b/src/test/suite/index.ts
@@ -1,9 +1,7 @@
 import * as path from "path";
+import * as Mocha from "mocha";
 import * as glob from "glob";
 
-// eslint-disable-next-line @typescript-eslint/no-require-imports
-const Mocha = require("mocha");
-
 export function run(): Promise<void> {
   // Create the mocha test
   const mocha = new Mocha({
@@ -25,7 +23,7 @@ export function run(): Promise<void> {
 
       try {
         // Run the mocha test
-        mocha.run((failures: any) => {
+        mocha.run((failures) => {
           if (failures > 0) {
             e(new Error(`${failures} tests failed.`));
           } else {
