Merge pull request #211 from soxhub/bugfixes-for-template-plugin

Fix template path transform issue with the app name had "app" in the name

ember-scoped-css/src/lib/path/template-transform-paths.js

@@ -17,6 +17,20 @@ export function fixFilename(filename) {
   let fileName = filename;
   let workspace = findWorkspacePath(fileName);
 
+  /**
+   * For a simple case, there are sometimes duplicate module paths in the fileName
+   * let's collapse that and
+   */
+  let potentialModuleName = path.basename(workspace);
+  let deduped = fileName.replace(
+    `${potentialModuleName}/${potentialModuleName}/`,
+    `${potentialModuleName}/app/`,
+  );
+
+  if (deduped !== fileName) {
+    return deduped;
+  }
+
   /**
    * ember-source 5.8:
    * - the filename looks like an absolute path, but swapped out the 'app' part of the path

ember-scoped-css/src/lib/path/template-transform-paths.test.ts

@@ -32,6 +32,19 @@ describe('fixFilename()', () => {
     );
   });
 
+  it('is not confused with "app" in the component path', () => {
+    let file = path.join(
+      paths.classicApp,
+      'app',
+      'components/app/page/template-only.hbs',
+    );
+    let corrected = fixFilename(file);
+
+    expect(corrected).to.equal(
+      path.join(paths.classicApp, 'app/components/app/page/template-only.hbs'),
+    );
+  });
+
   it('works with classic paths (w/ module name)', () => {
     let file = path.join(
       paths.classicApp,
@@ -44,4 +57,17 @@ describe('fixFilename()', () => {
       path.join(paths.classicApp, 'app/components/template-only.hbs'),
     );
   });
+
+  it('is not confused with "app" in the component path (w/ module name)', () => {
+    let file = path.join(
+      paths.classicApp,
+      'classic-app',
+      'components/app/page/template-only.hbs',
+    );
+    let corrected = fixFilename(file);
+
+    expect(corrected).to.equal(
+      path.join(paths.classicApp, 'app/components/app/page/template-only.hbs'),
+    );
+  });
 });