more fixes

dasathyakuma · dasathyakuma · commit 9bcc66faba98 · 2026-04-10T20:41:20.000-06:00
diff --git a/examples/marko/dynamic/package.json b/examples/marko/dynamic/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/examples/marko/dynamic/src/routes/+page.marko b/examples/marko/dynamic/src/routes/+page.marko
@@ -42,6 +42,7 @@
                 style=`position: absolute; top: 0; left: 0; width: 100%; transform: translateY(${item.start}px)`
               >
                 <script() {
+                  const _key = item.key
                   const node = itemEl()
                   if (node && measureElement) measureElement(node)
                 }/>
diff --git a/examples/marko/fixed/package.json b/examples/marko/fixed/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/examples/marko/grid/package.json b/examples/marko/grid/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/examples/marko/infinite-scroll/package.json b/examples/marko/infinite-scroll/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/examples/marko/smooth-scroll/package.json b/examples/marko/smooth-scroll/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/examples/marko/variable/package.json b/examples/marko/variable/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/examples/marko/window/package.json b/examples/marko/window/package.json
@@ -8,12 +8,12 @@
     "preview": "marko-run preview"
   },
   "dependencies": {
-    "@tanstack/marko-virtual": "workspace:*",
     "@marko/run": "^0.7.0",
+    "@tanstack/marko-virtual": "workspace:*",
     "marko": "^6.0.0"
   },
   "devDependencies": {
     "typescript": "5.4.5",
     "vite": "^5.4.19"
   }
-}
+}
diff --git a/knip.json b/knip.json
@@ -1,4 +1,24 @@
 {
   "$schema": "https://unpkg.com/knip@5/schema.json",
-  "ignoreWorkspaces": ["examples/**", "packages/react-virtual/e2e/**"]
-}
+  "ignoreWorkspaces": [
+    "examples/**",
+    "packages/react-virtual/e2e/**"
+  ],
+  "workspaces": {
+    "packages/marko-virtual": {
+      "entry": [
+        "src/index.ts",
+        "src/tags/**/*.{ts,marko}",
+        "tests/**/*.ts"
+      ],
+      "project": [
+        "src/**/*.{ts,marko}",
+        "tests/**/*.ts"
+      ],
+      "ignoreDependencies": [
+        "@marko/testing-library",
+        "marko"
+      ]
+    }
+  }
+}
diff --git a/packages/marko-virtual/package.json b/packages/marko-virtual/package.json
@@ -22,23 +22,23 @@
     "datagrid"
   ],
   "type": "module",
-  "types": "dist/index.d.ts",
-  "main": "dist/index.cjs",
-  "module": "dist/index.js",
+  "types": "dist/esm/index.d.ts",
+  "main": "dist/cjs/index.cjs",
+  "module": "dist/esm/index.js",
   "exports": {
     ".": {
       "import": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
       },
       "require": {
-        "types": "./dist/index.d.cts",
-        "default": "./dist/index.cjs"
+        "types": "./dist/cjs/index.d.cts",
+        "default": "./dist/cjs/index.cjs"
       }
     },
     "./package.json": "./package.json",
     "./marko.json": "./marko.json",
-    "./src/tags/": "./src/tags/"
+    "./src/tags/*": "./src/tags/*"
   },
   "sideEffects": false,
   "files": [
@@ -63,9 +63,9 @@
     "@marko/testing-library": "^1.1.0",
     "@marko/vite": "^3.0.0",
     "@testing-library/dom": "^10.0.0",
-    "marko": ">=6.0.0"
+    "marko": "^6.0.0"
   },
   "peerDependencies": {
-    "marko": ">=6.0.0"
+    "marko": "^6.0.0"
   }
 }
diff --git a/packages/marko-virtual/src/marko.d.ts b/packages/marko-virtual/src/marko.d.ts
@@ -5,10 +5,10 @@
 // minimal shape we actually use.
 declare module "*.marko" {
   const template: {
-    mount(
+    mount: (
       input: Record<string, unknown>,
       container: Element | DocumentFragment,
-    ): { destroy(): void }
+    ) => { destroy: () => void }
   }
   export default template
 }
@@ -17,6 +17,7 @@ declare module "*.marko" {
 // The actual package may ship its own types; this is a fallback.
 declare module "@marko/vite" {
   import type { Plugin } from "vite"
+
   function marko(options?: Record<string, unknown>): Plugin
   export default marko
 }
diff --git a/packages/marko-virtual/tsconfig.json b/packages/marko-virtual/tsconfig.json
@@ -4,6 +4,7 @@
     "src/**/*.ts",
     "tests/**/*.ts",
     "eslint.config.js",
-    "vite.config.ts"
+    "vite.config.ts",
+    "vitest.config.ts"
   ]
-}
+}
diff --git a/packages/marko-virtual/vite.config.ts b/packages/marko-virtual/vite.config.ts
@@ -1,33 +1,15 @@
 import { defineConfig, mergeConfig } from "vitest/config"
 import { tanstackViteConfig } from "@tanstack/vite-config"
-import packageJson from "./package.json"
 
-// @marko/vite is an app plugin requiring SSR+browser build order — it breaks
-// the library build. Only include it during test runs (VITEST env is set).
-// The build uses tanstackViteConfig which handles .ts source only.
-async function buildConfig() {
-  const plugins = process.env["VITEST"]
-    ? [(await import("@marko/vite")).default() as any]
-    : []
-
-  const config = defineConfig({
-    plugins,
-    test: {
-      name: packageJson.name,
-      dir: "./tests",
-      watch: false,
-      environment: "jsdom",
-      setupFiles: ["./tests/setup.ts"],
-    },
-  })
-
-  return mergeConfig(
-    config,
-    tanstackViteConfig({
-      entry: "./src/index.ts",
-      srcDir: "./src",
-    }),
-  )
-}
-
-export default buildConfig()
+// Test config lives in vitest.config.ts (vitest uses that file first).
+// This file handles only the library build via tanstackViteConfig.
+// Pattern mirrors other adapters (react-virtual, etc.): mergeConfig with defineConfig.
+const config = defineConfig({})
+
+export default mergeConfig(
+  config,
+  tanstackViteConfig({
+    entry: "./src/index.ts",
+    srcDir: "./src",
+  }),
+)
diff --git a/packages/marko-virtual/vitest.config.ts b/packages/marko-virtual/vitest.config.ts
@@ -0,0 +1,17 @@
+import { defineConfig } from "vitest/config"
+import marko from "@marko/vite"
+import packageJson from "./package.json"
+
+// This config is used by `vitest` only.
+// @marko/vite is an app plugin requiring SSR+browser build order — it must
+// never appear in the library build (vite.config.ts).
+export default defineConfig({
+  plugins: [marko() as any],
+  test: {
+    name: packageJson.name,
+    dir: "./tests",
+    watch: false,
+    environment: "jsdom",
+    setupFiles: ["./tests/setup.ts"],
+  },
+})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	style=`position: absolute; top: 0; left: 0; width: 100%; transform: translateY(${item.start}px)`
`43`	`43`	`>`
`44`	`44`	`<script() {`
	`45`	`+ const _key = item.key`
`45`	`46`	`const node = itemEl()`
`46`	`47`	`if (node && measureElement) measureElement(node)`
`47`	`48`	`}/>`