chore(optimizer): remove unused vendorRoots

Now they are only used to add noExternal to the vite config

Author: wmertens

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

@@ -95,7 +95,6 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
     insightsManifest: null,
     manifestOutput: null,
     transformedModuleOutput: null,
-    vendorRoots: [],
     scope: null,
     devTools: {
       imageDevTools: true,
@@ -286,7 +285,6 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
       opts.transformedModuleOutput = updatedOpts.transformedModuleOutput;
     }
 
-    opts.vendorRoots = updatedOpts.vendorRoots ? updatedOpts.vendorRoots : [];
     opts.scope = updatedOpts.scope ?? null;
 
     if (typeof updatedOpts.resolveQwikBuild === 'boolean') {
@@ -617,11 +615,7 @@ export function createPlugin(optimizerOptions: OptimizerOptions = {}) {
     const dir = parsedPathId.dir;
     const base = parsedPathId.base;
     const ext = parsedPathId.ext.toLowerCase();
-    if (
-      ext in TRANSFORM_EXTS ||
-      TRANSFORM_REGEX.test(pathId) ||
-      insideRoots(ext, dir, opts.srcDir, opts.vendorRoots)
-    ) {
+    if (ext in TRANSFORM_EXTS || TRANSFORM_REGEX.test(pathId)) {
       /** Strip client|server code from qwik server|client, but not in lib/test */
       const strip = opts.target === 'client' || opts.target === 'ssr';
       const normalizedID = normalizePath(pathId);
@@ -899,21 +893,6 @@ export const makeNormalizePath = (sys: OptimizerSystem) => (id: string) => {
   return id;
 };
 
-const insideRoots = (ext: string, dir: string, srcDir: string | null, vendorRoots: string[]) => {
-  if (ext !== '.js') {
-    return false;
-  }
-  if (srcDir != null && dir.startsWith(srcDir)) {
-    return true;
-  }
-  for (const root of vendorRoots) {
-    if (dir.startsWith(root)) {
-      return true;
-    }
-  }
-  return false;
-};
-
 function isAdditionalFile(mod: TransformModule) {
   return mod.isEntry || mod.hook;
 }
@@ -994,6 +973,7 @@ export interface QwikPluginOptions {
   entryStrategy?: EntryStrategy;
   rootDir?: string;
   tsconfigFileNames?: string[];
+  /** @deprecated No longer used */
   vendorRoots?: string[];
   manifestOutput?: ((manifest: QwikManifest) => Promise<void> | void) | null;
   manifestInput?: QwikManifest | null;
@@ -1024,7 +1004,8 @@ export interface QwikPluginOptions {
   lint?: boolean;
 }
 
-export interface NormalizedQwikPluginOptions extends Required<QwikPluginOptions> {
+export interface NormalizedQwikPluginOptions
+  extends Omit<Required<QwikPluginOptions>, 'vendorRoots'> {
   input: string[] | { [entry: string]: string };
 }
 

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

@@ -159,7 +159,6 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
 
       const shouldFindVendors =
         !qwikViteOpts.disableVendorScan && (target !== 'lib' || viteCommand === 'serve');
-      const vendorRoots = shouldFindVendors ? await findQwikRoots(sys, sys.cwd()) : [];
       viteAssetsDir = viteConfig.build?.assetsDir;
       const useAssetsDir = target === 'client' && !!viteAssetsDir && viteAssetsDir !== '_astro';
       const pluginOpts: QwikPluginOptions = {
@@ -173,7 +172,6 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
         tsconfigFileNames: qwikViteOpts.tsconfigFileNames,
         resolveQwikBuild: true,
         transformedModuleOutput: qwikViteOpts.transformedModuleOutput,
-        vendorRoots: [...(qwikViteOpts.vendorRoots ?? []), ...vendorRoots.map((v) => v.path)],
         outDir: viteConfig.build?.outDir,
         assetsDir: useAssetsDir ? viteAssetsDir : undefined,
         devTools: qwikViteOpts.devTools,
@@ -287,6 +285,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
         clientDevInput = qwikPlugin.normalizePath(clientDevInput);
       }
 
+      const vendorRoots = shouldFindVendors ? await findQwikRoots(sys, sys.cwd()) : [];
       const vendorIds = vendorRoots.map((v) => v.id);
       const isDevelopment = buildMode === 'development';
       const qDevKey = 'globalThis.qDev';
@@ -935,6 +934,8 @@ interface QwikVitePluginCommonOptions {
    * List of directories to recursively search for Qwik components or Vendors.
    *
    * Default `[]`
+   *
+   * @deprecated No longer used. Instead, any imported file with `.qwik.` in the name is processed.
    */
   vendorRoots?: string[];
   /**