Merge pull request #7756 from QwikDev/fix-plugin

fix(qwikVite): input handling

Author: wmertens

packages/qwik/src/optimizer/src/plugins/plugin.ts

@@ -384,7 +384,13 @@ export function createQwikPlugin(optimizerOptions: OptimizerOptions = {}) {
       }
     }
 
-    return { ...opts };
+    const out = { ...opts };
+    // Make sure to know what the actual input is
+    opts.input ||= updatedOpts.input as string[];
+    if (opts.input && typeof opts.input === 'string') {
+      opts.input = [opts.input];
+    }
+    return out;
   };
 
   let hasValidatedSource = false;

packages/qwik/src/optimizer/src/plugins/rollup.ts

@@ -66,11 +66,10 @@ export function qwikRollup(qwikRollupOpts: QwikRollupPluginOptions = {}): any {
         experimental: qwikRollupOpts.experimental,
       };
 
-      const opts = await qwikPlugin.normalizeOptions(pluginOpts);
-
-      if (opts.input) {
-        inputOpts.input = opts.input;
-      }
+      await qwikPlugin.normalizeOptions(pluginOpts);
+      // Override the input with the normalized input
+      const { input } = qwikPlugin.getOptions();
+      inputOpts.input = input;
 
       return inputOpts;
     },

packages/qwik/src/optimizer/src/plugins/rollup.unit.ts

@@ -54,14 +54,15 @@ test('rollup default set input options, ssr', async () => {
     target: 'ssr',
   } as any;
   const plugin = qwikRollup(initOpts);
+  const input = normalizePath(resolve(cwd, 'src', 'my.ssr.tsx'));
   const rollupInputOpts: Rollup.InputOptions = await plugin.options!({
-    input: normalizePath(resolve(cwd, 'src', 'my.ssr.tsx')),
+    input,
   });
   const opts: NormalizedQwikPluginOptions = plugin.api.getOptions();
   assert.deepEqual(typeof rollupInputOpts.onwarn, 'function');
   assert.deepEqual(rollupInputOpts.treeshake, undefined);
-  assert.deepEqual(rollupInputOpts.input, normalizePath(resolve(cwd, 'src', 'my.ssr.tsx')));
-  assert.deepEqual(opts.input, undefined);
+  assert.deepEqual(rollupInputOpts.input, [input]);
+  assert.deepEqual(opts.input, [input]);
 });
 
 test('rollup default output options, client', async () => {

packages/qwik/src/optimizer/src/plugins/vite.ts

@@ -144,6 +144,11 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
             ? viteConfig.build.ssr
             : qwikViteOpts.ssr?.input
           : undefined;
+      const clientInput = target === 'client' ? qwikViteOpts.client?.input : undefined;
+      let input = viteConfig.build?.rollupOptions?.input || clientInput || ssrInput;
+      if (input && typeof input === 'string') {
+        input = [input];
+      }
       const shouldFindVendors =
         !qwikViteOpts.disableVendorScan && (target !== 'lib' || viteCommand === 'serve');
       viteAssetsDir = viteConfig.build?.assetsDir;
@@ -170,16 +175,13 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
         sourcemap: !!viteConfig.build?.sourcemap,
         lint: qwikViteOpts.lint,
         experimental: qwikViteOpts.experimental,
-        input: viteConfig.build?.rollupOptions?.input || ssrInput,
+        input,
         manifestInput: qwikViteOpts.ssr?.manifestInput,
         manifestOutput: qwikViteOpts.client?.manifestOutput,
       };
 
       const opts = await qwikPlugin.normalizeOptions(pluginOpts);
-      if (ssrInput) {
-        // make sure vite uses the ssr input
-        opts.input ||= [ssrInput];
-      }
+      input ||= opts.input;
 
       manifestInput = opts.manifestInput;
       srcDir = opts.srcDir;
@@ -282,7 +284,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
              */
             maxParallelFileOps: 1,
             // This will amend the existing input
-            input: opts.input,
+            input,
             output: {
               manualChunks: qwikPlugin.manualChunks,
             },

packages/qwik/src/optimizer/src/plugins/vite.unit.ts

@@ -1,6 +1,6 @@
 import path, { resolve } from 'node:path';
 import type { Rollup } from 'vite';
-import { assert, test } from 'vitest';
+import { assert, describe, test } from 'vitest';
 import { normalizePath } from '../../../testing/util';
 import type { OptimizerOptions } from '../types';
 import { qwikVite, type QwikVitePlugin, type QwikVitePluginOptions } from './vite';
@@ -523,3 +523,35 @@ test('command: build, --mode lib with multiple outputs', async () => {
   assert.deepEqual(build.emptyOutDir, undefined);
   assert.deepEqual(opts.resolveQwikBuild, true);
 });
+
+describe('input config', () => {
+  const initOpts = {
+    optimizerOptions: mockOptimizerOptions(),
+    client: {
+      input: './src/widget/counter.tsx',
+      outDir: './dist/client',
+    },
+    ssr: {
+      input: './src/widget/ssr.tsx',
+      outDir: './dist/server',
+    },
+  } as QwikVitePluginOptions;
+  test('should handle client target', async () => {
+    const plugin = getPlugin(initOpts);
+    const c: any = (await plugin.config.call(
+      configHookPluginContext,
+      {},
+      { command: 'build', mode: 'development' }
+    ))!;
+    assert.deepEqual(c.build.rollupOptions.input, ['./src/widget/counter.tsx']);
+  });
+  test('should handle ssr target', async () => {
+    const plugin = getPlugin(initOpts);
+    const c: any = (await plugin.config.call(
+      configHookPluginContext,
+      {},
+      { command: 'build', mode: 'ssr' }
+    ))!;
+    assert.deepEqual(c.build.rollupOptions.input, ['./src/widget/ssr.tsx']);
+  });
+});