ember-scoped-css 3.0.0 → 3.2.0

package/dist/cjs/all.cjs

@@ -1,3 +1,3 @@
-const require_all = require('./all-BI7LOSuT.cjs');
+const require_all = require('./all-DJjr6YEx.cjs');
 
 exports.scopedCSS = require_all.scopedCSS;

package/dist/cjs/babel.cjs

@@ -1,4 +1,4 @@
-const require_all = require('./all-BI7LOSuT.cjs');
+const require_all = require('./all-DJjr6YEx.cjs');
 
 //#region src/build/public-exports/babel.js
 const scopedCSS = require_all.scopedCSS.babel;

package/dist/cjs/rollup.cjs

@@ -1,4 +1,4 @@
-const require_all = require('./all-BI7LOSuT.cjs');
+const require_all = require('./all-DJjr6YEx.cjs');
 
 //#region src/build/public-exports/rollup.js
 const scopedCSS = require_all.scopedCSS.rollup;

package/dist/cjs/vite.cjs

@@ -1,4 +1,4 @@
-const require_all = require('./all-BI7LOSuT.cjs');
+const require_all = require('./all-DJjr6YEx.cjs');
 
 //#region src/build/public-exports/vite.js
 const scopedCSS = require_all.scopedCSS.vite;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-scoped-css",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "",
   "keywords": [
     "ember-addon"
@@ -19,7 +19,8 @@
     "dist",
     "declarations",
     "addon-main.cjs",
-    "template-registry.d.ts"
+    "template-registry.d.ts",
+    "types.d.ts"
   ],
   "exports": {
     ".": {
@@ -42,6 +43,10 @@
       "types": "./template-registry.d.ts",
       "default": "./src/noop.js"
     },
+    "./types": {
+      "types": "./types.d.ts",
+      "default": "./src/noop.js"
+    },
     "./test-support": {
       "types": "./declarations/runtime/test-support.d.ts",
       "default": "./dist/runtime/test-support.js"

package/src/lib/path/utils.js

@@ -235,16 +235,37 @@ export function isRelevantFile(fileName, { additionalRoots, cwd }) {
   if (fileName.startsWith(leadingSlashPath.atEmbroider)) return false;
   if (IRRELEVANT_PATHS.some((i) => fileName.includes(i))) return false;
 
-  let workspace = findWorkspacePath(fileName);
-
   assert(cwd, `cwd was not passed to isRelevantFile`);
 
+  let isInAdditionalRoot = additionalRoots?.some((root) => {
+    let relative = path.relative(path.resolve(cwd, root), fileName);
+
+    return (
+      relative !== '..' &&
+      !relative.startsWith(`..${path.sep}`) &&
+      !path.isAbsolute(relative)
+    );
+  });
+
+  let workspace = findWorkspacePath(fileName);
+
   let ourWorkspace = findWorkspacePath(cwd);
 
-  if (workspace !== ourWorkspace) {
+  if (workspace !== ourWorkspace && !isInAdditionalRoot) {
     return false;
   }
 
+  let isInWorkspaceAdditionalRoot =
+    workspace === ourWorkspace &&
+    additionalRoots?.some((root) => {
+      if (path.isAbsolute(root)) return false;
+
+      let normalizedFileName = `${path.sep}${path.normalize(fileName)}${path.sep}`;
+      let normalizedRoot = `${path.sep}${path.normalize(root)}${path.sep}`;
+
+      return normalizedFileName.includes(normalizedRoot);
+    });
+
   let local = fileName.replace(workspace, '');
   let [, ...parts] = local.split(path.sep).filter(Boolean);
 
@@ -260,10 +281,13 @@ export function isRelevantFile(fileName, { additionalRoots, cwd }) {
     leadingSlashPath.componentsDir,
     leadingSlashPath.templatesDir,
     leadingSlashPath.routesDir,
-    ...(additionalRoots || []),
   ];
 
-  if (!roots.some((root) => fileName.includes(root))) {
+  if (
+    !isInAdditionalRoot &&
+    !isInWorkspaceAdditionalRoot &&
+    !roots.some((root) => fileName.includes(root))
+  ) {
     return;
   }
 

package/types.d.ts

@@ -0,0 +1,30 @@
+/**
+ * This declaration file teaches TypeScript (via Glint) about the special
+ * attributes that ember-scoped-css adds to the `<style>` element,
+ * so that `<style scoped>` and `<style inline>` type-check.
+ *
+ * Add it to your tsconfig.json:
+ *
+ * ```jsonc
+ * {
+ *   "compilerOptions": {
+ *     "types": ["ember-scoped-css/types"]
+ *   }
+ * }
+ * ```
+ *
+ * or, if you don't use `compilerOptions.types`, import it from a
+ * type-declaration file that is included in your project:
+ *
+ * ```ts
+ * import 'ember-scoped-css/types';
+ * ```
+ */
+import '@glint/template';
+
+declare global {
+  interface HTMLStyleElementAttributes {
+    scoped: '';
+    inline: '';
+  }
+}