@analogjs/vite-plugin-angular 2.5.0-beta.5 → 2.5.0-beta.51

package/src/lib/utils/plugin-config.js

@@ -0,0 +1,89 @@
+import { existsSync } from 'node:fs';
+import { isAbsolute, resolve } from 'node:path';
+import * as vite from 'vite';
+import { createCompilerPlugin, createRolldownCompilerPlugin, } from '../compiler-plugin.js';
+/**
+ * TypeScript file extension regex
+ * Match .ts / .cts / .mts extensions with an optional ?query suffix.
+ * Reject .tsx — and any other `.ts<letter>…` extension like .tsrx — via
+ * a negative-lookahead on a following ASCII letter, so only genuine TS
+ * files pass.
+ *
+ * Previous form `/\.[cm]?(ts)[^x]?\??/` was intended to exclude `.tsx`
+ * specifically (`[^x]?` = not-an-x), but the `?` quantifier also allows
+ * zero characters, and any non-`x` letter was admitted — so `.tsrx`
+ * and similar extensions matched by accident.
+ */
+export const TS_EXT_REGEX = /\.[cm]?ts(?![a-z])/;
+export function getTsConfigPath(root, tsconfig, isProd, isTest, isLib) {
+    if (tsconfig && isAbsolute(tsconfig)) {
+        if (!existsSync(tsconfig)) {
+            console.error(`[@analogjs/vite-plugin-angular]: Unable to resolve tsconfig at ${tsconfig}. This causes compilation issues. Check the path or set the "tsconfig" property with an absolute path.`);
+        }
+        return tsconfig;
+    }
+    let tsconfigFilePath = './tsconfig.app.json';
+    if (isLib) {
+        tsconfigFilePath = isProd
+            ? './tsconfig.lib.prod.json'
+            : './tsconfig.lib.json';
+    }
+    if (isTest) {
+        tsconfigFilePath = './tsconfig.spec.json';
+    }
+    if (tsconfig) {
+        tsconfigFilePath = tsconfig;
+    }
+    const resolvedPath = resolve(root, tsconfigFilePath);
+    if (!existsSync(resolvedPath)) {
+        console.error(`[@analogjs/vite-plugin-angular]: Unable to resolve tsconfig at ${resolvedPath}. This causes compilation issues. Check the path or set the "tsconfig" property with an absolute path.`);
+    }
+    return resolvedPath;
+}
+export function createTsConfigGetter(tsconfigOrGetter) {
+    if (typeof tsconfigOrGetter === 'function') {
+        return tsconfigOrGetter;
+    }
+    return () => tsconfigOrGetter || '';
+}
+export function createDepOptimizerConfig(opts) {
+    const defineOptions = {
+        ngJitMode: 'false',
+        ngI18nClosureMode: 'false',
+        ...(opts.watchMode ? {} : { ngDevMode: 'false' }),
+    };
+    const rolldownOptions = {
+        plugins: [
+            createRolldownCompilerPlugin({
+                tsconfig: opts.tsconfig,
+                sourcemap: !opts.isProd,
+                advancedOptimizations: opts.isProd,
+                jit: opts.jit,
+                incremental: opts.watchMode,
+            }),
+        ],
+    };
+    const esbuildOptions = {
+        plugins: [
+            createCompilerPlugin({
+                tsconfig: opts.tsconfig,
+                sourcemap: !opts.isProd,
+                advancedOptimizations: opts.isProd,
+                jit: opts.jit,
+                incremental: opts.watchMode,
+            }, opts.isTest, !opts.isAstroIntegration),
+        ],
+        define: defineOptions,
+    };
+    return {
+        optimizeDeps: {
+            include: ['rxjs/operators', 'rxjs'],
+            exclude: ['@angular/platform-server'],
+            ...(vite.rolldownVersion ? { rolldownOptions } : { esbuildOptions }),
+        },
+        resolve: {
+            conditions: ['style'],
+        },
+    };
+}
+//# sourceMappingURL=plugin-config.js.map

package/src/lib/utils/plugin-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-angular/src/lib/utils/plugin-config.ts"],"names":[],"mappings":"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"}

package/src/lib/utils/safe-module-paths.d.ts

@@ -0,0 +1,16 @@
+import { type ResolvedConfig } from 'vite';
+/**
+ * Mark a style file path as safe in Vite's `safeModulePaths` set so the
+ * `?inline` import passes the Denied ID security check without needing
+ * the plugin to intercept the load.
+ *
+ * Vite's own import-analysis transform does the same thing (adds the clean
+ * URL to `safeModulePaths` during transform). We additionally add the
+ * `?inline` form because `isServerAccessDeniedForTransform` checks *both*
+ * `cleanUrl(id)` and the full `id` (with query) against the allow list.
+ *
+ * This lets `?inline` CSS flow through Vite's native CSS pipeline, which
+ * handles preprocessing, `test.css` semantics, and browser-vs-node
+ * differences without the plugin having to reimplement any of it.
+ */
+export declare function markStylePathSafe(config: ResolvedConfig | undefined, absPath: string): void;

package/src/lib/utils/safe-module-paths.js

@@ -0,0 +1,26 @@
+import { normalizePath } from 'vite';
+/**
+ * Mark a style file path as safe in Vite's `safeModulePaths` set so the
+ * `?inline` import passes the Denied ID security check without needing
+ * the plugin to intercept the load.
+ *
+ * Vite's own import-analysis transform does the same thing (adds the clean
+ * URL to `safeModulePaths` during transform). We additionally add the
+ * `?inline` form because `isServerAccessDeniedForTransform` checks *both*
+ * `cleanUrl(id)` and the full `id` (with query) against the allow list.
+ *
+ * This lets `?inline` CSS flow through Vite's native CSS pipeline, which
+ * handles preprocessing, `test.css` semantics, and browser-vs-node
+ * differences without the plugin having to reimplement any of it.
+ */
+export function markStylePathSafe(config, absPath) {
+    if (!config)
+        return;
+    const normalized = normalizePath(absPath);
+    const safeModulePaths = config.safeModulePaths;
+    if (safeModulePaths) {
+        safeModulePaths.add(normalized);
+        safeModulePaths.add(normalized + '?inline');
+    }
+}
+//# sourceMappingURL=safe-module-paths.js.map

package/src/lib/utils/safe-module-paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"safe-module-paths.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-angular/src/lib/utils/safe-module-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAuB,MAAM,MAAM,CAAC;AAE1D;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,iBAAiB,CAC/B,MAAkC,EAClC,OAAe;IAEf,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAI,MAAc,CAAC,eAE3B,CAAC;IACd,IAAI,eAAe,EAAE,CAAC;QACpB,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChC,eAAe,CAAC,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC"}

package/src/lib/utils/virtual-ids.d.ts

@@ -0,0 +1,4 @@
+export declare const VIRTUAL_RAW_PREFIX = "virtual:@analogjs/vite-plugin-angular:raw:";
+export declare function toVirtualRawId(absPath: string): string;
+export declare function isVirtualRawId(id: string): boolean;
+export declare function fromVirtualRawId(id: string): string;

package/src/lib/utils/virtual-ids.js

@@ -0,0 +1,30 @@
+// Virtual module id helpers for external component resources (template files).
+// Routing through virtual ids keeps Vite's built-in plugins (vite:asset, the
+// server.fs Denied ID check) out of the picture: the id Vite sees has no
+// file extension, so extension-based matchers never fire, and it does not
+// match the /[?&](raw|inline)\b/ security regex.
+//
+// Style ?inline imports now flow through Vite's native CSS pipeline via
+// safeModulePaths (see safe-module-paths.ts). Only template ?raw imports
+// still use virtual ids. See #2263 / #2283 / #2310.
+export const VIRTUAL_RAW_PREFIX = 'virtual:@analogjs/vite-plugin-angular:raw:';
+function encode(absPath) {
+    return Buffer.from(absPath, 'utf-8').toString('base64url');
+}
+function decode(encoded) {
+    return Buffer.from(encoded, 'base64url').toString('utf-8');
+}
+export function toVirtualRawId(absPath) {
+    return `${VIRTUAL_RAW_PREFIX}${encode(absPath)}`;
+}
+export function isVirtualRawId(id) {
+    return id.replace(/^\0/, '').startsWith(VIRTUAL_RAW_PREFIX);
+}
+export function fromVirtualRawId(id) {
+    const normalizedId = id.replace(/^\0/, '');
+    if (!normalizedId.startsWith(VIRTUAL_RAW_PREFIX)) {
+        throw new Error(`Invalid virtual raw id: ${id}`);
+    }
+    return decode(normalizedId.slice(VIRTUAL_RAW_PREFIX.length));
+}
+//# sourceMappingURL=virtual-ids.js.map

package/src/lib/utils/virtual-ids.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-ids.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-angular/src/lib/utils/virtual-ids.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,6EAA6E;AAC7E,yEAAyE;AACzE,0EAA0E;AAC1E,iDAAiD;AACjD,EAAE;AACF,wEAAwE;AACxE,yEAAyE;AACzE,oDAAoD;AAEpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,4CAA4C,CAAC;AAE/E,SAAS,MAAM,CAAC,OAAe;IAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,MAAM,CAAC,OAAe;IAC7B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,GAAG,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAAU;IACvC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAAU;IACzC,MAAM,YAAY,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC3C,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;AAC/D,CAAC"}

package/src/lib/utils/virtual-resources.d.ts

@@ -0,0 +1,19 @@
+interface PluginContextLike {
+    addWatchFile(path: string): void;
+}
+/**
+ * Rewrite a user `.html?raw` import to a virtual raw id. Returns undefined
+ * when the id doesn't match, so callers can fall through to the next check.
+ *
+ * Routed through a virtual id (rather than `?analog-raw`) so the path Vite
+ * sees has no file extension — keeps vite:asset / vite:css from re-tagging
+ * the id before our load hook runs.
+ */
+export declare function rewriteHtmlRawImport(id: string, importer: string | undefined): string | undefined;
+/**
+ * Load a virtual raw module: reads the backing file, registers it for HMR
+ * watching, and returns its content as a default-exported string. Returns
+ * undefined when the id is not a virtual raw id.
+ */
+export declare function loadVirtualRawModule(ctx: PluginContextLike, id: string): Promise<string | undefined>;
+export {};

package/src/lib/utils/virtual-resources.js

@@ -0,0 +1,47 @@
+// Shared Vite plugin helpers for routing component resources (templates)
+// through virtual module ids. Both angular-vite-plugin and fast-compile-plugin
+// use these so the rewriting + loading behavior stays in sync between them.
+//
+// Style ?inline imports now flow through Vite's native CSS pipeline via
+// safeModulePaths (see safe-module-paths.ts). Only template ?raw imports
+// still use virtual ids.
+import { promises as fsPromises } from 'node:fs';
+import { dirname, isAbsolute, resolve } from 'node:path';
+import { normalizePath } from 'vite';
+import { fromVirtualRawId, isVirtualRawId, toVirtualRawId, } from './virtual-ids.js';
+function resolveImportPath(id, importer) {
+    const filePath = id.split('?')[0];
+    return isAbsolute(filePath)
+        ? normalizePath(filePath)
+        : importer
+            ? normalizePath(resolve(dirname(importer), filePath))
+            : undefined;
+}
+/**
+ * Rewrite a user `.html?raw` import to a virtual raw id. Returns undefined
+ * when the id doesn't match, so callers can fall through to the next check.
+ *
+ * Routed through a virtual id (rather than `?analog-raw`) so the path Vite
+ * sees has no file extension — keeps vite:asset / vite:css from re-tagging
+ * the id before our load hook runs.
+ */
+export function rewriteHtmlRawImport(id, importer) {
+    if (!id.includes('.html?raw'))
+        return undefined;
+    const resolved = resolveImportPath(id, importer);
+    return resolved ? toVirtualRawId(resolved) : undefined;
+}
+/**
+ * Load a virtual raw module: reads the backing file, registers it for HMR
+ * watching, and returns its content as a default-exported string. Returns
+ * undefined when the id is not a virtual raw id.
+ */
+export async function loadVirtualRawModule(ctx, id) {
+    if (!isVirtualRawId(id))
+        return undefined;
+    const filePath = fromVirtualRawId(id);
+    ctx.addWatchFile(filePath);
+    const content = await fsPromises.readFile(filePath, 'utf-8');
+    return `export default ${JSON.stringify(content)}`;
+}
+//# sourceMappingURL=virtual-resources.js.map

package/src/lib/utils/virtual-resources.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"virtual-resources.js","sourceRoot":"","sources":["../../../../../../packages/vite-plugin-angular/src/lib/utils/virtual-resources.ts"],"names":[],"mappings":"AAAA,yEAAyE;AACzE,+EAA+E;AAC/E,4EAA4E;AAC5E,EAAE;AACF,wEAAwE;AACxE,yEAAyE;AACzE,yBAAyB;AAEzB,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,cAAc,GACf,MAAM,kBAAkB,CAAC;AAM1B,SAAS,iBAAiB,CACxB,EAAU,EACV,QAA4B;IAE5B,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC,QAAQ,CAAC;QACzB,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC;QACzB,CAAC,CAAC,QAAQ;YACR,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;YACrD,CAAC,CAAC,SAAS,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,EAAU,EACV,QAA4B;IAE5B,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAChD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjD,OAAO,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAsB,EACtB,EAAU;IAEV,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACtC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC3B,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,kBAAkB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;AACrD,CAAC"}