Merge branch 'main' into workflow_artifacts

package.json

@@ -43,14 +43,13 @@
     "prepare": "husky",
     "postinstall": "npm run build -w shared",
     "clean": "rimraf ./dist ./downloaded_assets && npm run clean --workspaces --if-present",
-    "clean:all": "npm run clean && rimraf ./node_modules ./**/node_modules/",
+    "clean:all": "npm run clean && rimraf ./node_modules ./**/node_modules/ ./**/tsconfig.tsbuildinfo",
     "lint": "eslint ./scripts && npm run lint --workspaces --if-present",
     "lint:fix": "npm run lint:fix --workspaces --if-present",
-    "predev": "npm run build -w shared",
     "dev": "concurrently -c auto 'npm:dev:shared' 'npm:dev:webview-ui' 'npm:dev:vscode'",
     "dev:shared": "npm run dev -w shared",
-    "dev:webview-ui": "npm run start -w webview-ui",
-    "dev:vscode": "npm run dev -w vscode",
+    "dev:webview-ui": "wait-on -d 500 shared/dist/index.mjs && npm run start -w webview-ui",
+    "dev:vscode": "wait-on -d 500 shared/dist/index.mjs && npm run dev -w vscode",
     "build": "npm run build --workspaces --if-present",
     "collect-assets": "rimraf ./downloaded_assets && node ./scripts/collect-assets.js",
     "dist": "rimraf ./dist && node ./scripts/copy-dist.js",
@@ -63,6 +62,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.11.1",
+    "@rollup/plugin-node-resolve": "^16.0.0",
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "22.x",
@@ -88,7 +88,8 @@
     "tar": "^7.4.3",
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.14.0",
-    "unzipper": "^0.12.3"
+    "unzipper": "^0.12.3",
+    "wait-on": "^8.0.2"
   },
   "dependencies": {
     "fs-extra": "^11.2.0",

shared/package.json

@@ -2,15 +2,31 @@
   "name": "@editor-extensions/shared",
   "version": "0.0.6",
   "private": true,
-  "main": "./dist/index.js",
+  "type": "module",
   "types": "./dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs"
+    },
+    "./package.json": "./package.json"
+  },
   "scripts": {
     "clean": "rimraf dist",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "prebuild": "npm run clean",
-    "build": "tsc --build",
-    "dev": "tsc --build --watch --preserveWatchOutput"
+    "build": "vite build && tsc",
+    "dev": "concurrently -c auto 'npm:dev:*'",
+    "dev:types": "tsc --watch",
+    "dev:build": "vite build --watch"
+  },
+  "devDependencies": {
+    "vite": "^5.4.9",
+    "vite-plugin-checker": "^0.8.0"
   },
   "lint-staged": {
     "*.{js,cjs,mjs,ts,cts,mts}": "eslint --fix",

shared/tsconfig.json

@@ -3,11 +3,11 @@
   "compilerOptions": {
     "outDir": "./dist",
     "rootDir": "./src",
-    "composite": true,
+    "emitDeclarationOnly": true,
     "declaration": true,
     "declarationMap": true,
-    "sourceMap": true,
-    "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
+    "module": "ESNext",
+    "moduleResolution": "Node"
   },
   "include": ["src/**/*.ts"],
   "exclude": ["dist", "node_modules"]

shared/vite.config.js

@@ -0,0 +1,21 @@
+import { resolve } from "path";
+import { defineConfig } from "vite";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import checker from "vite-plugin-checker";
+
+export default defineConfig({
+  plugins: [checker({ typescript: true })],
+  build: {
+    lib: {
+      entry: resolve(__dirname, "src/index.ts"),
+      name: "Shared",
+      fileName: (format) => (format === "es" ? "index.mjs" : "index.cjs"),
+      formats: ["es", "cjs"],
+    },
+    minify: false,
+    sourcemap: true,
+    rollupOptions: {
+      plugins: [nodeResolve()], // this is a library so don't package libraries
+    },
+  },
+});

tsconfig.json

@@ -7,13 +7,7 @@
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
-    "composite": true,
-    "declaration": true
-  },
-
-  "references": [
-    { "path": "./shared" },
-    { "path": "./vscode" },
-    { "path": "./webview-ui" }
-  ]
+    "declaration": true,
+    "preserveWatchOutput": true
+  }
 }

vscode/package.json

@@ -723,11 +723,11 @@
     "lint:fix": "eslint --fix .",
     "prebuild": "npm run clean",
     "build": "npm run compile",
-    "compile": "tsc -b && webpack --mode production",
+    "compile": "tsc && webpack --mode production",
     "dev": "npm run watch",
     "watch": "webpack --watch --mode development",
     "test:local": "mocha --require ts-node/register src/**/__tests__/*test.ts",
-    "test": "npm run test:local && npm run compile && vscode-test"
+    "test": "npm run compile && npm run test:local && vscode-test"
   },
   "lint-staged": {
     "*.{js,cjs,mjs,ts,cts,mts}": "eslint --fix",

vscode/tsconfig.json

@@ -9,7 +9,6 @@
     "sourceMap": true,
     "rootDir": "src",
     "strict": true,
-    "composite": true,
     "declaration": true
   },
   "include": ["src/**/*.ts"]

webview-ui/src/components/AnalysisPage/AnalysisPage.tsx

@@ -98,7 +98,9 @@ const AnalysisPage: React.FC = () => {
                 variant={ButtonVariant.primary}
                 onClick={runAnalysisRequest}
                 isLoading={isAnalyzing}
-                isDisabled={isAnalyzing || isStartingServer || !serverRunning}
+                isDisabled={
+                  isAnalyzing || isStartingServer || !serverRunning || isWaitingForSolution
+                }
               >
                 {isAnalyzing ? "Analyzing..." : "Run Analysis"}
               </Button>

webview-ui/src/components/ResolutionsPage.tsx

@@ -167,7 +167,7 @@ const ResolutionPage: React.FC = () => {
                 </FlexItem>
               </>
             )}
-            {isResolved && (
+            {isResolved && !isFetchingSolution && (
               <FlexItem>
                 <Label color="blue">All resolutions have been applied.</Label>
               </FlexItem>

webview-ui/tsconfig.json

@@ -20,7 +20,6 @@
     "noImplicitAny": false,
     "allowJs": false,
     "baseUrl": ".",
-    "composite": true,
     "outDir": "dist",
     "declaration": true,
     "noEmit": false