Re-support pods

README.md

@@ -59,8 +59,6 @@ Setup webpack:
 ```js 
 // ember-cli-build.js
 module.exports = async function (defaults) {
-  const { appJsUnplugin } = await import('ember-scoped-css/build');
-
   const app = new EmberApp(defaults, { /* ... */ });
 
   const { Webpack } = require('@embroider/webpack');
@@ -70,7 +68,6 @@ module.exports = async function (defaults) {
     packagerOptions: {
       // css loaders for live reloading css
       webpackConfig: {
-        plugins: [appJsUnplugin.webpack({ appDir: __dirname })],
         module: {
           rules: [
             // css loaders for production

ember-scoped-css-compat/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const hashObj = require('hash-obj');
+const fs = require('fs');
 
 const {
   default: ScopedCssPreprocessor,
@@ -57,6 +58,7 @@ module.exports = {
 
     this._setupCSSPlugins(registry, options);
     this._setupHBSPlugins(registry, options);
+    this._setupJSPlugins(registry, options);
   },
 
   _setupCSSPlugins(registry, options) {
@@ -72,6 +74,10 @@ module.exports = {
     registry.add('css', this.outputStylePreprocessor);
   },
 
+  _setupJSPlugins(registry, options) {
+    registry.add('js', new JSPreprocessor(options));
+  },
+
   _setupHBSPlugins(registry, options) {
     let plugin = this._buildHBSPlugin(options);
 
@@ -112,3 +118,47 @@ function cacheKeyForConfig(config) {
   //       and those css files are not imported into js... so... no cache for us
   return `ember-scoped-css-${configHash}-${Math.random()}`;
 }
+
+const stew = require('broccoli-stew');
+const babel = require('@babel/core');
+
+class JSPreprocessor {
+  constructor(options) {
+    this.options = options;
+  }
+
+  toTree(tree) {
+    let updated = stew.map(tree, '**/*.{js}', (string, relativePath) => {
+      console.log({ string, relativePath });
+
+      let cssPath = relativePath.replace(/\.js$/, '.css');
+
+      if (fs.existsSync(cssPath)) {
+        /**
+         * This is slow to cause a whole parse again,
+         * so we only want to do it when we know we have a CSS file.
+         *
+         * The whole babel situation with embroider (pre v4) and classic ember,
+         * is... just a mess. So we're skirting around it and inserting our code
+         * as early as possible.
+         */
+        let result = babel.transformSync('code', {
+          plugins: [
+            [
+              require.resolve('ember-scoped-css/babel-plugin'),
+              {
+                ...this.options,
+              },
+            ],
+          ],
+        });
+
+        return result.code;
+      }
+
+      return string;
+    });
+
+    return updated;
+  }
+}

ember-scoped-css-compat/package.json

@@ -39,6 +39,7 @@
     "@glimmer/tracking": "^1.1.2",
     "@nullvoxpopuli/eslint-configs": "^4.0.0",
     "broccoli-asset-rev": "^3.0.0",
+    "broccoli-stew": "^3.0.0",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.7.2",
     "ember-cli": "~5.8.1",

ember-scoped-css/src/build/index.js

@@ -1,4 +1,3 @@
-import appJsUnplugin from './app-js-unplugin.js';
 import scopedCssUnplugin from './scoped-css-unplugin.js';
 
-export { appJsUnplugin, scopedCssUnplugin };
+export { scopedCssUnplugin };

ember-scoped-css/src/build/template-plugin.js

@@ -3,18 +3,15 @@
  * @typedef {import('@glimmer/syntax').ASTPluginEnvironment} ASTPluginEnvironment
  *
  */
-import path from 'node:path';
-
-import { existsSync } from 'fs';
 
 import { getCSSInfo } from '../lib/css/utils.js';
-import { appPath, findWorkspacePath } from '../lib/generateAbsolutePathHash.js';
-import { generateRelativePathHash } from '../lib/generateRelativePathHash.js';
+import { fixFilename } from '../lib/path/template-transform-paths.js';
 import {
+  appPath,
   cssPathFor,
+  hashFromModulePath,
   isRelevantFile,
-  withoutExtension,
-} from '../lib/path-utils.js';
+} from '../lib/path/utils.js';
 import { templatePlugin } from '../lib/rewriteHbs.js';
 
 const noopPlugin = {
@@ -37,12 +34,12 @@ export function createPlugin(config) {
       return noopPlugin;
     }
 
-    let absolutePath = fixFilename(env);
+    let absolutePath = fixFilename(env.filename);
     let modulePath = appPath(absolutePath);
 
     let cssPath = cssPathFor(absolutePath);
     let info = getCSSInfo(cssPath);
-    let postfix = generateRelativePathHash(modulePath);
+    let postfix = hashFromModulePath(modulePath);
 
     if (!info) {
       return noopPlugin;
@@ -77,77 +74,3 @@ export function createPlugin(config) {
     };
   };
 }
-
-/**
- * template plugins do not hand us the correct file path.
- * additionally, we may not be able to rely on this data in the future,
- * so this functions acts as a means of normalizing _whatever_ we're given
- * in the future.
- *
- * @param {ASTPluginEnvironment} env
- * @returns {string} the absolute path to the file
- */
-function fixFilename(env) {
-  let fileName = env.filename;
-  let workspace = findWorkspacePath(fileName);
-
-  /**
-   * ember-source 5.8:
-   * - the filename looks like an absolute path, but swapped out the 'app' part of the path
-   *   with the module name, so the file paths never exist on disk
-   */
-  if (!fileName.includes('/app/')) {
-    let maybeModule = fileName.replace(workspace, '');
-    let [maybeScope, ...rest] = maybeModule.split('/').filter(Boolean);
-    let parts = rest;
-
-    if (maybeScope.startsWith('@')) {
-      let [, ...rester] = rest;
-
-      parts = rester;
-    }
-
-    let relative = path.join(...parts);
-
-    /**
-     * We don't actually know if this file is an app.
-     * it could be an addon (v1 or v2)
-     *
-     * So here we log to see if we have unhandled situations.
-     */
-    let candidatePath = path.join(workspace, 'app', relative);
-
-    let resolved = findCandidate(candidatePath);
-
-    if (resolved) {
-      return resolved;
-    }
-  }
-
-  console.debug(`[ScopedCSS]: Failed to handle ${fileName}`);
-
-  // Fallback to what the plugin system gives us.
-  // This may be wrong, and if wrong, reveals
-  // unhandled scenarios with the file names in the plugin infra
-  return fileName;
-}
-
-const COMPILES_TO_JS = ['.hbs', '.gjs', '.gts'];
-
-function findCandidate(filePath) {
-  if (existsSync(filePath)) {
-    return filePath;
-  }
-
-  let withoutExt = withoutExtension(filePath);
-
-  for (let ext of COMPILES_TO_JS) {
-    let candidatePath = withoutExt + ext;
-
-    if (existsSync(candidatePath)) {
-      return candidatePath;
-    }
-  }
-
-  return null;
-}