@analogjs/vite-plugin-angular 3.0.0-alpha.70 → 3.0.0-alpha.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@analogjs/vite-plugin-angular",
-  "version": "3.0.0-alpha.70",
+  "version": "3.0.0-alpha.72",
   "description": "Vite Plugin for Angular",
   "type": "module",
   "keywords": [

package/src/index.d.ts

@@ -1,4 +1,6 @@
 import { angular } from "./lib/angular-vite-plugin.js";
 export { angular } from "./lib/angular-vite-plugin.js";
 export type { PluginOptions } from "./lib/angular-vite-plugin.js";
+export type { AnalogIntegrationPlugin, AnalogPluginContext, AnalogPluginHooks } from "./lib/analog-plugin-interop.js";
+export type { StylePreprocessor, StylesheetTransformContext, StylesheetTransformResult } from "./lib/style-preprocessor.js";
 export default angular;

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":["import { angular } from './lib/angular-vite-plugin.js';\nexport { angular } from './lib/angular-vite-plugin.js';\nexport type { PluginOptions } from './lib/angular-vite-plugin.js';\n\nexport default angular;\n"],"mappings":";;AAIA,IAAA,cAAe"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/index.ts"],"sourcesContent":["import { angular } from './lib/angular-vite-plugin.js';\nexport { angular } from './lib/angular-vite-plugin.js';\nexport type { PluginOptions } from './lib/angular-vite-plugin.js';\nexport type {\n  AnalogIntegrationPlugin,\n  AnalogPluginContext,\n  AnalogPluginHooks,\n} from './lib/analog-plugin-interop.js';\nexport type {\n  StylePreprocessor,\n  StylesheetTransformContext,\n  StylesheetTransformResult,\n} from './lib/style-preprocessor.js';\n\nexport default angular;\n"],"mappings":";;AAcA,IAAA,cAAe"}

package/src/lib/analog-plugin-interop.d.ts

@@ -0,0 +1,49 @@
+import type { Plugin, ResolvedConfig } from "vite";
+import { type StylePreprocessor } from "./style-preprocessor.js";
+/**
+* Narrow framework context handed to a Vite plugin's `analog.setup()` hook.
+* Only grows when a concrete integration needs another seam.
+*/
+export interface AnalogPluginContext {
+	/**
+	* Registers a pre-transform that runs on every Angular component stylesheet
+	* before it enters Vite's `preprocessCSS` pipeline.
+	*/
+	registerStylePreprocessor(preprocessor: StylePreprocessor): void;
+	/**
+	* Requests that component styles are externalized in dev and watch mode so
+	* they run through Vite's CSS plugin pipeline (for example
+	* `@tailwindcss/vite`) instead of being inlined through `preprocessCSS`,
+	* which only runs PostCSS and CSS preprocessors. Production builds keep
+	* inlining component styles.
+	*/
+	externalizeComponentStyles(): void;
+}
+export interface AnalogPluginHooks {
+	setup?(context: AnalogPluginContext): void | Promise<void>;
+}
+/**
+* A normal Vite plugin that optionally exposes an `analog` setup hook.
+* Discovery is structural (`plugin.analog?.setup`), so this type is a DX aid
+* rather than a requirement.
+*/
+export type AnalogIntegrationPlugin = Plugin & {
+	analog?: AnalogPluginHooks;
+};
+export interface AnalogIntegrations {
+	stylePreprocessor?: StylePreprocessor;
+	externalizeStyles: boolean;
+}
+/**
+* Runs every `analog.setup()` hook found in the resolved Vite plugin list,
+* once per resolved config, and composes the registrations in plugin order.
+*/
+export declare function discoverAnalogIntegrations(config: ResolvedConfig): Promise<AnalogIntegrations>;
+export declare function runAnalogSetupHooks(plugins: readonly Plugin[]): Promise<AnalogIntegrations>;
+/**
+* Resolves what a compilation path needs from the discovered integrations:
+* the stylesheet preprocessor chain (plugin-registered preprocessors first,
+* then the chain configured through `angular()` options) and whether any
+* plugin asked for externalized component styles.
+*/
+export declare function resolveAnalogIntegrations(config: ResolvedConfig, configured?: StylePreprocessor): Promise<AnalogIntegrations>;

package/src/lib/analog-plugin-interop.js

@@ -0,0 +1,75 @@
+import { debugStylePipeline } from "./utils/debug.js";
+import { composeStylePreprocessors } from "./style-preprocessor.js";
+//#region packages/vite-plugin-angular/src/lib/analog-plugin-interop.ts
+var integrationsByConfig = /* @__PURE__ */ new WeakMap();
+/**
+* Runs every `analog.setup()` hook found in the resolved Vite plugin list,
+* once per resolved config, and composes the registrations in plugin order.
+*/
+function discoverAnalogIntegrations(config) {
+	let pending = integrationsByConfig.get(config);
+	if (!pending) {
+		pending = runAnalogSetupHooks(config.plugins ?? []);
+		integrationsByConfig.set(config, pending);
+	}
+	return pending;
+}
+async function runAnalogSetupHooks(plugins) {
+	const preprocessors = [];
+	let externalizeStyles = false;
+	for (const plugin of plugins) {
+		if (typeof plugin.analog?.setup !== "function") continue;
+		const registeredBefore = preprocessors.length;
+		const context = {
+			registerStylePreprocessor(preprocessor) {
+				preprocessors.push(wrapStylePreprocessor(plugin.name, preprocessor));
+			},
+			externalizeComponentStyles() {
+				externalizeStyles = true;
+			}
+		};
+		try {
+			await plugin.analog.setup(context);
+		} catch (error) {
+			throw new Error(`[analog] analog.setup() from plugin "${plugin.name}" failed: ${describeError(error)}`);
+		}
+		debugStylePipeline("analog.setup() completed", {
+			plugin: plugin.name,
+			stylePreprocessors: preprocessors.length - registeredBefore,
+			externalizeStyles
+		});
+	}
+	return {
+		stylePreprocessor: composeStylePreprocessors(preprocessors),
+		externalizeStyles
+	};
+}
+/**
+* Resolves what a compilation path needs from the discovered integrations:
+* the stylesheet preprocessor chain (plugin-registered preprocessors first,
+* then the chain configured through `angular()` options) and whether any
+* plugin asked for externalized component styles.
+*/
+async function resolveAnalogIntegrations(config, configured) {
+	const integrations = await discoverAnalogIntegrations(config);
+	return {
+		stylePreprocessor: composeStylePreprocessors([integrations.stylePreprocessor, configured]),
+		externalizeStyles: integrations.externalizeStyles
+	};
+}
+function wrapStylePreprocessor(pluginName, preprocessor) {
+	return (code, filename, context) => {
+		try {
+			return preprocessor(code, filename, context);
+		} catch (error) {
+			throw new Error(`[analog] Style preprocessor from plugin "${pluginName}" failed for "${filename}": ${describeError(error)}`);
+		}
+	};
+}
+function describeError(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+//#endregion
+export { resolveAnalogIntegrations };
+
+//# sourceMappingURL=analog-plugin-interop.js.map

package/src/lib/analog-plugin-interop.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analog-plugin-interop.js","names":[],"sources":["../../../src/lib/analog-plugin-interop.ts"],"sourcesContent":["import type { Plugin, ResolvedConfig } from 'vite';\nimport {\n  composeStylePreprocessors,\n  type StylePreprocessor,\n} from './style-preprocessor.js';\nimport { debugStylePipeline } from './utils/debug.js';\n\n/**\n * Narrow framework context handed to a Vite plugin's `analog.setup()` hook.\n * Only grows when a concrete integration needs another seam.\n */\nexport interface AnalogPluginContext {\n  /**\n   * Registers a pre-transform that runs on every Angular component stylesheet\n   * before it enters Vite's `preprocessCSS` pipeline.\n   */\n  registerStylePreprocessor(preprocessor: StylePreprocessor): void;\n  /**\n   * Requests that component styles are externalized in dev and watch mode so\n   * they run through Vite's CSS plugin pipeline (for example\n   * `@tailwindcss/vite`) instead of being inlined through `preprocessCSS`,\n   * which only runs PostCSS and CSS preprocessors. Production builds keep\n   * inlining component styles.\n   */\n  externalizeComponentStyles(): void;\n}\n\nexport interface AnalogPluginHooks {\n  setup?(context: AnalogPluginContext): void | Promise<void>;\n}\n\n/**\n * A normal Vite plugin that optionally exposes an `analog` setup hook.\n * Discovery is structural (`plugin.analog?.setup`), so this type is a DX aid\n * rather than a requirement.\n */\nexport type AnalogIntegrationPlugin = Plugin & { analog?: AnalogPluginHooks };\n\nexport interface AnalogIntegrations {\n  stylePreprocessor?: StylePreprocessor;\n  externalizeStyles: boolean;\n}\n\nconst integrationsByConfig = new WeakMap<\n  ResolvedConfig,\n  Promise<AnalogIntegrations>\n>();\n\n/**\n * Runs every `analog.setup()` hook found in the resolved Vite plugin list,\n * once per resolved config, and composes the registrations in plugin order.\n */\nexport function discoverAnalogIntegrations(\n  config: ResolvedConfig,\n): Promise<AnalogIntegrations> {\n  let pending = integrationsByConfig.get(config);\n  if (!pending) {\n    pending = runAnalogSetupHooks(config.plugins ?? []);\n    integrationsByConfig.set(config, pending);\n  }\n  return pending;\n}\n\nexport async function runAnalogSetupHooks(\n  plugins: readonly Plugin[],\n): Promise<AnalogIntegrations> {\n  const preprocessors: StylePreprocessor[] = [];\n  let externalizeStyles = false;\n\n  for (const plugin of plugins as readonly AnalogIntegrationPlugin[]) {\n    if (typeof plugin.analog?.setup !== 'function') {\n      continue;\n    }\n\n    const registeredBefore = preprocessors.length;\n    const context: AnalogPluginContext = {\n      registerStylePreprocessor(preprocessor) {\n        preprocessors.push(wrapStylePreprocessor(plugin.name, preprocessor));\n      },\n      externalizeComponentStyles() {\n        externalizeStyles = true;\n      },\n    };\n\n    try {\n      await plugin.analog.setup(context);\n    } catch (error) {\n      throw new Error(\n        `[analog] analog.setup() from plugin \"${plugin.name}\" failed: ${describeError(error)}`,\n      );\n    }\n\n    debugStylePipeline('analog.setup() completed', {\n      plugin: plugin.name,\n      stylePreprocessors: preprocessors.length - registeredBefore,\n      externalizeStyles,\n    });\n  }\n\n  return {\n    stylePreprocessor: composeStylePreprocessors(preprocessors),\n    externalizeStyles,\n  };\n}\n\n/**\n * Resolves what a compilation path needs from the discovered integrations:\n * the stylesheet preprocessor chain (plugin-registered preprocessors first,\n * then the chain configured through `angular()` options) and whether any\n * plugin asked for externalized component styles.\n */\nexport async function resolveAnalogIntegrations(\n  config: ResolvedConfig,\n  configured?: StylePreprocessor,\n): Promise<AnalogIntegrations> {\n  const integrations = await discoverAnalogIntegrations(config);\n  return {\n    stylePreprocessor: composeStylePreprocessors([\n      integrations.stylePreprocessor,\n      configured,\n    ]),\n    externalizeStyles: integrations.externalizeStyles,\n  };\n}\n\nfunction wrapStylePreprocessor(\n  pluginName: string,\n  preprocessor: StylePreprocessor,\n): StylePreprocessor {\n  return (code, filename, context) => {\n    try {\n      return preprocessor(code, filename, context);\n    } catch (error) {\n      throw new Error(\n        `[analog] Style preprocessor from plugin \"${pluginName}\" failed for \"${filename}\": ${describeError(error)}`,\n      );\n    }\n  };\n}\n\nfunction describeError(error: unknown): string {\n  return error instanceof Error ? error.message : String(error);\n}\n"],"mappings":";;;AA2CA,IAAM,uCAAuB,IAAI,SAG9B;;;;;AAMH,SAAgB,2BACd,QAC6B;CAC7B,IAAI,UAAU,qBAAqB,IAAI,OAAO;AAC9C,KAAI,CAAC,SAAS;AACZ,YAAU,oBAAoB,OAAO,WAAW,EAAE,CAAC;AACnD,uBAAqB,IAAI,QAAQ,QAAQ;;AAE3C,QAAO;;AAGT,eAAsB,oBACpB,SAC6B;CAC7B,MAAM,gBAAqC,EAAE;CAC7C,IAAI,oBAAoB;AAExB,MAAK,MAAM,UAAU,SAA+C;AAClE,MAAI,OAAO,OAAO,QAAQ,UAAU,WAClC;EAGF,MAAM,mBAAmB,cAAc;EACvC,MAAM,UAA+B;GACnC,0BAA0B,cAAc;AACtC,kBAAc,KAAK,sBAAsB,OAAO,MAAM,aAAa,CAAC;;GAEtE,6BAA6B;AAC3B,wBAAoB;;GAEvB;AAED,MAAI;AACF,SAAM,OAAO,OAAO,MAAM,QAAQ;WAC3B,OAAO;AACd,SAAM,IAAI,MACR,wCAAwC,OAAO,KAAK,YAAY,cAAc,MAAM,GACrF;;AAGH,qBAAmB,4BAA4B;GAC7C,QAAQ,OAAO;GACf,oBAAoB,cAAc,SAAS;GAC3C;GACD,CAAC;;AAGJ,QAAO;EACL,mBAAmB,0BAA0B,cAAc;EAC3D;EACD;;;;;;;;AASH,eAAsB,0BACpB,QACA,YAC6B;CAC7B,MAAM,eAAe,MAAM,2BAA2B,OAAO;AAC7D,QAAO;EACL,mBAAmB,0BAA0B,CAC3C,aAAa,mBACb,WACD,CAAC;EACF,mBAAmB,aAAa;EACjC;;AAGH,SAAS,sBACP,YACA,cACmB;AACnB,SAAQ,MAAM,UAAU,YAAY;AAClC,MAAI;AACF,UAAO,aAAa,MAAM,UAAU,QAAQ;WACrC,OAAO;AACd,SAAM,IAAI,MACR,4CAA4C,WAAW,gBAAgB,SAAS,KAAK,cAAc,MAAM,GAC1G;;;;AAKP,SAAS,cAAc,OAAwB;AAC7C,QAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,MAAM"}

package/src/lib/angular-jit-plugin.js

@@ -1,15 +1,21 @@
 import { getJitInlineStyles } from "./utils/jit-inline-styles.js";
 import { debugStyles } from "./utils/debug.js";
 import { isTailwindReferenceError } from "./utils/tailwind-reference.js";
+import { resolveAnalogIntegrations } from "./analog-plugin-interop.js";
+import { preprocessStylesheet } from "./stylesheet-registry.js";
 import { preprocessCSS } from "vite";
 //#region packages/vite-plugin-angular/src/lib/angular-jit-plugin.ts
 function jitPlugin({ inlineStylesExtension }) {
 	let config;
+	let stylePreprocessor;
 	return {
 		name: "@analogjs/vite-plugin-angular-jit",
 		configResolved(_config) {
 			config = _config;
 		},
+		async buildStart() {
+			stylePreprocessor = (await resolveAnalogIntegrations(config)).stylePreprocessor;
+		},
 		resolveId(id) {
 			if (id.startsWith("virtual:angular")) return `\0${id}`;
 		},
@@ -19,9 +25,14 @@ function jitPlugin({ inlineStylesExtension }) {
 				const encodedStyles = getJitInlineStyles(styleIdHash);
 				if (encodedStyles === void 0) return;
 				const decodedStyles = Buffer.from(decodeURIComponent(encodedStyles), "base64").toString();
+				const filename = `${styleIdHash}.${inlineStylesExtension}`;
+				const preprocessed = preprocessStylesheet(decodedStyles, filename, stylePreprocessor, {
+					filename,
+					inline: true
+				});
 				let styles = "";
 				try {
-					styles = (await preprocessCSS(decodedStyles, `${styleIdHash}.${inlineStylesExtension}?direct`, config))?.code;
+					styles = (await preprocessCSS(preprocessed, `${filename}?direct`, config))?.code;
 				} catch (e) {
 					if (isTailwindReferenceError(e)) throw e;
 					const errorMessage = e instanceof Error ? e.message : String(e);

package/src/lib/angular-jit-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"angular-jit-plugin.js","names":[],"sources":["../../../src/lib/angular-jit-plugin.ts"],"sourcesContent":["import { Plugin, ResolvedConfig, preprocessCSS } from 'vite';\nimport {\n  JIT_INLINE_STYLE_PREFIX,\n  getJitInlineStyles,\n} from './utils/jit-inline-styles.js';\nimport { debugStyles } from './utils/debug.js';\nimport { isTailwindReferenceError } from './utils/tailwind-reference.js';\n\nexport function jitPlugin({\n  inlineStylesExtension,\n}: {\n  inlineStylesExtension: string;\n}): Plugin {\n  let config: ResolvedConfig;\n\n  return {\n    name: '@analogjs/vite-plugin-angular-jit',\n    configResolved(_config) {\n      config = _config;\n    },\n    resolveId(id: string) {\n      if (id.startsWith('virtual:angular')) {\n        return `\\0${id}`;\n      }\n\n      return;\n    },\n    async load(id: string) {\n      if (id.includes(JIT_INLINE_STYLE_PREFIX)) {\n        const styleIdHash = id.split('style:inline;')[1];\n        const encodedStyles = getJitInlineStyles(styleIdHash);\n\n        if (encodedStyles === undefined) {\n          return;\n        }\n\n        const decodedStyles = Buffer.from(\n          decodeURIComponent(encodedStyles),\n          'base64',\n        ).toString();\n\n        let styles: string | undefined = '';\n\n        try {\n          const compiled = await preprocessCSS(\n            decodedStyles,\n            `${styleIdHash}.${inlineStylesExtension}?direct`,\n            config,\n          );\n          styles = compiled?.code;\n        } catch (e) {\n          if (isTailwindReferenceError(e)) {\n            throw e;\n          }\n          const errorMessage = e instanceof Error ? e.message : String(e);\n          debugStyles('jit css compilation error', {\n            styleIdHash,\n            error: errorMessage,\n          });\n          console.warn(\n            '[@analogjs/vite-plugin-angular]: Failed to preprocess inline JIT stylesheet %s. Returning an empty stylesheet instead. %s',\n            styleIdHash,\n            errorMessage,\n          );\n        }\n\n        return `export default \\`${styles}\\``;\n      }\n\n      return;\n    },\n  };\n}\n"],"mappings":";;;;;AAQA,SAAgB,UAAU,EACxB,yBAGS;CACT,IAAI;AAEJ,QAAO;EACL,MAAM;EACN,eAAe,SAAS;AACtB,YAAS;;EAEX,UAAU,IAAY;AACpB,OAAI,GAAG,WAAW,kBAAkB,CAClC,QAAO,KAAK;;EAKhB,MAAM,KAAK,IAAY;AACrB,OAAI,GAAG,SAAA,oCAAiC,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;IAC9C,MAAM,gBAAgB,mBAAmB,YAAY;AAErD,QAAI,kBAAkB,KAAA,EACpB;IAGF,MAAM,gBAAgB,OAAO,KAC3B,mBAAmB,cAAc,EACjC,SACD,CAAC,UAAU;IAEZ,IAAI,SAA6B;AAEjC,QAAI;AAMF,eALiB,MAAM,cACrB,eACA,GAAG,YAAY,GAAG,sBAAsB,UACxC,OACD,GACkB;aACZ,GAAG;AACV,SAAI,yBAAyB,EAAE,CAC7B,OAAM;KAER,MAAM,eAAe,aAAa,QAAQ,EAAE,UAAU,OAAO,EAAE;AAC/D,iBAAY,6BAA6B;MACvC;MACA,OAAO;MACR,CAAC;AACF,aAAQ,KACN,6HACA,aACA,aACD;;AAGH,WAAO,oBAAoB,OAAO;;;EAKvC"}
+{"version":3,"file":"angular-jit-plugin.js","names":[],"sources":["../../../src/lib/angular-jit-plugin.ts"],"sourcesContent":["import { Plugin, ResolvedConfig, preprocessCSS } from 'vite';\nimport {\n  JIT_INLINE_STYLE_PREFIX,\n  getJitInlineStyles,\n} from './utils/jit-inline-styles.js';\nimport { debugStyles } from './utils/debug.js';\nimport { isTailwindReferenceError } from './utils/tailwind-reference.js';\nimport { resolveAnalogIntegrations } from './analog-plugin-interop.js';\nimport { preprocessStylesheet } from './stylesheet-registry.js';\nimport type { StylePreprocessor } from './style-preprocessor.js';\n\nexport function jitPlugin({\n  inlineStylesExtension,\n}: {\n  inlineStylesExtension: string;\n}): Plugin {\n  let config: ResolvedConfig;\n  let stylePreprocessor: StylePreprocessor | undefined;\n\n  return {\n    name: '@analogjs/vite-plugin-angular-jit',\n    configResolved(_config) {\n      config = _config;\n    },\n    async buildStart() {\n      stylePreprocessor = (await resolveAnalogIntegrations(config))\n        .stylePreprocessor;\n    },\n    resolveId(id: string) {\n      if (id.startsWith('virtual:angular')) {\n        return `\\0${id}`;\n      }\n\n      return;\n    },\n    async load(id: string) {\n      if (id.includes(JIT_INLINE_STYLE_PREFIX)) {\n        const styleIdHash = id.split('style:inline;')[1];\n        const encodedStyles = getJitInlineStyles(styleIdHash);\n\n        if (encodedStyles === undefined) {\n          return;\n        }\n\n        const decodedStyles = Buffer.from(\n          decodeURIComponent(encodedStyles),\n          'base64',\n        ).toString();\n        const filename = `${styleIdHash}.${inlineStylesExtension}`;\n        const preprocessed = preprocessStylesheet(\n          decodedStyles,\n          filename,\n          stylePreprocessor,\n          { filename, inline: true },\n        );\n\n        let styles: string | undefined = '';\n\n        try {\n          const compiled = await preprocessCSS(\n            preprocessed,\n            `${filename}?direct`,\n            config,\n          );\n          styles = compiled?.code;\n        } catch (e) {\n          if (isTailwindReferenceError(e)) {\n            throw e;\n          }\n          const errorMessage = e instanceof Error ? e.message : String(e);\n          debugStyles('jit css compilation error', {\n            styleIdHash,\n            error: errorMessage,\n          });\n          console.warn(\n            '[@analogjs/vite-plugin-angular]: Failed to preprocess inline JIT stylesheet %s. Returning an empty stylesheet instead. %s',\n            styleIdHash,\n            errorMessage,\n          );\n        }\n\n        return `export default \\`${styles}\\``;\n      }\n\n      return;\n    },\n  };\n}\n"],"mappings":";;;;;;;AAWA,SAAgB,UAAU,EACxB,yBAGS;CACT,IAAI;CACJ,IAAI;AAEJ,QAAO;EACL,MAAM;EACN,eAAe,SAAS;AACtB,YAAS;;EAEX,MAAM,aAAa;AACjB,wBAAqB,MAAM,0BAA0B,OAAO,EACzD;;EAEL,UAAU,IAAY;AACpB,OAAI,GAAG,WAAW,kBAAkB,CAClC,QAAO,KAAK;;EAKhB,MAAM,KAAK,IAAY;AACrB,OAAI,GAAG,SAAA,oCAAiC,EAAE;IACxC,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC;IAC9C,MAAM,gBAAgB,mBAAmB,YAAY;AAErD,QAAI,kBAAkB,KAAA,EACpB;IAGF,MAAM,gBAAgB,OAAO,KAC3B,mBAAmB,cAAc,EACjC,SACD,CAAC,UAAU;IACZ,MAAM,WAAW,GAAG,YAAY,GAAG;IACnC,MAAM,eAAe,qBACnB,eACA,UACA,mBACA;KAAE;KAAU,QAAQ;KAAM,CAC3B;IAED,IAAI,SAA6B;AAEjC,QAAI;AAMF,eALiB,MAAM,cACrB,cACA,GAAG,SAAS,UACZ,OACD,GACkB;aACZ,GAAG;AACV,SAAI,yBAAyB,EAAE,CAC7B,OAAM;KAER,MAAM,eAAe,aAAa,QAAQ,EAAE,UAAU,OAAO,EAAE;AAC/D,iBAAY,6BAA6B;MACvC;MACA,OAAO;MACR,CAAC;AACF,aAAQ,KACN,6HACA,aACA,aACD;;AAGH,WAAO,oBAAoB,OAAO;;;EAKvC"}

package/src/lib/angular-vite-plugin.d.ts

@@ -7,7 +7,6 @@ import { FileReplacement } from "./plugins/file-replacements.plugin.js";
 import { AnalogStylesheetRegistry } from "./stylesheet-registry.js";
 import { AngularStylePipelineOptions } from "./style-pipeline.js";
 export { DiagnosticModes, injectViteIgnoreForHmrMetadata, isIgnoredHmrFile, toAngularCompilationFileReplacements, mapTemplateUpdatesToFiles, refreshStylesheetRegistryForFile, describeStylesheetContent, isTestWatchMode } from "./utils/compilation-shared.js";
-export { findStaticClassAndBoundClassConflicts, findBoundClassAndNgClassConflicts } from "./template-class-binding-guard-plugin.js";
 export { buildStylePreprocessor } from "./tailwind-plugin.js";
 export interface PluginOptions {
 	tsconfig?: string | (() => string);
@@ -152,9 +151,7 @@ export interface PluginOptions {
 		prefixes?: string[];
 	};
 }
-export declare function evictDeletedFileMetadata(file: string, { removeActiveGraphMetadata, removeStyleOwnerMetadata, classNamesMap, fileTransformMap }: {
-	removeActiveGraphMetadata: (file: string) => void;
-	removeStyleOwnerMetadata: (file: string) => void;
+export declare function evictDeletedFileMetadata(file: string, { classNamesMap, fileTransformMap }: {
 	classNamesMap: Map<string, string>;
 	fileTransformMap: Map<string, string>;
 }): void;

package/src/lib/angular-vite-plugin.js

@@ -5,9 +5,10 @@ import { getJsTransformConfigKey, isRolldown } from "./utils/rolldown.js";
 import { buildOptimizerPlugin } from "./angular-build-optimizer-plugin.js";
 import { toJitInlineStyleId } from "./utils/jit-inline-styles.js";
 import { activateDeferredDebug, applyDebugOption, debugCompiler, debugCompilerV, debugEmit, debugEmitV, debugHmr, debugHmrV, debugStyles, debugStylesV } from "./utils/debug.js";
-import { jitPlugin } from "./angular-jit-plugin.js";
-import { StyleUrlsResolver, TemplateUrlsResolver, getAngularComponentMetadata } from "./component-resolvers.js";
+import { resolveAnalogIntegrations } from "./analog-plugin-interop.js";
 import { AnalogStylesheetRegistry, preprocessStylesheet, rewriteRelativeCssImports } from "./stylesheet-registry.js";
+import { jitPlugin } from "./angular-jit-plugin.js";
+import { StyleUrlsResolver, TemplateUrlsResolver } from "./component-resolvers.js";
 import { augmentHostWithCaching, augmentHostWithResources, augmentProgramWithVersioning, mergeTransformers } from "./host.js";
 import { TsconfigResolver } from "./utils/tsconfig-resolver.js";
 import { configureStylePipelineRegistry } from "./style-pipeline.js";
@@ -20,7 +21,6 @@ import { ANGULAR_DECORATOR_CALL_RE } from "./compiler/constants.js";
 import "./compiler/index.js";
 import { markStylePathSafe } from "./utils/safe-module-paths.js";
 import { fastCompilePlugin } from "./fast-compile-plugin.js";
-import { removeActiveGraphMetadata, removeStyleOwnerMetadata, templateClassBindingGuardPlugin } from "./template-class-binding-guard-plugin.js";
 import { buildStylePreprocessor, tailwindReferencePlugin, validateTailwindConfig } from "./tailwind-plugin.js";
 import { encapsulationPlugin, getComponentStyleSheetMeta, isComponentStyleSheet } from "./encapsulation-plugin.js";
 import { virtualModulesPlugin } from "./virtual-modules-plugin.js";
@@ -40,16 +40,16 @@ import { normalizePath, preprocessCSS } from "vite";
 //#region packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts
 var require = createRequire(import.meta.url);
 var classNames = /* @__PURE__ */ new Map();
-function evictDeletedFileMetadata(file, { removeActiveGraphMetadata, removeStyleOwnerMetadata, classNamesMap, fileTransformMap }) {
+function evictDeletedFileMetadata(file, { classNamesMap, fileTransformMap }) {
 	const normalizedFile = normalizePath(file.split("?")[0]);
-	removeActiveGraphMetadata(normalizedFile);
-	removeStyleOwnerMetadata(normalizedFile);
 	classNamesMap.delete(normalizedFile);
 	fileTransformMap.delete(normalizedFile);
 }
 function angular(options) {
 	applyDebugOption(options?.debug, options?.workspaceRoot);
 	const liveReload = options?.liveReload ?? true;
+	const configuredStylePreprocessor = buildStylePreprocessor(options);
+	let externalizeStylesRequested = false;
 	/**
 	* Normalize plugin options so defaults
 	* are used for values not provided.
@@ -75,7 +75,7 @@ function angular(options) {
 		fastCompileMode: options?.fastCompileMode ?? "full",
 		hasTailwindCss: !!options?.tailwindCss,
 		tailwindCss: options?.tailwindCss,
-		stylePreprocessor: buildStylePreprocessor(options)
+		stylePreprocessor: configuredStylePreprocessor
 	};
 	let resolvedConfig;
 	let tsConfigResolutionContext = null;
@@ -102,11 +102,6 @@ function angular(options) {
 	}
 	let watchMode = false;
 	let testWatchMode = isTestWatchMode();
-	const activeGraphComponentMetadata = /* @__PURE__ */ new Map();
-	const selectorOwners = /* @__PURE__ */ new Map();
-	const classNameOwners = /* @__PURE__ */ new Map();
-	const transformedStyleOwnerMetadata = /* @__PURE__ */ new Map();
-	const styleSourceOwners = /* @__PURE__ */ new Map();
 	function hasViteHmrTransport() {
 		return resolvedConfig ? resolvedConfig.server.hmr !== false : true;
 	}
@@ -131,7 +126,7 @@ function angular(options) {
 	*/
 	function shouldExternalizeStyles() {
 		if (!(isTest ? testWatchMode : watchMode)) return false;
-		return !!(shouldEnableLiveReload() || pluginOptions.hasTailwindCss);
+		return !!(shouldEnableLiveReload() || pluginOptions.hasTailwindCss || externalizeStylesRequested);
 	}
 	function validateNoDuplicateAnalogPlugins(config) {
 		const analogInstances = (config.plugins ?? []).filter((p) => p.name === "@analogjs/vite-plugin-angular");
@@ -145,14 +140,6 @@ function angular(options) {
 	const jit = typeof pluginOptions?.jit !== "undefined" ? pluginOptions.jit : isTest;
 	let viteServer;
 	const styleUrlsResolver = new StyleUrlsResolver();
-	const guardContext = {
-		styleUrlsResolver,
-		activeGraphComponentMetadata,
-		selectorOwners,
-		classNameOwners,
-		transformedStyleOwnerMetadata,
-		styleSourceOwners
-	};
 	const templateUrlsResolver = new TemplateUrlsResolver();
 	let outputFile;
 	const outputFiles = /* @__PURE__ */ new Map();
@@ -284,8 +271,6 @@ function angular(options) {
 				server.watcher.on("add", invalidateCompilationOnFsChange);
 				server.watcher.on("unlink", (file) => {
 					evictDeletedFileMetadata(file, {
-						removeActiveGraphMetadata: (f) => removeActiveGraphMetadata(guardContext, f),
-						removeStyleOwnerMetadata: (f) => removeStyleOwnerMetadata(guardContext, f),
 						classNamesMap: classNames,
 						fileTransformMap
 					});
@@ -440,52 +425,18 @@ function angular(options) {
 									directId: isDirect.id,
 									trackedRequestIds: stylesheetRegistry?.getRequestIdsForSource(ctx.file) ?? []
 								});
-								const ownerModules = findStyleOwnerModules(ctx.server, ctx.file, styleSourceOwners);
-								debugHmrV("component stylesheet owner fallback lookup", {
-									file: ctx.file,
-									ownerCount: ownerModules.length,
-									ownerIds: ownerModules.map((mod) => mod.id),
-									ownerFiles: [...styleSourceOwners.get(normalizePath(ctx.file)) ?? []]
-								});
-								if (ownerModules.length > 0) {
-									pendingCompilation = performCompilation(resolvedConfig, [...ownerModules.map((mod) => mod.id).filter(Boolean)]);
-									await pendingCompilation;
-									pendingCompilation = null;
-									const updates = ownerModules.map((mod) => mod.id).filter((id) => !!id && !!classNames.get(id));
-									const derivedUpdates = ownerModules.map((mod) => mod.id).filter((id) => !!id).flatMap((ownerId) => resolveComponentClassNamesForStyleOwner(ownerId, ctx.file).map((className) => ({
-										ownerId,
-										className,
-										via: "raw-component-metadata"
-									})));
-									debugHmrV("component stylesheet owner fallback compilation", {
-										file: ctx.file,
-										ownerIds: ownerModules.map((mod) => mod.id),
-										updateIds: updates,
-										classNames: updates.map((id) => ({
-											id,
-											className: classNames.get(id)
-										})),
-										derivedUpdates
-									});
-									if (derivedUpdates.length > 0) debugHmrV("component stylesheet owner fallback derived updates", {
-										file: ctx.file,
-										updates: derivedUpdates,
-										hint: "Angular did not repopulate classNames during CSS-only owner recompilation, so Analog derived component identities from raw component metadata."
-									});
-								}
 								logComponentStylesheetHmrOutcome({
 									file: ctx.file,
 									encapsulation,
 									diagnosis: stylesheetDiagnosis,
 									outcome: "full-reload",
 									directModuleId: isDirect.id,
-									wrapperIds: wrapperModules.map((mod) => mod.id),
-									ownerIds: ownerModules.map((mod) => mod.id)
+									wrapperIds: wrapperModules.map((mod) => mod.id)
 								});
 								sendFullReload(ctx.server, {
 									file: ctx.file,
 									encapsulation,
-									reason: wrapperModules.length === 0 ? "missing-wrapper-module-and-no-owner-updates" : "shadow-encapsulation",
+									reason: wrapperModules.length === 0 ? "missing-wrapper-module" : "shadow-encapsulation",
 									directId: isDirect.id,
 									trackedRequestIds: stylesheetRegistry?.getRequestIdsForSource(ctx.file) ?? []
 								});
@@ -799,7 +750,6 @@ function angular(options) {
 		cssExtensionStyleResolverPlugin(),
 		replaceFiles(pluginOptions.fileReplacements, pluginOptions.workspaceRoot),
 		virtualModulesPlugin({ jit }),
-		templateClassBindingGuardPlugin(guardContext),
 		pluginOptions.hasTailwindCss && tailwindReferencePlugin({ tailwindCss: pluginOptions.tailwindCss }),
 		pluginOptions.liveReload && liveReloadPlugin({
 			classNames,
@@ -833,6 +783,9 @@ function angular(options) {
 		});
 		try {
 			await previousLock;
+			const integrations = await resolveAnalogIntegrations(config, configuredStylePreprocessor);
+			pluginOptions.stylePreprocessor = integrations.stylePreprocessor;
+			externalizeStylesRequested = integrations.externalizeStyles;
 			await _doPerformCompilation(config, ids);
 		} finally {
 			resolve();
@@ -859,6 +812,7 @@ function angular(options) {
 		debugCompiler("tsCompilerOptions (NgtscProgram path)", {
 			liveReload: pluginOptions.liveReload,
 			viteHmr: hasViteHmrTransport(),
+			externalizeStylesRequested,
 			shouldExternalize: shouldExternalizeStyles(),
 			externalRuntimeStyles: !!tsCompilerOptions["externalRuntimeStyles"],
 			hmrEnabled: !!tsCompilerOptions["_enableHmr"]
@@ -1181,12 +1135,6 @@ function sendFullReload(server, details) {
 	server.ws.send("analog:debug-full-reload", details);
 	server.ws.send({ type: "full-reload" });
 }
-function resolveComponentClassNamesForStyleOwner(ownerFile, sourcePath) {
-	if (!existsSync(ownerFile)) return [];
-	const components = getAngularComponentMetadata(readFileSync(ownerFile, "utf-8"));
-	const normalizedSourcePath = normalizePath(sourcePath);
-	return components.filter((component) => component.styleUrls.some((styleUrl) => normalizePath(resolve(dirname(ownerFile), styleUrl)) === normalizedSourcePath)).map((component) => component.className);
-}
 function logComponentStylesheetHmrOutcome(details) {
 	const pitfalls = [];
 	const rejectedPreferredPaths = [];
@@ -1194,7 +1142,6 @@ function logComponentStylesheetHmrOutcome(details) {
 	if (details.encapsulation === "shadow") {
 		pitfalls.push("shadow-encapsulation");
 		rejectedPreferredPaths.push("css-update");
-		rejectedPreferredPaths.push("owner-component-update");
 		hints.push("Shadow DOM styles cannot rely on Vite CSS patching because Angular applies them inside a shadow root.");
 	}
 	if (details.diagnosis.anomalies.includes("wrapper_not_yet_tracked")) {
@@ -1207,27 +1154,12 @@ function logComponentStylesheetHmrOutcome(details) {
 		rejectedPreferredPaths.push("css-update");
 		hints.push("A wrapper request id is known, but Vite could not resolve a live wrapper module for targeted CSS HMR.");
 	}
-	if ((details.ownerIds?.filter(Boolean).length ?? 0) === 0) {
-		pitfalls.push("no-owner-modules");
-		if (details.outcome === "full-reload") {
-			rejectedPreferredPaths.push("owner-component-update");
-			hints.push("No owning TS component modules were available in the module graph for owner-based fallback.");
-		}
-	} else if ((details.updateIds?.length ?? 0) === 0) {
-		pitfalls.push("owner-modules-without-class-identities");
-		if (details.outcome === "full-reload") {
-			rejectedPreferredPaths.push("owner-component-update");
-			hints.push("Owner modules were found, but Angular did not expose component class identities after recompilation, so no targeted component update could be sent.");
-		}
-	}
 	debugHmrV("component stylesheet hmr outcome", {
 		file: details.file,
 		outcome: details.outcome,
 		encapsulation: details.encapsulation,
 		directModuleId: details.directModuleId,
 		wrapperIds: details.wrapperIds ?? [],
-		ownerIds: details.ownerIds ?? [],
-		updateIds: details.updateIds ?? [],
 		preferredPath: details.encapsulation === "shadow" ? "full-reload" : "css-update",
 		rejectedPreferredPaths: [...new Set(rejectedPreferredPaths)],
 		pitfalls: [...new Set(pitfalls)],
@@ -1243,15 +1175,6 @@ function findTemplateOwnerModules(server, resourceFile) {
 	});
 	return [...modules.values()];
 }
-function findStyleOwnerModules(server, resourceFile, styleSourceOwners) {
-	const normalizedResourceFile = normalizePath(resourceFile.split("?")[0]);
-	const candidateOwnerFiles = [...styleSourceOwners.get(normalizedResourceFile) ?? []];
-	const modules = /* @__PURE__ */ new Map();
-	for (const ownerFile of candidateOwnerFiles) server.moduleGraph.getModulesByFile(ownerFile)?.forEach((mod) => {
-		if (mod.id) modules.set(mod.id, mod);
-	});
-	return [...modules.values()];
-}
 /**
 * @internal
 */