Merge pull request #35 from lowcoding/feat/v1.9.0

✨ feat: bundle using esbuild

Author: wjkang

.npmrc

@@ -1 +1 @@
-registry = https://registry.npm.taobao.org
+registry = https://registry.npmmirror.com/

.vscode/settings.json

@@ -1,11 +1,31 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "files.exclude": {
-        "build": false // set this to true to hide the "out" folder with the compiled JS files
-    },
-    "search.exclude": {
-        "build": true // set this to false to include "out" folder in search results
-    },
-    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-    "typescript.tsc.autoDetect": "off"
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.stylelint": "explicit"
+  },
+  "stylelint.validate": [
+    "css",
+    "less",
+    "scss",
+    "vue"
+  ],
+  "[scss]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[vue]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "files.exclude": {
+    "build": false // set this to true to hide the "out" folder with the compiled JS files
+  },
+  "search.exclude": {
+    "build": true // set this to false to include "out" folder in search results
+  },
+  "typescript.tsdk": "node_modules/typescript/lib",
 }

.vscodeignore

@@ -15,24 +15,7 @@ vsc-extension-quickstart.md
 **/*.ts
 *.lock
 *.vsix
-webpack.config.js
+.lowcoderc
+esbuild.js
 
-node_modules
-!node_modules/prettier
-!node_modules/copy-paste
-!node_modules/iconv-lite
-!node_modules/safer-buffer
-!node_modules/typescript-json-schema
-!node_modules/glob
-!node_modules/fs.realpath
-!node_modules/minimatch
-!node_modules/brace-expansion
-!node_modules/concat-map
-!node_modules/balanced-match
-!node_modules/inherits
-!node_modules/path-is-absolute
-!node_modules/inflight
-!node_modules/wrappy
-!node_modules/once
-!node_modules/json-stable-stringify
-!node_modules/typescript
+node_modules

esbuild.js

@@ -0,0 +1,18 @@
+const path = require('path');
+const fs = require('fs-extra');
+const { build } = require('esbuild');
+
+fs.removeSync(path.join(__dirname, 'build'));
+const entryFile = path.join(__dirname, 'src', 'extension.ts');
+build({
+  entryPoints: [entryFile],
+  bundle: true,
+  minify: true,
+  // only needed if you have dependencies
+  external: ['vscode'],
+  platform: 'node',
+  format: 'cjs',
+  outfile: path.join(__dirname, 'build', 'extension.js'),
+  write: true,
+  logLevel: 'error',
+});

package.json

@@ -3,19 +3,18 @@
 	"displayName": "lowcode",
 	"description": "lowcode tool, support ChatGPT and other LLM",
 	"author": "wjkang <ruoxieme@gmail.com>",
-	"version": "1.8.9",
+	"version": "1.9.0",
 	"icon": "asset/icon.png",
 	"publisher": "wjkang",
 	"repository": "https://github.com/lowcoding/lowcode-vscode",
 	"main": "./build/extension.js",
 	"scripts": {
 		"vscode:prepublish": "yarn run compile",
-		"compile": "webpack --mode production",
+		"compile": "node ./esbuild.js",
 		"compile:tsc": "tsc -p ./",
 		"dev": "yarn --cwd \"webview-react\" dev",
 		"build": "yarn --cwd \"webview-react\" build",
 		"lint": "eslint src --ext ts",
-		"watch": "webpack --mode development",
 		"pretest": "yarn run compile:tsc",
 		"test:js": "node ./build/test/runTest.js",
 		"test": "node ./build/test/runTest.js"
@@ -271,7 +270,6 @@
 		}
 	},
 	"devDependencies": {
-		"@types/copy-paste": "^1.1.30",
 		"@types/debug": "^4.1.5",
 		"@types/ejs": "^3.0.4",
 		"@types/fs-extra": "^9.0.1",
@@ -294,15 +292,13 @@
 		"prettier": "^2.2.1",
 		"ts-loader": "^8.0.3",
 		"typescript": "^4.3.5",
-		"vscode-test": "^1.3.0",
-		"webpack": "^4.44.1",
-		"webpack-cli": "^3.3.12"
+		"vscode-test": "^1.3.0"
 	},
 	"dependencies": {
 		"axios": "^0.19.2",
-		"copy-paste": "^1.3.0",
 		"directory-tree": "^2.2.4",
 		"ejs": "^3.1.3",
+		"esbuild": "^0.24.2",
 		"execa": "^4.0.3",
 		"fs-extra": "^9.0.1",
 		"generate-schema": "^2.6.0",

src/commands/addSnippet.ts

@@ -1,16 +1,19 @@
-import * as vscode from 'vscode';
+import vscode from 'vscode';
 import { getClipboardText, getSelectedText } from '../utils/editor';
 import { showWebView } from '../webview';
 
 export const createOrShowWebview = (context: vscode.ExtensionContext) => {
   context.subscriptions.push(
-    vscode.commands.registerTextEditorCommand('lowcode.addSnippet', () => {
-      const content = getSelectedText() || getClipboardText();
-      showWebView({
-        key: 'main',
-        task: { task: 'addSnippets', data: { content } },
-      });
-    }),
+    vscode.commands.registerTextEditorCommand(
+      'lowcode.addSnippet',
+      async () => {
+        const content = getSelectedText() || (await getClipboardText());
+        showWebView({
+          key: 'main',
+          task: { task: 'addSnippets', data: { content } },
+        });
+      },
+    ),
     vscode.commands.registerCommand('lowcode.addPromptTemplate', () => {
       showWebView({
         key: 'main',

src/commands/chatGPT.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode';
+import vscode from 'vscode';
 import { commands } from '../utils/env';
 import { hideChatGPTView, showChatGPTView } from '../webview';
 import { getClipboardText, getSelectedText } from '../utils/editor';
@@ -19,11 +19,11 @@ export const registerChatGPTCommand = (context: vscode.ExtensionContext) => {
         'lowcode',
       );
     }),
-    vscode.commands.registerCommand('lowcode.askChatGPT', () => {
+    vscode.commands.registerCommand('lowcode.askChatGPT', async () => {
       showChatGPTView({
         task: {
           task: 'askChatGPT',
-          data: getSelectedText() || getClipboardText(),
+          data: getSelectedText() || (await getClipboardText()),
         },
       });
     }),
@@ -49,7 +49,7 @@ export const registerChatGPTCommand = (context: vscode.ExtensionContext) => {
         const template = templateList.find((s) => s.name === templateResult);
         const model = {
           rawSelectedText: getSelectedText() || '',
-          rawClipboardText: getClipboardText() || '',
+          rawClipboardText: await getClipboardText(),
         };
         const code = compileEjs(
           template?.commandPrompt || template!.preview.chatGPT?.commandPrompt!,

src/commands/common.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode';
+import vscode from 'vscode';
 import { commands } from '../utils/env';
 import { hideChatGPTView, showChatGPTView, showWebView } from '../webview';
 

src/commands/createOrShowWebview.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode';
+import vscode from 'vscode';
 import { formatPath } from '../utils/platform';
 import { showWebView } from '../webview';
 

src/commands/generateCode.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode';
+import vscode from 'vscode';
 import { genCodeByYapi } from '../genCode/genCodeByYapi';
 import { genCodeByJson } from '../genCode/genCodeByJson';
 import { genCodeByTypescript } from '../genCode/genCodeByTypescript';
@@ -12,7 +12,7 @@ export const generateCode = (context: vscode.ExtensionContext) => {
     vscode.commands.registerTextEditorCommand(
       'lowcode.generateCode',
       async () => {
-        const rawClipboardText = getClipboardText();
+        const rawClipboardText = await getClipboardText();
         let clipboardText = rawClipboardText.trim();
 
         clipboardText = JSON.stringify(jsonParse(clipboardText));