Fix regression in non-embroider apps, fix broken tests.

Author: chriseppstein

eyeglass.code-workspace

@@ -17,6 +17,9 @@
 		},
 		{
 			"path": "private-packages/lazy-test-addon"
+		},
+		{
+			"path": "private-packages/eyeglass-embroider-app"
 		}
 	],
 	"settings": {

packages/ember-cli-eyeglass/src/index.ts

@@ -92,6 +92,8 @@ function getDefaultAssetHttpPrefix(parent: any): string {
     if (isLazyEngine(current)) {
       // only lazy engines will inline their assets in the engines-dist folder
       return `engines-dist/${current.name}/assets`;
+    } else if (isEngine(current)) {
+      return `${current.name}/assets`;
     }
     current = current.parent;
   }
@@ -173,6 +175,7 @@ const EMBER_CLI_EYEGLASS = {
       name,
       parentPath,
       app,
+      isEngine: isEngine(this.parent),
       assets: new BroccoliSymbolicLinker({}, {
         annotation: `Eyeglass Assets for ${app.name}/${name}`,
         persistentOutput: true,
@@ -229,7 +232,7 @@ const EMBER_CLI_EYEGLASS = {
           addonInfo.assets.reset();
         });
         let withoutSassFiles = funnel(tree, {
-          srcDir: isApp ? 'app/styles' : undefined,
+          srcDir: (isApp && !embroiderEnabled()) ? 'app/styles' : undefined,
           destDir: isApp ? 'assets' : undefined,
           exclude: ['**/*.s{a,c}ss'],
           allowEmpty: true,
@@ -346,6 +349,11 @@ const EMBER_CLI_EYEGLASS = {
   }
 };
 
+function isEngine(appOrAddon: any): boolean {
+  let keywords: Array<string> = appOrAddon._packageInfo.pkg.keywords || new Array<string>();
+  return keywords.includes("ember-engine");
+}
+
 function convertURLToPath(fragment: string): string {
   return (new URL(`file://${fragment}`)).pathname;
 }

private-packages/eager-test-addon/addon/styles/addon.scss

@@ -2,5 +2,9 @@
 
 .eager-addon {
   color: blue;
-  background-image: asset-url('img/test.jpg')
+  height: 200px;
+  background-image: asset-url('img/test.jpg');
+  background-size: contain;
+  background-position-y: 10px;
+  background-repeat: no-repeat;
 }

private-packages/eyeglass-test-app/tests/acceptance/eyeglass-test.js

@@ -77,7 +77,7 @@ module('Acceptance | eyeglass', function(hooks) {
 
     const lazyStyle = self.getComputedStyle(document.querySelector('.lazy'));
 
-    assert.contains('/engines-dist/lazy-test-addon/assets/img/test.svg', lazyStyle.borderImage);
+    assert.contains('/engines-dist/lazy-test-addon/assets/img/test.svg', lazyStyle.backgroundImage);
   });
 
   test('/assets/eyeglass-test-app.css', async function(assert) {

private-packages/lazy-test-addon/addon/styles/addon.scss

@@ -2,5 +2,7 @@
 
 .lazy {
   background: blue;
-  border-image: asset-url('img/test.svg');
+  height: 200px;
+  background-image: asset-url('img/test.svg');
+  background-size: contain;
 }

private-packages/lazy-test-addon/package.json

@@ -7,9 +7,9 @@
     "ember-engine"
   ],
   "dependencies": {
-    "ember-cli-babel": "^7.13.0",
+    "ember-cli-babel": "^7.20.5",
     "ember-cli-eyeglass": "^7.0.2",
-    "ember-cli-htmlbars": "^4.2.2"
+    "ember-cli-htmlbars": "^4.3.1"
   },
   "ember-addon": {
     "engineConfigPath": "config",