@analogjs/vite-plugin-angular 3.0.0-alpha.92 → 3.0.0-alpha.94

package/README.md

@@ -60,7 +60,7 @@ export default defineConfig({
 });
 ```
 
-When `fastCompile` is enabled, template and input type errors will not surface during compilation — run `ngc -p tsconfig.app.json --noEmit` as a separate step in your build script to keep full type safety:
+When `fastCompile` is enabled, template and input type errors will not surface during compilation. Run `ngc -p tsconfig.app.json --noEmit` as a separate step in your build script to keep full type safety:
 
 ```json
 {
@@ -72,6 +72,21 @@ When `fastCompile` is enabled, template and input type errors will not surface d
 
 The fast compile path currently passes ~91% of Angular's conformance suite. Behavior and output may change between minor releases.
 
+## Vendor Sourcemaps
+
+The sourcemaps of dependencies and prebuilt libraries are preserved whenever `build.sourcemap` is enabled.
+
+```ts
+export default defineConfig({
+  plugins: [angular()],
+  build: { sourcemap: true },
+});
+```
+
+Expect larger sourcemap files, since they now include the mappings for dependency code. The application bundles are unchanged, and builds without `build.sourcemap` are unaffected.
+
+Angular's own packages are compiled through a separate path that always discards their sourcemaps, so mappings are not restored for `@angular/*`.
+
 ## Setting up the TypeScript config
 
 The integration needs a `tsconfig.app.json` at the root of the project for compilation.

package/package.json

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

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

@@ -4,7 +4,7 @@ import { ModuleNode, Plugin, ViteDevServer } from "vite";
 import { type DebugOption } from "./utils/debug.js";
 import { FileReplacement } from "./plugins/file-replacements.plugin.js";
 import { AnalogStylesheetRegistry } from "./stylesheet-registry.js";
-export { DiagnosticModes, injectViteIgnoreForHmrMetadata, isIgnoredHmrFile, toAngularCompilationFileReplacements, mapTemplateUpdatesToFiles, refreshStylesheetRegistryForFile, describeStylesheetContent, isTestWatchMode } from "./utils/compilation-shared.js";
+export { DiagnosticModes, injectViteIgnoreForHmrMetadata, isIgnoredHmrFile, toAngularCompilationFileReplacements, mapTemplateUpdatesToFiles, refreshStylesheetRegistryForFile, describeStylesheetContent, isTestWatchMode, getBrowserModeCliOverride } from "./utils/compilation-shared.js";
 export interface PluginOptions {
 	tsconfig?: string | (() => string);
 	workspaceRoot?: string;

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

@@ -1,12 +1,13 @@
 import { angularFullVersion, cjt, sourceFileCache } from "./utils/devkit.js";
 import { activateDeferredDebug, applyDebugOption, debugCompiler, debugCompilerV, debugEmit, debugEmitV, debugHmr, debugHmrV, debugStyles, debugStylesV } from "./utils/debug.js";
 import { createCompilerPlugin, createRolldownCompilerPlugin } from "./compiler-plugin.js";
-import { TS_EXT_REGEX, createTsConfigGetter, getTsConfigPath, isProdMode } from "./utils/plugin-config.js";
+import { EXCLUDED_TS_EXT_REGEX, TS_EXT_REGEX, createTsConfigGetter, getTsConfigPath, isProdMode } from "./utils/plugin-config.js";
 import { TsconfigResolver } from "./utils/tsconfig-resolver.js";
 import { getJsTransformConfigKey, isRolldown } from "./utils/rolldown.js";
 import { AnalogStylesheetRegistry, preprocessStylesheet, rewriteRelativeCssImports } from "./stylesheet-registry.js";
 import { discoverAnalogIntegrations } from "./analog-plugin-interop.js";
-import { describeStylesheetContent, injectViteIgnoreForHmrMetadata, isIgnoredHmrFile, isTestWatchMode } from "./utils/compilation-shared.js";
+import { describeStylesheetContent, getBrowserModeCliOverride, injectViteIgnoreForHmrMetadata, isIgnoredHmrFile, isTestWatchMode } from "./utils/compilation-shared.js";
+import { createHotUpdateBatcher } from "./hot-update-batch.js";
 import { angularVitestPlugins } from "./angular-vitest-plugin.js";
 import { buildOptimizerPlugin } from "./angular-build-optimizer-plugin.js";
 import { toJitInlineStyleId } from "./utils/jit-inline-styles.js";
@@ -22,7 +23,7 @@ import { replaceFiles } from "./plugins/file-replacements.plugin.js";
 import { cssExtensionStyleResolverPlugin } from "./utils/css-extension-resolver.js";
 import { loadVirtualRawModule, rewriteHtmlRawImport } from "./utils/virtual-resources.js";
 import { StyleUrlsResolver, TemplateUrlsResolver } from "./component-resolvers.js";
-import { augmentHostWithCaching, augmentHostWithResources, augmentProgramWithVersioning, mergeTransformers } from "./host.js";
+import { augmentHostWithCaching, augmentHostWithModuleResolution, augmentHostWithResources, augmentProgramWithVersioning, mergeTransformers } from "./host.js";
 import { markStylePathSafe } from "./utils/safe-module-paths.js";
 import { fastCompilePlugin } from "./fast-compile-plugin.js";
 import { pendingTasksPlugin } from "./angular-pending-tasks.plugin.js";
@@ -122,6 +123,7 @@ function angular(options) {
 		sourceFileCache$1.invalidate(files);
 	}
 	const isVitestVscode = !!process.env["VITEST_VSCODE"];
+	let deferInitialCompilation = isVitestVscode;
 	const isStackBlitz = !!process.versions["webcontainer"];
 	const isAstroIntegration = process.env["ANALOG_ASTRO"] === "true";
 	const jit = typeof pluginOptions?.jit !== "undefined" ? pluginOptions.jit : isTest;
@@ -167,6 +169,7 @@ function angular(options) {
 	let styleTransform;
 	let pendingCompilation;
 	let compilationLock = Promise.resolve();
+	const hotUpdates = createHotUpdateBatcher((ids) => performCompilation(resolvedConfig, ids));
 	function angularPlugin() {
 		let isProd = false;
 		if (angularFullVersion < 19e4 && pluginOptions.liveReload) {
@@ -247,12 +250,20 @@ function angular(options) {
 					};
 				}
 				if (!jit) styleTransform = (code, filename) => preprocessCSS(code, filename, config);
-				if (isTest) testWatchMode = !(config.server.watch === null) || config.test?.watch === true || testWatchMode;
+				if (isTest) {
+					const browser = config.test?.browser;
+					deferInitialCompilation = isVitestVscode || !!browser && (getBrowserModeCliOverride() ?? browser.enabled) === true;
+					testWatchMode = !(config.server.watch === null) || config.test?.watch === true || testWatchMode;
+				}
 			},
 			configureServer(server) {
 				viteServer = server;
+				hotUpdates.configureServer(server);
 				const invalidateCompilationOnFsChange = createFsWatcherCacheInvalidator(invalidateFsCaches, invalidateTsconfigCaches, () => performCompilation(resolvedConfig));
-				server.watcher.on("add", invalidateCompilationOnFsChange);
+				server.watcher.on("add", (file) => {
+					if (EXCLUDED_TS_EXT_REGEX.test(file)) invalidateSourceFiles(new Set([normalizePath(file)]));
+					return invalidateCompilationOnFsChange();
+				});
 				server.watcher.on("unlink", (file) => {
 					const id = normalizePath(file);
 					outputFiles.delete(id);
@@ -269,7 +280,8 @@ function angular(options) {
 				});
 			},
 			async buildStart() {
-				if (!isVitestVscode) {
+				if (!jit) styleTransform = (code, filename) => preprocessCSS(code, filename, resolvedConfig);
+				if (!deferInitialCompilation) {
 					pendingCompilation = performCompilation(this.environment?.config ?? resolvedConfig);
 					await pendingCompilation;
 					pendingCompilation = null;
@@ -304,11 +316,17 @@ function angular(options) {
 						file: ctx.file,
 						fileId
 					});
-					pendingCompilation = performCompilation(resolvedConfig, [fileId]);
+					await hotUpdates.schedule(ctx.file, [fileId]);
+					if (EXCLUDED_TS_EXT_REGEX.test(fileId)) {
+						ctx.server.moduleGraph.invalidateAll();
+						ctx.server.ws.send({
+							type: "full-reload",
+							triggeredBy: fileId
+						});
+						return [];
+					}
 					let result;
 					if (shouldEnableLiveReload()) {
-						await pendingCompilation;
-						pendingCompilation = null;
 						result = fileEmitter(fileId);
 						debugHmr("TS file emitted", {
 							fileId,
@@ -461,9 +479,7 @@ function angular(options) {
 						if (ownerModules.length > 0) {
 							const ownerIds = ownerModules.map((mod) => mod.id).filter(Boolean);
 							ownerModules.forEach((mod) => ctx.server.moduleGraph.invalidateModule(mod));
-							pendingCompilation = performCompilation(resolvedConfig, ownerIds);
-							await pendingCompilation;
-							pendingCompilation = null;
+							await hotUpdates.schedule(ctx.file, ownerIds);
 							const updates = ownerIds.filter((id) => classNames.get(id));
 							debugHmrV("template owner recompilation result", {
 								file: ctx.file,
@@ -505,10 +521,9 @@ function angular(options) {
 						updates,
 						mods: mods.map((mod) => mod.id)
 					});
-					pendingCompilation = performCompilation(resolvedConfig, [...mods.map((mod) => mod.id).filter(Boolean), ...updates]);
+					if (mods.length === 0 && updates.length === 0) return mods;
+					await hotUpdates.schedule(ctx.file, [...mods.map((mod) => mod.id), ...updates]);
 					if (updates.length > 0) {
-						await pendingCompilation;
-						pendingCompilation = null;
 						debugHmr("resource importer component updates", {
 							file: ctx.file,
 							updateCount: updates.length
@@ -619,7 +634,7 @@ function angular(options) {
 					* for test(Vitest)
 					*/
 					if (isTest) {
-						if (isVitestVscode && !initialCompilation) {
+						if (deferInitialCompilation && !initialCompilation) {
 							pendingCompilation = performCompilation(this.environment?.config ?? resolvedConfig);
 							initialCompilation = true;
 						}
@@ -646,6 +661,7 @@ function angular(options) {
 						await pendingCompilation;
 						pendingCompilation = null;
 					}
+					await hotUpdates.wait();
 					const typescriptResult = fileEmitter(id);
 					if (!typescriptResult) {
 						debugCompilerV("transform skip (file not emitted by Angular)", { id });
@@ -703,6 +719,7 @@ function angular(options) {
 				}
 			},
 			closeBundle() {
+				hotUpdates.close();
 				declarationFiles.forEach(({ declarationFileDir, declarationPath, data }) => {
 					mkdirSync(declarationFileDir, { recursive: true });
 					writeFileSync(declarationPath, data, "utf-8");
@@ -786,7 +803,6 @@ function angular(options) {
 	* It should not be called concurrently. Use `performCompilation` which wraps this method in a lock to ensure only one compilation runs at a time.
 	*/
 	async function _doPerformCompilation(config, ids) {
-		if (!jit) styleTransform = (code, filename) => preprocessCSS(code, filename, config);
 		const isProd = config.mode === "production";
 		invalidateSourceFiles(new Set(ids ?? []));
 		if (ids?.length) for (const id of ids || []) fileTransformMap.delete(id);
@@ -832,6 +848,7 @@ function angular(options) {
 					return file;
 				}
 			});
+			augmentHostWithModuleResolution(host, tsCompilerOptions);
 			cachedHost = host;
 			cachedHostKey = hostKey;
 			if (watchMode) augmentHostWithCaching(host, tsSourceFileCache);
@@ -856,7 +873,7 @@ function angular(options) {
 		*/
 		let typeScriptProgram;
 		let angularCompiler;
-		const oldBuilder = builder ?? ts.readBuilderProgram(tsCompilerOptions, host);
+		const oldBuilder = ids?.some((id) => EXCLUDED_TS_EXT_REGEX.test(id)) ? void 0 : builder ?? ts.readBuilderProgram(tsCompilerOptions, host);
 		if (!jit) {
 			const angularProgram = new compilerCli.NgtscProgram(rootNames, tsCompilerOptions, host, nextProgram);
 			angularCompiler = angularProgram.compiler;