Merge pull request #197 from salsify/fix-3-12-local-imports

Ensure local imports work with CLI 3.12

Author: jamescdavis

packages/ember-css-modules/lib/resolve-path.js

@@ -31,6 +31,15 @@ function resolveRelativePath(importPath, fromFile, options) {
 // Resolve absolute paths pointing to the same app/addon as the importer
 function resolveLocalPath(importPath, fromFile, options) {
   let appOrAddonDirIndex = fromFile.indexOf(options.ownerName, options.root.length);
+
+  // Depending on the exact version of Ember CLI and/or Embroider in play, the
+  // app/addon name may or may not be included in `fromFile`'s path. If not, we
+  // need to strip that prefix from the import path.
+  if (appOrAddonDirIndex === -1) {
+    appOrAddonDirIndex = options.root.length;
+    importPath = ensurePosixPath(importPath).replace(new RegExp('^' + options.ownerName + '/?'), '');
+  }
+
   let prefix = fromFile.substring(0, appOrAddonDirIndex);
   let absolutePath = ensurePosixPath(path.resolve(prefix, importPath));
   return internalDep(absolutePath, options);