Merge pull request #7413 from maiieul/refactor-normalizeRollupOutputOptionsObject-2

refactor(rollup): normalizeRollupOutputOptionsObject to accept qwikPlugin as an argument

Author: maiieul

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

@@ -77,7 +77,7 @@ export interface QwikPackages {
   path: string;
 }
 
-export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
+export function createQwikPlugin(optimizerOptions: OptimizerOptions = {}) {
   const id = `${Math.round(Math.random() * 899) + 100}`;
 
   const clientResults = new Map<string, TransformOutput>();
@@ -1053,6 +1053,8 @@ export interface NormalizedQwikPluginOptions
   experimental?: Record<keyof typeof ExperimentalFeatures, boolean>;
 }
 
+export type QwikPlugin = ReturnType<typeof createQwikPlugin>;
+
 /** @public */
 export type QwikBuildTarget = 'client' | 'ssr' | 'lib' | 'test';
 

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

@@ -1,7 +1,7 @@
 import path, { resolve } from 'node:path';
 import { assert, describe, expect, test } from 'vitest';
 import type { QwikManifest } from '../types';
-import { ExperimentalFeatures, createPlugin } from './plugin';
+import { ExperimentalFeatures, createQwikPlugin } from './plugin';
 import { normalizePath } from '../../../testing/util';
 import { qwikVite } from './vite';
 
@@ -297,7 +297,7 @@ describe('resolveId', () => {
 });
 
 async function mockPlugin(os = process.platform) {
-  const plugin = createPlugin({
+  const plugin = createQwikPlugin({
     sys: {
       cwd: () => process.cwd(),
       env: 'node',

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

@@ -10,13 +10,14 @@ import type {
   Optimizer,
 } from '../types';
 import {
-  createPlugin,
+  createQwikPlugin,
   type NormalizedQwikPluginOptions,
   type QwikBuildMode,
   type QwikBuildTarget,
   type QwikPluginOptions,
   Q_MANIFEST_FILENAME,
   type ExperimentalFeatures,
+  type QwikPlugin,
 } from './plugin';
 import { versions } from '../versions';
 
@@ -27,7 +28,7 @@ type QwikRollupPluginApi = {
 
 /** @public */
 export function qwikRollup(qwikRollupOpts: QwikRollupPluginOptions = {}): any {
-  const qwikPlugin = createPlugin(qwikRollupOpts.optimizerOptions);
+  const qwikPlugin = createQwikPlugin(qwikRollupOpts.optimizerOptions);
 
   const rollupPlugin: QwikRollupPlugin = {
     name: 'rollup-plugin-qwik',
@@ -77,13 +78,7 @@ export function qwikRollup(qwikRollupOpts: QwikRollupPluginOptions = {}): any {
     },
 
     outputOptions(rollupOutputOpts) {
-      return normalizeRollupOutputOptionsObject(
-        qwikPlugin.getOptimizer(),
-        qwikPlugin.getOptions(),
-        rollupOutputOpts,
-        false,
-        qwikPlugin.manualChunks
-      );
+      return normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOpts, false);
     },
 
     async buildStart() {
@@ -161,11 +156,9 @@ export function qwikRollup(qwikRollupOpts: QwikRollupPluginOptions = {}): any {
 }
 
 export function normalizeRollupOutputOptions(
-  optimizer: Optimizer,
-  opts: NormalizedQwikPluginOptions,
+  qwikPlugin: QwikPlugin,
   rollupOutputOpts: Rollup.OutputOptions | Rollup.OutputOptions[] | undefined,
   useAssetsDir: boolean,
-  manualChunks: Rollup.GetManualChunk,
   outDir?: string
 ): Rollup.OutputOptions | Rollup.OutputOptions[] {
   if (Array.isArray(rollupOutputOpts)) {
@@ -175,38 +168,26 @@ export function normalizeRollupOutputOptions(
     }
 
     return rollupOutputOpts.map((outputOptsObj) => ({
-      ...normalizeRollupOutputOptionsObject(
-        optimizer,
-        opts,
-        outputOptsObj,
-        useAssetsDir,
-        manualChunks
-      ),
+      ...normalizeRollupOutputOptionsObject(qwikPlugin, outputOptsObj, useAssetsDir),
       dir: outDir || outputOptsObj.dir,
     }));
   }
 
   return {
-    ...normalizeRollupOutputOptionsObject(
-      optimizer,
-      opts,
-      rollupOutputOpts,
-      useAssetsDir,
-      manualChunks
-    ),
+    ...normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOpts, useAssetsDir),
     dir: outDir || rollupOutputOpts?.dir,
   };
 }
 
 export function normalizeRollupOutputOptionsObject(
-  optimizer: Optimizer,
-  opts: NormalizedQwikPluginOptions,
+  qwikPlugin: QwikPlugin,
   rollupOutputOptsObj: Rollup.OutputOptions | undefined,
-  useAssetsDir: boolean,
-  manualChunks: Rollup.GetManualChunk
+  useAssetsDir: boolean
 ): Rollup.OutputOptions {
   const outputOpts: Rollup.OutputOptions = { ...rollupOutputOptsObj };
-
+  const opts = qwikPlugin.getOptions();
+  const optimizer = qwikPlugin.getOptimizer();
+  const manualChunks = qwikPlugin.manualChunks;
   if (opts.target === 'client') {
     // client output
     if (!outputOpts.assetFileNames) {

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

@@ -25,7 +25,7 @@ import {
   Q_MANIFEST_FILENAME,
   SSR_OUT_DIR,
   TRANSFORM_REGEX,
-  createPlugin,
+  createQwikPlugin,
   parseId,
   type ExperimentalFeatures,
   type NormalizedQwikPluginOptions,
@@ -74,7 +74,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
     ? (id, type) => TRANSFORM_REGEX.test(id) || qwikViteOpts.fileFilter!(id, type)
     : () => true;
   const injections: GlobalInjections[] = [];
-  const qwikPlugin = createPlugin(qwikViteOpts.optimizerOptions);
+  const qwikPlugin = createQwikPlugin(qwikViteOpts.optimizerOptions);
 
   async function loadQwikInsights(clientOutDir = ''): Promise<InsightManifest | null> {
     const sys = qwikPlugin.getSys();
@@ -360,11 +360,9 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
         updatedViteConfig.build!.rollupOptions = {
           input: opts.input,
           output: normalizeRollupOutputOptions(
-            qwikPlugin.getOptimizer(),
-            opts,
+            qwikPlugin,
             viteConfig.build?.rollupOptions?.output,
             useAssetsDir,
-            qwikPlugin.manualChunks,
             buildOutputDir
           ),
           preserveEntrySignatures: 'exports-only',