diff --git a/.vscodeignore b/.vscodeignore index 4f930c8f..b6d6b586 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -11,4 +11,7 @@ vsc-extension-quickstart.md node_modules/ .github/ Makefile -webpack.config.json \ No newline at end of file +webpack.config.json +.git/** +/cmake*/ +**/cb-vscode-extension*/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 29e908e9..1612d773 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vscode-couchbase", - "version": "2.0.1", + "version": "2.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vscode-couchbase", - "version": "2.0.1", + "version": "2.0.2", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@chatscope/chat-ui-kit-styles": "^1.4.0", @@ -81,6 +81,7 @@ "sass": "^1.72.0", "sass-loader": "^14.1.1", "style-loader": "^3.3.4", + "terser-webpack-plugin": "^5.3.10", "ts-jest": "^29.1.2", "ts-loader": "^9.5.1", "typescript": "^5.4.3", diff --git a/package.json b/package.json index bfaecc0f..78947648 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vscode-couchbase", "displayName": "Couchbase", "description": "", - "version": "2.0.1", + "version": "2.0.2", "engines": { "vscode": "^1.63.1" }, @@ -83,6 +83,7 @@ "sass": "^1.72.0", "sass-loader": "^14.1.1", "style-loader": "^3.3.4", + "terser-webpack-plugin": "^5.3.10", "ts-jest": "^29.1.2", "ts-loader": "^9.5.1", "typescript": "^5.4.3", diff --git a/src/handlers/handleCLIDownloader.ts b/src/handlers/handleCLIDownloader.ts index 90746aa3..2c6b8498 100644 --- a/src/handlers/handleCLIDownloader.ts +++ b/src/handlers/handleCLIDownloader.ts @@ -92,7 +92,7 @@ class DependenciesDownloader { map.set( this.TOOL_IMPORT_EXPORT, this.getToolSpec( - "https://packages.couchbase.com/releases/7.2.0/couchbase-server-tools_7.2.0-macos_x86_64.zip", + "https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-macos_x86_64.zip", this.TOOL_IMPORT_EXPORT, OSUtil.MACOS_64 ) @@ -125,7 +125,7 @@ class DependenciesDownloader { map.set( this.TOOL_IMPORT_EXPORT, this.getToolSpec( - "https://packages.couchbase.com/releases/7.2.0/couchbase-server-tools_7.2.0-macos_arm64.zip", + "https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-macos_arm64.zip", this.TOOL_IMPORT_EXPORT, OSUtil.MACOS_ARM ) @@ -158,7 +158,7 @@ class DependenciesDownloader { map.set( this.TOOL_IMPORT_EXPORT, this.getToolSpec( - "https://packages.couchbase.com/releases/7.2.0/couchbase-server-tools_7.2.0-windows_amd64.zip", + "https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-windows_amd64.zip", this.TOOL_IMPORT_EXPORT, OSUtil.WINDOWS_64 ) @@ -191,7 +191,7 @@ class DependenciesDownloader { map.set( this.TOOL_IMPORT_EXPORT, this.getToolSpec( - "https://packages.couchbase.com/releases/7.2.0/couchbase-server-tools_7.2.0-windows_amd64.zip", + "https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-windows_amd64.zip", this.TOOL_IMPORT_EXPORT, OSUtil.WINDOWS_ARM ) @@ -224,7 +224,7 @@ class DependenciesDownloader { map.set( this.TOOL_IMPORT_EXPORT, this.getToolSpec( - "https://packages.couchbase.com/releases/7.2.0/couchbase-server-tools_7.2.0-linux_x86_64.tar.gz", + "https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-linux_x86_64.tar.gz", this.TOOL_IMPORT_EXPORT, OSUtil.LINUX_64 ) @@ -257,7 +257,7 @@ class DependenciesDownloader { map.set( this.TOOL_IMPORT_EXPORT, this.getToolSpec( - "https://packages.couchbase.com/releases/7.2.0/couchbase-server-tools_7.2.0-linux_aarch64.tar.gz", + "https://packages.couchbase.com/releases/7.6.0/couchbase-server-tools_7.6.0-linux_aarch64.tar.gz", this.TOOL_IMPORT_EXPORT, OSUtil.LINUX_ARM ) diff --git a/src/handlers/versionConfig.ts b/src/handlers/versionConfig.ts index 4fec99f4..1ae97dc1 100644 --- a/src/handlers/versionConfig.ts +++ b/src/handlers/versionConfig.ts @@ -7,5 +7,5 @@ export const config = { TOOLS_VERSION: "7.2", CBMIGRATE_VERSION: "1", SHELL_VERSION: "1", - CBIMPORT_EXPORT_VERSION: "7.2", + CBIMPORT_EXPORT_VERSION: "7.6", }; \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 98046a39..28972314 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -19,6 +19,8 @@ "use strict"; const path = require("path"); +const TerserPlugin = require('terser-webpack-plugin'); + /**@type {import('webpack').Configuration}*/ const extensionConfig = { @@ -27,13 +29,19 @@ const extensionConfig = { entry: { "extension": "./src/extension.ts" }, // the entry point of this extension, 📖 -> https://webpack.js.org/configuration/entry-context/ - output: { // the bundle is stored in the 'dist' folder (check package.json), 📖 -> https://webpack.js.org/configuration/output/ path: path.resolve(__dirname, "dist"), filename: "[name].js", libraryTarget: "commonjs2", }, + optimization: { + minimize: true, + minimizer: [new TerserPlugin()], + splitChunks: { + chunks: 'all', + }, + }, devtool: "source-map", externals: { vscode: "commonjs vscode", // the vscode-module is created on-the-fly and must be excluded. Add other modules that cannot be webpack'ed, 📖 -> https://webpack.js.org/configuration/externals/ @@ -75,6 +83,13 @@ const reactConfig = { path: path.resolve(__dirname, "dist/workbench"), filename: "[name].js", }, + optimization: { + minimize: true, + minimizer: [new TerserPlugin()], + splitChunks: { + chunks: 'all', + }, + }, devtool: "source-map", resolve: { // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader @@ -131,7 +146,6 @@ const reactConfig = { }, ], }, - plugins: [], }; const iqReactConfig = { @@ -143,6 +157,13 @@ const iqReactConfig = { path: path.resolve(__dirname, "dist/iq"), filename: "[name].js", }, + optimization: { + minimize: true, + minimizer: [new TerserPlugin()], + splitChunks: { + chunks: 'all', + }, + }, devtool: "source-map", resolve: { // support reading TypeScript and JavaScript files, 📖 -> https://github.com/TypeStrong/ts-loader @@ -203,7 +224,6 @@ const iqReactConfig = { }, ], }, - plugins: [], }; module.exports = [extensionConfig, reactConfig, iqReactConfig]; \ No newline at end of file