From ad3494728d6f3dd36b012efa06d59472db02c40a Mon Sep 17 00:00:00 2001
From: colin-grant-work <colin.grant@ericsson.com>
Date: Tue, 7 Nov 2023 09:26:19 -0700
Subject: [PATCH] Return to no bundling on plugin side (#112)

Fixes #111
---
 .eslintignore                       |  1 -
 .gitignore                          |  1 -
 .prettierignore                     |  1 -
 .vscodeignore                       | 23 +++++++++++-----------
 esbuild.js                          | 30 ++---------------------------
 package.json                        | 10 ++++------
 src/memory/client/MemoryBrowser.tsx |  2 +-
 src/memory/client/tsconfig.json     |  2 +-
 tsconfig.json                       |  2 +-
 9 files changed, 21 insertions(+), 51 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 725bae7..0051b4b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,4 +2,3 @@
 node_modules
 # don't lint build output (make sure it's set to your correct build folder name)
 dist
-out
diff --git a/.gitignore b/.gitignore
index 56f29d3..bc814db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /node_modules/
-/out/
 /dist/
 *.vsix
diff --git a/.prettierignore b/.prettierignore
index 56f29d3..bc814db 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,4 +1,3 @@
 /node_modules/
-/out/
 /dist/
 *.vsix
diff --git a/.vscodeignore b/.vscodeignore
index 3134b5d..f0dc1e1 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -1,11 +1,12 @@
-# Exclude everything
-*
-*/
-
-# Include the following:
-!images/
-!dist/
-!LICENSE
-!NOTICE
-!package.json
-!README.md
+adapter
+.gitignore
+.gitmodules
+.vscode
+dist/**/*.map
+**/*.tsbuildinfo
+package-lock.json
+README.md
+src
+tsconfig.json
+webpack.config.js
+*.code-workspace
diff --git a/esbuild.js b/esbuild.js
index ce9c22f..2af7eda 100644
--- a/esbuild.js
+++ b/esbuild.js
@@ -18,43 +18,17 @@ const commonConfig = {
     sourcemap: CLIDevelopment,
 };
 
-const outDir = path.join(__dirname, 'out');
-const debugAdapterRoot = path.join(
-    __dirname,
-    'node_modules',
-    'cdt-gdb-adapter',
-    'dist'
-);
+const srcDir = path.join(__dirname, 'src');
 /** @type {BuildOptions[]} */
 const configurations = [
     {
-        entryPoints: [path.join(outDir, 'extension.js')],
-        outdir: path.join(__dirname, 'dist'),
-        external: ['vscode'],
-        format: 'cjs',
-        platform: 'node',
-        ...commonConfig,
-    },
-    {
-        entryPoints: [path.join(outDir, 'memory', 'client', 'index.js')],
+        entryPoints: [path.join(srcDir, 'memory', 'client', 'index.tsx')],
         outfile: path.join(__dirname, 'dist', 'MemoryBrowser.js'),
         plugins: [sassPlugin()],
         format: 'iife',
         platform: 'browser',
         ...commonConfig,
     },
-    {
-        entryPoints: [
-            path.join(debugAdapterRoot, 'debugAdapter.js'),
-            path.join(debugAdapterRoot, 'debugTargetAdapter.js'),
-        ],
-        outdir: path.join(__dirname, 'dist'),
-        external: os.platform() !== 'linux' ? ['*/pty.node'] : undefined,
-        loader: { '.node': 'copy' },
-        format: 'cjs',
-        platform: 'node',
-        ...commonConfig,
-    },
 ];
 
 if (CLIWatch) {
diff --git a/package.json b/package.json
index 0cdfddb..b110e8b 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
       {
         "type": "gdb",
         "label": "GDB",
-        "program": "./dist/debugAdapter.js",
+        "program": "./node_modules/cdt-gdb-adapter/dist/debugAdapter.js",
         "runtime": "node",
         "configurationAttributes": {
           "launch": {
@@ -228,7 +228,7 @@
       {
         "type": "gdbtarget",
         "label": "GDB Target",
-        "program": "./dist/debugTargetAdapter.js",
+        "program": "./node_modules/cdt-gdb-adapter/dist/debugTargetAdapter.js",
         "runtime": "node",
         "configurationAttributes": {
           "launch": {
@@ -726,10 +726,8 @@
     "watch:tsc": "tsc -b -w",
     "build:esbuild": "node esbuild.js",
     "watch:esbuild": "node esbuild.js --watch",
-    "build": "run-s build:*",
-    "pre-watch": "yarn build",
-    "do-watch": "run-p watch:*",
-    "watch": "run-s pre-watch do-watch",
+    "build": "run-p build:*",
+    "watch": "run-p watch:*",
     "lint": "eslint . --ext .ts,.tsx",
     "format": "prettier --write .",
     "format-check": "prettier --check .",
diff --git a/src/memory/client/MemoryBrowser.tsx b/src/memory/client/MemoryBrowser.tsx
index bd617aa..0aa0258 100644
--- a/src/memory/client/MemoryBrowser.tsx
+++ b/src/memory/client/MemoryBrowser.tsx
@@ -15,7 +15,7 @@
 import * as React from 'react';
 import { MemoryContents } from 'cdt-gdb-adapter';
 
-import '../../../src/memory/client/MemoryBrowser.scss';
+import './MemoryBrowser.scss';
 import { messageBroker } from './MessageBroker';
 
 class ForwardIterator implements Iterator<number> {
diff --git a/src/memory/client/tsconfig.json b/src/memory/client/tsconfig.json
index 8cd6a16..08e10bc 100644
--- a/src/memory/client/tsconfig.json
+++ b/src/memory/client/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "outDir": "../../../out/memory",
+    "outDir": "../../../dist/memory",
     "rootDir": "../",
     "esModuleInterop": true
   },
diff --git a/tsconfig.json b/tsconfig.json
index cd1d4ac..3dcb36e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,7 +4,7 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2015",
-    "outDir": "out",
+    "outDir": "dist",
     "lib": ["es2015", "dom"],
     "jsx": "react",
     "strict": true,