'Resolving merge conflicts'

Merge branch 'dev' into FL-JA/D3-visualization

Author: Ponch49

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 /build
-/package-lock.json
+/package-lock.json
+/.vscode-test/

.vscode-test.js

@@ -0,0 +1,9 @@
+// .vscode-test.js
+const { defineConfig } = require('@vscode/test-cli');
+
+module.exports = defineConfig([
+  {
+    label: 'unitTests',
+    files: 'build/src/test/**/*.test.js',
+  }
+]);

.vscode/launch.json

@@ -5,6 +5,7 @@
 {
 	"version": "0.2.0",
 	"configurations": [
+		
 		{
 			"name": "Run Extension",
 			"type": "extensionHost",
@@ -20,7 +21,9 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/test/suite/index"
-			]
+			], 
+			"outFiles": ["${workspaceFolder}/build/*.js"],
+			"preLaunchTask": "npm: test-compile"
 		}
 	]
 }

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "cmake.configureOnOpen": false
+}

.vscodeignore

@@ -7,3 +7,4 @@ vsc-extension-quickstart.md
 **/jsconfig.json
 **/*.map
 **/.eslintrc.json
+**/*.js.map

package-lock.json

@@ -5,7 +5,7 @@
   "version": "0.0.1",
   "publisher": "ReactLabyrinthDev",
   "engines": {
-    "vscode": "^1.84.0"
+    "vscode": "^1.85.1"
   },
   "repository": {
     "type": "git",
@@ -70,17 +70,20 @@
   "scripts": {
     "lint": "eslint .",
     "pretest": "npm run lint",
-    "test": "node ./test/runTest.js",
+    "test": "node ./build/src/test/runTest.js",
+    "test1": "vscode-test",
     "dev": "webpack --watch",
     "webpack": "webpack"
   },
   "devDependencies": {
+    "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.3",
     "@types/node": "18.x",
     "@types/react": "^18.2.45",
     "@types/react-dom": "^18.2.18",
-    "@types/vscode": "^1.84.0",
-    "@vscode/test-electron": "^2.3.6",
+    "@types/vscode": "^1.85.1",
+    "@vscode/test-cli": "^0.0.4",
+    "@vscode/test-electron": "^2.3.8",
     "eslint": "^8.54.0",
     "glob": "^10.3.10",
     "mocha": "^10.2.0",

package.json

@@ -423,7 +423,7 @@ export class Parser {
                 // Case for finding components passed in as props e.g. <Route component={App} />
             } else if (
                 astTokens[i].type.label === 'jsxName' &&
-                (astTokens[i].value === 'component' ||
+                (astTokens[i].value === 'Component' ||
                     astTokens[i].value === 'children') &&
                 importsObj[astTokens[i + 3].value]
             ) {

src/parser.ts

@@ -1,17 +1,23 @@
-const path = require('path');
+import * as path from 'path';
 
-const { runTests } = require('@vscode/test-electron');
+import { runTests } from '@vscode/test-electron';
 
 async function main() {
+	console.log('made it through the line before try block');
 	try {
+		console.log('inside try block');
 		// The folder containing the Extension Manifest package.json
 		// Passed to `--extensionDevelopmentPath`
-		const extensionDevelopmentPath = path.resolve(__dirname, '../');
+		const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+
+		console.log('inside try block after first var declare');
 
 		// The path to the extension test script
 		// Passed to --extensionTestsPath
 		const extensionTestsPath = path.resolve(__dirname, './suite/index');
 
+		console.log('inside try block after second var declare');
+
 		// Download VS Code, unzip it and run the integration test
 		await runTests({ extensionDevelopmentPath, extensionTestsPath });
 	} catch (err) {

test/runTest.js src/test/runTest.tstest/runTest.js renamed to src/test/runTest.ts

@@ -1,15 +1,16 @@
-const assert = require('assert');
+import * as assert from 'assert'
 
 // You can import and use all API from the 'vscode' module
 // as well as import your extension to test it
-const vscode = require('vscode');
+import * as vscode from 'vscode'
 // const myExtension = require('../extension');
 
 suite('Extension Test Suite', () => {
 	vscode.window.showInformationMessage('Start all tests.');
 
 	test('Sample test', () => {
-		assert.strictEqual(-1, [1, 2, 3].indexOf(5));
+		assert.strictEqual(-1, [1, 2, 3].indexOf(5)); // false
 		assert.strictEqual(-1, [1, 2, 3].indexOf(0));
+		assert.strictEqual(0, [1, 2, 3].indexOf(1)); // true
 	});
 });