Updates build mechanism

baflo · Oct 16, 2024 · 51e037d · 51e037d
1 parent d4627a1
commit 51e037d
Show file tree

Hide file tree

Showing 13 changed files with 857 additions and 17,634 deletions.
diff --git a/.vscodeignore b/.vscodeignore
@@ -3,6 +3,7 @@
 build/**/*.js.map
 ext-src/**
 public/**
+node_modules
 scripts/**
 src/**
 .editorconfig

diff --git a/build-ext.js b/build-ext.js
@@ -0,0 +1,21 @@
+const esbuild = require('esbuild')
+const esbuildPluginTsc = require('esbuild-plugin-tsc')
+
+/** import("esbuild").BuildOptions */
+const settings = {
+  entryPoints: ['ext-src/extension.ts'],
+  outfile: 'build/ext-src/extension.js',
+  platform: 'node',
+  bundle: true,
+  external: [
+    'vscode'
+  ],
+  plugins: [
+    esbuildPluginTsc({
+      force: true,
+      tsconfigPath: 'tsconfig.extension.json'
+    })
+  ]
+}
+
+esbuild.build(settings)
diff --git a/build-view.js b/build-view.js
@@ -0,0 +1,25 @@
+const esbuild = require('esbuild')
+const esbuildPluginTsc = require('esbuild-plugin-tsc')
+
+/** import("esbuild").BuildOptions */
+const settings = {
+  entryPoints: ['src/index.tsx'],
+  outdir: 'build/static/',
+  platform: 'browser',
+  bundle: true,
+  loader: {
+    '.html': 'file',
+    '.ttf': 'file',
+    '.ttf?*': 'file',
+    '.woff': 'file',
+    '.woff2': 'file'
+  },
+  plugins: [
+    esbuildPluginTsc({
+      force: true,
+      tsconfigPath: 'tsconfig.json'
+    })
+  ]
+}
+
+esbuild.build(settings)
diff --git a/ext-src/KanbnBoardPanel.ts b/ext-src/KanbnBoardPanel.ts
@@ -109,8 +109,7 @@ export default class KanbnBoardPanel {
       // Restrict the webview to only loading content from allowed paths
       localResourceRoots: [
         vscode.Uri.file(path.join(this._extensionPath, 'build')),
-        vscode.Uri.file(path.join(this._kanbnFolderName, '.kanbn')),
-        vscode.Uri.file(path.join(this._extensionPath, 'node_modules', 'vscode-codicons', 'dist'))
+        vscode.Uri.file(path.join(this._kanbnFolderName, '.kanbn'))
       ]
     });
     (this._panel as any).iconPath = {
@@ -283,10 +282,8 @@ export default class KanbnBoardPanel {
   }
 
   private _getHtmlForWebview (): string {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const manifest = require(path.join(this._extensionPath, 'build', 'asset-manifest.json'))
-    const mainScript = manifest.files['main.js']
-    const mainStyle = manifest.files['main.css']
+    const mainScript = path.join('static', 'index.js')
+    const mainStyle = path.join('static', 'index.css')
     if (this._panel === null) {
       throw new Error('panel is undefined')
     }
@@ -296,9 +293,6 @@ export default class KanbnBoardPanel {
     const customStyleUri = webview.asWebviewUri(vscode.Uri.file(
       path.join(this._kanbnFolderName, '.kanbn', 'board.css')
     ))
-    const codiconsUri = webview.asWebviewUri(vscode.Uri.file(
-      path.join(this._extensionPath, 'node_modules', 'vscode-codicons', 'dist', 'codicon.css')
-    ))
 
     // Use a nonce to whitelist which scripts can be run
     const nonce = getNonce()
@@ -312,7 +306,6 @@ export default class KanbnBoardPanel {
 <title>Kanbn Board</title>
 <link rel="stylesheet" type="text/css" href="${styleUri.toString()}">
 <link rel="stylesheet" type="text/css" href="${customStyleUri.toString()}">
-<link rel="stylesheet" type="text/css" href="${codiconsUri.toString()}">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-webview-resource: https:; script-src 'nonce-${nonce}'; font-src vscode-webview-resource:; style-src vscode-webview-resource: 'unsafe-inline' http: https: data:;">
 <base href="${webview.asWebviewUri(vscode.Uri.file(path.join(this._extensionPath, 'build'))).toString()})}/">
 </head>

diff --git a/ext-src/KanbnBurndownPanel.ts b/ext-src/KanbnBurndownPanel.ts
@@ -34,8 +34,7 @@ export default class KanbnBurndownPanel {
       // Restrict the webview to only loading content from allowed paths
       localResourceRoots: [
         vscode.Uri.file(path.join(this._extensionPath, 'build')),
-        vscode.Uri.file(path.join(this._kanbnFolderName, '.kanbn')),
-        vscode.Uri.file(path.join(this._extensionPath, 'node_modules', 'vscode-codicons', 'dist'))
+        vscode.Uri.file(path.join(this._kanbnFolderName, '.kanbn'))
       ]
     });
     (this._panel as any).iconPath = {
@@ -148,10 +147,8 @@ export default class KanbnBurndownPanel {
   }
 
   private _getHtmlForWebview (): string {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const manifest = require(path.join(this._extensionPath, 'build', 'asset-manifest.json'))
-    const mainScript = manifest.files['main.js']
-    const mainStyle = manifest.files['main.css']
+    const mainScript = path.join('static', 'index.js')
+    const mainStyle = path.join('static', 'index.css')
     if (this._panel === null) {
       throw new Error('panel is undefined')
     }
@@ -163,9 +160,6 @@ export default class KanbnBurndownPanel {
     const customStyleUri = webview.asWebviewUri(vscode.Uri.file(
       path.join(this._kanbnFolderName, '.kanbn', 'board.css')
     ))
-    const codiconsUri = webview.asWebviewUri(vscode.Uri.file(
-      path.join(this._extensionPath, 'node_modules', 'vscode-codicons', 'dist', 'codicon.css')
-    ))
 
     // Use a nonce to whitelist which scripts can be run
     const nonce = getNonce()
@@ -179,7 +173,6 @@ export default class KanbnBurndownPanel {
 <title>Kanbn Board</title>
 <link rel="stylesheet" type="text/css" href="${styleUri.toString()}">
 <link rel="stylesheet" type="text/css" href="${customStyleUri.toString()}">
-<link rel="stylesheet" type="text/css" href="${codiconsUri.toString()}">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-webview-resource: https:; script-src 'nonce-${nonce}'; font-src vscode-webview-resource:; style-src vscode-webview-resource: 'unsafe-inline' http: https: data:;">
 <base href="${webview.asWebviewUri(vscode.Uri.file(path.join(this._extensionPath, 'build'))).toString()}/">
 </head>

diff --git a/ext-src/KanbnTaskPanel.ts b/ext-src/KanbnTaskPanel.ts
@@ -107,7 +107,7 @@ export default class KanbnTaskPanel {
     this._kanbnFolderName = kanbnFolderName
     this._taskId = taskId
     this._defaultColumn = defaultColumn
-    
+
     // Create and show a new webview panel
     this._panel = this.createWebviewPanel(column)
     this.updateFileWatcher()
@@ -224,16 +224,15 @@ export default class KanbnTaskPanel {
     )
   }
 
-  private createWebviewPanel(column: vscode.ViewColumn): vscode.WebviewPanel {
+  private createWebviewPanel (column: vscode.ViewColumn): vscode.WebviewPanel {
     return vscode.window.createWebviewPanel(KanbnTaskPanel.viewType, 'New task', column, {
       // Enable javascript in the webview
       enableScripts: true,
 
       // Restrict the webview to only loading content from allowed paths
       localResourceRoots: [
         vscode.Uri.file(path.join(this._extensionPath, 'build')),
-        vscode.Uri.file(path.join(this._kanbnFolderName, '.kanbn')),
-        vscode.Uri.file(path.join(this._extensionPath, 'node_modules', 'vscode-codicons', 'dist'))
+        vscode.Uri.file(path.join(this._kanbnFolderName, '.kanbn'))
       ]
     })
   }
@@ -248,9 +247,8 @@ export default class KanbnTaskPanel {
     }
   }
 
-
   private getTaskFilename (): string | undefined {
-    if (typeof this._taskId !== 'string') return 
+    if (typeof this._taskId !== 'string') return
 
     const folderPath = path.join(this._kanbnFolderName, '.kanbn')
     const taskFilename = this._taskId.replace(/(?<!\.md)$/, '.md')
@@ -259,12 +257,12 @@ export default class KanbnTaskPanel {
     return taskPath
   }
 
-  private updateFileWatcher() {
+  private updateFileWatcher (): void {
     this.fileWatcher?.dispose()
-    if (!this._panel) return
+    if (this._panel === undefined) return
 
     const taskPath = this.getTaskFilename()
-    if (!taskPath) return;
+    if (taskPath === undefined) return
 
     this.fileWatcher = vscode.workspace.createFileSystemWatcher(taskPath)
     this._panel.onDidDispose(() => this.fileWatcher?.dispose())
@@ -277,7 +275,7 @@ export default class KanbnTaskPanel {
   public async showTaskFilePanel (): Promise<void> {
     const taskPath = this.getTaskFilename()
 
-    if (!taskPath) return
+    if (taskPath === undefined) return
 
     const taskfileEditor = vscode.workspace.getConfiguration('kanbn').get<boolean>('taskfileEditor')
     try {
@@ -349,15 +347,14 @@ export default class KanbnTaskPanel {
     }
   }
 
-  private async loadOtherTaskData(task?: any) {
-    if (typeof task?.id !== "string") return;
+  private async loadOtherTaskData (task?: any): void {
+    if (typeof task?.id !== 'string') return
 
     try {
       const finishedPomodoros: number | undefined = await vscode.commands.executeCommand('pomodoro.getFinishedTasksCount', task.id)
 
-      if (typeof finishedPomodoros === "number") {
+      if (typeof finishedPomodoros === 'number') {
         task.finishedPomodoros = finishedPomodoros
-      } else {
       }
     } catch (e) {
     }
@@ -369,10 +366,8 @@ export default class KanbnTaskPanel {
   }
 
   private _getHtmlForWebview (): string {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const manifest = require(path.join(this._extensionPath, 'build', 'asset-manifest.json'))
-    const mainScript = manifest.files['main.js']
-    const mainStyle = manifest.files['main.css']
+    const mainScript = path.join('static', 'index.js')
+    const mainStyle = path.join('static', 'index.css')
     if (this._panel === null) {
       throw new Error('Panel is not defined')
     }
@@ -384,9 +379,6 @@ export default class KanbnTaskPanel {
     const customStyleUri = webview.asWebviewUri(vscode.Uri.file(
       path.join(this._kanbnFolderName, '.kanbn', 'board.css')
     ))
-    const codiconsUri = webview.asWebviewUri(vscode.Uri.file(
-      path.join(this._extensionPath, 'node_modules', 'vscode-codicons', 'dist', 'codicon.css')
-    ))
 
     // Use a nonce to whitelist which scripts can be run
     const nonce = getNonce()
@@ -400,7 +392,6 @@ export default class KanbnTaskPanel {
 <title>Kanbn Board</title>
 <link rel="stylesheet" type="text/css" href="${styleUri.toString()}">
 <link rel="stylesheet" type="text/css" href="${customStyleUri.toString()}">
-<link rel="stylesheet" type="text/css" href="${codiconsUri.toString()}">
 <meta http-equiv="Content-Security-Policy" content="default-src 'none'; img-src vscode-webview-resource: https:; script-src 'nonce-${nonce}'; font-src vscode-webview-resource:; style-src vscode-webview-resource: 'unsafe-inline' http: https: data:;">
 <base href="${webview.asWebviewUri(vscode.Uri.file(path.join(this._extensionPath, 'build'))).toString()}/">
 </head>