Embroider compat

adopted-ember-addons · May 20, 2021 · 16a8211 · 16a8211
1 parent 6a32eff
commit 16a8211
Show file tree

Hide file tree

Showing 4 changed files with 1,820 additions and 2,719 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function() {
   return {
@@ -76,7 +77,9 @@ module.exports = async function() {
             '@ember/jquery': '^0.5.1'
           }
         }
-      }
+      },
+      embroiderSafe(),
+      embroiderOptimized(),
     ]
   };
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+const { maybeEmbroider } = require('@embroider/test-setup');
 
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
@@ -14,5 +15,5 @@ module.exports = function(defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  return maybeEmbroider(app);
 };
diff --git a/package.json b/package.json
@@ -37,10 +37,12 @@
     "ember-cli-babel": "^7.11.1",
     "ember-cli-htmlbars": "^4.0.5",
     "ember-get-config": "^0.2.4",
-    "ember-validators": "^3.0.1"
+    "ember-validators": "^3.0.1",
+    "validated-changeset": "~0.14.5"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.0.0",
+    "@embroider/test-setup": "^0.39.1",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^1.5.3",