Merge pull request #8 from solarspace-dev/share-code

RaoulSchaffranek · web-flow · commit 63ff64c0d3d1 · 2025-06-09T02:05:25.000+02:00
Fix bundle
diff --git a/vscode-ext/.vscodeignore b/vscode-ext/.vscodeignore
@@ -12,3 +12,4 @@ vsc-extension-quickstart.md
 **/*.map
 **/*.ts
 **/.vscode-test.*
+webview/dist/**
diff --git a/vscode-ext/package-lock.json b/vscode-ext/package-lock.json
diff --git a/vscode-ext/package.json b/vscode-ext/package.json
@@ -3,7 +3,7 @@
   "publisher": "solarspace",
   "displayName": "Solar Space",
   "description": "Sharable URLs for GitHub codespaces",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "license": "GPL-3.0-only",
   "engines": {
     "vscode": "^1.90.0"
@@ -36,7 +36,7 @@
     "build": "npm run build:webview && npm run build:ext",
     "compile": "webpack",
     "watch": "webpack --watch",
-    "package": "webpack --mode production --devtool hidden-source-map",
+    "package": "npm run build:webview && webpack --mode production --devtool hidden-source-map",
     "compile-tests": "tsc -p . --outDir out",
     "watch-tests": "tsc -p . -w --outDir out",
     "pretest": "npm run compile-tests && npm run compile && npm run lint",
@@ -51,6 +51,7 @@
     "@typescript-eslint/parser": "^8.7.0",
     "@vscode/test-cli": "^0.0.10",
     "@vscode/test-electron": "^2.4.1",
+    "copy-webpack-plugin": "^13.0.0",
     "eslint": "^9.13.0",
     "ts-loader": "^9.5.1",
     "typescript": "^5.6.3",
diff --git a/vscode-ext/src/extension.ts b/vscode-ext/src/extension.ts
@@ -282,11 +282,16 @@ async function createPanel (context: vscode.ExtensionContext): Promise<vscode.We
         },
         {
             enableScripts: true,
-            localResourceRoots: [vscode.Uri.file(context.extensionPath)]
+            localResourceRoots: [
+				vscode.Uri.file(context.extensionPath),
+				vscode.Uri.file(path.join(context.extensionPath, 'dist')),
+				vscode.Uri.file(path.join(context.extensionPath, 'dist', 'webview')),
+			]
         }
     );
     panel.webview.html = await readHtml(
-        path.resolve(context.extensionPath, 'webview/index.html'),
+		context,
+        path.resolve(context.extensionPath, 'dist/webview/index.html'),
         panel
     );
     return panel;
@@ -303,10 +308,10 @@ async function saveImage (data: string): Promise<void> {
     }
 }
 
-async function readHtml (htmlPath: string, panel: vscode.WebviewPanel): Promise<string> {
+async function readHtml(context: vscode.ExtensionContext, htmlPath: string, panel: vscode.WebviewPanel): Promise<string> {
     const template = await readFile(htmlPath, 'utf-8');
-    const mainCss = panel.webview.asWebviewUri(vscode.Uri.file(path.resolve(htmlPath, '../dist/style.css')));
-    const mainJs = panel.webview.asWebviewUri(vscode.Uri.file(path.resolve(htmlPath, '../dist/index.js')));
+	const mainCss = panel.webview.asWebviewUri(vscode.Uri.file(path.resolve(context.extensionPath, 'dist/webview/style.css')));
+const mainJs = panel.webview.asWebviewUri(vscode.Uri.file(path.resolve(context.extensionPath, 'dist/webview/index.js')));
     const html = template
         .replace(/%CSP_SOURCE%/gu, panel.webview.cspSource)
         .replace('./style.css', mainCss.toString())
diff --git a/vscode-ext/webpack.config.js b/vscode-ext/webpack.config.js
@@ -3,6 +3,7 @@
 'use strict';
 
 const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
 
 //@ts-check
 /** @typedef {import('webpack').Configuration} WebpackConfig **/
@@ -40,6 +41,13 @@ const extensionConfig = {
       }
     ]
   },
+  plugins: [
+    new CopyPlugin({
+      patterns: [
+        { from: path.resolve(__dirname, 'webview/dist'), to: path.resolve(__dirname, 'dist/webview') }
+      ],
+    }),
+  ],
   devtool: 'nosources-source-map',
   infrastructureLogging: {
     level: "log", // enables logging required for problem matchers
diff --git a/vscode-ext/webview/index.html b/vscode-ext/webview/index.html
@@ -10,7 +10,6 @@
     />
     <title>Share Space</title>
     <link rel="stylesheet" href="./style.css" />
-    <script src="./src/index.ts" type="module"></script>
   </head>
 
   <body>
@@ -59,5 +58,8 @@
         Copy Snapshot
       </button>
     </div>
+
+    
+    <script src="./src/index.ts"></script>
   </body>
 </html>
