fix: add better embroider test and fix embroider compat (#8410)

* Add embroider try scenarios * Add maybeEmbroider for main app * Remove comment * fix newlines * update compat scenario locations * continue on error * fix? * remove embroider test-setup * add test and fix --------- Co-authored-by: Chris Thoburn <[email protected]>
emberjs · Feb 25, 2023 · 6143956 · 6143956
1 parent 38c23e0
commit 6143956
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/...ivate-build-infra/src/transforms/babel-plugin-convert-existence-checks-to-macros/index.js b/...ivate-build-infra/src/transforms/babel-plugin-convert-existence-checks-to-macros/index.js
@@ -20,8 +20,9 @@ module.exports = function (babel) {
               binding.referencePaths.forEach((p) => {
                 p.replaceWith(
                   // t.callExpression(state.importer.import(p, '@embroider/macros', 'macroCondition'), [
-                  t.callExpression(state.importer.import(p, '@embroider/macros', 'moduleExists'), [
+                  t.callExpression(state.importer.import(p, '@embroider/macros', 'dependencySatisfies'), [
                     t.stringLiteral(replacements[name]),
+                    t.stringLiteral('*'),
                   ])
                   // ])
                 );

diff --git a/tests/embroider-basic-compat/app/models/user.ts b/tests/embroider-basic-compat/app/models/user.ts
@@ -0,0 +1,5 @@
+import Model, { attr } from '@ember-data/model';
+
+export default class User extends Model {
+  @attr declare name: string;
+}
diff --git a/tests/embroider-basic-compat/tests/acceptance/visit-test.js b/tests/embroider-basic-compat/tests/acceptance/visit-test.js
@@ -11,4 +11,13 @@ module('it works', function (hooks) {
     await visit('/');
     assert.ok('it works!');
   });
+
+  test('we can use the store', async function (assert) {
+    const { owner } = this;
+    const store = owner.lookup('service:store');
+
+    const record = store.createRecord('user', { name: 'Chris' });
+
+    assert.strictEqual(record.name, 'Chris', 'correct name');
+  });
 });