From b569db005e7a614c5d331cd15a19c7a22e27f4cb Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:05:48 -0400
Subject: [PATCH 1/2] Rename vendor.* to be from @embroider/virtual instead of
 @embroider/core

---
 packages/core/src/module-resolver.ts                   |  8 ++++----
 packages/core/src/virtual-entrypoint.ts                |  2 +-
 packages/vite/src/resolver.ts                          |  2 +-
 tests/addon-template/tests/dummy/index.html            |  4 ++--
 tests/addon-template/tests/index.html                  |  4 ++--
 tests/app-template/index.html                          |  4 ++--
 tests/app-template/tests/index.html                    |  4 ++--
 .../macro-sample-addon/tests/dummy/app/index.html      |  4 ++--
 tests/fixtures/macro-sample-addon/tests/index.html     |  4 ++--
 tests/fixtures/macro-test/tests/index.html             |  4 ++--
 tests/scenarios/compat-addon-classic-features-test.ts  | 10 +++++-----
 tests/ts-app-template/index.html                       |  4 ++--
 tests/ts-app-template/tests/index.html                 |  4 ++--
 13 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts
index a6dc96297..a36cbdc6a 100644
--- a/packages/core/src/module-resolver.ts
+++ b/packages/core/src/module-resolver.ts
@@ -560,7 +560,7 @@ export class Resolver {
 
   private handleVendorStyles<R extends ModuleRequest>(request: R): R {
     //TODO move the extra forwardslash handling out into the vite plugin
-    const candidates = ['@embroider/core/vendor.css', '/@embroider/core/vendor.css', './@embroider/core/vendor.css'];
+    const candidates = ['@embroider/virtual/vendor.css', '/@embroider/virtual/vendor.css', './@embroider/virtual/vendor.css'];
 
     if (!candidates.includes(request.specifier)) {
       return request;
@@ -569,7 +569,7 @@ export class Resolver {
     let pkg = this.packageCache.ownerOfFile(request.fromFile);
     if (!pkg || !this.options.engines.some(e => e.root === pkg?.root)) {
       throw new Error(
-        `bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app or Engine. The top-level Ember app is the only one that has support for @embroider/core/vendor.css. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`
+        `bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app or Engine. The top-level Ember app is the only one that has support for @embroider/virtual/vendor.css. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`
       );
     }
 
@@ -1029,7 +1029,7 @@ export class Resolver {
 
   private handleVendor<R extends ModuleRequest>(request: R): R {
     //TODO move the extra forwardslash handling out into the vite plugin
-    const candidates = ['@embroider/core/vendor.js', '/@embroider/core/vendor.js', './@embroider/core/vendor.js'];
+    const candidates = ['@embroider/virtual/vendor.js', '/@embroider/virtual/vendor.js', './@embroider/virtual/vendor.js'];
 
     if (!candidates.includes(request.specifier)) {
       return request;
@@ -1038,7 +1038,7 @@ export class Resolver {
     let pkg = this.packageCache.ownerOfFile(request.fromFile);
     if (pkg?.root !== this.options.engines[0].root) {
       throw new Error(
-        `bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/core/vendor.js. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`
+        `bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/vendor.js. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`
       );
     }
 
diff --git a/packages/core/src/virtual-entrypoint.ts b/packages/core/src/virtual-entrypoint.ts
index 8b4de6685..e2d21adc2 100644
--- a/packages/core/src/virtual-entrypoint.ts
+++ b/packages/core/src/virtual-entrypoint.ts
@@ -87,7 +87,7 @@ export function renderEntrypoint(
   // will be inserted via a direct <link> tag.
   if (!appFiles.engine.isApp && appFiles.engine.package.isLazyEngine()) {
     styles.push({
-      path: '@embroider/core/vendor.css',
+      path: '@embroider/virtual/vendor.css',
     });
   }
 
diff --git a/packages/vite/src/resolver.ts b/packages/vite/src/resolver.ts
index 7df743f57..922388b5b 100644
--- a/packages/vite/src/resolver.ts
+++ b/packages/vite/src/resolver.ts
@@ -70,7 +70,7 @@ export function resolver(): Plugin {
     buildEnd() {
       this.emitFile({
         type: 'asset',
-        fileName: '@embroider/core/vendor.js',
+        fileName: '@embroider/virtual/vendor.js',
         source: virtualContent(
           resolve(resolverLoader.resolver.options.engines[0].root, '-embroider-vendor.js'),
           resolverLoader.resolver
diff --git a/tests/addon-template/tests/dummy/index.html b/tests/addon-template/tests/dummy/index.html
index 44af3dc9b..4f2e1d6f0 100644
--- a/tests/addon-template/tests/dummy/index.html
+++ b/tests/addon-template/tests/dummy/index.html
@@ -8,7 +8,7 @@
 
     {{content-for "head"}}
 
-    <link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link integrity="" rel="stylesheet" href="/assets/dummy.css">
 
     {{content-for "head-footer"}}
@@ -16,7 +16,7 @@
   <body>
     {{content-for "body"}}
 
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script type="module">
       import Application from './app/app.js';
       import environment from './app/config/environment';
diff --git a/tests/addon-template/tests/index.html b/tests/addon-template/tests/index.html
index 3922c3892..3a4e7d968 100644
--- a/tests/addon-template/tests/index.html
+++ b/tests/addon-template/tests/index.html
@@ -9,7 +9,7 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link rel="stylesheet" href="/assets/dummy.css">
     <link rel="stylesheet" href="/@embroider/core/test-support.css">
 
@@ -28,7 +28,7 @@
     </div>
 
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
     <script type="module">import "ember-testing";</script>
 
diff --git a/tests/app-template/index.html b/tests/app-template/index.html
index 60a4b93e5..b385800fa 100644
--- a/tests/app-template/index.html
+++ b/tests/app-template/index.html
@@ -8,7 +8,7 @@
 
     {{content-for "head"}}
 
-    <link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link integrity="" rel="stylesheet" href="/assets/app-template.css">
 
     {{content-for "head-footer"}}
@@ -16,7 +16,7 @@
   <body>
     {{content-for "body"}}
 
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script type="module">
       import Application from './app/app';
       import environment from './app/config/environment';
diff --git a/tests/app-template/tests/index.html b/tests/app-template/tests/index.html
index a9f23697f..fa9b5a099 100644
--- a/tests/app-template/tests/index.html
+++ b/tests/app-template/tests/index.html
@@ -8,7 +8,7 @@
 
     {{content-for "head"}} {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="/@embroider/core/vendor.css" />
+    <link rel="stylesheet" href="/@embroider/virtual/vendor.css" />
     <link rel="stylesheet" href="/assets/app-template.css" />
     <link rel="stylesheet" href="/@embroider/core/test-support.css" />
 
@@ -25,7 +25,7 @@
     </div>
 
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
     <script type="module">import "ember-testing";</script>
 
diff --git a/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html b/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html
index 8dfc7c9bd..ed5dab348 100644
--- a/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html
+++ b/tests/fixtures/macro-sample-addon/tests/dummy/app/index.html
@@ -8,7 +8,7 @@
 
     {{content-for "head"}}
 
-    <link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link integrity="" rel="stylesheet" href="/assets/dummy.css">
 
     {{content-for "head-footer"}}
@@ -16,7 +16,7 @@
   <body>
     {{content-for "body"}}
 
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script type="module">
       import Application from './app/app.js';
       import environment from './app/config/environment';
diff --git a/tests/fixtures/macro-sample-addon/tests/index.html b/tests/fixtures/macro-sample-addon/tests/index.html
index 3922c3892..3a4e7d968 100644
--- a/tests/fixtures/macro-sample-addon/tests/index.html
+++ b/tests/fixtures/macro-sample-addon/tests/index.html
@@ -9,7 +9,7 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link rel="stylesheet" href="/assets/dummy.css">
     <link rel="stylesheet" href="/@embroider/core/test-support.css">
 
@@ -28,7 +28,7 @@
     </div>
 
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
     <script type="module">import "ember-testing";</script>
 
diff --git a/tests/fixtures/macro-test/tests/index.html b/tests/fixtures/macro-test/tests/index.html
index c231c4e5e..ffcb8d4d4 100644
--- a/tests/fixtures/macro-test/tests/index.html
+++ b/tests/fixtures/macro-test/tests/index.html
@@ -10,7 +10,7 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link rel="stylesheet" href="/assets/app-template.css">
     <link rel="stylesheet" href="/@embroider/core/test-support.css">
 
@@ -32,7 +32,7 @@
       self.ORDER = [];
     </script>
     <script src="/testem.js" integrity=""></script>
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script src="{{rootURL}}apple.js"></script>
     <script src="{{rootURL}}ordered.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
diff --git a/tests/scenarios/compat-addon-classic-features-test.ts b/tests/scenarios/compat-addon-classic-features-test.ts
index a6ef2a8e0..2849d7443 100644
--- a/tests/scenarios/compat-addon-classic-features-test.ts
+++ b/tests/scenarios/compat-addon-classic-features-test.ts
@@ -71,7 +71,7 @@ appScenarios
 
               {{content-for "head"}}
 
-              <link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
+              <link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
               <link integrity="" rel="stylesheet" href="/assets/app-template.css">
 
               {{content-for "head-footer"}}
@@ -80,7 +80,7 @@ appScenarios
               {{content-for "body"}}
               {{content-for "custom"}}
 
-              <script src="/@embroider/core/vendor.js"></script>
+              <script src="/@embroider/virtual/vendor.js"></script>
               <script type="module">
                 import Application from './app/app.js';
                 import environment from './app/config/environment';
@@ -151,7 +151,7 @@ appScenarios
         let result = await app.execute('pnpm build');
         assert.equal(result.exitCode, 0, result.output);
 
-        assert.true(lstatSync(`${app.dir}/dist/@embroider/core/vendor.js`).isFile());
+        assert.true(lstatSync(`${app.dir}/dist/@embroider/virtual/vendor.js`).isFile());
         assert.true(lstatSync(`${app.dir}/dist/@embroider/core/test-support.js`).isFile());
       });
 
@@ -160,7 +160,7 @@ appScenarios
         try {
           const [, url] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
 
-          let response = await fetch(`${url}/@embroider/core/vendor.js`);
+          let response = await fetch(`${url}/@embroider/virtual/vendor.js`);
           assert.strictEqual(response.status, 200);
           // checking the response status 200 is not enough to assert vendor.js is served,
           // because when the URL is not recognized, the response contains the index.html
@@ -240,7 +240,7 @@ appScenarios
         try {
           const [, url] = await server.waitFor(/Local:\s+(https?:\/\/.*)\//g);
 
-          let response = await fetch(`${url}/@embroider/core/vendor.css?direct`);
+          let response = await fetch(`${url}/@embroider/virtual/vendor.css?direct`);
           let text = await response.text();
           assert.true(text.includes('.my-addon-p { color: blue; }'));
 
diff --git a/tests/ts-app-template/index.html b/tests/ts-app-template/index.html
index 3c632d832..96cf4c8ea 100644
--- a/tests/ts-app-template/index.html
+++ b/tests/ts-app-template/index.html
@@ -8,7 +8,7 @@
 
     {{content-for "head"}}
 
-    <link integrity="" rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link integrity="" rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link integrity="" rel="stylesheet" href="/assets/ts-app-template.css">
 
     {{content-for "head-footer"}}
@@ -16,7 +16,7 @@
   <body>
     {{content-for "body"}}
 
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script type="module">
       import Application from './app/app.ts';
       import environment from './app/config/environment';
diff --git a/tests/ts-app-template/tests/index.html b/tests/ts-app-template/tests/index.html
index 337ce67a5..c0a6c830c 100644
--- a/tests/ts-app-template/tests/index.html
+++ b/tests/ts-app-template/tests/index.html
@@ -9,7 +9,7 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="/@embroider/core/vendor.css">
+    <link rel="stylesheet" href="/@embroider/virtual/vendor.css">
     <link rel="stylesheet" href="/assets/ts-app-template.css">
     <link rel="stylesheet" href="/@embroider/core/test-support.css">
 
@@ -28,7 +28,7 @@
     </div>
 
     <script src="/testem.js" integrity="" data-embroider-ignore></script>
-    <script src="/@embroider/core/vendor.js"></script>
+    <script src="/@embroider/virtual/vendor.js"></script>
     <script src="/@embroider/core/test-support.js"></script>
     <script type="module">import "ember-testing";</script>
 

From 51eb294f95e1bfbdbdd275b85e1179ae12487af7 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 3 Oct 2024 11:18:17 -0400
Subject: [PATCH 2/2] lint:fix

---
 packages/core/src/module-resolver.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/module-resolver.ts b/packages/core/src/module-resolver.ts
index a36cbdc6a..a14661178 100644
--- a/packages/core/src/module-resolver.ts
+++ b/packages/core/src/module-resolver.ts
@@ -560,7 +560,11 @@ export class Resolver {
 
   private handleVendorStyles<R extends ModuleRequest>(request: R): R {
     //TODO move the extra forwardslash handling out into the vite plugin
-    const candidates = ['@embroider/virtual/vendor.css', '/@embroider/virtual/vendor.css', './@embroider/virtual/vendor.css'];
+    const candidates = [
+      '@embroider/virtual/vendor.css',
+      '/@embroider/virtual/vendor.css',
+      './@embroider/virtual/vendor.css',
+    ];
 
     if (!candidates.includes(request.specifier)) {
       return request;
@@ -1029,7 +1033,11 @@ export class Resolver {
 
   private handleVendor<R extends ModuleRequest>(request: R): R {
     //TODO move the extra forwardslash handling out into the vite plugin
-    const candidates = ['@embroider/virtual/vendor.js', '/@embroider/virtual/vendor.js', './@embroider/virtual/vendor.js'];
+    const candidates = [
+      '@embroider/virtual/vendor.js',
+      '/@embroider/virtual/vendor.js',
+      './@embroider/virtual/vendor.js',
+    ];
 
     if (!candidates.includes(request.specifier)) {
       return request;