fix: Cache invalidation when block files change.

Author: chriseppstein

packages/@css-blocks/ember/src/CSSBlocksTemplateCompilerPlugin.ts

@@ -128,7 +128,7 @@ export class CSSBlocksTemplateCompilerPlugin extends TemplateCompilerPlugin {
     let factory = new BlockFactory(config, postcss);
     let fileLocator = new BroccoliFileLocator(this.input);
     this.debug(`Looking for templates using css blocks.`);
-    this.analyzingRewriter = new AnalyzingRewriteManager(factory, fileLocator, this.cssBlocksOptions.analysisOpts || {}, this.parserOpts);
+    this.analyzingRewriter = new AnalyzingRewriteManager(factory, fileLocator, this.cssBlocksOptions.analysisOpts || {}, config);
     // The astPluginBuilder interface isn't async so we have to first load all
     // the blocks and associate them to their corresponding templates.
     await this.analyzingRewriter.discoverTemplatesWithBlocks();

packages/@css-blocks/ember/src/TemplateAnalyzingRewriter.ts

@@ -22,6 +22,7 @@ import {
 } from "@glimmer/syntax";
 import { assertNever } from "@opticss/util";
 import * as debugGenerator from "debug";
+import * as path from "path";
 
 const enum StyleCondition {
   STATIC = 1,
@@ -100,21 +101,30 @@ export class TemplateAnalyzingRewriter implements ASTPluginWithDeps {
   get name(): string { return this.block ? "css-blocks-glimmer-rewriter" : "css-blocks-noop"; }
 
   /**
-   * @param _relativePath Unused in this implementation.
+   * @param relativePath the relative path to the template starting at the root
+   * of the input tree.
    * @returns Files this template file depends on.
    */
-  dependencies(_relativePath: string): Array<string> {
-    this.debug("Getting dependencies for", _relativePath);
+  dependencies(relativePath: string): Array<string> {
+    this.debug("Getting dependencies for", relativePath);
     if (!this.block) return [];
 
     let deps: Set<string> = new Set();
-    // let importer = this.cssBlocksOpts.importer;
-    for (let block of this.block.transitiveBlockDependencies()) {
+    let importer = this.cssBlocksOpts.importer;
+    for (let block of [this.block, ...this.block.transitiveBlockDependencies()]) {
       // TODO: Figure out why the importer is returning null here.
-      // let blockFile = importer.filesystemPath(block.identifier, this.cssBlocksOpts);
-      let blockFile = block.identifier;
+      let blockFile = importer.filesystemPath(block.identifier, this.cssBlocksOpts);
+
       this.debug("block file path is", blockFile);
       if (blockFile) {
+        if (!path.isAbsolute(blockFile)) {
+          // this isn't actually relative to the rootDir but it doesn't matter
+          // because the shared root directory will be removed by the relative
+          // path calculation.
+          let templatePath = path.dirname(path.resolve(this.cssBlocksOpts.rootDir, relativePath));
+          let blockPath = path.resolve(this.cssBlocksOpts.rootDir, blockFile);
+          blockFile = path.relative(templatePath, blockPath);
+        }
         deps.add(blockFile);
       }
       // These dependencies happen when additional files get involved via preprocessors.

packages/@css-blocks/ember/src/index.ts

@@ -112,8 +112,7 @@ const EMBER_ADDON: AddonImplementation<CSSBlocksAddon> = {
       name: "css-blocks-htmlbars",
       // TODO: parallel babel stuff
       plugin: this.astPluginBuilder.bind(this),
-      // This is turned off to work around a bug in broccoli-persistent-filter.
-      dependencyInvalidation: false,
+      dependencyInvalidation: true,
       cacheKey: () => this.optionsForCacheInvalidation(),
       baseDir: () => __dirname,
     });

private-packages/fixtures-ember-v2/ember-app/package.json

@@ -14,6 +14,7 @@
     "build": "yarn pretest && ember build",
     "build:debug": "yarn pretest && node --inspect-brk ./node_modules/.bin/ember build",
     "start": "yarn pretest && ember serve",
+    "start:debug": "yarn pretest && node --inspect-brk ./node_modules/.bin/ember serve",
     "pretest": "cd ../../../packages/@css-blocks/ember && yarn compile && cd ../ember-app && yarn compile",
     "test": "ember test",
     "clean:debug": "rm -rf DEBUG"