Return to no bundling on plugin side

eclipse-cdt-cloud · Nov 7, 2023 · daa75d4 · daa75d4
1 parent 66232f0
commit daa75d4
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 59 deletions.
diff --git 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
@@ -1,4 +1,3 @@
 /node_modules/
-/out/
 /dist/
 *.vsix
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,3 @@
 /node_modules/
-/out/
 /dist/
 *.vsix
diff --git 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
@@ -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')],
-        outfile: path.join(__dirname, 'dist', 'MemoryBrowser.js'),
+        entryPoints: [path.join(srcDir, 'memory', 'client', 'index.tsx')],
+        outfile: path.join(__dirname, 'dist', 'MemoryBrowser-bundle.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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "outDir": "../../../out/memory",
+    "outDir": "../../../dist/memory",
     "rootDir": "../",
     "esModuleInterop": true
   },

diff --git a/src/memory/server/MemoryServer.ts b/src/memory/server/MemoryServer.ts
@@ -55,20 +55,20 @@ export class MemoryServer {
                  <head>
                      <meta charset="utf-8">
                      <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-                     <link href="${newPanel.webview.asWebviewUri(
-                         vscode.Uri.joinPath(
-                             context.extensionUri,
-                             'dist/MemoryBrowser.css'
-                         )
-                     )}" type="text/css" rel="stylesheet"></link>
+                    <link href="${newPanel.webview.asWebviewUri(
+                        vscode.Uri.joinPath(
+                            context.extensionUri,
+                            'dist/MemoryBrowser-bundle.css'
+                        )
+                    )}" type="text/css" rel="stylesheet"></link>
                  </head>
                  <body>
                      <div id="app"></div>
                      <script src="${newPanel.webview
                          .asWebviewUri(
                              vscode.Uri.joinPath(
                                  context.extensionUri,
-                                 'dist/MemoryBrowser.js'
+                                 'dist/MemoryBrowser-bundle.js'
                              )
                          )
                          .toString()}"></script>

diff --git 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,