Merge pull request #164 from josemarluedke/feat/embroider-take-2

Setup Embroider for testing in CI
josemarluedke · Jul 23, 2021 · acd91bf · acd91bf
2 parents f9b950c + 61df554
commit acd91bf
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 68 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,6 +43,8 @@ jobs:
         ember-try-scenario:
           - ember-release
           - ember-beta
+          # - embroider-safe
+          # - embroider-optimized
           # - ember-canary https://github.com/jeffjewiss/ember-cli-postcss/issues/745
 
     steps:

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,59 +1,38 @@
 'use strict';
 
 const getChannelURL = require('ember-source-channel-url');
+const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
-module.exports = function () {
-  return Promise.all([
-    getChannelURL('release'),
-    getChannelURL('beta'),
-    getChannelURL('canary')
-  ]).then((urls) => {
-    return {
-      useYarn: true,
-      scenarios: [
-        {
-          name: 'ember-3.16',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.16.0'
-            }
+module.exports = async function () {
+  return {
+    useYarn: true,
+    scenarios: [
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release')
           }
-        },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0]
-            }
-          }
-        },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1]
-            }
-          }
-        },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2]
-            }
+        }
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta')
           }
-        },
-        // The default `.travis.yml` runs this scenario via `yarn test`,
-        // not via `ember try`. It's still included here so that running
-        // `ember try:each` manually or from a customized CI config will run it
-        // along with all the other scenarios.
-        {
-          name: 'ember-default',
-          npm: {
-            devDependencies: {}
+        }
+      },
+      {
+        name: 'ember-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary')
           }
         }
-      ]
-    };
-  });
+      },
+      embroiderSafe(),
+      embroiderOptimized()
+    ]
+  };
 };
diff --git a/package.json b/package.json
@@ -22,5 +22,8 @@
     "eslint": "^7.31.0",
     "lerna": "^4.0.0",
     "typescript": "^4.3.5"
+  },
+  "dependencies": {
+    "@embroider/test-setup": "^0.43.0"
   }
 }
diff --git a/packages/buttons/ember-cli-build.js b/packages/buttons/ember-cli-build.js
@@ -26,5 +26,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/buttons/package.json b/packages/buttons/package.json
@@ -22,6 +22,7 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
+    "@embroider/test-setup": "^0.43.0",
     "@frontile/tailwindcss-plugin-helpers": "^0.12.0",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.7.1",

diff --git a/packages/changeset-form/ember-cli-build.js b/packages/changeset-form/ember-cli-build.js
@@ -26,5 +26,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/changeset-form/package.json b/packages/changeset-form/package.json
@@ -22,6 +22,7 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
+    "@embroider/test-setup": "^0.43.0",
     "@frontile/forms": "^0.12.0",
     "ember-changeset": "^3.14.1",
     "ember-changeset-validations": "^3.15.2",

diff --git a/packages/core/ember-cli-build.js b/packages/core/ember-cli-build.js
@@ -27,5 +27,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -26,6 +26,7 @@
   "dependencies": {
     "@ember/render-modifiers": "^1.0.2",
     "@ember/test-waiters": "^2.4.5",
+    "@embroider/test-setup": "^0.43.0",
     "@frontile/tailwindcss-plugin-helpers": "^0.12.0",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.7.1",

diff --git a/packages/forms/addon/components/form-select.hbs b/packages/forms/addon/components/form-select.hbs
@@ -1,7 +1,6 @@
 <FormField
   @size={{@size}}
-  class={{use-frontile-class "form-select" @size class=@containerClass}}
-  as |f|
+  class={{use-frontile-class "form-select" @size class=@containerClass}} as |f|
 >
   {{#if @label}}
     <f.Label
@@ -14,25 +13,33 @@
   {{/if}}
 
   {{#if @hint}}
-    <f.Hint
-      class={{use-frontile-class "form-select" @size part="hint"}}
-    >
+    <f.Hint class={{use-frontile-class "form-select" @size part="hint"}}>
       {{@hint}}
     </f.Hint>
   {{/if}}
 
-  {{#let (component (if @isMultiple "power-select-multiple" "power-select")) as |Component|}}
+  {{#let
+    (if
+      @isMultiple (component "power-select-multiple") (component "power-select")
+    ) as |Component|
+  }}
     <Component
       ...attributes
       @onChange={{this.handleChange}}
       @onFocus={{this.handleFocusIn}}
       @onBlur={{this.handleFocusOut}}
       @onOpen={{this.handleOpen}}
       @onClose={{this.handleClose}}
-      @ariaDescribedBy="{{if @hint f.hintId}}{{if this.showErrorFeedback (concat " " f.feedbackId)}}{{if @ariaDescribedBy (concat " " @ariaDescribedBy)}}"
-      @ariaLabelledBy="{{if @label f.id}}{{if @ariaLabelledBy (concat " "@ariaLabelledBy)}}"
+      @ariaDescribedBy="{{if @hint f.hintId}}{{
+        if this.showErrorFeedback (concat " " f.feedbackId)
+      }}{{if @ariaDescribedBy (concat " " @ariaDescribedBy)}}"
+      @ariaLabelledBy="{{if @label f.id}}{{
+        if @ariaLabelledBy (concat " " @ariaLabelledBy)
+      }}"
       @ariaInvalid={{if this.showErrorFeedback "true"}}
-      @triggerClass="{{@triggerClass}} {{if @size (concat "ember-power-select-trigger-" @size)}} {{use-frontile-class "form-select" @size part="select"}}"
+      @triggerClass="{{@triggerClass}} {{
+        if @size (concat "ember-power-select-trigger-" @size)
+      }} {{use-frontile-class "form-select" @size part="select"}}"
       @highlightOnHover={{@highlightOnHover}}
       @placeholderComponent={{@placeholderComponent}}
       @searchMessage={{@searchMessage}}
@@ -79,8 +86,7 @@
       @optionsComponent={{@optionsComponent}}
       @extra={{@extra}}
       @groupComponent={{@groupComponent}}
-      @afterOptionsComponent={{@afterOptionsComponent}}
-      as |option term|
+      @afterOptionsComponent={{@afterOptionsComponent}} as |option term|
     >
       {{yield option term}}
     </Component>
@@ -92,4 +98,4 @@
       @errors={{@errors}}
     />
   {{/if}}
-</FormField>
+</FormField>
diff --git a/packages/forms/ember-cli-build.js b/packages/forms/ember-cli-build.js
@@ -26,5 +26,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/forms/package.json b/packages/forms/package.json
@@ -22,6 +22,7 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
+    "@embroider/test-setup": "^0.43.0",
     "@frontile/core": "^0.12.0",
     "@frontile/tailwindcss-plugin-helpers": "^0.12.0",
     "ember-cli-babel": "^7.26.6",

diff --git a/packages/notifications/ember-cli-build.js b/packages/notifications/ember-cli-build.js
@@ -32,5 +32,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/notifications/package.json b/packages/notifications/package.json
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@ember/render-modifiers": "^1.0.2",
+    "@embroider/test-setup": "^0.43.0",
     "@frontile/core": "^0.12.0",
     "@frontile/tailwindcss-plugin-helpers": "^0.12.0",
     "ember-cli-babel": "^7.26.6",

diff --git a/packages/overlays/ember-cli-build.js b/packages/overlays/ember-cli-build.js
@@ -30,5 +30,6 @@ module.exports = function (defaults) {
     behave. You most likely want to be modifying `./index.js` or app's build file
   */
 
-  return app.toTree();
+  const { maybeEmbroider } = require('@embroider/test-setup');
+  return maybeEmbroider(app);
 };
diff --git a/packages/overlays/package.json b/packages/overlays/package.json
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@ember/render-modifiers": "^1.0.2",
+    "@embroider/test-setup": "^0.43.0",
     "@frontile/core": "^0.12.0",
     "@frontile/forms": "^0.12.0",
     "@frontile/tailwindcss-plugin-helpers": "^0.12.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1194,6 +1194,14 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
+"@embroider/test-setup@^0.43.0":
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-0.43.0.tgz#c549bec9b3597ad30793ba008fcc9f6eafbfa03e"
+  integrity sha512-8LWpqqdPw283yb0LWxbXwf75LTbnpka6kCnTYcFh8MIRR6yraEXNu2BL6xezI5PCbYqc+fhNQGA8gUHbxAOfYw==
+  dependencies:
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+
 "@embroider/util@^0.39.0 || ^0.40.0 || ^0.41.0", "@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0":
   version "0.41.0"
   resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.41.0.tgz#5324cb4742aa4ed8d613c4f88a466f73e4e6acc1"