Merge pull request #34 from DockYard/make-it-work-with-ember-312

Make it work in ember 3.12

.travis.yml

@@ -47,7 +47,7 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+    - env: EMBER_TRY_SCENARIO=ember-3.13
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

config/ember-try.js

@@ -6,10 +6,10 @@ module.exports = async function() {
   return {
     scenarios: [
       {
-        name: 'ember-lts-3.16',
+        name: 'ember-3.13',
         npm: {
           devDependencies: {
-            'ember-source': '~3.16.0'
+            'ember-source': '~3.13.0'
           }
         }
       },

index.js

@@ -1,20 +1,20 @@
 'use strict';
-
-const EmberMaybeInElementAstTransform = require('./lib/ast-transform')
+const VersionChecker = require('ember-cli-version-checker');
+const buildAstTransform = require('./lib/ast-transform')
 
 module.exports = {
   name: require('./package').name,
 
   setupPreprocessorRegistry(type, registry) {
-    let plugins = registry.load('htmlbars-ast-plugin');
-    let inElementPlugin = plugins.find((plugin) => plugin.name === 'ember-in-element-polyfill');
+    let checker = new VersionChecker(this.project);
+    let dep = checker.for('ember-source');
     let maybePlugin = {
       name: 'ember-maybe-in-element-transform',
-      plugin: EmberMaybeInElementAstTransform,
+      plugin: buildAstTransform(dep.gte('3.17.0')),
       baseDir() {
         return __dirname;
-      }
+      },
     };
-    registry.add("htmlbars-ast-plugin", maybePlugin);
+    registry.add('htmlbars-ast-plugin', maybePlugin);
   },
 };

lib/ast-transform.js

@@ -18,31 +18,53 @@
  *
  * It also thrown an error if called with less than two arguments.
  */
-module.exports = function ({ syntax }) {
-  const b = syntax.builders;
+module.exports = function(is317OrGreater) {
+  return function ({ syntax }) {
+    const b = syntax.builders;
 
-  return {
-    name: "ember-maybe-in-element-transform",
+    let buildMaybeInElement;
+    if (is317OrGreater) {
+      buildMaybeInElement = function (destinationElement, renderInPlace, children) {
+        return b.element("MaybeInElement", {
+          attrs: [
+            b.attr("@destinationElement", b.mustache(destinationElement)),
+            b.attr("@renderInPlace", b.mustache(renderInPlace)),
+          ],
+          children
+        });
+      };
+    } else {
+      buildMaybeInElement = function (destinationElement, renderInPlace, children) {
+        return b.element("MaybeInElement",
+          [b.attr("@destinationElement", b.mustache(destinationElement)),b.attr("@renderInPlace", b.mustache(renderInPlace))],
+          [],
+          children,
+        );
+      };
+    }
 
-    visitor: {
-      BlockStatement(node) {
-        if (node.path.original === "maybe-in-element") {
-          if (node.params.length < 2) {
-            throw new Error(
-              "{{#maybe-in-element}} requires two arguments. The first is the destination element and the second is the `renderInPlace` boolean flag"
+    return {
+      name: "ember-maybe-in-element-transform",
+
+      visitor: {
+        BlockStatement(node) {
+          if (node.path.original === "maybe-in-element") {
+            if (node.params.length < 2) {
+              throw new Error(
+                "{{#maybe-in-element}} requires two arguments. The first is the destination element and the second is the `renderInPlace` boolean flag"
+              );
+            }
+            let destinationElement = node.params[0];
+            let renderInPlace = node.params[1];
+            let newNode = buildMaybeInElement(
+              destinationElement,
+              renderInPlace,
+              node.program.body
             );
+            return newNode;
           }
-          let destinationElement = node.params[0];
-          let renderInPlace = node.params[1];
-          return b.element("MaybeInElement", {
-            attrs: [
-              b.attr("@destinationElement", b.mustache(destinationElement)),
-              b.attr("@renderInPlace", b.mustache(renderInPlace)),
-            ],
-            children: node.program.body,
-          });
-        }
+        },
       },
-    },
-  };
+    };
+  }
 };

package.json

@@ -27,6 +27,7 @@
   "dependencies": {
     "ember-cli-babel": "^7.21.0",
     "ember-cli-htmlbars": "^5.2.0",
+    "ember-cli-version-checker": "^5.1.1",
     "ember-in-element-polyfill": "^1.0.0"
   },
   "devDependencies": {
@@ -48,7 +49,7 @@
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-maybe-import-regenerator-for-testing": "^1.0.0",
     "ember-resolver": "^8.0.0",
-    "ember-source": "~3.20.2",
+    "ember-source": "~3.20.0",
     "ember-source-channel-url": "^2.0.1",
     "ember-template-lint": "^2.9.1",
     "ember-try": "^1.4.0",