Merge pull request #584 from arthirm/master

ember-cli · Jul 17, 2020 · 71d7580 · 71d7580
2 parents fa88f66 + cf34fec
commit 71d7580
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 185 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -13,7 +13,9 @@ module.exports = function (defaults) {
 
   let app = new EmberAddon(defaults, {
     // Add options here
-    throwUnlessParallelizable: true,
+    'ember-cli-babel': {
+      throwUnlessParallelizable: true,
+    },
 
     trees: {
       app: appTree,

diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "broccoli-plugin": "^4.0.3",
     "common-tags": "^1.8.0",
     "ember-cli-babel-plugin-helpers": "^1.1.0",
+    "ember-template-lint": "^2.9.1",
     "fs-tree-diff": "^2.0.1",
     "hash-for-dep": "^1.5.1",
     "heimdalljs-logger": "^0.1.10",
@@ -69,7 +70,6 @@
     "ember-cli-babel": "^7.21.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-template-lint": "^1.0.0",
     "ember-cli-version-checker": "^5.1.1",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",

diff --git a/tests/dummy/lib/module-name-inliner/index.js b/tests/dummy/lib/module-name-inliner/index.js
@@ -54,7 +54,7 @@ module.exports = {
       },
       parallelBabel: {
         requireFile: __filename,
-        buildUsing: 'buildPlugin',
+        buildUsing: 'buildLegacyPlugin',
         params: {},
       },