Merge pull request #9 from SolidOS/fix/watch

configure toolkit for watch

Author: SharonStrats

package.json

@@ -23,7 +23,8 @@
   },
   "scripts": {
     "build": "vp pack",
-    "check": "vp check"
+    "check": "vp check",
+    "watch": "vp pack -w"
   },
   "dependencies": {
     "@babel/core": "^7.29.0",

src/vite/config/build.ts

@@ -2,13 +2,32 @@ import { isAbsolute } from 'node:path';
 
 import type { UserConfig } from 'vite';
 
+type BuildOutput = NonNullable<NonNullable<UserConfig['build']>['rolldownOptions']>['output'];
+
 export interface BuildConfigOptions {
   entry: string;
   overrides?: UserConfig['build'];
 }
 
+function normalizeWatchOutputs(output: BuildOutput): BuildOutput {
+  if (!output) {
+    return output;
+  }
+
+  const outputs = Array.isArray(output) ? output : [output];
+  const watchOutputs = outputs.filter((output) => output.format !== 'cjs');
+
+  return Array.isArray(output)
+    ? watchOutputs
+    : watchOutputs.length === 1
+      ? watchOutputs[0]
+      : watchOutputs;
+}
+
 export default function ({ entry, overrides }: BuildConfigOptions): UserConfig['build'] {
-  return {
+  const isWatch = process.argv.includes('--watch') || process.argv.includes('-w');
+
+  const build: UserConfig['build'] = {
     cssCodeSplit: true,
     sourcemap: true,
     lib: {
@@ -40,6 +59,20 @@ export default function ({ entry, overrides }: BuildConfigOptions): UserConfig['
         );
       },
     },
+  };
+
+  const merged: UserConfig['build'] = {
+    ...build,
     ...overrides,
+    rolldownOptions: {
+      ...build.rolldownOptions,
+      ...overrides?.rolldownOptions,
+    },
   };
+
+  if (isWatch && merged.rolldownOptions?.output) {
+    merged.rolldownOptions.output = normalizeWatchOutputs(merged.rolldownOptions.output);
+  }
+
+  return merged;
 }

src/vite/plugins/solid-pane.ts

@@ -14,17 +14,25 @@ export interface SolidPanePluginOptions {
 }
 
 export default function (options: SolidPanePluginOptions): PluginOption[] {
-  return [
+  const isWatch = process.argv.includes('--watch') || process.argv.includes('-w');
+
+  const plugins: PluginOption[] = [
     css(),
     icons(),
     raw(/\.ttl$/),
     babel({ litDecoratorPaths: options.litDecoratorPaths }),
-    dts({
-      tsconfigPath: 'tsconfig.json',
-      entryRoot: 'src',
-      outDirs: ['dist'],
-      insertTypesEntry: true,
-    }),
+    ...(isWatch
+      ? []
+      : [
+          dts({
+            tsconfigPath: 'tsconfig.json',
+            entryRoot: 'src',
+            outDirs: ['dist'],
+            insertTypesEntry: true,
+          }),
+        ]),
     paneSandbox(options.sandbox),
   ];
+
+  return plugins;
 }