Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vite-plugin-angular): resolve JIT external template/style files #1493

Merged
merged 1 commit into from
Dec 11, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions packages/vite-plugin-angular/src/lib/angular-vite-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CompilerHost, NgtscProgram } from '@angular/compiler-cli';
import { resolve } from 'node:path';
import { dirname, resolve } from 'node:path';

import * as compilerCli from '@angular/compiler-cli';
import * as ts from 'typescript';
Expand Down Expand Up @@ -276,6 +276,16 @@ export function angular(options?: PluginOptions): Plugin[] {

return ctx.modules;
},
resolveId(id, importer) {
if (id.startsWith('angular:jit:')) {
const path = id.split(';')[1];
return `${normalizePath(
resolve(dirname(importer as string), path)
)}?raw`;
}

return id;
},
async transform(code, id) {
// Skip transforming node_modules
if (id.includes('node_modules')) {
Expand Down Expand Up @@ -311,14 +321,6 @@ export function angular(options?: PluginOptions): Plugin[] {
return;
}

/**
* Skip re-transforming files already JIT compiled
* with external styles or templates.
*/
if (jit && code.includes('angular:jit:')) {
return;
}

if (TS_EXT_REGEX.test(id)) {
if (id.includes('.ts?')) {
// Strip the query string off the ID
Expand Down
Loading