fix: Bugs in ember addon now that htmlbars is released.

Author: chriseppstein

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

@@ -180,7 +180,7 @@ interface CSSBlocksAddon {
   _options?: CSSBlocksEmberOptions;
 }
 interface HTMLBarsAddon {
-  getTemplateCompiler(inputTree: Tree, htmlbarsOptions: TemplateCompilerPlugin.HtmlBarsOptions): TemplateCompilerPlugin;
+  transpileTree(inputTree: Tree, htmlbarsOptions: TemplateCompilerPlugin.HtmlBarsOptions): TemplateCompilerPlugin;
 }
 
 function isAddon(parent: EmberAddon | EmberApp | Project): parent is EmberAddon {
@@ -211,10 +211,10 @@ const EMBER_ADDON: AddonImplementation<CSSBlocksAddon> = {
     if (!htmlBarsAddon) {
       throw new Error(`Using @css-blocks/ember on ${parentName} also requires ember-cli-htmlbars to be an addon for ${parentName} (ember-cli-htmlbars should be a dependency in package.json, not a devDependency)`);
     }
-    if (!htmlBarsAddon.getTemplateCompiler) {
-      throw new Error("This version of ember-cli-htmlbars is not compatible with @css-blocks/ember. Please upgrade.");
+    if (!htmlBarsAddon.transpileTree) {
+      throw new Error(`Version ${htmlBarsAddon.pkg.version} of ember-cli-htmlbars for ${parentName} is not compatible with @css-blocks/ember. Please upgrade to ^5.2.0.`);
     }
-    htmlBarsAddon.getTemplateCompiler = (inputTree: Tree, htmlbarsOptions: TemplateCompilerPlugin.HtmlBarsOptions) => {
+    htmlBarsAddon.transpileTree = (inputTree: Tree, htmlbarsOptions: TemplateCompilerPlugin.HtmlBarsOptions) => {
       this.templateCompiler = new CSSBlocksTemplateCompilerPlugin(inputTree, htmlbarsOptions, this._options!);
       return this.templateCompiler;
     };
@@ -246,7 +246,8 @@ const EMBER_ADDON: AddonImplementation<CSSBlocksAddon> = {
     registry.add("htmlbars-ast-plugin", {
       name: "css-blocks-htmlbars",
       plugin: this.astPluginBuilder.bind(this),
-      dependencyInvalidation: true,
+      // This is turned off to work around a bug in broccoli-persistent-filter.
+      dependencyInvalidation: false,
       cacheKey: () => this.optionsForCacheInvalidation(),
       baseDir: () => __dirname,
     });

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

@@ -12,7 +12,7 @@
   "dependencies": {
     "@css-blocks/ember": "^0.1.0",
     "ember-cli-babel": "^7.17.2",
-    "ember-cli-htmlbars": "^4.3.1"
+    "ember-cli-htmlbars": "^5.2.0"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.0",

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

@@ -13,7 +13,7 @@
   "scripts": {
     "build": "ember build",
     "start": "ember serve",
-    "pretest": "cd ../../../packages/@css-blocks/broccoli && yarn compile",
+    "pretest": "cd ../../../packages/@css-blocks/ember && yarn compile",
     "test": "ember test"
   },
   "dependencies": {
@@ -22,7 +22,7 @@
     "@css-blocks-fixtures-v2/ember-lazy-engine": "^1.0.0",
     "@css-blocks/ember": "^0.1.0",
     "ember-cli-babel": "^7.7.3",
-    "ember-cli-htmlbars": "^4.3.1",
+    "ember-cli-htmlbars": "^5.2.0",
     "ember-engines": "^0.8.5"
   },
   "devDependencies": {

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

@@ -10,7 +10,7 @@
     "@css-blocks-fixtures-v2/ember-addon": "^1.0.0",
     "@css-blocks/ember": "^0.1.0",
     "ember-cli-babel": "^7.7.3",
-    "ember-cli-htmlbars": "^4.3.1"
+    "ember-cli-htmlbars": "^5.2.0"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.0",

private-packages/fixtures-ember-v2/ember-lazy-engine/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@css-blocks/ember": "^0.1.0",
     "ember-cli-babel": "^7.7.3",
-    "ember-cli-htmlbars": "^4.3.1"
+    "ember-cli-htmlbars": "^5.2.0"
   },
   "devDependencies": {
     "broccoli-plugin": "^4.0.0",

yarn.lock

@@ -8445,26 +8445,6 @@ ember-cli-htmlbars@^4.0.0, ember-cli-htmlbars@^4.2.2, ember-cli-htmlbars@^4.2.3:
     strip-bom "^4.0.0"
     walk-sync "^2.0.2"
 
-ember-cli-htmlbars@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-4.3.1.tgz#4af8adc21ab3c4953f768956b7f7d207782cb175"
-  integrity sha512-CW6AY/yzjeVqoRtItOKj3hcYzc5dWPRETmeCzr2Iqjt5vxiVtpl0z5VTqHqIlT5fsFx6sGWBQXNHIe+ivYsxXQ==
-  dependencies:
-    "@ember/edition-utils" "^1.2.0"
-    babel-plugin-htmlbars-inline-precompile "^3.0.1"
-    broccoli-debug "^0.6.5"
-    broccoli-persistent-filter "^2.3.1"
-    broccoli-plugin "^3.1.0"
-    common-tags "^1.8.0"
-    ember-cli-babel-plugin-helpers "^1.1.0"
-    fs-tree-diff "^2.0.1"
-    hash-for-dep "^1.5.1"
-    heimdalljs-logger "^0.1.10"
-    json-stable-stringify "^1.0.1"
-    semver "^6.3.0"
-    strip-bom "^4.0.0"
-    walk-sync "^2.0.2"
-
 ember-cli-htmlbars@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/ember-cli-htmlbars/-/ember-cli-htmlbars-5.2.0.tgz#5ceccd0d18163dd810dea29f6fd777d0baa01e23"