@analogjs/vite-plugin-angular 3.0.0-alpha.52 → 3.0.0-alpha.54

package/package.json

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

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

@@ -587,6 +587,15 @@ function angular(options) {
 				}
 				if (isComponentStyleSheet(id)) {
 					const filename = getFilenameFromPath(id);
+					const search = new URL(id, "http://localhost").search;
+					const servedSourcePath = stylesheetRegistry?.getServedSourcePath(filename);
+					if (servedSourcePath) {
+						debugStylesV("resolveId: mapped served stylesheet to source", {
+							filename,
+							resolvedPath: servedSourcePath
+						});
+						return servedSourcePath + search;
+					}
 					if (stylesheetRegistry?.hasServed(filename)) {
 						debugStylesV("resolveId: kept preprocessed ID", { filename });
 						return id;
@@ -618,8 +627,8 @@ function angular(options) {
 						debugHmrV("stylesheet active request registered", {
 							requestId: id,
 							filename,
-							sourcePath: stylesheetRegistry?.resolveExternalSource(filename) ?? stylesheetRegistry?.resolveExternalSource(filename.replace(/^\//, "")),
-							trackedRequestIds: stylesheetRegistry?.getRequestIdsForSource(stylesheetRegistry?.resolveExternalSource(filename) ?? stylesheetRegistry?.resolveExternalSource(filename.replace(/^\//, "")) ?? "") ?? []
+							sourcePath: stylesheetRegistry?.resolveExternalSource(filename) ?? stylesheetRegistry?.resolveExternalSource(filename.replace(/^\//, "")) ?? stylesheetRegistry?.getServedSourcePath(filename) ?? stylesheetRegistry?.getServedSourcePath(filename.replace(/^\//, "")),
+							trackedRequestIds: stylesheetRegistry?.getRequestIdsForSource(stylesheetRegistry?.resolveExternalSource(filename) ?? stylesheetRegistry?.resolveExternalSource(filename.replace(/^\//, "")) ?? stylesheetRegistry?.getServedSourcePath(filename) ?? stylesheetRegistry?.getServedSourcePath(filename.replace(/^\//, "")) ?? "") ?? []
 						});
 						debugStylesV("load: served inline component stylesheet", {
 							filename,
@@ -731,9 +740,10 @@ function angular(options) {
 							data = patched;
 						}
 					}
+					if (typescriptResult.map) data = data.replace(/\s*\/\/# sourceMappingURL=[^\r\n]*\s*$/, "");
 					return {
 						code: data,
-						map: null
+						map: typescriptResult.map ?? null
 					};
 				}
 			},
@@ -791,7 +801,7 @@ function angular(options) {
 			classNames,
 			fileEmitter
 		}),
-		...isTest && !isStackBlitz ? angularVitestPlugins() : [],
+		...isTest && !isStackBlitz ? angularVitestPlugins((id) => outputFiles.get(normalizePath(id))?.map) : [],
 		jit && jitPlugin({ inlineStylesExtension: pluginOptions.inlineStylesExtension }),
 		buildOptimizerPlugin({
 			supportedBrowsers: pluginOptions.supportedBrowsers,
@@ -913,8 +923,18 @@ function angular(options) {
 			if (!sourceFiles?.length) return;
 			const filename = normalizePath(sourceFiles[0].fileName);
 			if (filename.includes("ngtypecheck.ts") || filename.includes(".d.")) return;
+			if (/\.[cm]?js\.map$/.test(_filename)) {
+				const existing = outputFiles.get(filename);
+				outputFiles.set(filename, {
+					...existing ?? { dependencies: [] },
+					map: content
+				});
+				return;
+			}
 			const metadata = watchMode ? fileMetadata(filename) : {};
+			const existing = outputFiles.get(filename);
 			outputFiles.set(filename, {
+				...existing ?? {},
 				content,
 				dependencies: [],
 				errors: metadata.errors,
@@ -935,8 +955,14 @@ function angular(options) {
 			const sourceFile = builder.getSourceFile(id);
 			if (!sourceFile) return;
 			let content = "";
+			let map;
+			let mapFilename;
 			builder.emit(sourceFile, (filename, data) => {
 				if (/\.[cm]?js$/.test(filename)) content = data;
+				if (/\.[cm]?js\.map$/.test(filename)) {
+					map = data;
+					mapFilename = filename;
+				}
 				if (!watchMode && !isTest && /\.d\.ts/.test(filename) && !filename.includes(".ngtypecheck.")) {
 					const declarationPath = resolve(config.root, config.build.outDir, relative(config.root, filename)).replace("/src/", "/");
 					const declarationFileDir = declarationPath.replace(basename(filename), "").replace("/src/", "/");
@@ -948,6 +974,7 @@ function angular(options) {
 				}
 			}, void 0, void 0, transformers);
 			writeFileCallback(id, content, false, void 0, [sourceFile]);
+			if (map !== void 0 && mapFilename !== void 0) writeFileCallback(mapFilename, map, false, void 0, [sourceFile]);
 			if (angularCompiler) angularCompiler.incrementalCompilation.recordSuccessfulEmit(sourceFile);
 		};
 		if (watchMode) {
@@ -974,14 +1001,14 @@ function isModuleForChangedResource(mod, changedFile, stylesheetRegistry) {
 	if (normalizePath((mod.file ?? "").split("?")[0]) === normalizedChangedFile) return true;
 	if (!mod.id) return false;
 	const requestPath = getFilenameFromPath(mod.id);
-	return normalizePath((stylesheetRegistry?.resolveExternalSource(requestPath) ?? stylesheetRegistry?.resolveExternalSource(requestPath.replace(/^\//, "")) ?? "").split("?")[0]) === normalizedChangedFile;
+	return normalizePath((stylesheetRegistry?.resolveExternalSource(requestPath) ?? stylesheetRegistry?.resolveExternalSource(requestPath.replace(/^\//, "")) ?? stylesheetRegistry?.getServedSourcePath(requestPath) ?? stylesheetRegistry?.getServedSourcePath(requestPath.replace(/^\//, "")) ?? "").split("?")[0]) === normalizedChangedFile;
 }
 function diagnoseComponentStylesheetPipeline(changedFile, directModule, stylesheetRegistry, wrapperModules, stylePreprocessor) {
 	const normalizedFile = normalizePath(changedFile.split("?")[0]);
 	const sourceExists = existsSync(normalizedFile);
 	const sourceCode = sourceExists ? readFileSync(normalizedFile, "utf-8") : void 0;
 	const directRequestPath = directModule.id ? getFilenameFromPath(directModule.id) : void 0;
-	const sourcePath = directRequestPath ? stylesheetRegistry?.resolveExternalSource(directRequestPath) ?? stylesheetRegistry?.resolveExternalSource(directRequestPath.replace(/^\//, "")) : normalizedFile;
+	const sourcePath = directRequestPath ? stylesheetRegistry?.resolveExternalSource(directRequestPath) ?? stylesheetRegistry?.resolveExternalSource(directRequestPath.replace(/^\//, "")) ?? stylesheetRegistry?.getServedSourcePath(directRequestPath) ?? stylesheetRegistry?.getServedSourcePath(directRequestPath.replace(/^\//, "")) : normalizedFile;
 	const registryCode = directRequestPath ? stylesheetRegistry?.getServedContent(directRequestPath) : void 0;
 	const trackedRequestIds = stylesheetRegistry?.getRequestIdsForSource(sourcePath ?? "") ?? [];
 	const dependencies = stylesheetRegistry?.getDependenciesForSource(sourcePath ?? "") ?? [];
@@ -1040,7 +1067,7 @@ async function findComponentStylesheetWrapperModules(server, changedFile, direct
 	if (directModule.id) directRequestIds.add(directModule.id);
 	if (directModule.url) directRequestIds.add(directModule.url);
 	const requestPath = directModule.id ? getFilenameFromPath(directModule.id) : void 0;
-	const sourcePath = requestPath ? stylesheetRegistry?.resolveExternalSource(requestPath) ?? stylesheetRegistry?.resolveExternalSource(requestPath.replace(/^\//, "")) : void 0;
+	const sourcePath = requestPath ? stylesheetRegistry?.resolveExternalSource(requestPath) ?? stylesheetRegistry?.resolveExternalSource(requestPath.replace(/^\//, "")) ?? stylesheetRegistry?.getServedSourcePath(requestPath) ?? stylesheetRegistry?.getServedSourcePath(requestPath.replace(/^\//, "")) : void 0;
 	for (const requestId of stylesheetRegistry?.getRequestIdsForSource(sourcePath ?? "") ?? []) if (requestId.includes("?ngcomp=")) directRequestIds.add(requestId);
 	const candidateWrapperIds = [...directRequestIds].filter((id) => id.includes("?direct&ngcomp=")).map((id) => id.replace("?direct&ngcomp=", "?ngcomp="));
 	const lookupHits = [];