getlocalci · kienstra · Sep 18, 2022 · Aug 28, 2022 · Aug 28, 2022 · Aug 28, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,11 +6,12 @@ orbs:
 jobs:
   test:
     docker:
-      - image: cimg/node:16.8.0-browsers
+      - image: cimg/node:16.17
     steps:
       - checkout
       - node/install-packages
       - run: npm test
+      - run: npm run lint
     resource_class: large
   package:
     docker:

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,5 @@ out
 dist
 bin
 node_modules
-.vscode-test/
 *.vsix
-.DS_Store
+.DS_Store
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,20 +11,14 @@
       "outFiles": [
         "${workspaceFolder}/dist/**/*.js"
       ],
-      "preLaunchTask": "${defaultBuildTask}"
+      "preLaunchTask": "npm: watch"
     },
     {
-      "name": "Extension Tests",
-      "type": "extensionHost",
+      "name": "Unit Tests",
+      "type": "node",
       "request": "launch",
-      "args": [
-        "--extensionDevelopmentPath=${workspaceFolder}",
-        "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
-      ],
-      "outFiles": [
-        "${workspaceFolder}/out/test/**/*.js"
-      ],
-      "preLaunchTask": "npm: test-watch"
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "console": "integratedTerminal"
     }
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,3 @@
-// Place your settings in this file to overwrite default and user settings.
 {
     "files.exclude": {
         "out": false, // set this to true to hide the "out" folder with the compiled JS files

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -18,16 +18,6 @@
         "kind": "build",
         "isDefault": true
       }
-    },
-    {
-      "type": "npm",
-      "script": "test-watch",
-      "problemMatcher": "$tsc-watch",
-      "isBackground": true,
-      "presentation": {
-        "reveal": "never"
-      },
-      "group": "build"
     }
   ]
 }
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,5 +1,4 @@
 .vscode/**
-.vscode-test/**
 .circleci/**
 .husky/**
 artifacts/**
@@ -9,7 +8,8 @@ src/**
 CONTRIBUTING.md
 .gitignore
 .nvmrc
-**/tsconfig.json
-**/.eslintrc.json
+tsconfig.json
+.eslintrc.json
+jest.config.js
 **/*.map
 **/*.ts
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -22,6 +22,8 @@
   <img src="https://user-images.githubusercontent.com/4063887/138581226-9aeb09aa-e9c4-44e3-8b22-a6022080119b.gif" alt="restarting the editor">
 </p>
 
+9. If step 3 causes the warning "The task 'npm: watch' cannot be tracked," you can either activate the extension [TypeScript + Webpack Problem Matchers](https://marketplace.visualstudio.com/items?itemName=amodio.tsl-problem-matcher), or manually do `npm run watch` and click "Debug Anyway."
+
 ## Linting
 
 `npm run lint`

diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,13 @@
+// @ts-check
+
+/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  moduleDirectories: ['node_modules', 'src'],
+  setupFilesAfterEnv: ['<rootDir>/src/test-tools/jest.setup.ts'],
+  transform: {
+    '\\.sh$': '<rootDir>/src/test-tools/jest-raw-loader.js',
+    '\\.yml$': '<rootDir>/src/test-tools/jest-raw-loader.js'
+  }
+};