re-enable watch tests

packages/vite/src/dep-tracker.ts

@@ -0,0 +1,32 @@
+import type { ViteDevServer } from 'vite';
+import makeDebug from 'debug';
+
+const debug = makeDebug('embroider:vite');
+
+export class DepTracker {
+ #virtualDeps: Map<string, string[]> = new Map();
+ #server: ViteDevServer;
+
+ constructor(server: ViteDevServer) {
+ this.#server = server;
+ server.watcher.on('all', (_eventName, path) => {
+ for (let [id, watches] of this.#virtualDeps) {
+ for (let watch of watches) {
+ if (path.startsWith(watch)) {
+ debug('Invalidate %s because %s', id, path);
+ server.moduleGraph.onFileChange(id);
+ let m = server.moduleGraph.getModuleById(id);
+ if (m) {
+ server.reloadModule(m);
+ }
+ }
+ }
+ }
+ });
+ }
+
+ trackDeps(id: string, deps: string[]) {
+ this.#virtualDeps.set(id, deps);
+ this.#server.watcher.add(deps);
+ }
+}

packages/vite/src/hbs.ts

@@ -1,6 +1,7 @@
 import { createFilter } from '@rollup/pluginutils';
 import type { PluginContext } from 'rollup';
 import type { Plugin } from 'vite';
+
 import {
  hbsToJS,
  ResolverLoader,
@@ -9,14 +10,22 @@ import {
  templateOnlyComponentSource,
  syntheticJStoHBS,
 } from '@embroider/core';
+import { DepTracker } from './dep-tracker.js';
 
 const resolverLoader = new ResolverLoader(process.cwd());
 const hbsFilter = createFilter('**/*.hbs?([?]*)');
 
 export function hbs(): Plugin {
+ let depTracker: DepTracker | undefined;
+
  return {
  name: 'rollup-hbs-plugin',
  enforce: 'pre',
+
+ configureServer(s) {
+ depTracker = new DepTracker(s);
+ },
+
  async resolveId(source: string, importer: string | undefined, options) {
  if (options.custom?.depScan) {
  // during depscan we have a corresponding esbuild plugin that is
@@ -62,16 +71,31 @@ export function hbs(): Plugin {
  }
  }
 
- let syntheticId = needsSyntheticComponentJS(source, resolution.id);
- if (syntheticId && isInComponents(resolution.id, resolverLoader.resolver.packageCache)) {
- return {
- id: syntheticId,
- meta: {
- 'rollup-hbs-plugin': {
- type: 'template-only-component-js',
+ if (isInComponents(resolution.id, resolverLoader.resolver.packageCache)) {
+ let syntheticId = needsSyntheticComponentJS(source, resolution.id);
+ if (syntheticId) {
+ depTracker?.trackDeps(syntheticId, [resolution.id]);
+ return {
+ id: syntheticId,
+ meta: {
+ 'rollup-hbs-plugin': {
+ type: 'template-only-component-js',
+ },
  },
- },
- };
+ };
+ } else {
+ let correspondingHBS = syntheticJStoHBS(resolution.id);
+ if (correspondingHBS) {
+ depTracker?.trackDeps(resolution.id, [correspondingHBS]);
+ }
+ }
+ }
+
+ // we should be able to clear any earlier meta by returning
+ // resolution.meta here, but vite breaks that rollup feature.
+ let meta = getMeta(this, resolution.id);
+ if (meta) {
+ meta.type = null;
  }
 
  return resolution;
@@ -95,7 +119,7 @@ export function hbs(): Plugin {
 }
 
 type Meta = {
- type: 'template-only-component-js';
+ type: 'template-only-component-js' | null;
 };
 
 function getMeta(context: PluginContext, id: string): Meta | null {

packages/vite/src/resolver.ts

@@ -1,4 +1,4 @@
-import type { Plugin, ViteDevServer } from 'vite';
+import type { Plugin } from 'vite';
 import core, { type Resolver } from '@embroider/core';
 const { virtualContent, ResolverLoader, explicitRelative, cleanUrl, tmpdir } = core;
 import { RollupModuleRequest, virtualPrefix } from './request.js';
@@ -10,37 +10,23 @@ import type { PluginContext, ResolveIdResult } from 'rollup';
 import { externalName } from '@embroider/reverse-exports';
 import fs from 'fs-extra';
 import { createHash } from 'crypto';
+import { DepTracker } from './dep-tracker.js';
 
 const { ensureSymlinkSync, outputJSONSync } = fs;
 
 const debug = makeDebug('embroider:vite');
 
 export function resolver(): Plugin {
  const resolverLoader = new ResolverLoader(process.cwd());
- let server: ViteDevServer;
- const virtualDeps: Map<string, string[]> = new Map();
+ let depTracker: DepTracker | undefined;
  const notViteDeps = new Set<string>();
 
  return {
  name: 'embroider-resolver',
  enforce: 'pre',
 
  configureServer(s) {
- server = s;
- server.watcher.on('all', (_eventName, path) => {
- for (let [id, watches] of virtualDeps) {
- for (let watch of watches) {
- if (path.startsWith(watch)) {
- debug('Invalidate %s because %s', id, path);
- server.moduleGraph.onFileChange(id);
- let m = server.moduleGraph.getModuleById(id);
- if (m) {
- server.reloadModule(m);
- }
- }
- }
- }
- });
+ depTracker = new DepTracker(s);
  },
 
  async resolveId(source, importer, options) {
@@ -73,8 +59,7 @@ export function resolver(): Plugin {
  if (id.startsWith(virtualPrefix)) {
  let { pathname } = new URL(id, 'http://example.com');
  let { src, watches } = virtualContent(pathname.slice(virtualPrefix.length + 1), resolverLoader.resolver);
- virtualDeps.set(id, watches);
- server?.watcher.add(watches);
+ depTracker?.trackDeps(id, watches);
  return src;
  }
  },