Merge pull request #68 from Dwarf1er/develop

Webpack config fix

.changeset/fifty-tigers-hope.md

@@ -0,0 +1,5 @@
+---
+"sqlanydb-tools-vscode": patch
+---
+
+Fixed Webpack configuration to bundle internal dependencies with the .VSIX package

README.md

@@ -46,6 +46,10 @@ By bundling both command-line utilities and an integrated VSCode experience in a
 
 ## VSCode extension
 
+There are 2 ways to install the VSCode extension:
+1. Navigate to the `Extensions` tab in VSCode and search for `sqlanydb-tools-vscode`
+2. Download the VSIX file from the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=dwarf1er.sqlanydb-tools-vscode)
+
 ## sqlanydb-manager CLI
 
 [(Back to top)](#table-of-contents)

apps/sqlanydb-tools-vscode/tsconfig.json

@@ -4,13 +4,16 @@
 		"target": "ES2022",
 		"lib": ["ES2022"],
 		"sourceMap": true,
-		"rootDir": "src",
+		"rootDir": "../../",
 		"outDir": "dist",
 		"strict": true,
 		"noImplicitReturns": true,
 		"noFallthroughCasesInSwitch": true,
 		"noUnusedParameters": true
 	},
-	"include": ["src/**/*"],
+	"include": [
+		"../../apps/**/*",
+		"../../packages/**/*"
+	],
 	"exclude": ["node_modules", "dist"]
 }

apps/sqlanydb-tools-vscode/webpack.config.js

@@ -3,20 +3,45 @@
 "use strict";
 
 const path = require("path");
+const fs = require("fs");
+
+const getInternalPackages = (dir) => {
+	return fs.readdirSync(dir)
+		.filter((item) => {
+			const itemPath = path.join(dir, item);
+			return fs.statSync(itemPath).isDirectory() && item !== 'sqlanydb-tools-vscode';
+		})
+		.map((item) => path.join(dir, item, 'src', 'index.ts'));
+};
+
+  const packagesDir = path.resolve(__dirname, '../../packages');
+  const appsDir = path.resolve(__dirname, '../../apps');
 
 //@ts-check
 /** @typedef {import('webpack').Configuration} WebpackConfig **/
 
 /** @type WebpackConfig */
 const extensionConfig = {
-	target: "node", // VS Code extensions run in a Node.js-context 📖 -> https://webpack.js.org/configuration/node/
-	mode: "none", // this leaves the source code as close as possible to the original (when packaging we set this to 'production')
+	target: "node",
+	mode: "none",
 
-	entry: "./src/extension.ts", // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/
+	entry: {
+		extension: "./src/extension.ts",
+		...getInternalPackages(packagesDir).reduce((acc, packageEntry) => {
+		  const packageName = path.basename(path.dirname(packageEntry));
+		  acc[packageName] = packageEntry;
+		  return acc;
+		}, {}),
+		...getInternalPackages(appsDir).reduce((acc, appEntry) => {
+		  const appName = path.basename(path.dirname(appEntry));
+		  acc[appName] = appEntry;
+		  return acc;
+		}, {}),
+	},
 	output: {
 		// the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/
 		path: path.resolve(__dirname, "dist"),
-		filename: "extension.js",
+		filename: "[name].js",
 		libraryTarget: "commonjs2",
 	},
 	externals: {