WIP: emborider approach may need to change entirely to be more like g…

…limmer-scoped-css

ember-scoped-css/src/build/ember-classic-support.js

@@ -17,11 +17,33 @@ import {
 } from '../lib/path/utils.js';
 import rewriteCss from '../lib/rewriteCss.js';
 import rewriteHbs from '../lib/rewriteHbs.js';
+import { createPlugin } from './template-plugin.js';
 
 const p = new Preprocessor();
 const COMPONENT_EXTENSIONS = ['hbs', 'js', 'ts', 'gjs', 'gts'];
 const TEMPLATE_EXTENSIONS = ['hbs', 'gjs', 'gts'];
 
+export function installScopedCSS(registry, options) {
+  registry.add('htmlbars-ast-plugin', buildASTPlugin(options));
+}
+
+export function buildASTPlugin(options) {
+  let plugin = createPlugin(options);
+
+  return {
+    name: 'ember-scoped-css::template-plugin',
+    plugin,
+    baseDir: function () {
+      return __dirname;
+    },
+    parallelBabel: {
+      requireFile: __filename,
+      buildUsing: 'buildASTPlugin',
+      params: {},
+    },
+  };
+}
+
 class ScopedFilter extends Filter {
   constructor(componentsNode, options = {}) {
     super(componentsNode, options);
@@ -235,8 +257,6 @@ export default class ScopedCssPreprocessor {
       ...(this.userOptions.additionalRoots || []).map(
         (root) => `${this.appName}/${root}`,
       ),
-      'app/components/',
-      ...(this.userOptions.additionalRoots || []).map((root) => `app/${root}`),
     ];
     let include = roots
       .map((root) => {

ember-scoped-css/src/lib/path/utils.js

@@ -141,6 +141,8 @@ export function isRelevantFile(fileName, additionalRoots) {
 
     // These are already the bundled files.
     if (fileName.includes('/node_modules/.embroider/rewritten-app/assets/')) {
+      return false;
+
       // not supported, never will be
       if (
         fileName.endsWith(
@@ -265,6 +267,7 @@ export function appPath(sourcePath) {
 }
 
 const CACHE = new Set();
+const cwd = process.cwd();
 
 /**
  * For a given source path, if we have seen a
@@ -273,7 +276,7 @@ const CACHE = new Set();
  */
 function hasSeen(sourcePath) {
   for (let entry of CACHE) {
-    if (sourcePath.startsWith(entry)) {
+    if (sourcePath.startsWith(entry) && cwd !== entry) {
       return entry;
     }
   }
@@ -294,7 +297,7 @@ export function findWorkspacePath(sourcePath) {
   }
 
   const packageJsonPath = findUp.sync('package.json', {
-    cwd: path.dirname(sourcePath),
+    cwd: sourcePath,
   });
 
   const workspacePath = path.dirname(packageJsonPath);