Merge pull request #1949 from embroider-build/ownerOfFile-bug

Fix ownerOfFile bug on windows

package.json

@@ -33,7 +33,8 @@
       "browserslist": "^4.14.0",
       "graceful-fs": "^4.0.0",
       "@types/eslint": "^8.37.0",
-      "[email protected]": "5.0.0"
+      "[email protected]": "5.0.0",
+      "@embroider/shared-internals": "workspace:*"
     }
   },
   "devDependencies": {
@@ -66,4 +67,4 @@
     },
     "wildcardLabel": "unlabeled"
   }
-}
+}

packages/shared-internals/src/package-cache.ts

@@ -2,7 +2,7 @@ import Package from './package';
 import { existsSync, realpathSync } from 'fs';
 import { getOrCreate } from './get-or-create';
 import resolvePackagePath from 'resolve-package-path';
-import { dirname, sep } from 'path';
+import { basename, dirname, join, resolve } from 'path';
 
 const realpathSyncCache = new Map<string, string>();
 
@@ -67,25 +67,29 @@ export default class PackageCache {
   }
 
   ownerOfFile(filename: string): Package | undefined {
-    let segments = filename.split(sep);
+    let candidate = filename;
 
     // first we look through our cached packages for any that are rooted right
     // at or above the file.
-    for (let length = segments.length; length >= 0; length--) {
-      if (segments[length - 1] === 'node_modules' || segments[length - 1] === '') {
-        // once we hit a node_modules or the filesystem root, we're leaving the
+    while (true) {
+      if (basename(candidate) === 'node_modules') {
+        // once we hit a node_modules, we're leaving the
         // package we were in, so any higher caches don't apply to us
         break;
       }
 
-      let usedSegments = segments.slice(0, length);
-      let candidate = usedSegments.join(sep);
       if (this.rootCache.has(candidate)) {
         return this.rootCache.get(candidate);
       }
-      if (getCachedExists([...usedSegments, 'package.json'].join(sep))) {
+      if (getCachedExists(join(candidate, 'package.json'))) {
         return this.get(candidate);
       }
+      let nextCandidate = resolve(candidate, '..');
+      if (nextCandidate === candidate) {
+        // got to the top
+        break;
+      }
+      candidate = nextCandidate;
     }
   }
 

test-packages/support/suite-setup-util.ts

@@ -10,7 +10,7 @@ async function githubMatrix() {
   let dir = resolve(__dirname, '..', '..', 'tests', 'scenarios');
   let { stdout } = await execa(
     'scenario-tester',
-    ['list', '--require', 'ts-node/register', '--files', '*-test.ts', '--matrix', 'pnpm run test --filter %s'],
+    ['list', '--require', 'ts-node/register', '--files', '*-test.ts', '--matrix', 'pnpm run test --filter "/^%s/"'],
     {
       cwd: dir,
       preferLocal: true,

tests/scenarios/util-test.ts

@@ -14,8 +14,6 @@ supportMatrix(Scenarios.fromDir(dirname(require.resolve('@embroider/util/package
       'test.js': `
         const { module: QModule, test } = require("qunit");
         const semver = require("semver");
-        const { PackageCache } = require("@embroider/shared-internals");
-
         QModule("shared-internals", function () {
           test("testing on node 12", function (assert) {
             assert.ok(