Merge remote-tracking branch 'upstream/main'

Author: phillco

.eslintrc.json

@@ -12,6 +12,9 @@
 	},
 	"plugins": ["@typescript-eslint", "unused-imports"],
 	"rules": {
+		// Note: you must disable the base rule as it can report incorrect errors
+		"no-restricted-imports": "off",
+		"@typescript-eslint/no-restricted-imports": "error",
 		"@typescript-eslint/consistent-type-assertions": [
 			"error",
 			{

.vscode/launch.json

@@ -31,9 +31,25 @@
 			"args": [
 				"--extensions-dir=${workspaceFolder}/.vscode-sandbox/extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+				"--extensionTestsPath=${workspaceFolder}/out/test/runners/all"
 			],
-			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
+			"preLaunchTask": "${defaultBuildTask}",
+			"resolveSourceMapLocations": [
+				"${workspaceFolder}/**",
+				"!${workspaceFolder}/.vscode-sandbox/**",
+				"!**/node_modules/**"
+			]
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Unit tests only",
+			"program": "${workspaceFolder}/out/test/scripts/runUnitTestsOnly",
+			"env": {
+				"CURSORLESS_TEST": "true"
+			},
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
 			"preLaunchTask": "${defaultBuildTask}",
 			"resolveSourceMapLocations": [
 				"${workspaceFolder}/**",
@@ -52,9 +68,9 @@
 			"args": [
 				"--extensions-dir=${workspaceFolder}/.vscode-sandbox/extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+				"--extensionTestsPath=${workspaceFolder}/out/test/runners/all"
 			],
-			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
 			"preLaunchTask": "${defaultBuildTask}",
 			"resolveSourceMapLocations": [
 				"${workspaceFolder}/**",
@@ -73,9 +89,9 @@
 			"args": [
 				"--extensions-dir=${workspaceFolder}/.vscode-sandbox/extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+				"--extensionTestsPath=${workspaceFolder}/out/test/runners/all"
 			],
-			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
 			"preLaunchTask": "${defaultBuildTask}",
 			"resolveSourceMapLocations": [
 				"${workspaceFolder}/**",
@@ -95,9 +111,9 @@
 			"args": [
 				"--extensions-dir=${workspaceFolder}/.vscode-sandbox/extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+				"--extensionTestsPath=${workspaceFolder}/out/test/runners/all"
 			],
-			"outFiles": ["${workspaceFolder}/out/test/**/*.js"],
+			"outFiles": ["${workspaceFolder}/out/**/*.js"],
 			"preLaunchTask": "${defaultBuildTask}",
 			"resolveSourceMapLocations": [
 				"${workspaceFolder}/**",

docs-site/package.json

@@ -43,6 +43,6 @@
 		"typedoc-plugin-mdn-links": "^1.0.4",
 		"typedoc-plugin-missing-exports": "^0.22.6",
 		"typedoc-plugin-rename-defaults": "^0.4.0",
-		"typescript": "^4.5.5"
+		"typescript": "4.6.3"
 	}
 }

docs-site/yarn.lock

@@ -8257,10 +8257,10 @@ typedoc@^0.22.10:
     minimatch "^3.0.4"
     shiki "^0.9.12"
 
-typescript@^4.5.5:
-  version "4.5.5"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"
-  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+typescript@4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
 ua-parser-js@^0.7.30:
   version "0.7.31"

package.json

@@ -566,6 +566,10 @@
 		"url": "https://github.com/sponsors/pokey"
 	},
 	"funding": "https://github.com/sponsors/pokey",
+	"_moduleAliases": {
+		"@cursorless/common": "./out/libs/common/index.js",
+		"@cursorless/vscode-common": "./out/libs/vscode-common/index.js"
+	},
 	"scripts": {
 		"vscode:prepublish": "npm run -S esbuild-base -- --minify",
 		"update-licenses": "npx npm-license-crawler --onlyDirectDependencies --csv third-party-licenses.csv",
@@ -577,9 +581,9 @@
 		"watch": "tsc -watch -p ./",
 		"pretest": "yarn run compile && yarn run lint && yarn run esbuild",
 		"lint": "eslint src --ext ts",
-		"test": "env CURSORLESS_TEST=true node ./out/test/runTest.js",
+		"test": "env CURSORLESS_TEST=true node ./out/test/scripts/runTestsCI.js",
 		"unused-exports": "ts-unused-exports tsconfig.json --showLineNumber",
-		"init-launch-sandbox": "node ./out/test/initLaunchSandbox.js",
+		"init-launch-sandbox": "node ./out/scripts/initLaunchSandbox.js",
 		"prepare-for-extension-publish": "node ./out/scripts/prepareForExtensionPublish.js"
 	},
 	"devDependencies": {
@@ -603,19 +607,21 @@
 		"glob": "^7.1.7",
 		"js-yaml": "^4.1.0",
 		"mocha": "^8.1.3",
+		"module-alias": "^2.2.2",
 		"npm-license-crawler": "^0.2.1",
 		"prettier": "2.7.1",
 		"semver": "^7.3.7",
 		"sinon": "^11.1.1",
-		"ts-unused-exports": "8.0.0",
-		"typescript": "^4.5.5"
+		"ts-unused-exports": "^8.0.0",
+		"typescript": "4.6.3"
 	},
 	"dependencies": {
 		"@types/lodash": "^4.14.168",
 		"immer": "^9.0.15",
 		"immutability-helper": "^3.1.1",
 		"itertools": "^1.7.1",
 		"lodash": "^4.17.21",
-		"node-html-parser": "^5.3.3"
+		"node-html-parser": "^5.3.3",
+		"vscode-uri": "^3.0.6"
 	}
 }

src/actions/CommandAction.ts

@@ -15,7 +15,7 @@ import {
   runOnTargetsForEachEditor,
 } from "../util/targetUtils";
 import { Action, ActionReturnValue } from "./actions.types";
-import { getActiveTextEditor } from "../ide/activeTextEditor";
+import { getActiveTextEditor } from "../ide/vscode/activeTextEditor";
 
 export interface CommandOptions {
   command?: string;

src/actions/Fold.ts

@@ -4,7 +4,7 @@ import { Graph } from "../typings/Types";
 import { focusEditor } from "../util/setSelectionsAndFocusEditor";
 import { createThatMark, ensureSingleEditor } from "../util/targetUtils";
 import { Action, ActionReturnValue } from "./actions.types";
-import { getActiveTextEditor } from "../ide/activeTextEditor";
+import { getActiveTextEditor } from "../ide/vscode/activeTextEditor";
 
 class FoldAction implements Action {
   constructor(private command: string) {

src/actions/MakeshiftActions.ts

@@ -1,5 +1,5 @@
 import { Target } from "../typings/target.types";
-import sleep from "../util/sleep";
+import sleep from "../libs/common/util/sleep";
 import CommandAction from "./CommandAction";
 
 abstract class MakeshiftAction extends CommandAction {

src/actions/Paste.ts

@@ -11,7 +11,7 @@ import {
 } from "../util/setSelectionsAndFocusEditor";
 import { ensureSingleEditor } from "../util/targetUtils";
 import { ActionReturnValue } from "./actions.types";
-import { getActiveTextEditor } from "../ide/activeTextEditor";
+import { getActiveTextEditor } from "../ide/vscode/activeTextEditor";
 
 export class Paste {
   constructor(private graph: Graph) {}

src/actions/Scroll.ts

@@ -4,7 +4,7 @@ import { Graph } from "../typings/Types";
 import { groupBy } from "../util/itertools";
 import { focusEditor } from "../util/setSelectionsAndFocusEditor";
 import { Action, ActionReturnValue } from "./actions.types";
-import { getActiveTextEditor } from "../ide/activeTextEditor";
+import { getActiveTextEditor } from "../ide/vscode/activeTextEditor";
 
 class Scroll implements Action {
   constructor(private graph: Graph, private at: string) {